diff --git a/Dockerfile b/Dockerfile index f4639cfec..0739da509 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ gpg-agent \ software-properties-common \ - && rm -rf /var/lib/apt/lists/* \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ && apt-get update && apt-get install -y --no-install-recommends \ @@ -19,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Build Tools RUN apt-get update && apt-get install -y --no-install-recommends \ - wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev \ + wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev sudo \ git make g++ file perl bash binutils locales qemu-utils bison flex \ && rm -rf /var/lib/apt/lists/* diff --git a/Documentation/kernel.md b/Documentation/kernel.md index b256c3056..bbebee1f7 100644 --- a/Documentation/kernel.md +++ b/Documentation/kernel.md @@ -3,10 +3,10 @@ | Board | Version | |-------|---------| -| Open Virtual Applicance | 4.19.20 | +| Open Virtual Applicance | 4.19.56 | | Raspberry Pi | 4.14.98 | -| Tinker Board | 4.19.20 | -| Odroid-C2 | 4.19.15 | -| Odroid-XU4 | 4.19.15 | -| Orangepi-Prime | 4.19.13 | -| Intel NUC | 4.14.82 | +| Tinker Board | 4.19.56 | +| Odroid-C2 | 4.19.56 | +| Odroid-XU4 | 4.19.56 | +| Orangepi-Prime | 4.19.56 | +| Intel NUC | 4.19.56 | diff --git a/Documentation/network.md b/Documentation/network.md index d180307a9..2bfae042a 100644 --- a/Documentation/network.md +++ b/Documentation/network.md @@ -12,7 +12,7 @@ We have a preinstalled connection profile: ```ini [connection] -id=HassOS default +id=my-network uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add type=802-3-ethernet @@ -28,7 +28,7 @@ method=auto ```ini [connection] -id=hassos-network +id=my-network uuid=d55162b4-6152-4310-9312-8f4c54d86afa type=802-3-ethernet @@ -44,7 +44,7 @@ method=auto ```ini [connection] -id=hassos-network +id=my-network uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3 type=802-11-wireless diff --git a/README.md b/README.md index 9015c8f5c..6f593233b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://dev.azure.com/home-assistant/Hass.io/_apis/build/status/hassos?branchName=dev)](https://dev.azure.com/home-assistant/Hass.io/_build/latest?definitionId=13&branchName=dev) + # HassOS Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for Docker and supports various kind of IoT hardware. It is also available as virtual appliance. The whole system is optimized for embedded system and security. You can update the system simple with OTA updates or offline updates. diff --git a/azure-pipelines.yml b/azure-pipelines-ci.yml similarity index 84% rename from azure-pipelines.yml rename to azure-pipelines-ci.yml index 073cb008f..85f06f938 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines-ci.yml @@ -5,11 +5,6 @@ trigger: branches: include: - dev - tags: - include: - - '*' - exclude: - - untagged* pr: - dev @@ -25,7 +20,8 @@ jobs: pool: vmImage: 'ubuntu-16.04' steps: - - script: sudo docker pull hadolint/hadolint:$(versionHadolint) + - script: | + sudo docker pull hadolint/hadolint:$(versionHadolint) displayName: 'Install Hadolint' - script: | sudo docker run --rm -i \ @@ -38,7 +34,8 @@ jobs: pool: vmImage: 'ubuntu-16.04' steps: - - script: sudo docker pull koalaman/shellcheck:$(versionShellCheck) + - script: | + sudo docker pull koalaman/shellcheck:$(versionShellCheck) displayName: 'Install ShellCheck' - script: | sudo docker run --rm -i \ diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml new file mode 100644 index 000000000..7555251d3 --- /dev/null +++ b/azure-pipelines-release.yml @@ -0,0 +1,79 @@ +# https://dev.azure.com/home-assistant + +trigger: + batch: true + tags: + include: + - '*' + exclude: + - untagged* +pr: none + +variables: + - name: versionGHR + value: 'v0.12.1' + - group: github + - group: hassos + +jobs: + + +- job: 'Release' + condition: startsWith(variables['Build.SourceBranch'], 'refs/tags') + timeoutInMinutes: 240 + dependsOn: + - 'ShellCheck' + pool: + name: 'Buildroot' + strategy: + maxParallel: 1 + matrix: + OpenVirtualAppliance: + board: 'ova' + IntelNuc: + board: 'intel_nuc' + OdroidC2: + board: 'odroid_c2' + OdroidXU4: + board: 'odroid_xu4' + OrangePiPrime: + board: 'opi_prime' + RaspberryPi0-W: + board: 'rpi0_w' + RaspberryPi3: + board: 'rpi3' + RaspberryPi3-64: + board: 'rpi3_64' + RaspberryPi2: + board: 'rpi2' + RaspberryPi: + board: 'rpi' + AsusTinker: + board: 'tinker' + workspace: + clean: 'all' + steps: + - script: | + echo -e "-----BEGIN CERTIFICATE-----\n$(releaseCertificate)\n-----END CERTIFICATE-----" > cert.pem + echo -e "-----BEGIN PRIVATE KEY-----\n$(releaseKey)\n-----END PRIVATE KEY-----" > key.pem + displayName: 'Add release PKI certs' + - script: | + sudo docker build -t hassos:azure . + displayName: 'Build container for HassOS' + - script: | + curl -SsL https://github.com/tcnksm/ghr/releases/download/$(versionGHR)/ghr_$(versionGHR)_linux_amd64.tar.gz | tar xzf - + cp ghr_$(versionGHR)_linux_amd64/ghr . + rm -rf ghr_$(versionGHR)_linux_amd64 + displayName: 'Install GHR' + - script: | + BUILDER_UID="$(id -u)" + BUILDER_GID="$(id -g)" + + sudo docker run --rm --privileged -v "$(pwd):/build" \ + -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \ + -v "/mnt/build-cache:/cache" \ + hassos:azure make $(board) + displayName: 'Build $(board)' + - script: | + ./ghr -t $(githubToken) $(Build.SourceBranchName) release/ + displayName: 'Upload $(board)' diff --git a/buildroot-external/board/asus/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch b/buildroot-external/board/asus/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch deleted file mode 100644 index a7e203830..000000000 --- a/buildroot-external/board/asus/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b82f540967f6a732a22bbd236457b864951aeda7 Mon Sep 17 00:00:00 2001 -From: Myy -Date: Sun, 14 May 2017 10:13:26 +0000 -Subject: [PATCH] clk: rockchip: rk3288: prefer vdpu for vcodec clock source - -Patch provided by Randy Li. The original commit message reads : - -_______________ -The RK3288 CRU system clock solution would suggest use -the vdpu clock source for the VPU(aclk_vpu and hclk_vpu). - -Reading the registers of VPU(both VEPU and VDPU) would become all high -when the vepu is used as the clock source. It may be a bug in the SoC, -not sure whether it is fixed at RK3288W. - -Signed-off-by: Randy Li -_______________ - -This also resolves a freeze when loading the OOT Video Codec driver - -Signed-off-by: Myy ---- - drivers/clk/rockchip/clk-rk3288.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c -index 1227f74..f218256 100644 ---- a/drivers/clk/rockchip/clk-rk3288.c -+++ b/drivers/clk/rockchip/clk-rk3288.c -@@ -215,7 +215,7 @@ PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" }; - PNAME(mux_edp_24m_p) = { "ext_edp_24m", "xin24m" }; - PNAME(mux_tspout_p) = { "cpll", "gpll", "npll", "xin27m" }; - --PNAME(mux_aclk_vcodec_pre_p) = { "aclk_vepu", "aclk_vdpu" }; -+PNAME(mux_aclk_vcodec_pre_p) = { "aclk_vdpu", "aclk_vepu" }; - PNAME(mux_usbphy480m_p) = { "sclk_otgphy1_480m", "sclk_otgphy2_480m", - "sclk_otgphy0_480m" }; - PNAME(mux_hsicphy480m_p) = { "cpll", "gpll", "usbphy480m_src" }; --- -2.10.2 - diff --git a/buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch.disabled b/buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch.disabled new file mode 100644 index 000000000..52519bb4a --- /dev/null +++ b/buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch.disabled @@ -0,0 +1,35 @@ +From 8ca607f3fe77c80a3367d8363703d5dc1d6781d4 Mon Sep 17 00:00:00 2001 +From: Myy Miouyouyou +Date: Thu, 19 Oct 2017 22:36:02 +0200 +Subject: [PATCH 22/28] ARM: DTS: rk3288-tinker.dts: Add the MIPI DSI node + +Taken from, and tested by @TonyMac32 . + +Signed-off-by: Myy Miouyouyou +--- + arch/arm/boot/dts/rk3288-tinker.dts | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts +index 67a3ce6f..6f4c0843 100644 +--- a/arch/arm/boot/dts/rk3288-tinker.dts ++++ b/arch/arm/boot/dts/rk3288-tinker.dts +@@ -443,6 +443,15 @@ + sdcard-supply = <&vccio_sd>; + }; + ++&mipi_dsi { ++ status = "okay"; ++ mipi_panel: mipi-panel { ++ compatible ="asus,tc358762"; ++ reg = <0x0 0>; ++ status = "okay"; ++ }; ++}; ++ + &sdio0 { + status = "okay"; + clock-frequency = <50000000>; +-- +2.11.0 + diff --git a/buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch b/buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch deleted file mode 100644 index 4ca2818cf..000000000 --- a/buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 24d6638302b48328a58c13439276d4531af4ca7d Mon Sep 17 00:00:00 2001 -From: Katsuhiro Suzuki -Date: Tue, 11 Sep 2018 01:39:32 +0900 -Subject: ASoC: rockchip: add missing INTERLEAVED PCM attribute - -This patch adds SNDRV_PCM_INFO_INTERLEAVED into PCM hardware info. - -Signed-off-by: Katsuhiro Suzuki -Signed-off-by: Mark Brown ---- - sound/soc/rockchip/rockchip_pcm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -(limited to 'sound/soc/rockchip') - -Armbian Note: this patch has been backported from 4.20 to 4.19 due to break in rockchip HDMI/I2S audio. This -can be safely removed once there is a new kernel bump. -Origin: - -diff --git a/sound/soc/rockchip/rockchip_pcm.c b/sound/soc/rockchip/rockchip_pcm.c -index f77538319221..9e7b5fa4cf59 100644 ---- a/sound/soc/rockchip/rockchip_pcm.c -+++ b/sound/soc/rockchip/rockchip_pcm.c -@@ -21,7 +21,8 @@ static const struct snd_pcm_hardware snd_rockchip_hardware = { - .info = SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_PAUSE | -- SNDRV_PCM_INFO_RESUME, -+ SNDRV_PCM_INFO_RESUME | -+ SNDRV_PCM_INFO_INTERLEAVED, - .period_bytes_min = 32, - .period_bytes_max = 8192, - .periods_min = 1, --- -cgit 1.2-0.3.lf.el7 - - diff --git a/buildroot-external/board/asus/tinker/patches/linux/general-adjust-tinker-dts-hdmi-sound.patch b/buildroot-external/board/asus/tinker/patches/linux/general-adjust-tinker-dts-hdmi-sound.patch new file mode 100644 index 000000000..befe282f8 --- /dev/null +++ b/buildroot-external/board/asus/tinker/patches/linux/general-adjust-tinker-dts-hdmi-sound.patch @@ -0,0 +1,13 @@ +diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts +index 958c0f3bf..59b8d8eac 100644 +--- a/arch/arm/boot/dts/rk3288-tinker.dts ++++ b/arch/arm/boot/dts/rk3288-tinker.dts +@@ -70,7 +70,7 @@ + sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; +- simple-audio-card,name = "rockchip,tinker-codec"; ++ simple-audio-card,name = "DW-I2S-HDMI"; + simple-audio-card,mclk-fs = <512>; + + simple-audio-card,codec { diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index cc9b0fb64..8d85d8a28 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -4,7 +4,6 @@ BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y @@ -20,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.82" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56" BR2_LINUX_KERNEL_DEFCONFIG="x86_64" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/kernel.config" BR2_LINUX_KERNEL_LZ4=y @@ -88,6 +87,7 @@ BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/barebox.config" BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config" BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -95,7 +95,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/intel-nuc-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 9696335be..d07989232 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/kernel.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" @@ -81,6 +81,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -88,7 +89,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-c2-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 19a10cd15..a920fb296 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -5,7 +5,6 @@ BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y @@ -24,7 +23,7 @@ BR2_LINUX_KERNEL=y #BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git" #BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.14.87-153" BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4" #BR2_LINUX_KERNEL_DEFCONFIG="odroidxu4" @@ -89,6 +88,7 @@ BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -96,7 +96,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-xu-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/opi_prime_defconfig b/buildroot-external/configs/opi_prime_defconfig index 163d5f240..5278b7336 100644 --- a/buildroot-external/configs/opi_prime_defconfig +++ b/buildroot-external/configs/opi_prime_defconfig @@ -6,7 +6,6 @@ BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y @@ -38,7 +37,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/prime/uboot.config" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime" BR2_LINUX_KERNEL_LZ4=y @@ -95,6 +94,7 @@ BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -103,7 +103,7 @@ BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HOST_SWIG=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/orangepi-prime-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 8a4f133b0..eda39baed 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -19,12 +19,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.20" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56" BR2_LINUX_KERNEL_DEFCONFIG="x86_64" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_PROCPS_NG=y @@ -76,6 +77,7 @@ BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/barebox.config" BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config" BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -83,7 +85,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index 22f9c85ad..d10837815 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -6,7 +6,6 @@ BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y @@ -85,6 +84,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -92,7 +92,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index ed921ba0c..11214f455 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -6,7 +6,6 @@ BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y @@ -84,6 +83,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -91,7 +91,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index b10b4add3..f87add6bf 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -6,7 +6,6 @@ BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y @@ -85,6 +84,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -92,7 +92,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-64-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index e967378c5..cf7fb6c1e 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -6,7 +6,6 @@ BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y @@ -85,6 +84,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -92,7 +92,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index e55e50a8a..503e9c107 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -6,7 +6,6 @@ BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y @@ -84,6 +83,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -91,7 +91,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index cf35a3f07..2485d4bdf 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.20" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.56" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" @@ -88,6 +88,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot-boot.ush" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y @@ -95,7 +96,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="167" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/tinker-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/kernel/hassos.config b/buildroot-external/kernel/hassos.config index a7d4967ea..b55fff013 100644 --- a/buildroot-external/kernel/hassos.config +++ b/buildroot-external/kernel/hassos.config @@ -34,3 +34,9 @@ CONFIG_TUN=y CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y + +CONFIG_CIFS=m +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +CONFIG_CIFS_DFS_UPCALL=y diff --git a/buildroot-external/meta b/buildroot-external/meta index abcb6db46..b022f5ac5 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,5 +1,5 @@ VERSION_MAJOR=3 -VERSION_BUILD=1 +VERSION_BUILD=2 HASSOS_NAME="HassOS" HASSOS_ID="hassos" diff --git a/buildroot-external/package/hassos/builder/Dockerfile b/buildroot-external/package/hassos/builder/Dockerfile index f97a86b1d..3a2a8a53e 100644 --- a/buildroot-external/package/hassos/builder/Dockerfile +++ b/buildroot-external/package/hassos/builder/Dockerfile @@ -1,10 +1,20 @@ -FROM alpine:3.7 +FROM ubuntu:18.04 -# Install packages -RUN apk add --no-cache \ - bash coreutils e2fsprogs curl -RUN apk add --no-cache --repository http://nl.alpinelinux.org/alpine/v3.7/community \ - docker +# Set shell +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +# Docker +RUN apt-get update && apt-get install -y --no-install-recommends \ + apt-transport-https \ + ca-certificates \ + curl \ + gpg-agent \ + software-properties-common \ + && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ + && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ + && apt-get update && apt-get install -y --no-install-recommends \ + docker-ce=5:18.09.6~3-0~ubuntu-bionic \ + && rm -rf /var/lib/apt/lists/* COPY hostapp.sh /usr/bin/ ENTRYPOINT ["/usr/bin/hostapp.sh"] diff --git a/buildroot-external/package/hassos/builder/hostapp.sh b/buildroot-external/package/hassos/builder/hostapp.sh index b0c1eac3f..6424ab1bf 100755 --- a/buildroot-external/package/hassos/builder/hostapp.sh +++ b/buildroot-external/package/hassos/builder/hostapp.sh @@ -73,6 +73,13 @@ done dd if=/dev/zero of=${DATA_IMG} bs=1G count=1 mkfs.ext4 -L "hassos-data" -E lazy_itable_init=0,lazy_journal_init=0 ${DATA_IMG} +# Setup local user +if [ "${BUILDER_UID:0}" -ne 0 ] && [ "${BUILDER_GID:0}" -ne 0 ]; then + groupadd -g "${BUILDER_GID}" builder + useradd -m -u "${BUILDER_UID}" -g "${BUILDER_GID}" -G docker builder + chown builder:builder ${DATA_IMG} +fi + # Mount / init file structs mkdir -p /mnt/data/ mount -o loop ${DATA_IMG} /mnt/data @@ -114,19 +121,26 @@ cat > /mnt/data/hassos.json <<- EOF EOF # Setup AppArmor -if [ ! -z "${APPARMOR}" ]; then - mkdir -p /mnt/data/${APPARMOR} +if [ -n "${APPARMOR}" ]; then + mkdir -p "/mnt/data/${APPARMOR}" # Supervisor - if [ ! -z "${SUPERVISOR_PROFILE_URL}" ]; then - curl -L -o /mnt/data/${APPARMOR}/${SUPERVISOR_PROFILE} ${SUPERVISOR_PROFILE_URL} + if [ -n "${SUPERVISOR_PROFILE_URL}" ]; then + curl -sL -o "/mnt/data/${APPARMOR}/${SUPERVISOR_PROFILE}" "${SUPERVISOR_PROFILE_URL}" fi # CLI - if [ ! -z "${CLI_PROFILE_URL}" ]; then - curl -L -o /mnt/data/${APPARMOR}/${CLI_PROFILE} ${CLI_PROFILE_URL} + if [ -n "${CLI_PROFILE_URL}" ]; then + curl -sL -o "/mnt/data/${APPARMOR}/${CLI_PROFILE}" "${CLI_PROFILE_URL}" fi fi # Finish -kill -TERM $DOCKER_PID && wait $DOCKER_PID && umount /mnt/data +kill $DOCKER_PID && wait $DOCKER_PID + +# Unmount resource +if ! umount /mnt/data; then + umount -f /mnt/data || echo "umount force fails!" +fi + +exit 0 diff --git a/buildroot-external/package/hassos/hassos.mk b/buildroot-external/package/hassos/hassos.mk index 68f9946c6..78984892c 100644 --- a/buildroot-external/package/hassos/hassos.mk +++ b/buildroot-external/package/hassos/hassos.mk @@ -16,6 +16,7 @@ endef define HASSOS_INSTALL_TARGET_CMDS docker run --rm --privileged \ + -e BUILDER_UID="$(shell id -u)" -e BUILDER_GID="$(shell id -g)" \ -v $(BINARIES_DIR):/export \ hassos-hostapps \ --supervisor $(BR2_PACKAGE_HASSOS_SUPERVISOR) \ diff --git a/buildroot-external/patches/runc/0048-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch b/buildroot-external/patches/runc/0048-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch deleted file mode 100644 index 26698e6c3..000000000 --- a/buildroot-external/patches/runc/0048-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch +++ /dev/null @@ -1,337 +0,0 @@ -From 0a8e4117e7f715d5fbeef398405813ce8e88558b Mon Sep 17 00:00:00 2001 -From: Aleksa Sarai -Date: Wed, 9 Jan 2019 13:40:01 +1100 -Subject: [PATCH 48/50] nsenter: clone /proc/self/exe to avoid exposing host - binary to container - -There are quite a few circumstances where /proc/self/exe pointing to a -pretty important container binary is a _bad_ thing, so to avoid this we -have to make a copy (preferably doing self-clean-up and not being -writeable). - -We require memfd_create(2) -- though there is an O_TMPFILE fallback -- -but we can always extend this to use a scratch MNT_DETACH overlayfs or -tmpfs. The main downside to this approach is no page-cache sharing for -the runc binary (which overlayfs would give us) but this is far less -complicated. - -This is only done during nsenter so that it happens transparently to the -Go code, and any libcontainer users benefit from it. This also makes -ExtraFiles and --preserve-fds handling trivial (because we don't need to -worry about it). - -Fixes: CVE-2019-5736 -Co-developed-by: Christian Brauner -Signed-off-by: Aleksa Sarai ---- - libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++ - libcontainer/nsenter/nsexec.c | 11 ++ - 2 files changed, 279 insertions(+) - create mode 100644 libcontainer/nsenter/cloned_binary.c - -diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c -new file mode 100644 -index 00000000..c8a42c23 ---- /dev/null -+++ b/libcontainer/nsenter/cloned_binary.c -@@ -0,0 +1,268 @@ -+/* -+ * Copyright (C) 2019 Aleksa Sarai -+ * Copyright (C) 2019 SUSE LLC -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#define _GNU_SOURCE -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* Use our own wrapper for memfd_create. */ -+#if !defined(SYS_memfd_create) && defined(__NR_memfd_create) -+# define SYS_memfd_create __NR_memfd_create -+#endif -+#ifdef SYS_memfd_create -+# define HAVE_MEMFD_CREATE -+/* memfd_create(2) flags -- copied from . */ -+# ifndef MFD_CLOEXEC -+# define MFD_CLOEXEC 0x0001U -+# define MFD_ALLOW_SEALING 0x0002U -+# endif -+int memfd_create(const char *name, unsigned int flags) -+{ -+ return syscall(SYS_memfd_create, name, flags); -+} -+#endif -+ -+/* This comes directly from . */ -+#ifndef F_LINUX_SPECIFIC_BASE -+# define F_LINUX_SPECIFIC_BASE 1024 -+#endif -+#ifndef F_ADD_SEALS -+# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) -+# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) -+#endif -+#ifndef F_SEAL_SEAL -+# define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ -+# define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ -+# define F_SEAL_GROW 0x0004 /* prevent file from growing */ -+# define F_SEAL_WRITE 0x0008 /* prevent writes */ -+#endif -+ -+#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */ -+#ifdef HAVE_MEMFD_CREATE -+# define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe" -+# define RUNC_MEMFD_SEALS \ -+ (F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) -+#endif -+ -+static void *must_realloc(void *ptr, size_t size) -+{ -+ void *old = ptr; -+ do { -+ ptr = realloc(old, size); -+ } while(!ptr); -+ return ptr; -+} -+ -+/* -+ * Verify whether we are currently in a self-cloned program (namely, is -+ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather -+ * for shmem files), and we want to be sure it's actually sealed. -+ */ -+static int is_self_cloned(void) -+{ -+ int fd, ret, is_cloned = 0; -+ -+ fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC); -+ if (fd < 0) -+ return -ENOTRECOVERABLE; -+ -+#ifdef HAVE_MEMFD_CREATE -+ ret = fcntl(fd, F_GET_SEALS); -+ is_cloned = (ret == RUNC_MEMFD_SEALS); -+#else -+ struct stat statbuf = {0}; -+ ret = fstat(fd, &statbuf); -+ if (ret >= 0) -+ is_cloned = (statbuf.st_nlink == 0); -+#endif -+ close(fd); -+ return is_cloned; -+} -+ -+/* -+ * Basic wrapper around mmap(2) that gives you the file length so you can -+ * safely treat it as an ordinary buffer. Only gives you read access. -+ */ -+static char *read_file(char *path, size_t *length) -+{ -+ int fd; -+ char buf[4096], *copy = NULL; -+ -+ if (!length) -+ return NULL; -+ -+ fd = open(path, O_RDONLY | O_CLOEXEC); -+ if (fd < 0) -+ return NULL; -+ -+ *length = 0; -+ for (;;) { -+ int n; -+ -+ n = read(fd, buf, sizeof(buf)); -+ if (n < 0) -+ goto error; -+ if (!n) -+ break; -+ -+ copy = must_realloc(copy, (*length + n) * sizeof(*copy)); -+ memcpy(copy + *length, buf, n); -+ *length += n; -+ } -+ close(fd); -+ return copy; -+ -+error: -+ close(fd); -+ free(copy); -+ return NULL; -+} -+ -+/* -+ * A poor-man's version of "xargs -0". Basically parses a given block of -+ * NUL-delimited data, within the given length and adds a pointer to each entry -+ * to the array of pointers. -+ */ -+static int parse_xargs(char *data, int data_length, char ***output) -+{ -+ int num = 0; -+ char *cur = data; -+ -+ if (!data || *output != NULL) -+ return -1; -+ -+ while (cur < data + data_length) { -+ num++; -+ *output = must_realloc(*output, (num + 1) * sizeof(**output)); -+ (*output)[num - 1] = cur; -+ cur += strlen(cur) + 1; -+ } -+ (*output)[num] = NULL; -+ return num; -+} -+ -+/* -+ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ. -+ * This is necessary because we are running in a context where we don't have a -+ * main() that we can just get the arguments from. -+ */ -+static int fetchve(char ***argv, char ***envp) -+{ -+ char *cmdline = NULL, *environ = NULL; -+ size_t cmdline_size, environ_size; -+ -+ cmdline = read_file("/proc/self/cmdline", &cmdline_size); -+ if (!cmdline) -+ goto error; -+ environ = read_file("/proc/self/environ", &environ_size); -+ if (!environ) -+ goto error; -+ -+ if (parse_xargs(cmdline, cmdline_size, argv) <= 0) -+ goto error; -+ if (parse_xargs(environ, environ_size, envp) <= 0) -+ goto error; -+ -+ return 0; -+ -+error: -+ free(environ); -+ free(cmdline); -+ return -EINVAL; -+} -+ -+static int clone_binary(void) -+{ -+ int binfd, memfd; -+ ssize_t sent = 0; -+ -+#ifdef HAVE_MEMFD_CREATE -+ memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING); -+#else -+ memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711); -+#endif -+ if (memfd < 0) -+ return -ENOTRECOVERABLE; -+ -+ binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC); -+ if (binfd < 0) -+ goto error; -+ -+ sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX); -+ close(binfd); -+ if (sent < 0) -+ goto error; -+ -+#ifdef HAVE_MEMFD_CREATE -+ int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS); -+ if (err < 0) -+ goto error; -+#else -+ /* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */ -+ int newfd; -+ char *fdpath = NULL; -+ -+ if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0) -+ goto error; -+ newfd = open(fdpath, O_RDONLY | O_CLOEXEC); -+ free(fdpath); -+ if (newfd < 0) -+ goto error; -+ -+ close(memfd); -+ memfd = newfd; -+#endif -+ return memfd; -+ -+error: -+ close(memfd); -+ return -EIO; -+} -+ -+int ensure_cloned_binary(void) -+{ -+ int execfd; -+ char **argv = NULL, **envp = NULL; -+ -+ /* Check that we're not self-cloned, and if we are then bail. */ -+ int cloned = is_self_cloned(); -+ if (cloned > 0 || cloned == -ENOTRECOVERABLE) -+ return cloned; -+ -+ if (fetchve(&argv, &envp) < 0) -+ return -EINVAL; -+ -+ execfd = clone_binary(); -+ if (execfd < 0) -+ return -EIO; -+ -+ fexecve(execfd, argv, envp); -+ return -ENOEXEC; -+} -diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c -index 28269dfc..7750af35 100644 ---- a/libcontainer/nsenter/nsexec.c -+++ b/libcontainer/nsenter/nsexec.c -@@ -534,6 +534,9 @@ void join_namespaces(char *nslist) - free(namespaces); - } - -+/* Defined in cloned_binary.c. */ -+extern int ensure_cloned_binary(void); -+ - void nsexec(void) - { - int pipenum; -@@ -549,6 +552,14 @@ void nsexec(void) - if (pipenum == -1) - return; - -+ /* -+ * We need to re-exec if we are not in a cloned binary. This is necessary -+ * to ensure that containers won't be able to access the host binary -+ * through /proc/self/exe. See CVE-2019-5736. -+ */ -+ if (ensure_cloned_binary() < 0) -+ bail("could not ensure we are a cloned binary"); -+ - /* Parse all of the netlink configuration. */ - nl_parse(pipenum, &config); - --- -2.17.1 - diff --git a/buildroot-external/patches/runc/0050-nsexec-CVE-2019-5736-avoid-parsing-environ.patch b/buildroot-external/patches/runc/0050-nsexec-CVE-2019-5736-avoid-parsing-environ.patch deleted file mode 100644 index d4123151f..000000000 --- a/buildroot-external/patches/runc/0050-nsexec-CVE-2019-5736-avoid-parsing-environ.patch +++ /dev/null @@ -1,106 +0,0 @@ -From bb7d8b1f41f7bf0399204d54009d6da57c3cc775 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Thu, 14 Feb 2019 15:56:26 +0100 -Subject: [PATCH 50/50] nsexec (CVE-2019-5736): avoid parsing environ - -My first attempt to simplify this and make it less costly focussed on -the way constructors are called. I was under the impression that the ELF -specification mandated that arg, argv, and actually even envp need to be -passed to functions located in the .init_arry section (aka -"constructors"). Actually, the specifications is (cf. [2]): - -SHT_INIT_ARRAY -This section contains an array of pointers to initialization functions, -as described in ``Initialization and Termination Functions'' in Chapter -5. Each pointer in the array is taken as a parameterless procedure with -a void return. - -which means that this becomes a libc specific decision. Glibc passes -down those args, musl doesn't. So this approach can't work. However, we -can at least remove the environment parsing part based on POSIX since -[1] mandates that there should be an environ variable defined in -unistd.h which provides access to the environment. See also the relevant -Open Group specification [1]. - -[1]: http://pubs.opengroup.org/onlinepubs/9699919799/ -[2]: http://www.sco.com/developers/gabi/latest/ch4.sheader.html#init_array - -Fixes: CVE-2019-5736 -Signed-off-by: Christian Brauner ---- - libcontainer/nsenter/cloned_binary.c | 23 ++++++++++------------- - 1 file changed, 10 insertions(+), 13 deletions(-) - -diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c -index c8a42c23..c97dfcb7 100644 ---- a/libcontainer/nsenter/cloned_binary.c -+++ b/libcontainer/nsenter/cloned_binary.c -@@ -169,31 +169,25 @@ static int parse_xargs(char *data, int data_length, char ***output) - } - - /* -- * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ. -+ * "Parse" out argv from /proc/self/cmdline. - * This is necessary because we are running in a context where we don't have a - * main() that we can just get the arguments from. - */ --static int fetchve(char ***argv, char ***envp) -+static int fetchve(char ***argv) - { -- char *cmdline = NULL, *environ = NULL; -- size_t cmdline_size, environ_size; -+ char *cmdline = NULL; -+ size_t cmdline_size; - - cmdline = read_file("/proc/self/cmdline", &cmdline_size); - if (!cmdline) - goto error; -- environ = read_file("/proc/self/environ", &environ_size); -- if (!environ) -- goto error; - - if (parse_xargs(cmdline, cmdline_size, argv) <= 0) - goto error; -- if (parse_xargs(environ, environ_size, envp) <= 0) -- goto error; - - return 0; - - error: -- free(environ); - free(cmdline); - return -EINVAL; - } -@@ -246,23 +240,26 @@ error: - return -EIO; - } - -+/* Get cheap access to the environment. */ -+extern char **environ; -+ - int ensure_cloned_binary(void) - { - int execfd; -- char **argv = NULL, **envp = NULL; -+ char **argv = NULL; - - /* Check that we're not self-cloned, and if we are then bail. */ - int cloned = is_self_cloned(); - if (cloned > 0 || cloned == -ENOTRECOVERABLE) - return cloned; - -- if (fetchve(&argv, &envp) < 0) -+ if (fetchve(&argv) < 0) - return -EINVAL; - - execfd = clone_binary(); - if (execfd < 0) - return -EIO; - -- fexecve(execfd, argv, envp); -+ fexecve(execfd, argv, environ); - return -ENOEXEC; - } --- -2.17.1 - diff --git a/buildroot-external/rootfs-overlay/usr/share/system-connections/default b/buildroot-external/rootfs-overlay/etc/NetworkManager/system-connections/default similarity index 100% rename from buildroot-external/rootfs-overlay/usr/share/system-connections/default rename to buildroot-external/rootfs-overlay/etc/NetworkManager/system-connections/default diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-overlay.service b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-overlay.service new file mode 120000 index 000000000..577ec4382 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-overlay.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hassos-overlay.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/hostname.conf b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/hostname.conf deleted file mode 100644 index 9d64a0516..000000000 --- a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/hostname.conf +++ /dev/null @@ -1,2 +0,0 @@ -C /mnt/overlay/etc/hostname - - - - /etc/hostname -C /mnt/overlay/etc/hosts - - - - /etc/hosts diff --git a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf index c5c629983..08720f923 100644 --- a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf +++ b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf @@ -1,4 +1,3 @@ # Cleanup lease files e /var/lib/NetworkManager/*.lease - - - 14d -C /mnt/overlay/etc/NetworkManager/system-connections - - - - /usr/share/system-connections f /run/resolv.conf - - - - diff --git a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/timesyncd.conf b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/timesyncd.conf deleted file mode 100644 index b4d8dc217..000000000 --- a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/timesyncd.conf +++ /dev/null @@ -1 +0,0 @@ -C /mnt/overlay/etc/systemd/timesyncd.conf - - - - /etc/systemd/timesyncd.conf diff --git "a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" "b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" index ea15e6132..b848e2e30 100644 --- "a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" +++ "b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" @@ -1,7 +1,7 @@ [Unit] Description=NetworkManager persistent system connections Requires=mnt-overlay.mount -After=mnt-overlay.mount systemd-tmpfiles-setup.service +After=mnt-overlay.mount hassos-overlay.service Before=NetworkManager.service hassos-config.service [Mount] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount index d00309e4f..c82917c65 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hostname.mount @@ -1,7 +1,7 @@ [Unit] Description=Hostname persistent configuration Requires=mnt-overlay.mount -After=mnt-overlay.mount systemd-tmpfiles-setup.service +After=mnt-overlay.mount hassos-overlay.service Before=network.target [Mount] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount index 68c33e457..7a02ccce2 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-hosts.mount @@ -1,7 +1,7 @@ [Unit] Description=Hosts persistent configuration Requires=mnt-overlay.mount -After=mnt-overlay.mount systemd-tmpfiles-setup.service +After=mnt-overlay.mount hassos-overlay.service Before=network.target [Mount] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-systemd-timesyncd.conf.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-systemd-timesyncd.conf.mount index a26658c2a..41f3914ac 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-systemd-timesyncd.conf.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-systemd-timesyncd.conf.mount @@ -1,7 +1,7 @@ [Unit] Description=Timesyncd persistent configuration Requires=mnt-overlay.mount -After=mnt-overlay.mount systemd-tmpfiles-setup.service +After=mnt-overlay.mount hassos-overlay.service Before=systemd-timesyncd.service [Mount] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-bind.target b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-bind.target index 2aa73f380..4d0e40302 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-bind.target +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-bind.target @@ -1,5 +1,4 @@ [Unit] Description=HassOS overlay targets Documentation=man:systemd.target(5) -After=local-fs.target Before=sysinit.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-overlay.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-overlay.service new file mode 100644 index 000000000..50c42e829 --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-overlay.service @@ -0,0 +1,15 @@ +[Unit] +Description=HassOS overlay setup +DefaultDependencies=no +RefuseManualStart=true +RefuseManualStop=true +Before=hassos-bind.target +After=mnt-overlay.mount + +[Service] +Type=oneshot +ExecStart=/usr/libexec/hassos-overlay +RemainAfterExit=true + +[Install] +WantedBy=local-fs.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount index df5616926..18cfdd584 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount @@ -1,8 +1,7 @@ [Unit] Description=HassOS boot partition DefaultDependencies=no -Before=umount.target -After=local-fs.target +Before=umount.target local-fs.target Conflicts=umount.target [Mount] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount index fdb2d2880..4c71e12e3 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount @@ -3,7 +3,7 @@ Description=HassOS data partition Wants=hassos-expand.service DefaultDependencies=no After=hassos-expand.service -Before=umount.target systemd-tmpfiles-setup.service +Before=umount.target local-fs.target Conflicts=umount.target [Mount] diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount index 787aac375..21c633faa 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount @@ -1,7 +1,7 @@ [Unit] Description=HassOS overlay partition DefaultDependencies=no -Before=umount.target systemd-tmpfiles-setup.service +Before=umount.target local-fs.target Conflicts=umount.target [Mount] diff --git a/buildroot-external/rootfs-overlay/usr/libexec/hassos-overlay b/buildroot-external/rootfs-overlay/usr/libexec/hassos-overlay new file mode 100755 index 000000000..b8d6af7c8 --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/libexec/hassos-overlay @@ -0,0 +1,24 @@ +#!/bin/sh + +mkdir -p /mnt/overlay/etc/ + +# Network +if [ ! -d /mnt/overlay/etc/NetworkManager/system-connections ]; then + mkdir -p /mnt/overlay/etc/NetworkManager/system-connections + cp -fp /etc/NetworkManager/system-connections/* /mnt/overlay/etc/NetworkManager/system-connections/ + chmod 600 /mnt/overlay/etc/NetworkManager/system-connections/* +fi + +if [ ! -f /mnt/overlay/etc/hostname ]; then + cp -fp /etc/hostname /mnt/overlay/etc/hostname +fi + +if [ ! -f /mnt/overlay/etc/hosts ]; then + cp -fp /etc/hosts /mnt/overlay/etc/hosts +fi + +# TimeSync +if [ ! -f /mnt/overlay/etc/systemd/timesyncd.conf ]; then + mkdir -p /mnt/overlay/etc/systemd + cp -fp /etc/systemd/timesyncd.conf /mnt/overlay/etc/systemd/timesyncd.conf +fi diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh index ea38248dd..931167db6 100755 --- a/buildroot-external/scripts/hdd-image.sh +++ b/buildroot-external/scripts/hdd-image.sh @@ -89,10 +89,10 @@ function create_kernel_image() { mkfs.ext4 -L "hassos-kernel" -E lazy_itable_init=0,lazy_journal_init=0 -O ^extent,^64bit "${kernel_img}" # Mount / init file structs - mkdir -p /mnt/data/ - mount -o loop "${kernel_img}" /mnt/data - cp -f "${kernel}" /mnt/data/ - umount /mnt/data + sudo mkdir -p /mnt/data/ + sudo mount -o loop "${kernel_img}" /mnt/data + sudo cp -f "${kernel}" /mnt/data/ + sudo umount /mnt/data } diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh index 1592c5f80..79ab0c332 100755 --- a/buildroot-external/scripts/rootfs-layer.sh +++ b/buildroot-external/scripts/rootfs-layer.sh @@ -17,7 +17,7 @@ function fix_rootfs() { rm -rf "${TARGET_DIR}/usr/lib/modules-load.d" # Fix: permission for system connection files - chmod 600 "${TARGET_DIR}/usr/share/system-connections"/* + chmod 600 "${TARGET_DIR}/etc/NetworkManager/system-connections"/* # Fix: tempfs with /srv sed -i "/srv/d" "${TARGET_DIR}/usr/lib/tmpfiles.d/home.conf" diff --git a/buildroot-patches/0001-docker-containerd-bump-to-v1.2.4.patch b/buildroot-patches/0001-docker-containerd-bump-to-v1.2.7.patch similarity index 70% rename from buildroot-patches/0001-docker-containerd-bump-to-v1.2.4.patch rename to buildroot-patches/0001-docker-containerd-bump-to-v1.2.7.patch index e67be1b99..afd6d33bd 100644 --- a/buildroot-patches/0001-docker-containerd-bump-to-v1.2.4.patch +++ b/buildroot-patches/0001-docker-containerd-bump-to-v1.2.7.patch @@ -1,7 +1,7 @@ -From 0484ba124482874b9612563887b22ce454026f7e Mon Sep 17 00:00:00 2001 +From 9759621540997500a9dc0163506a8eac1e4769cc Mon Sep 17 00:00:00 2001 From: Pascal Vizeli -Date: Mon, 26 Nov 2018 14:38:19 +0000 -Subject: [PATCH 1/1] docker-containerd: bump to v1.2.4 +Date: Wed, 26 Jun 2019 09:57:05 +0000 +Subject: [PATCH 1/1] docker-containerd: bump to v1.2.7 Signed-off-by: Pascal Vizeli --- @@ -10,24 +10,24 @@ Signed-off-by: Pascal Vizeli 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash -index a530873..71cd5e5 100644 +index 525191c651..163a519d36 100644 --- a/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash @@ -1,3 +1,3 @@ # Computed locally --sha256 a946f4614d92d60361213ef18deab04ee73599e4567f1ff26f7a72841afe4fa2 docker-containerd-v1.1.3.tar.gz -+sha256 5b23bd330f9e59e14f7dced9e3106f37f5b552e527bb6c1503001d90e853c155 docker-containerd-v1.2.4.tar.gz +-sha256 f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891 docker-containerd-v1.2.6.tar.gz ++sha256 7179c709a0d187708a1eeddcbdecd7206b2c642dc4413bcdb049cd6b38d06801 docker-containerd-v1.2.7.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk -index 121ef09..36f4a25 100644 +index c67b36e7dc..4c0877ecd1 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ --DOCKER_CONTAINERD_VERSION = v1.1.3 -+DOCKER_CONTAINERD_VERSION = v1.2.4 +-DOCKER_CONTAINERD_VERSION = v1.2.6 ++DOCKER_CONTAINERD_VERSION = v1.2.7 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE @@ -38,7 +38,7 @@ index 121ef09..36f4a25 100644 +DOCKER_CONTAINERD_TAGS = apparmor ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) - DOCKER_CONTAINERD_DEPENDENCIES += libseccomp + DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf -- 2.17.1 diff --git a/buildroot-patches/0002-runc-add-AppArmor.patch b/buildroot-patches/0002-runc-add-AppArmor.patch new file mode 100644 index 000000000..56af8933c --- /dev/null +++ b/buildroot-patches/0002-runc-add-AppArmor.patch @@ -0,0 +1,26 @@ +From 021395083b5829c4fd00bebcdc7d38c2acd7232d Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Wed, 26 Jun 2019 10:00:31 +0000 +Subject: [PATCH 1/1] runc: add AppArmor + +Signed-off-by: Pascal Vizeli +--- + package/runc/runc.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/package/runc/runc.mk b/package/runc/runc.mk +index 55097e5a17..31da4fae58 100644 +--- a/package/runc/runc.mk ++++ b/package/runc/runc.mk +@@ -13,7 +13,7 @@ RUNC_WORKSPACE = Godeps/_workspace + + RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) + +-RUNC_TAGS = cgo static_build ++RUNC_TAGS = cgo static_build apparmor + + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) + RUNC_TAGS += seccomp +-- +2.17.1 + diff --git a/buildroot-patches/0002-runc-bump-to-1.0-rc6.patch b/buildroot-patches/0002-runc-bump-to-1.0-rc6.patch deleted file mode 100644 index 39dfded8c..000000000 --- a/buildroot-patches/0002-runc-bump-to-1.0-rc6.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 73d51fb34287f40236a0d7a8cb2fe50a1f3da9ca Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Sun, 25 Nov 2018 16:00:25 +0000 -Subject: [PATCH 1/1] runc: bump to 1.0-rc6 - -Signed-off-by: Pascal Vizeli ---- - package/runc/runc.hash | 2 +- - package/runc/runc.mk | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/package/runc/runc.hash b/package/runc/runc.hash -index 853cbb1..1636e5b 100644 ---- a/package/runc/runc.hash -+++ b/package/runc/runc.hash -@@ -1,3 +1,3 @@ - # Locally computed --sha256 994a3a0447fcbf7e37614b02aa5604d2d6b9fdb41e6870d8d3ff1138ed6e61ef runc-69663f0bd4b60df09991c08812a60108003fa340.tar.gz -+sha256 a221f8380e7b5806031f54d423af6dde24c305dad49868056cf70e5f5f4ef771 runc-v1.0.0-rc6.tar.gz - sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE -diff --git a/package/runc/runc.mk b/package/runc/runc.mk -index 7f42c96..4bce0aa 100644 ---- a/package/runc/runc.mk -+++ b/package/runc/runc.mk -@@ -5,7 +5,7 @@ - ################################################################################ - - # docker-engine/hack/dockerfile/install/runc.installer:4 RUNC_COMMIT=... --RUNC_VERSION = 69663f0bd4b60df09991c08812a60108003fa340 -+RUNC_VERSION = v1.0.0-rc6 - RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) - RUNC_LICENSE = Apache-2.0 - RUNC_LICENSE_FILES = LICENSE -@@ -14,7 +14,7 @@ RUNC_WORKSPACE = Godeps/_workspace - - RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) - --RUNC_TAGS = cgo static_build -+RUNC_TAGS = cgo static_build apparmor - - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) - RUNC_TAGS += seccomp --- -2.17.1 - diff --git a/buildroot-patches/0004-docker-proxy-bump-to-449672e51370ccca3b115c834fd0ef2fdec9b094.patch b/buildroot-patches/0004-docker-proxy-bump-to-449672e51370ccca3b115c834fd0ef2fdec9b094.patch deleted file mode 100644 index 3ae85166e..000000000 --- a/buildroot-patches/0004-docker-proxy-bump-to-449672e51370ccca3b115c834fd0ef2fdec9b094.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 512537d74cbefbb288dba7f594557c5abe507317 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Sun, 25 Nov 2018 16:30:31 +0000 -Subject: [PATCH 1/1] docker-proxy: bump to 449672e51370ccca3b115c834fd0ef2fdec9b094 - -Signed-off-by: Pascal Vizeli ---- - package/docker-proxy/docker-proxy.hash | 2 +- - package/docker-proxy/docker-proxy.mk | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash -index 3ec184f..4260926 100644 ---- a/package/docker-proxy/docker-proxy.hash -+++ b/package/docker-proxy/docker-proxy.hash -@@ -1,2 +1,2 @@ - # Locally calculated --sha256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz -+sha256 1823f8f86b0b7fa5c65afaed75db1732b72245c318205a75180f0da6525f2f67 docker-proxy-449672e51370ccca3b115c834fd0ef2fdec9b094.tar.gz -diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk -index dfa9d43..9250538 100644 ---- a/package/docker-proxy/docker-proxy.mk -+++ b/package/docker-proxy/docker-proxy.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e -+DOCKER_PROXY_VERSION = 449672e51370ccca3b115c834fd0ef2fdec9b094 - DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) - - DOCKER_PROXY_LICENSE = Apache-2.0 -@@ -12,8 +12,6 @@ DOCKER_PROXY_LICENSE_FILES = LICENSE - - DOCKER_PROXY_DEPENDENCIES = host-pkgconf - --DOCKER_PROXY_WORKSPACE = gopath -- - DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - - define DOCKER_PROXY_INSTALL_TARGET_CMDS --- -2.17.1 - diff --git a/buildroot-patches/0005-Pump-raspberry-pi-firmware-for-kernel-4.14.patch b/buildroot-patches/0004-rpi-firmware-Bump-firmware-for-kernel-4.14.patch similarity index 62% rename from buildroot-patches/0005-Pump-raspberry-pi-firmware-for-kernel-4.14.patch rename to buildroot-patches/0004-rpi-firmware-Bump-firmware-for-kernel-4.14.patch index 4e26d133f..1a96f52f0 100644 --- a/buildroot-patches/0005-Pump-raspberry-pi-firmware-for-kernel-4.14.patch +++ b/buildroot-patches/0004-rpi-firmware-Bump-firmware-for-kernel-4.14.patch @@ -1,7 +1,7 @@ -From 4822be5410d0e01c88d9d4aa2e20b5bbae32c81a Mon Sep 17 00:00:00 2001 +From 86fe49bf731e36138fef39790afacaef9555469b Mon Sep 17 00:00:00 2001 From: Pascal Vizeli -Date: Sun, 27 May 2018 20:49:19 +0000 -Subject: [PATCH 1/1] Pump raspberry-pi firmware for kernel 4.14 +Date: Wed, 26 Jun 2019 10:12:53 +0000 +Subject: [PATCH 1/1] rpi-firmware: Bump firmware for kernel 4.14 Signed-off-by: Pascal Vizeli --- @@ -10,26 +10,26 @@ Signed-off-by: Pascal Vizeli 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash -index 4854deae03..3a9f21e877 100644 +index 9988dda717..c81935c913 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,2 +1,2 @@ # Locally computed --sha256 57c56e9e41a2d9b1ce660aa7887db5c4b44f768fc63c6b6ef1d2fe460a090d85 rpi-firmware-fbad6408c4596d3d671736ee0571aae444f24e68.tar.gz -+sha256 9a34ccc4a51695a33206cc6c8534f615ba5a30fcbce5fa3add400ecc6b80ad8a rpi-firmware-83977fe3b6ef54c1d29c83b0a778d330f523441f.tar.gz +-sha256 f1d631920ed4ae15f368ba7b8b3caa4ed604f5223372cc6debbd39a101eb8d74 rpi-firmware-81cca1a9380c828299e884dba5efd0d4acb39e8d.tar.gz ++sha256 9a34ccc4a51695a33206cc6c8534f615ba5a30fcbce5fa3add400ecc6b80ad8a rpi-firmware-83977fe3b6ef54c1d29c83b0a778d330f523441f.tar.gz diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk -index eab4c5d307..cb2e9d6cd8 100644 +index 630bc670ca..b57ed2ef4c 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ --RPI_FIRMWARE_VERSION = fbad6408c4596d3d671736ee0571aae444f24e68 +-RPI_FIRMWARE_VERSION = 81cca1a9380c828299e884dba5efd0d4acb39e8d +RPI_FIRMWARE_VERSION = 83977fe3b6ef54c1d29c83b0a778d330f523441f RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom -- -2.17.0 +2.17.1 diff --git a/buildroot-patches/0005-network-manager-Bump-version-1.16.2.patch b/buildroot-patches/0005-network-manager-Bump-version-1.16.2.patch new file mode 100644 index 000000000..b596e0d2e --- /dev/null +++ b/buildroot-patches/0005-network-manager-Bump-version-1.16.2.patch @@ -0,0 +1,127 @@ +From 1f92066037ff71aa895fe552d4821247010da72e Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Wed, 26 Jun 2019 12:46:09 +0000 +Subject: [PATCH 1/1] network-manager: Bump version 1.16.2 + +Signed-off-by: Pascal Vizeli +--- + ...we-have-enough-space-for-the-DHCP6-o.patch | 38 ------------------- + package/network-manager/Config.in | 5 ++- + package/network-manager/network-manager.hash | 3 +- + package/network-manager/network-manager.mk | 10 +++-- + 4 files changed, 11 insertions(+), 45 deletions(-) + delete mode 100644 package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch + +diff --git a/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch +deleted file mode 100644 +index c6066abe28..0000000000 +--- a/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch ++++ /dev/null +@@ -1,38 +0,0 @@ +-From 01ca2053bbea09f35b958c8cc7631e15469acb79 Mon Sep 17 00:00:00 2001 +-From: Lennart Poettering +-Date: Fri, 19 Oct 2018 12:12:33 +0200 +-Subject: dhcp6: make sure we have enough space for the DHCP6 option header +- +-Fixes a vulnerability originally discovered by Felix Wilhelm from +-Google. +- +-CVE-2018-15688 +-LP: #1795921 +-https://bugzilla.redhat.com/show_bug.cgi?id=1639067 +- +-(cherry picked from commit 4dac5eaba4e419b29c97da38a8b1f82336c2c892) +- +-Patch downloaded from upstream commit: +-https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=01ca2053bbea09f35b958c8cc7631e15469acb79 +- +-Signed-off-by: Bernd Kuhls +---- +- src/systemd/src/libsystemd-network/dhcp6-option.c | 2 +- +- 1 file changed, 1 insertion(+), 1 deletion(-) +- +-diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c +-index d178fe2..9027c14 100644 +---- a/src/systemd/src/libsystemd-network/dhcp6-option.c +-+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c +-@@ -108,7 +108,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) { +- return -EINVAL; +- } +- +-- if (*buflen < len) +-+ if (*buflen < offsetof(DHCP6Option, data) + len) +- return -ENOBUFS; +- +- ia_hdr = *buf; +--- +-cgit v1.1 +- +diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in +index ca508185f0..1db6f32d31 100644 +--- a/package/network-manager/Config.in ++++ b/package/network-manager/Config.in +@@ -16,8 +16,9 @@ config BR2_PACKAGE_NETWORK_MANAGER + select BR2_PACKAGE_LIBGUDEV + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID +- select BR2_PACKAGE_WIRELESS_TOOLS +- select BR2_PACKAGE_WIRELESS_TOOLS_LIB ++ select BR2_PACKAGE_WPA_SUPPLICANT ++ select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW ++ select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION + select BR2_PACKAGE_READLINE + select BR2_PACKAGE_LIBNDP + help +diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash +index 3439439175..f1bc5d1b09 100644 +--- a/package/network-manager/network-manager.hash ++++ b/package/network-manager/network-manager.hash +@@ -1,5 +1,4 @@ + # From https://download.gnome.org/sources/NetworkManager/1.10/NetworkManager-1.10.8.sha256sum +-sha256 eb4ac8ce75fed5ec804f409caec7b54342d4e01512baf7d7fc119fd40ac8a938 NetworkManager-1.10.8.tar.xz ++sha256 8fe9cd2c45bd661c58a91b03d8a922d6d2ab6b25bc185b2d3f050c80f427589f NetworkManager-1.16.2.tar.xz + # Locally computed + sha256 49d9659a4f9a09747c320d51d3cf9dfde210de67b70862acf849890f6477b00d COPYING +-sha256 3a2968e3abb4fea464cd8dc1146d71996f9544af91a5f687bc4f3a2932df49b4 libnm-util/COPYING +diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk +index 2b9f68a030..2951f1230e 100644 +--- a/package/network-manager/network-manager.mk ++++ b/package/network-manager/network-manager.mk +@@ -4,13 +4,13 @@ + # + ################################################################################ + +-NETWORK_MANAGER_VERSION_MAJOR = 1.10 +-NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8 ++NETWORK_MANAGER_VERSION_MAJOR = 1.16 ++NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 + NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz + NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) + NETWORK_MANAGER_INSTALL_STAGING = YES + NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \ +- libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev ++ libgcrypt wpa_supplicant util-linux host-intltool readline libndp libgudev + NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm-util) + NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING + +@@ -93,6 +93,7 @@ endef + + define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants ++ mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants + + ln -sf /usr/lib/systemd/system/NetworkManager.service \ + $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service +@@ -100,6 +101,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD + ln -sf /usr/lib/systemd/system/NetworkManager.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service + ++ ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \ ++ $(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service ++ + ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \ + $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service + endef +-- +2.17.1 + diff --git a/buildroot-patches/0007-Fix-dhcp-client.patch b/buildroot-patches/0006-Fix-dhcp-client.patch similarity index 100% rename from buildroot-patches/0007-Fix-dhcp-client.patch rename to buildroot-patches/0006-Fix-dhcp-client.patch diff --git a/buildroot-patches/0006-NetworkManager_wpa-supplicant.patch b/buildroot-patches/0006-NetworkManager_wpa-supplicant.patch deleted file mode 100644 index 9ecf97644..000000000 --- a/buildroot-patches/0006-NetworkManager_wpa-supplicant.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 22a39b0058643c9aebdaf3ebc42a1ea30a33522f Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Sat, 30 Jun 2018 21:10:14 +0000 -Subject: [PATCH 1/1] NetworkManager_wpa-supplicant - -Signed-off-by: Pascal Vizeli ---- - package/network-manager/Config.in | 5 +++-- - package/network-manager/network-manager.mk | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in -index 72658c1278..759e4a98f9 100644 ---- a/package/network-manager/Config.in -+++ b/package/network-manager/Config.in -@@ -16,8 +16,9 @@ config BR2_PACKAGE_NETWORK_MANAGER - select BR2_PACKAGE_LIBGUDEV - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID -- select BR2_PACKAGE_WIRELESS_TOOLS -- select BR2_PACKAGE_WIRELESS_TOOLS_LIB -+ select BR2_PACKAGE_WPA_SUPPLICANT -+ select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW -+ select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_LIBNDP - help -diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk -index a520aad9c0..846605eb8e 100644 ---- a/package/network-manager/network-manager.mk -+++ b/package/network-manager/network-manager.mk -@@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz - NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) - NETWORK_MANAGER_INSTALL_STAGING = YES - NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \ -- libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev -+ libgcrypt wpa_supplicant util-linux host-intltool readline libndp libgudev - NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm-util) - NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING - --- -2.17.1 - diff --git a/buildroot-patches/0009-rpi-use-latest-wifi-driver.patch b/buildroot-patches/0007-rpi-use-latest-wifi-driver.patch similarity index 100% rename from buildroot-patches/0009-rpi-use-latest-wifi-driver.patch rename to buildroot-patches/0007-rpi-use-latest-wifi-driver.patch diff --git a/buildroot-patches/0008-NetworkManager-allow-to-wait-on-boot.patch b/buildroot-patches/0008-NetworkManager-allow-to-wait-on-boot.patch deleted file mode 100644 index 273dd981a..000000000 --- a/buildroot-patches/0008-NetworkManager-allow-to-wait-on-boot.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 590565bc07f563f978004727dc817dc89527377a Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Sat, 31 Mar 2018 16:58:14 +0200 -Subject: [PATCH 1/1] NetworkManager: allow to wait on boot - -Signed-off-by: Pascal Vizeli ---- - package/network-manager/network-manager.mk | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk -index a520aad..fb2012a 100644 ---- a/package/network-manager/network-manager.mk -+++ b/package/network-manager/network-manager.mk -@@ -93,6 +93,7 @@ endef - - define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants -+ mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants - - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service -@@ -100,6 +101,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service - -+ ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \ -+ $(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service -+ - ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - endef --- -2.7.4 diff --git a/buildroot-patches/0010-tini-make-static-for-docker.patch b/buildroot-patches/0008-tini-make-static-for-docker.patch similarity index 100% rename from buildroot-patches/0010-tini-make-static-for-docker.patch rename to buildroot-patches/0008-tini-make-static-for-docker.patch diff --git a/buildroot-patches/0009-openvmtools-start-only-inside-a-vmware-env.patch b/buildroot-patches/0009-openvmtools-start-only-inside-a-vmware-env.patch new file mode 100644 index 000000000..83877f449 --- /dev/null +++ b/buildroot-patches/0009-openvmtools-start-only-inside-a-vmware-env.patch @@ -0,0 +1,32 @@ +From f80ba7397087960c033bc8ba43959e399aefb250 Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Wed, 26 Jun 2019 13:38:47 +0000 +Subject: [PATCH 1/1] openvmtools: start only inside a vmware env + +Signed-off-by: Pascal Vizeli +--- + package/openvmtools/vmtoolsd.service | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/openvmtools/vmtoolsd.service b/package/openvmtools/vmtoolsd.service +index 17a4df44c2..1d2a3566cf 100644 +--- a/package/openvmtools/vmtoolsd.service ++++ b/package/openvmtools/vmtoolsd.service +@@ -1,11 +1,12 @@ + [Unit] + Description=vmtoolsd for openvmtools + After=syslog.target network.target ++ConditionVirtualization=vmware + + [Service] + Type=forking +-PIDFile=/var/run/vmtoolsd.pid +-ExecStart=/usr/bin/vmtoolsd -b /var/run/vmtoolsd.pid ++PIDFile=/run/vmtoolsd.pid ++ExecStart=/usr/bin/vmtoolsd -b /run/vmtoolsd.pid + Restart=on-failure + KillMode=process + KillSignal=SIGKILL +-- +2.17.1 + diff --git a/buildroot-patches/0011-openvmtools-bump-version-to-10.3.5.patch b/buildroot-patches/0011-openvmtools-bump-version-to-10.3.5.patch deleted file mode 100644 index 1cac34de6..000000000 --- a/buildroot-patches/0011-openvmtools-bump-version-to-10.3.5.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 9a81400fdba5a0a82ff972f25b94ff94e7ed0e50 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Mon, 3 Dec 2018 23:27:00 +0000 -Subject: [PATCH 1/1] openvmtools: bump version to 10.3.5 - -Signed-off-by: Pascal Vizeli ---- - package/openvmtools/0001-has_bsd_printf.patch | 26 ------------------- - ...rror.patch => 0001-no_cflags_werror.patch} | 0 - ...s.patch => 0002-dont-force-cppflags.patch} | 0 - ....patch => 0003-uclibc_secure_getenv.patch} | 0 - package/openvmtools/openvmtools.hash | 2 +- - package/openvmtools/openvmtools.mk | 2 +- - 6 files changed, 2 insertions(+), 28 deletions(-) - delete mode 100644 package/openvmtools/0001-has_bsd_printf.patch - rename package/openvmtools/{0002-no_cflags_werror.patch => 0001-no_cflags_werror.patch} (100%) - rename package/openvmtools/{0003-dont-force-cppflags.patch => 0002-dont-force-cppflags.patch} (100%) - rename package/openvmtools/{0004-uclibc_secure_getenv.patch => 0003-uclibc_secure_getenv.patch} (100%) - -diff --git a/package/openvmtools/0001-has_bsd_printf.patch b/package/openvmtools/0001-has_bsd_printf.patch -deleted file mode 100644 -index df23f00..0000000 ---- a/package/openvmtools/0001-has_bsd_printf.patch -+++ /dev/null -@@ -1,26 +0,0 @@ --lib/misc/msgList.c: missing #ifdef -- --This macro checks for BSD style printf(), which is not present --when compiling for uClibc. The linked functions are unnecessary in --this case, and they break compilation. -- --Signed-off-by: Karoly Kasza -- ----- openvmtools-stable-9.10.0.orig/open-vm-tools/lib/misc/msgList.c 2015-06-17 10:01:00.000000000 +0200 --+++ openvmtools-stable-9.10.0/open-vm-tools/lib/misc/msgList.c 2015-06-17 10:01:00.000000000 +0200 --@@ -487,6 +487,7 @@ -- return messages->id; -- } -- --+#ifdef HAS_BSD_PRINTF -- -- /* -- *---------------------------------------------------------------------- --@@ -566,6 +567,7 @@ -- } -- } -- --+#endif -- -- /* -- *---------------------------------------------------------------------- -diff --git a/package/openvmtools/0002-no_cflags_werror.patch b/package/openvmtools/0001-no_cflags_werror.patch -similarity index 100% -rename from package/openvmtools/0002-no_cflags_werror.patch -rename to package/openvmtools/0001-no_cflags_werror.patch -diff --git a/package/openvmtools/0003-dont-force-cppflags.patch b/package/openvmtools/0002-dont-force-cppflags.patch -similarity index 100% -rename from package/openvmtools/0003-dont-force-cppflags.patch -rename to package/openvmtools/0002-dont-force-cppflags.patch -diff --git a/package/openvmtools/0004-uclibc_secure_getenv.patch b/package/openvmtools/0003-uclibc_secure_getenv.patch -similarity index 100% -rename from package/openvmtools/0004-uclibc_secure_getenv.patch -rename to package/openvmtools/0003-uclibc_secure_getenv.patch -diff --git a/package/openvmtools/openvmtools.hash b/package/openvmtools/openvmtools.hash -index bf344e5..743b7dc 100644 ---- a/package/openvmtools/openvmtools.hash -+++ b/package/openvmtools/openvmtools.hash -@@ -1,2 +1,2 @@ - # locally computed --sha256 ff384ab0c11e19db0fd6ddab60e8ae48a4591b141fb3a8e8f1d4e1a489dd293f openvmtools-5a9033ddfa95786d867e4d02bbb9a29bac8fb64f.tar.gz -+sha256 c0ecd281d6113ca700b1ab0a10559db72e80d8fc03264d53ebfdc400578ab1b6 openvmtools-stable-10.3.5.tar.gz -diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk -index 9501ef3..f331c0e 100644 ---- a/package/openvmtools/openvmtools.mk -+++ b/package/openvmtools/openvmtools.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --OPENVMTOOLS_VERSION = 5a9033ddfa95786d867e4d02bbb9a29bac8fb64f -+OPENVMTOOLS_VERSION = stable-10.3.5 - OPENVMTOOLS_SITE = $(call github,vmware,open-vm-tools,$(OPENVMTOOLS_VERSION)) - OPENVMTOOLS_SUBDIR = open-vm-tools - OPENVMTOOLS_LICENSE = LGPL-2.1 --- -2.17.1 - diff --git a/buildroot-patches/0013-linux-bump-default-to-4.19.2.patch b/buildroot-patches/0013-linux-bump-default-to-4.19.2.patch deleted file mode 100644 index 9a2244cd5..000000000 --- a/buildroot-patches/0013-linux-bump-default-to-4.19.2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 377944f65a74670075c1878a0b6b61ad84856ed5 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 20 Nov 2018 15:30:08 +0200 -Subject: [PATCH] linux: bump default to 4.19.2 - -Signed-off-by: Baruch Siach -Signed-off-by: Peter Korsgaard ---- - linux/Config.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/linux/Config.in b/linux/Config.in -index ecb12d0b16..c75e149a37 100644 ---- a/linux/Config.in -+++ b/linux/Config.in -@@ -30,7 +30,7 @@ choice - prompt "Kernel version" - - config BR2_LINUX_KERNEL_LATEST_VERSION -- bool "Latest version (4.18)" -+ bool "Latest version (4.19)" - - config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (v4.4.138-cip25)" --- -2.17.1 - diff --git a/buildroot-patches/0015-toolchain-add-4.19.x-choice-for-headers.patch b/buildroot-patches/0015-toolchain-add-4.19.x-choice-for-headers.patch deleted file mode 100644 index 9f02a1ee4..000000000 --- a/buildroot-patches/0015-toolchain-add-4.19.x-choice-for-headers.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 561770fd032744b4daac186c1ede9bce1d4b4c45 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 20 Nov 2018 15:30:06 +0200 -Subject: [PATCH] toolchain: add 4.19.x choice for headers - -Signed-off-by: Baruch Siach -Signed-off-by: Peter Korsgaard ---- - toolchain/Config.in | 5 +++++ - .../toolchain-external-custom/Config.in.options | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/toolchain/Config.in b/toolchain/Config.in -index c2192a52b1..474e3c8bba 100644 ---- a/toolchain/Config.in -+++ b/toolchain/Config.in -@@ -361,10 +361,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 - -+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 -+ bool -+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 -+ - # This order guarantees that the highest version is set, as kconfig - # stops affecting a value on the first matching default. - config BR2_TOOLCHAIN_HEADERS_AT_LEAST - string -+ default "4.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 - default "4.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 - default "4.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 - default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 -diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -index 8665d2e2a7..288fc3f3e0 100644 ---- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -@@ -123,6 +123,10 @@ choice - m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF - p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF - -+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19 -+ bool "4.19.x" -+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 -+ - config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_18 - bool "4.18.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 --- -2.17.1 - diff --git a/buildroot-patches/0016-openvmtools-start-only-inside-a-vmware-env.patch b/buildroot-patches/0016-openvmtools-start-only-inside-a-vmware-env.patch deleted file mode 100644 index 276df2602..000000000 --- a/buildroot-patches/0016-openvmtools-start-only-inside-a-vmware-env.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ef9591dd61cfc79a0549954c71826ec1ac47757d Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Mon, 28 Jan 2019 09:13:33 +0000 -Subject: [PATCH] openvmtools: start only inside a vmware env - -Signed-off-by: Pascal Vizeli ---- - package/openvmtools/vmtoolsd.service | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/package/openvmtools/vmtoolsd.service b/package/openvmtools/vmtoolsd.service -index 17a4df4..cb97357 100644 ---- a/package/openvmtools/vmtoolsd.service -+++ b/package/openvmtools/vmtoolsd.service -@@ -1,6 +1,7 @@ - [Unit] - Description=vmtoolsd for openvmtools - After=syslog.target network.target -+ConditionVirtualization=vmware - - [Service] - Type=forking --- -2.17.1 - diff --git a/buildroot/.gitlab-ci.yml b/buildroot/.gitlab-ci.yml index c78f2ea58..c373d4a79 100644 --- a/buildroot/.gitlab-ci.yml +++ b/buildroot/.gitlab-ci.yml @@ -6,16 +6,17 @@ image: buildroot/base:20180318.1724 -.defconfig_script: &defconfig_script - - echo 'Configure Buildroot' - - make ${CI_JOB_NAME} - - echo 'Build buildroot' - - | - make > >(tee build.log |grep '>>>') 2>&1 || { - echo 'Failed build last output' - tail -200 build.log - exit 1 - } +.defconfig_script: + script: + - echo 'Configure Buildroot' + - make ${CI_JOB_NAME} + - echo 'Build buildroot' + - | + make > >(tee build.log |grep '>>>') 2>&1 || { + echo 'Failed build last output' + tail -200 build.log + exit 1 + } check-gitlab-ci.yml: script: @@ -45,28 +46,32 @@ check-package: script: - make check-package -.defconfig: &defconfig +.defconfig: + extends: .defconfig_script # Running the defconfigs for every push is too much, so limit to # explicit triggers through the API. only: - triggers - tags - script: *defconfig_script + - /-defconfigs$/ artifacts: when: always expire_in: 2 weeks paths: + - .config - build.log - output/images/ - output/build/build-time.log - output/build/packages-file-list.txt + - output/build/*/.config -.runtime_test: &runtime_test +.runtime_test: # Running the runtime tests for every push is too much, so limit to # explicit triggers through the API. only: - triggers - tags + - /-runtime-tests$/ # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in @@ -79,261 +84,314 @@ check-package: - test-output/*.log - test-output/*/.config - test-output/*/images/* -acmesystems_aria_g25_128mb_defconfig: *defconfig -acmesystems_aria_g25_256mb_defconfig: *defconfig -acmesystems_arietta_g25_128mb_defconfig: *defconfig -acmesystems_arietta_g25_256mb_defconfig: *defconfig -amarula_a64_relic_defconfig: *defconfig -amarula_vyasa_rk3288_defconfig: *defconfig -arcturus_ucls1012a_defconfig: *defconfig -arcturus_ucp1020_defconfig: *defconfig -arm_foundationv8_defconfig: *defconfig -arm_juno_defconfig: *defconfig -armadeus_apf27_defconfig: *defconfig -armadeus_apf28_defconfig: *defconfig -armadeus_apf51_defconfig: *defconfig -asus_tinker_rk3288_defconfig: *defconfig -at91sam9260eknf_defconfig: *defconfig -at91sam9g20dfc_defconfig: *defconfig -at91sam9g45m10ek_defconfig: *defconfig -at91sam9rlek_defconfig: *defconfig -at91sam9x5ek_defconfig: *defconfig -at91sam9x5ek_dev_defconfig: *defconfig -at91sam9x5ek_mmc_defconfig: *defconfig -at91sam9x5ek_mmc_dev_defconfig: *defconfig -atmel_sama5d27_som1_ek_mmc_dev_defconfig: *defconfig -atmel_sama5d2_xplained_mmc_defconfig: *defconfig -atmel_sama5d2_xplained_mmc_dev_defconfig: *defconfig -atmel_sama5d3_xplained_defconfig: *defconfig -atmel_sama5d3_xplained_dev_defconfig: *defconfig -atmel_sama5d3_xplained_mmc_defconfig: *defconfig -atmel_sama5d3_xplained_mmc_dev_defconfig: *defconfig -atmel_sama5d3xek_defconfig: *defconfig -atmel_sama5d4_xplained_defconfig: *defconfig -atmel_sama5d4_xplained_dev_defconfig: *defconfig -atmel_sama5d4_xplained_mmc_defconfig: *defconfig -atmel_sama5d4_xplained_mmc_dev_defconfig: *defconfig -bananapi_m1_defconfig: *defconfig -bananapi_m2_plus_defconfig: *defconfig -bananapi_m2_ultra_defconfig: *defconfig -bananapi_m64_defconfig: *defconfig -bananapro_defconfig: *defconfig -beagleboardx15_defconfig: *defconfig -beaglebone_defconfig: *defconfig -beaglebone_qt5_defconfig: *defconfig -chromebook_snow_defconfig: *defconfig -ci20_defconfig: *defconfig -csky_gx6605s_defconfig: *defconfig -cubieboard2_defconfig: *defconfig -engicam_imx6qdl_icore_defconfig: *defconfig -engicam_imx6qdl_icore_qt5_defconfig: *defconfig -engicam_imx6qdl_icore_rqs_defconfig: *defconfig -engicam_imx6ul_geam_defconfig: *defconfig -engicam_imx6ul_isiot_defconfig: *defconfig -freescale_imx28evk_defconfig: *defconfig -freescale_imx6dlsabreauto_defconfig: *defconfig -freescale_imx6dlsabresd_defconfig: *defconfig -freescale_imx6qsabreauto_defconfig: *defconfig -freescale_imx6qsabresd_defconfig: *defconfig -freescale_imx6sxsabresd_defconfig: *defconfig -freescale_imx7dsabresd_defconfig: *defconfig -freescale_imx8mqevk_defconfig: *defconfig -freescale_p1025twr_defconfig: *defconfig -freescale_t1040d4rdb_defconfig: *defconfig -friendlyarm_nanopi_a64_defconfig: *defconfig -friendlyarm_nanopi_neo2_defconfig: *defconfig -galileo_defconfig: *defconfig -grinn_chiliboard_defconfig: *defconfig -grinn_liteboard_defconfig: *defconfig -imx23evk_defconfig: *defconfig -imx6-sabreauto_defconfig: *defconfig -imx6-sabresd_defconfig: *defconfig -imx6-sabresd_qt5_defconfig: *defconfig -imx6slevk_defconfig: *defconfig -imx6sx-sdb_defconfig: *defconfig -imx6ulevk_defconfig: *defconfig -imx6ulpico_defconfig: *defconfig -imx7d-sdb_defconfig: *defconfig -imx7dpico_defconfig: *defconfig -lego_ev3_defconfig: *defconfig -linksprite_pcduino_defconfig: *defconfig -minnowboard_max-graphical_defconfig: *defconfig -minnowboard_max_defconfig: *defconfig -mx25pdk_defconfig: *defconfig -mx51evk_defconfig: *defconfig -mx53loco_defconfig: *defconfig -mx6cubox_defconfig: *defconfig -mx6sx_udoo_neo_defconfig: *defconfig -mx6udoo_defconfig: *defconfig -nanopi_m1_defconfig: *defconfig -nanopi_m1_plus_defconfig: *defconfig -nanopi_neo_defconfig: *defconfig -nexbox_a95x_defconfig: *defconfig -nitrogen6sx_defconfig: *defconfig -nitrogen6x_defconfig: *defconfig -nitrogen7_defconfig: *defconfig -nitrogen8m_defconfig: *defconfig -odroidc2_defconfig: *defconfig -odroidxu4_defconfig: *defconfig -olimex_a10_olinuxino_lime_defconfig: *defconfig -olimex_a13_olinuxino_defconfig: *defconfig -olimex_a20_olinuxino_lime2_defconfig: *defconfig -olimex_a20_olinuxino_lime_defconfig: *defconfig -olimex_a20_olinuxino_lime_legacy_defconfig: *defconfig -olimex_a20_olinuxino_micro_defconfig: *defconfig -olimex_a64_olinuxino_defconfig: *defconfig -olimex_imx233_olinuxino_defconfig: *defconfig -openblocks_a6_defconfig: *defconfig -orangepi_lite_defconfig: *defconfig -orangepi_one_defconfig: *defconfig -orangepi_pc2_defconfig: *defconfig -orangepi_pc_defconfig: *defconfig -orangepi_pc_plus_defconfig: *defconfig -orangepi_plus_defconfig: *defconfig -orangepi_prime_defconfig: *defconfig -orangepi_win_defconfig: *defconfig -orangepi_zero_defconfig: *defconfig -orangepi_zero_plus2_defconfig: *defconfig -pandaboard_defconfig: *defconfig -pc_x86_64_bios_defconfig: *defconfig -pc_x86_64_efi_defconfig: *defconfig -pine64_defconfig: *defconfig -pine64_sopine_defconfig: *defconfig -qemu_aarch64_virt_defconfig: *defconfig -qemu_arm_versatile_defconfig: *defconfig -qemu_arm_versatile_nommu_defconfig: *defconfig -qemu_arm_vexpress_defconfig: *defconfig -qemu_m68k_mcf5208_defconfig: *defconfig -qemu_m68k_q800_defconfig: *defconfig -qemu_microblazebe_mmu_defconfig: *defconfig -qemu_microblazeel_mmu_defconfig: *defconfig -qemu_mips32r2_malta_defconfig: *defconfig -qemu_mips32r2el_malta_defconfig: *defconfig -qemu_mips32r6_malta_defconfig: *defconfig -qemu_mips32r6el_malta_defconfig: *defconfig -qemu_mips64_malta_defconfig: *defconfig -qemu_mips64el_malta_defconfig: *defconfig -qemu_mips64r6_malta_defconfig: *defconfig -qemu_mips64r6el_malta_defconfig: *defconfig -qemu_nios2_10m50_defconfig: *defconfig -qemu_or1k_defconfig: *defconfig -qemu_ppc64_e5500_defconfig: *defconfig -qemu_ppc64_pseries_defconfig: *defconfig -qemu_ppc64le_pseries_defconfig: *defconfig -qemu_ppc_g3beige_defconfig: *defconfig -qemu_ppc_mpc8544ds_defconfig: *defconfig -qemu_ppc_virtex_ml507_defconfig: *defconfig -qemu_riscv64_virt_defconfig: *defconfig -qemu_sh4_r2d_defconfig: *defconfig -qemu_sh4eb_r2d_defconfig: *defconfig -qemu_sparc64_sun4u_defconfig: *defconfig -qemu_sparc_ss10_defconfig: *defconfig -qemu_x86_64_defconfig: *defconfig -qemu_x86_defconfig: *defconfig -qemu_xtensa_lx60_defconfig: *defconfig -qemu_xtensa_lx60_nommu_defconfig: *defconfig -raspberrypi0_defconfig: *defconfig -raspberrypi0w_defconfig: *defconfig -raspberrypi2_defconfig: *defconfig -raspberrypi3_64_defconfig: *defconfig -raspberrypi3_defconfig: *defconfig -raspberrypi3_qt5we_defconfig: *defconfig -raspberrypi_defconfig: *defconfig -riotboard_defconfig: *defconfig -roseapplepi_defconfig: *defconfig -s6lx9_microboard_defconfig: *defconfig -sheevaplug_defconfig: *defconfig -snps_aarch64_vdk_defconfig: *defconfig -snps_arc700_axs101_defconfig: *defconfig -snps_archs38_axs103_defconfig: *defconfig -snps_archs38_haps_defconfig: *defconfig -snps_archs38_hsdk_defconfig: *defconfig -snps_archs38_vdk_defconfig: *defconfig -socrates_cyclone5_defconfig: *defconfig -solidrun_clearfog_defconfig: *defconfig -solidrun_macchiatobin_mainline_defconfig: *defconfig -solidrun_macchiatobin_marvell_defconfig: *defconfig -stm32f429_disco_defconfig: *defconfig -stm32f469_disco_defconfig: *defconfig -toradex_apalis_imx6_defconfig: *defconfig -ts4800_defconfig: *defconfig -ts4900_defconfig: *defconfig -ts5500_defconfig: *defconfig -ts7680_defconfig: *defconfig -wandboard_defconfig: *defconfig -warp7_defconfig: *defconfig -warpboard_defconfig: *defconfig -zynq_microzed_defconfig: *defconfig -zynq_zc706_defconfig: *defconfig -zynq_zed_defconfig: *defconfig -zynq_zybo_defconfig: *defconfig -zynqmp_zcu106_defconfig: *defconfig -tests.boot.test_atf.TestATFAllwinner: *runtime_test -tests.boot.test_atf.TestATFMarvell: *runtime_test -tests.boot.test_atf.TestATFVexpress: *runtime_test -tests.core.test_file_capabilities.TestFileCapabilities: *runtime_test -tests.core.test_hardening.TestFortifyConserv: *runtime_test -tests.core.test_hardening.TestFortifyNone: *runtime_test -tests.core.test_hardening.TestRelro: *runtime_test -tests.core.test_hardening.TestRelroPartial: *runtime_test -tests.core.test_hardening.TestSspNone: *runtime_test -tests.core.test_hardening.TestSspStrong: *runtime_test -tests.core.test_post_scripts.TestPostScripts: *runtime_test -tests.core.test_rootfs_overlay.TestRootfsOverlay: *runtime_test -tests.core.test_timezone.TestGlibcAllTimezone: *runtime_test -tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: *runtime_test -tests.core.test_timezone.TestNoTimezone: *runtime_test -tests.fs.test_ext.TestExt2: *runtime_test -tests.fs.test_ext.TestExt2r1: *runtime_test -tests.fs.test_ext.TestExt3: *runtime_test -tests.fs.test_ext.TestExt4: *runtime_test -tests.fs.test_f2fs.TestF2FS: *runtime_test -tests.fs.test_iso9660.TestIso9660Grub2External: *runtime_test -tests.fs.test_iso9660.TestIso9660Grub2ExternalCompress: *runtime_test -tests.fs.test_iso9660.TestIso9660Grub2Internal: *runtime_test -tests.fs.test_iso9660.TestIso9660SyslinuxExternal: *runtime_test -tests.fs.test_iso9660.TestIso9660SyslinuxExternalCompress: *runtime_test -tests.fs.test_iso9660.TestIso9660SyslinuxInternal: *runtime_test -tests.fs.test_jffs2.TestJffs2: *runtime_test -tests.fs.test_squashfs.TestSquashfs: *runtime_test -tests.fs.test_ubi.TestUbi: *runtime_test -tests.fs.test_yaffs2.TestYaffs2: *runtime_test -tests.init.test_busybox.TestInitSystemBusyboxRo: *runtime_test -tests.init.test_busybox.TestInitSystemBusyboxRoNet: *runtime_test -tests.init.test_busybox.TestInitSystemBusyboxRw: *runtime_test -tests.init.test_busybox.TestInitSystemBusyboxRwNet: *runtime_test -tests.init.test_none.TestInitSystemNone: *runtime_test -tests.init.test_systemd.TestInitSystemSystemdRoFull: *runtime_test -tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: *runtime_test -tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: *runtime_test -tests.init.test_systemd.TestInitSystemSystemdRwFull: *runtime_test -tests.init.test_systemd.TestInitSystemSystemdRwIfupdown: *runtime_test -tests.init.test_systemd.TestInitSystemSystemdRwNetworkd: *runtime_test -tests.package.test_dropbear.TestDropbear: *runtime_test -tests.package.test_ipython.TestIPythonPy2: *runtime_test -tests.package.test_ipython.TestIPythonPy3: *runtime_test -tests.package.test_python.TestPython2: *runtime_test -tests.package.test_python.TestPython3: *runtime_test -tests.package.test_python_autobahn.TestPythonPy2Autobahn: *runtime_test -tests.package.test_python_autobahn.TestPythonPy3Autobahn: *runtime_test -tests.package.test_python_cryptography.TestPythonPy2Cryptography: *runtime_test -tests.package.test_python_cryptography.TestPythonPy3Cryptography: *runtime_test -tests.package.test_python_incremental.TestPythonPy2Incremental: *runtime_test -tests.package.test_python_incremental.TestPythonPy3Incremental: *runtime_test -tests.package.test_python_twisted.TestPythonPy2Twisted: *runtime_test -tests.package.test_python_twisted.TestPythonPy3Twisted: *runtime_test -tests.package.test_python_txaio.TestPythonPy2Txaio: *runtime_test -tests.package.test_python_txaio.TestPythonPy3Txaio: *runtime_test -tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: *runtime_test -tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: *runtime_test -tests.package.test_rust.TestRust: *runtime_test -tests.package.test_rust.TestRustBin: *runtime_test -tests.package.test_syslog_ng.TestSyslogNg: *runtime_test -tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: *runtime_test -tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: *runtime_test -tests.toolchain.test_external.TestExternalToolchainCCache: *runtime_test -tests.toolchain.test_external.TestExternalToolchainCtngMusl: *runtime_test -tests.toolchain.test_external.TestExternalToolchainLinaroArm: *runtime_test -tests.toolchain.test_external.TestExternalToolchainSourceryArmv4: *runtime_test -tests.toolchain.test_external.TestExternalToolchainSourceryArmv5: *runtime_test -tests.toolchain.test_external.TestExternalToolchainSourceryArmv7: *runtime_test +aarch64_efi_defconfig: { extends: .defconfig } +acmesystems_aria_g25_128mb_defconfig: { extends: .defconfig } +acmesystems_aria_g25_256mb_defconfig: { extends: .defconfig } +acmesystems_arietta_g25_128mb_defconfig: { extends: .defconfig } +acmesystems_arietta_g25_256mb_defconfig: { extends: .defconfig } +amarula_a64_relic_defconfig: { extends: .defconfig } +amarula_vyasa_rk3288_defconfig: { extends: .defconfig } +arcturus_ucls1012a_defconfig: { extends: .defconfig } +arcturus_ucp1020_defconfig: { extends: .defconfig } +arm_foundationv8_defconfig: { extends: .defconfig } +arm_juno_defconfig: { extends: .defconfig } +armadeus_apf27_defconfig: { extends: .defconfig } +armadeus_apf28_defconfig: { extends: .defconfig } +armadeus_apf51_defconfig: { extends: .defconfig } +asus_tinker_rk3288_defconfig: { extends: .defconfig } +at91sam9260eknf_defconfig: { extends: .defconfig } +at91sam9g20dfc_defconfig: { extends: .defconfig } +at91sam9g45m10ek_defconfig: { extends: .defconfig } +at91sam9rlek_defconfig: { extends: .defconfig } +at91sam9x5ek_defconfig: { extends: .defconfig } +at91sam9x5ek_dev_defconfig: { extends: .defconfig } +at91sam9x5ek_mmc_defconfig: { extends: .defconfig } +at91sam9x5ek_mmc_dev_defconfig: { extends: .defconfig } +atmel_sama5d27_som1_ek_mmc_dev_defconfig: { extends: .defconfig } +atmel_sama5d2_xplained_mmc_defconfig: { extends: .defconfig } +atmel_sama5d2_xplained_mmc_dev_defconfig: { extends: .defconfig } +atmel_sama5d3_xplained_defconfig: { extends: .defconfig } +atmel_sama5d3_xplained_dev_defconfig: { extends: .defconfig } +atmel_sama5d3_xplained_mmc_defconfig: { extends: .defconfig } +atmel_sama5d3_xplained_mmc_dev_defconfig: { extends: .defconfig } +atmel_sama5d3xek_defconfig: { extends: .defconfig } +atmel_sama5d4_xplained_defconfig: { extends: .defconfig } +atmel_sama5d4_xplained_dev_defconfig: { extends: .defconfig } +atmel_sama5d4_xplained_mmc_defconfig: { extends: .defconfig } +atmel_sama5d4_xplained_mmc_dev_defconfig: { extends: .defconfig } +bananapi_m1_defconfig: { extends: .defconfig } +bananapi_m2_plus_defconfig: { extends: .defconfig } +bananapi_m2_ultra_defconfig: { extends: .defconfig } +bananapi_m64_defconfig: { extends: .defconfig } +bananapro_defconfig: { extends: .defconfig } +beagleboardx15_defconfig: { extends: .defconfig } +beaglebone_defconfig: { extends: .defconfig } +beaglebone_qt5_defconfig: { extends: .defconfig } +chromebook_snow_defconfig: { extends: .defconfig } +ci20_defconfig: { extends: .defconfig } +csky_gx6605s_defconfig: { extends: .defconfig } +cubieboard2_defconfig: { extends: .defconfig } +engicam_imx6qdl_icore_defconfig: { extends: .defconfig } +engicam_imx6qdl_icore_qt5_defconfig: { extends: .defconfig } +engicam_imx6qdl_icore_rqs_defconfig: { extends: .defconfig } +engicam_imx6ul_geam_defconfig: { extends: .defconfig } +engicam_imx6ul_isiot_defconfig: { extends: .defconfig } +freescale_imx28evk_defconfig: { extends: .defconfig } +freescale_imx6dlsabreauto_defconfig: { extends: .defconfig } +freescale_imx6dlsabresd_defconfig: { extends: .defconfig } +freescale_imx6qsabreauto_defconfig: { extends: .defconfig } +freescale_imx6qsabresd_defconfig: { extends: .defconfig } +freescale_imx6sxsabresd_defconfig: { extends: .defconfig } +freescale_imx7dsabresd_defconfig: { extends: .defconfig } +freescale_imx8mqevk_defconfig: { extends: .defconfig } +freescale_p1025twr_defconfig: { extends: .defconfig } +freescale_t1040d4rdb_defconfig: { extends: .defconfig } +friendlyarm_nanopi_a64_defconfig: { extends: .defconfig } +friendlyarm_nanopi_neo2_defconfig: { extends: .defconfig } +galileo_defconfig: { extends: .defconfig } +grinn_chiliboard_defconfig: { extends: .defconfig } +grinn_liteboard_defconfig: { extends: .defconfig } +imx23evk_defconfig: { extends: .defconfig } +imx6-sabreauto_defconfig: { extends: .defconfig } +imx6-sabresd_defconfig: { extends: .defconfig } +imx6-sabresd_qt5_defconfig: { extends: .defconfig } +imx6slevk_defconfig: { extends: .defconfig } +imx6sx-sdb_defconfig: { extends: .defconfig } +imx6ulevk_defconfig: { extends: .defconfig } +imx6ulpico_defconfig: { extends: .defconfig } +imx7d-sdb_defconfig: { extends: .defconfig } +imx7dpico_defconfig: { extends: .defconfig } +lego_ev3_defconfig: { extends: .defconfig } +linksprite_pcduino_defconfig: { extends: .defconfig } +minnowboard_max-graphical_defconfig: { extends: .defconfig } +minnowboard_max_defconfig: { extends: .defconfig } +mx25pdk_defconfig: { extends: .defconfig } +mx51evk_defconfig: { extends: .defconfig } +mx53loco_defconfig: { extends: .defconfig } +mx6cubox_defconfig: { extends: .defconfig } +mx6sx_udoo_neo_defconfig: { extends: .defconfig } +mx6udoo_defconfig: { extends: .defconfig } +nanopi_m1_defconfig: { extends: .defconfig } +nanopi_m1_plus_defconfig: { extends: .defconfig } +nanopi_neo_defconfig: { extends: .defconfig } +nexbox_a95x_defconfig: { extends: .defconfig } +nitrogen6sx_defconfig: { extends: .defconfig } +nitrogen6x_defconfig: { extends: .defconfig } +nitrogen7_defconfig: { extends: .defconfig } +nitrogen8m_defconfig: { extends: .defconfig } +odroidc2_defconfig: { extends: .defconfig } +odroidxu4_defconfig: { extends: .defconfig } +olimex_a10_olinuxino_lime_defconfig: { extends: .defconfig } +olimex_a13_olinuxino_defconfig: { extends: .defconfig } +olimex_a20_olinuxino_lime2_defconfig: { extends: .defconfig } +olimex_a20_olinuxino_lime_defconfig: { extends: .defconfig } +olimex_a20_olinuxino_lime_legacy_defconfig: { extends: .defconfig } +olimex_a20_olinuxino_micro_defconfig: { extends: .defconfig } +olimex_a64_olinuxino_defconfig: { extends: .defconfig } +olimex_imx233_olinuxino_defconfig: { extends: .defconfig } +openblocks_a6_defconfig: { extends: .defconfig } +orangepi_lite2_defconfig: { extends: .defconfig } +orangepi_lite_defconfig: { extends: .defconfig } +orangepi_one_defconfig: { extends: .defconfig } +orangepi_one_plus_defconfig: { extends: .defconfig } +orangepi_pc2_defconfig: { extends: .defconfig } +orangepi_pc_defconfig: { extends: .defconfig } +orangepi_pc_plus_defconfig: { extends: .defconfig } +orangepi_plus_defconfig: { extends: .defconfig } +orangepi_prime_defconfig: { extends: .defconfig } +orangepi_win_defconfig: { extends: .defconfig } +orangepi_zero_defconfig: { extends: .defconfig } +orangepi_zero_plus2_defconfig: { extends: .defconfig } +pandaboard_defconfig: { extends: .defconfig } +pc_x86_64_bios_defconfig: { extends: .defconfig } +pc_x86_64_efi_defconfig: { extends: .defconfig } +pine64_defconfig: { extends: .defconfig } +pine64_sopine_defconfig: { extends: .defconfig } +qemu_aarch64_virt_defconfig: { extends: .defconfig } +qemu_arm_versatile_defconfig: { extends: .defconfig } +qemu_arm_versatile_nommu_defconfig: { extends: .defconfig } +qemu_arm_vexpress_defconfig: { extends: .defconfig } +qemu_m68k_mcf5208_defconfig: { extends: .defconfig } +qemu_m68k_q800_defconfig: { extends: .defconfig } +qemu_microblazebe_mmu_defconfig: { extends: .defconfig } +qemu_microblazeel_mmu_defconfig: { extends: .defconfig } +qemu_mips32r2_malta_defconfig: { extends: .defconfig } +qemu_mips32r2el_malta_defconfig: { extends: .defconfig } +qemu_mips32r6_malta_defconfig: { extends: .defconfig } +qemu_mips32r6el_malta_defconfig: { extends: .defconfig } +qemu_mips64_malta_defconfig: { extends: .defconfig } +qemu_mips64el_malta_defconfig: { extends: .defconfig } +qemu_mips64r6_malta_defconfig: { extends: .defconfig } +qemu_mips64r6el_malta_defconfig: { extends: .defconfig } +qemu_nios2_10m50_defconfig: { extends: .defconfig } +qemu_or1k_defconfig: { extends: .defconfig } +qemu_ppc64_e5500_defconfig: { extends: .defconfig } +qemu_ppc64_pseries_defconfig: { extends: .defconfig } +qemu_ppc64le_pseries_defconfig: { extends: .defconfig } +qemu_ppc_g3beige_defconfig: { extends: .defconfig } +qemu_ppc_mpc8544ds_defconfig: { extends: .defconfig } +qemu_ppc_virtex_ml507_defconfig: { extends: .defconfig } +qemu_riscv32_virt_defconfig: { extends: .defconfig } +qemu_riscv64_virt_defconfig: { extends: .defconfig } +qemu_sh4_r2d_defconfig: { extends: .defconfig } +qemu_sh4eb_r2d_defconfig: { extends: .defconfig } +qemu_sparc64_sun4u_defconfig: { extends: .defconfig } +qemu_sparc_ss10_defconfig: { extends: .defconfig } +qemu_x86_64_defconfig: { extends: .defconfig } +qemu_x86_defconfig: { extends: .defconfig } +qemu_xtensa_lx60_defconfig: { extends: .defconfig } +qemu_xtensa_lx60_nommu_defconfig: { extends: .defconfig } +raspberrypi0_defconfig: { extends: .defconfig } +raspberrypi0w_defconfig: { extends: .defconfig } +raspberrypi2_defconfig: { extends: .defconfig } +raspberrypi3_64_defconfig: { extends: .defconfig } +raspberrypi3_defconfig: { extends: .defconfig } +raspberrypi3_qt5we_defconfig: { extends: .defconfig } +raspberrypi_defconfig: { extends: .defconfig } +riotboard_defconfig: { extends: .defconfig } +rock64_defconfig: { extends: .defconfig } +roseapplepi_defconfig: { extends: .defconfig } +s6lx9_microboard_defconfig: { extends: .defconfig } +sheevaplug_defconfig: { extends: .defconfig } +snps_aarch64_vdk_defconfig: { extends: .defconfig } +snps_arc700_axs101_defconfig: { extends: .defconfig } +snps_archs38_axs103_defconfig: { extends: .defconfig } +snps_archs38_haps_defconfig: { extends: .defconfig } +snps_archs38_hsdk_defconfig: { extends: .defconfig } +snps_archs38_vdk_defconfig: { extends: .defconfig } +socrates_cyclone5_defconfig: { extends: .defconfig } +solidrun_clearfog_defconfig: { extends: .defconfig } +solidrun_macchiatobin_mainline_defconfig: { extends: .defconfig } +solidrun_macchiatobin_marvell_defconfig: { extends: .defconfig } +stm32f429_disco_defconfig: { extends: .defconfig } +stm32f469_disco_defconfig: { extends: .defconfig } +toradex_apalis_imx6_defconfig: { extends: .defconfig } +ts4800_defconfig: { extends: .defconfig } +ts4900_defconfig: { extends: .defconfig } +ts5500_defconfig: { extends: .defconfig } +ts7680_defconfig: { extends: .defconfig } +wandboard_defconfig: { extends: .defconfig } +warp7_defconfig: { extends: .defconfig } +warpboard_defconfig: { extends: .defconfig } +zynq_microzed_defconfig: { extends: .defconfig } +zynq_zc706_defconfig: { extends: .defconfig } +zynq_zed_defconfig: { extends: .defconfig } +zynqmp_zcu106_defconfig: { extends: .defconfig } +tests.boot.test_atf.TestATFAllwinner: { extends: .runtime_test } +tests.boot.test_atf.TestATFMarvell: { extends: .runtime_test } +tests.boot.test_atf.TestATFVexpress: { extends: .runtime_test } +tests.core.test_file_capabilities.TestFileCapabilities: { extends: .runtime_test } +tests.core.test_hardening.TestFortifyConserv: { extends: .runtime_test } +tests.core.test_hardening.TestFortifyNone: { extends: .runtime_test } +tests.core.test_hardening.TestRelro: { extends: .runtime_test } +tests.core.test_hardening.TestRelroPartial: { extends: .runtime_test } +tests.core.test_hardening.TestSspNone: { extends: .runtime_test } +tests.core.test_hardening.TestSspStrong: { extends: .runtime_test } +tests.core.test_post_scripts.TestPostScripts: { extends: .runtime_test } +tests.core.test_rootfs_overlay.TestRootfsOverlay: { extends: .runtime_test } +tests.core.test_timezone.TestGlibcAllTimezone: { extends: .runtime_test } +tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: { extends: .runtime_test } +tests.core.test_timezone.TestNoTimezone: { extends: .runtime_test } +tests.download.test_git.TestGitHash: { extends: .runtime_test } +tests.download.test_git.TestGitRefs: { extends: .runtime_test } +tests.fs.test_ext.TestExt2: { extends: .runtime_test } +tests.fs.test_ext.TestExt2r1: { extends: .runtime_test } +tests.fs.test_ext.TestExt3: { extends: .runtime_test } +tests.fs.test_ext.TestExt4: { extends: .runtime_test } +tests.fs.test_f2fs.TestF2FS: { extends: .runtime_test } +tests.fs.test_iso9660.TestIso9660Grub2External: { extends: .runtime_test } +tests.fs.test_iso9660.TestIso9660Grub2ExternalCompress: { extends: .runtime_test } +tests.fs.test_iso9660.TestIso9660Grub2Internal: { extends: .runtime_test } +tests.fs.test_iso9660.TestIso9660SyslinuxExternal: { extends: .runtime_test } +tests.fs.test_iso9660.TestIso9660SyslinuxExternalCompress: { extends: .runtime_test } +tests.fs.test_iso9660.TestIso9660SyslinuxInternal: { extends: .runtime_test } +tests.fs.test_jffs2.TestJffs2: { extends: .runtime_test } +tests.fs.test_squashfs.TestSquashfs: { extends: .runtime_test } +tests.fs.test_ubi.TestUbi: { extends: .runtime_test } +tests.fs.test_yaffs2.TestYaffs2: { extends: .runtime_test } +tests.init.test_busybox.TestInitSystemBusyboxRo: { extends: .runtime_test } +tests.init.test_busybox.TestInitSystemBusyboxRoNet: { extends: .runtime_test } +tests.init.test_busybox.TestInitSystemBusyboxRw: { extends: .runtime_test } +tests.init.test_busybox.TestInitSystemBusyboxRwNet: { extends: .runtime_test } +tests.init.test_none.TestInitSystemNone: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRoFull: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRwFull: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRwIfupdown: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRwNetworkd: { extends: .runtime_test } +tests.package.test_atop.TestAtop: { extends: .runtime_test } +tests.package.test_docker_compose.TestDockerCompose: { extends: .runtime_test } +tests.package.test_dropbear.TestDropbear: { extends: .runtime_test } +tests.package.test_ipython.TestIPythonPy2: { extends: .runtime_test } +tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test } +tests.package.test_lua.TestLua: { extends: .runtime_test } +tests.package.test_lua.TestLuajit: { extends: .runtime_test } +tests.package.test_perl.TestPerl: { extends: .runtime_test } +tests.package.test_perl_class_load.TestPerlClassLoad: { extends: .runtime_test } +tests.package.test_perl_dbd_mysql.TestPerlDBDmysql: { extends: .runtime_test } +tests.package.test_perl_encode_detect.TestPerlEncodeDetect: { extends: .runtime_test } +tests.package.test_perl_gdgraph.TestPerlGDGraph: { extends: .runtime_test } +tests.package.test_perl_io_socket_multicast.TestPerlIOSocketMulticast: { extends: .runtime_test } +tests.package.test_perl_io_socket_ssl.TestPerlIOSocketSSL: { extends: .runtime_test } +tests.package.test_perl_libwww_perl.TestPerllibwwwperl: { extends: .runtime_test } +tests.package.test_perl_mail_dkim.TestPerlMailDKIM: { extends: .runtime_test } +tests.package.test_perl_x10.TestPerlX10: { extends: .runtime_test } +tests.package.test_perl_xml_libxml.TestPerlXMLLibXML: { extends: .runtime_test } +tests.package.test_prosody.TestProsodyLua51: { extends: .runtime_test } +tests.package.test_prosody.TestProsodyLuajit: { extends: .runtime_test } +tests.package.test_python.TestPython2: { extends: .runtime_test } +tests.package.test_python.TestPython3: { extends: .runtime_test } +tests.package.test_python_argh.TestPythonPy2Argh: { extends: .runtime_test } +tests.package.test_python_argh.TestPythonPy3Argh: { extends: .runtime_test } +tests.package.test_python_attrs.TestPythonPy2Attrs: { extends: .runtime_test } +tests.package.test_python_attrs.TestPythonPy3Attrs: { extends: .runtime_test } +tests.package.test_python_autobahn.TestPythonPy2Autobahn: { extends: .runtime_test } +tests.package.test_python_autobahn.TestPythonPy3Autobahn: { extends: .runtime_test } +tests.package.test_python_automat.TestPythonPy2Automat: { extends: .runtime_test } +tests.package.test_python_automat.TestPythonPy3Automat: { extends: .runtime_test } +tests.package.test_python_bitstring.TestPythonPy2Bitstring: { extends: .runtime_test } +tests.package.test_python_bitstring.TestPythonPy3Bitstring: { extends: .runtime_test } +tests.package.test_python_cbor.TestPythonPy2Cbor: { extends: .runtime_test } +tests.package.test_python_cbor.TestPythonPy3Cbor: { extends: .runtime_test } +tests.package.test_python_click.TestPythonPy2Click: { extends: .runtime_test } +tests.package.test_python_click.TestPythonPy3Click: { extends: .runtime_test } +tests.package.test_python_constantly.TestPythonPy2Constantly: { extends: .runtime_test } +tests.package.test_python_constantly.TestPythonPy3Constantly: { extends: .runtime_test } +tests.package.test_python_crossbar.TestPythonPy3Crossbar: { extends: .runtime_test } +tests.package.test_python_cryptography.TestPythonPy2Cryptography: { extends: .runtime_test } +tests.package.test_python_cryptography.TestPythonPy3Cryptography: { extends: .runtime_test } +tests.package.test_python_incremental.TestPythonPy2Incremental: { extends: .runtime_test } +tests.package.test_python_incremental.TestPythonPy3Incremental: { extends: .runtime_test } +tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test } +tests.package.test_python_passlib.TestPythonPy3Passlib: { extends: .runtime_test } +tests.package.test_python_pexpect.TestPythonPy2Pexpect: { extends: .runtime_test } +tests.package.test_python_pexpect.TestPythonPy3Pexpect: { extends: .runtime_test } +tests.package.test_python_pynacl.TestPythonPy2Pynacl: { extends: .runtime_test } +tests.package.test_python_pynacl.TestPythonPy3Pynacl: { extends: .runtime_test } +tests.package.test_python_pyyaml.TestPythonPy2Pyyaml: { extends: .runtime_test } +tests.package.test_python_pyyaml.TestPythonPy3Pyyaml: { extends: .runtime_test } +tests.package.test_python_service_identity.TestPythonPy2ServiceIdentity: { extends: .runtime_test } +tests.package.test_python_service_identity.TestPythonPy3ServiceIdentity: { extends: .runtime_test } +tests.package.test_python_subprocess32.TestPythonPy2Subprocess32: { extends: .runtime_test } +tests.package.test_python_treq.TestPythonPy2Treq: { extends: .runtime_test } +tests.package.test_python_treq.TestPythonPy3Treq: { extends: .runtime_test } +tests.package.test_python_twisted.TestPythonPy2Twisted: { extends: .runtime_test } +tests.package.test_python_twisted.TestPythonPy3Twisted: { extends: .runtime_test } +tests.package.test_python_txaio.TestPythonPy2Txaio: { extends: .runtime_test } +tests.package.test_python_txaio.TestPythonPy3Txaio: { extends: .runtime_test } +tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: { extends: .runtime_test } +tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: { extends: .runtime_test } +tests.package.test_python_ubjson.TestPythonPy2Ubjson: { extends: .runtime_test } +tests.package.test_python_ubjson.TestPythonPy3Ubjson: { extends: .runtime_test } +tests.package.test_rust.TestRust: { extends: .runtime_test } +tests.package.test_rust.TestRustBin: { extends: .runtime_test } +tests.package.test_syslog_ng.TestSyslogNg: { extends: .runtime_test } +tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: { extends: .runtime_test } +tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: { extends: .runtime_test } +tests.toolchain.test_external.TestExternalToolchainCCache: { extends: .runtime_test } +tests.toolchain.test_external.TestExternalToolchainCtngMusl: { extends: .runtime_test } +tests.toolchain.test_external.TestExternalToolchainLinaroArm: { extends: .runtime_test } +tests.toolchain.test_external.TestExternalToolchainSourceryArmv4: { extends: .runtime_test } +tests.toolchain.test_external.TestExternalToolchainSourceryArmv5: { extends: .runtime_test } +tests.toolchain.test_external.TestExternalToolchainSourceryArmv7: { extends: .runtime_test } diff --git a/buildroot/.gitlab-ci.yml.in b/buildroot/.gitlab-ci.yml.in index db526c4b5..a50684089 100644 --- a/buildroot/.gitlab-ci.yml.in +++ b/buildroot/.gitlab-ci.yml.in @@ -6,16 +6,17 @@ image: buildroot/base:20180318.1724 -.defconfig_script: &defconfig_script - - echo 'Configure Buildroot' - - make ${CI_JOB_NAME} - - echo 'Build buildroot' - - | - make > >(tee build.log |grep '>>>') 2>&1 || { - echo 'Failed build last output' - tail -200 build.log - exit 1 - } +.defconfig_script: + script: + - echo 'Configure Buildroot' + - make ${CI_JOB_NAME} + - echo 'Build buildroot' + - | + make > >(tee build.log |grep '>>>') 2>&1 || { + echo 'Failed build last output' + tail -200 build.log + exit 1 + } check-gitlab-ci.yml: script: @@ -45,28 +46,32 @@ check-package: script: - make check-package -.defconfig: &defconfig +.defconfig: + extends: .defconfig_script # Running the defconfigs for every push is too much, so limit to # explicit triggers through the API. only: - triggers - tags - script: *defconfig_script + - /-defconfigs$/ artifacts: when: always expire_in: 2 weeks paths: + - .config - build.log - output/images/ - output/build/build-time.log - output/build/packages-file-list.txt + - output/build/*/.config -.runtime_test: &runtime_test +.runtime_test: # Running the runtime tests for every push is too much, so limit to # explicit triggers through the API. only: - triggers - tags + - /-runtime-tests$/ # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in diff --git a/buildroot/CHANGES b/buildroot/CHANGES index c4ccda92e..e3d7ad3bf 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,384 @@ +2019.02.3, Released June 7th, 2019 + + Important / security related fixes. + + Infra: pkg-config: Use a dedicated timestamp file rather than + .config as that gets touched by linux-4.19+, causing repeated + builds. + + check-bin-arch: Also ignore /usr/lib/grub to support merged + /usr setups, similar to how /lib/grub is ignored. + + gnuconfig/config.sub: Add C-SKY architecture support. + + Updated/fixed packages: assimp, atftp, atop, botan, busybox, + ca-certificates, chocolate-doom, cjson, coreutils, cracklib, + ddrescue, dhcp, docker-cli, docker-containerd, docker-engine, + dosfstools, dovecot, dovecot-pigeonhole, dropbear, exim, + ffmpeg, flare-engine, gcc, gdb, gerbera, glibmm, go, gpsd, + gst-ffmpeg, gst1-plugins-bad, gst1-plugins-base, imagemagick, + intel-microcode, jasper, kf5-kcoreaddons, kismet, libcurl, + libglib2, libnss, libopenssl, libsigrok, libssh2, libupnp18, + linuxptp, luajit, lynx, matchbox-panel, mender, + netcat-openbsd, netsurf, nfs-utils, opus, orc, owfs, + pcsc-lite, php, popt, postgresql, python, python-cython, + python-django, python-ply, qt5enginio, rpm, runc, samba4, + sqlite, subversion, supertux, systemd, tslib, uclibc, + v4l2loopback, webkitgtk, woff2 + + #11816: Only selected coreutils binaries are installed + #11841: grub-efi.cfg not used when building EFI disk image + #11911: systemd v240 memory leak in systemd-journald + +2019.02.2, Released April 29th, 2019 + + Important / security related fixes. + + Only build host-lzip / host-xz when really needed by packages, + not just when not available on the build host. + + fs: Set FAKEROOTDONTTRYCHOWN environment variable to not + forward {f,l,}chown calls to libc when running under fakeroot + to fix issues when building in restricted environments + (E.G. user namespace with bubblewrap). + + Linux: Also build default make target to ensure extra files + like the gdb scripts enabled by CONFIG_GDB_SCRIPTS are also + built. Notice: This may mean that extra host utilities like + uboot-mkimage are needed. + + Defconfigs: ASUS tinker and Amarula vyasa rk3822: Support + larger kernel images, Atmel SAM5D27, SAM5D2,3,4 xplained: + Increase rootfs size to fit utilities, Raspberry Pi 64bit: + Include overlays in sdcard image + + Updated/fixed packages: android-tools, apache, bind, binutils, + busybox, civetweb, cjson, copas, davfs2, docker-cli, + docker-containerd, docker-engine, dovecot, dovecot-pigeonhole, + freerdp, gerbera, ghostscript, git, gnutls, go, gst-omx, + gst1-plugins-base, gst1-plugins-ugly, haproxy, hostapd, + ipsec-tools, libfreefare, libfuse, libkrb5, libpng, libxml2, + libxslt, linknx, linux, linux-firmware, linux-tools, live555, + lldp, lrzsz, lynx, madplay, make, minicom, mongodb, msmtp, + musl, mutt, neon, netsnmp, numactl, opus, perl, php, + postgresql, pure-ftpd, python-urllib3, python3, qt5base, + rapidxml, rpm, rsyslog, ruby, runc, samba4, sane-backends, + softether, stunnel, sysklogd, syslinux, syslog-ng, + systemd-bootchart, thttpd, thrift, tiff, tor, tpm2-tools, + tpm2-tss, webkitgtk, yaffs2utils, wget, wpa_supplicant, wsapi, + xapp_xfd, xapp_xload, xlib_libXpm, xserver_xorg-server, xz, + znc + + Issues resolved (http://bugs.uclibc.org): + + #11756: package/syslinux: MBR's don't fit because of binutils.. + #11761: Building custom kernel 5.1-rc3 or later breaks on objtool + +2019.02.1, Released March 29th, 2019 + + Important / security related fixes. + + pkg-generic: Only tweak .la files needing it to ensure they + are not included in subsequent package file lists. + + test-pkg: Generate a basic package config if none is + specified. + + Updated/fixed packages: asterisk, avahi, bash, beecrypt, + binutils, busybox, clamav, cups, efl, eigen, fetchmail, file, + flashrom, fltk, gerbera, git, glibc, gnuradio, go, + gst-plugins-bad, intel-gmmlib, jq, kexec, kf5-modemmanager-qt, + leveldb, libcurl, libdrm, libftdi1, libglib2, libiio, libpcap, + libseccomp, libssh2, log4cplus, lvm2, mariadb, mender, + mongodb, mosquitto, musl, nodejs, ntp, openjpeg, owfs, php, + pure-ftpd, putty, python-aiojobs, qt5webkit, rdesktop, samba4, + sunxi-tools, supertux, swupdate, tpm2-abrmd, tpm2-tss, + wavemon, wireshark, vsftpd, xapp_xdm, xen, + xdriver_xf86-video-fbdev, xlib_libXdmcp + + Issues resolved (http://bugs.uclibc.org): + + #11716: Typo on website, saying latest release is 2018.2.11 + +2019.02, released March 4th, 2019 + + Minor fixes. + + Libressl support added for Qt 5.6 as a replacement for + openssl, as 5.6 is not compatible with openssl 1.1.x. + + Updated/fixed packages: cutelyst, devmem2, gqrx, + gst-plugins-bad, libraw, libsoxr, qt5base, runc, systemd, tor + +2019.02-rc3, released March 1st, 2019 + + Fixes all over the tree. + + Openssl support dropped from Qt 5.6, as it isn't compatible + with openssl 1.1.x. + + Toolchain: GCC 8.x updated to 8.3.0, fixing a number of + issues. + + Dependencies: Require CMake 3.8 or newer to fix compilation + issue with certain packages. If not available, host-cmake will + instead be built. + + Printvars: Fix performance regression since 2018.02 + + Scanypi: Correctly handle underscores in python package names. + + Updated/fixed packages: botan, clamav, cryptopp, i2pd, + ibrcommon, iproute2, libcpprestsdk, libssh, lua-curl, + luaexpat, qt5base, runc, stress-ng, syslinux, systemd, + upmpdcli, zbar + + Issues resolved (http://bugs.uclibc.org): + + #9966: util-linux-2.30/.stamp_built' failed + #11696: possible typo in board/pc/post-build.sh + +2019.02-rc2, released February 23th, 2019 + + Fixes all over the tree. + + Removed zynq_zybo defconfig, as it hasn't seen any update + since it was added in 2016, and uses a U-Boot version not + compatible with openssl-1.1.x. + + Linux: Ignore user supplied downloadable hashes, as no hash + checksums are available for those. + + Updated/fixed packages: bind, cryptopp, docker-containerd, + dtc, efivar, gdb, imagemagick, ipmiutil, libcpprestsdk, + libcurl, libgpiod, libid3tag, libv4l, log4cplus, luvi, + madplay, mender, mosquitto, poco, postgresql, proftpd, + pulseaudio, python-django, qemu, qt5base, qwt, rabbitmq-c, + reaver, safeclip, stress-ng, swupdate, syslog-ng, systemd, + tor, unzip, xenomai + + Issues resolved (http://bugs.uclibc.org): + + #11501: compile sdl2 with enable wayland + #11681: .. unable to initialize decompress status for section.. + +2019.02-rc1, released February 13th, 2019 + + Fixes all over the tree and new features. + + + Dependencies: + + Require Python >= 2.7 as it is needed for E.G. building + libglib2. + + Ensure GNU gzip is used for reproducible tarballs (instead of + pigz) + + + Infrastucture: + + Ensure the PLATFORM and OS environment variables are not set, + as they cause build issues for some packages. + + The package list infrastructure now correctly handles packages + installing files with old mtime. + + Add a config option to force all optional host utilities to be + built, even if suitable versions are available on the build + machine. + + graph-build-time: Also show time spent downloading + + Download: fixes for SSH/SCP support + + Ensure user provided permissions override permissions from + packages. + + SDK: Fix handling of relative symlinks (targets starting with + '.' or '..') + + BR2_SYSTEM_DEFAULT_PATH setting to customize the default path + for processes. + + The custom skeleton logic will now populate the needed /bin, + /lib, /sbin directories/symlinks if not present. Merged /usr + can now be used with a custom skeleton. + + Rootfs overlays can now override symbolic links from + packages. This was disabled to ensure the correct symbolic + links are present when merged /usr is used. Instead validate + that the rootfs overlays do not include invalid /bin, /sbin + and /lib entries. + + The waf infrastructure now support the _SUBDIR variable, + similar to the other package types. + + cmake: Also set CMAKE_SYSTEM_VERSION in toolchainfile.cmake + + Various improvements to the meson infrastructure. + + Luarocks: A Buildroot addon has been added to automate + creating a Buildroot package from luarocks, similar to + scancpan and scanpypi. + + scanpypi: protect against zip-slip vulnerability in zip/tar + handling + + check-package: fix Python 3 support + + get-developers: Fix behaviour when called from elsewhere than + the toplevel directory. + + pkg-stats: Show latest upstream version of each package, based + on data from release-monitoring.org + + kconfig: Fix for make linux-menuconfig / uboot-menuconfig from + a clean tree when ccache is enabled. + + Default to sha256 password encoding, drop md5 support. + + + Architecture: + + Support for RISC-V 32bit architecture, ARM A55, 75 and Saphira + variants, MIPS support for mips32r3, mips64r3 and Marvell + Octeon II/III variants. + + + Toolchain: + + ARC toolchain 2018.09, ARM 8.2-2018.11, Codescape IMG/MTI MIPS + 2018.09-02, MUSL 1.1.21, GCC 6.5.0 / 7.4.0, GDB 8.2.1 + + + Packages: + + openssl: Bump to 1.1.1x series, bringing TLSv1.3 support and + long term support. + + fftw: Split into fftw-{single,double,long-double,quad} + packages for the different data precision options. + + libcurl: Now has explicit TLS backend selection options. + + linux: Support building device tree blobs with the -@ option + for device tree overlays. + + weston: The weston-imx i.MX variant is now used when + imx-gpu-viv is enabled + + pkgconf: Update to 1.5.3, which brings support for + --define-prefix (used by GStreamer) + + Add host-python3-setuptools package to handle host python + packages needing python3 with setuptools support. + + + New defconfigs: Aarch64 EFI, Orangepi one plus, Orangepi lite + 2, QEMU RISC-V 32bit virt, Rock64 + + + New packages: brcm-patchram-plus, clinfo, cunit, docker-cli, + erlang-p1-eimp, exempi, fail2ban, fftw-double, + fftw-double-long, fftw-quad, fftw-single, gerbera, grpc, + gst1-shark, intel-gmmlib, iwd, kf5-kcoreaddons, libeastl, + libpackagekite, libtorrent-rasterbar, lua-std-debug, + lua-std-normalize, mini-snmpd, netsurf, pamtester, pcm-tools, + python-aiodns, python-aiohttp, python-aiohttp-jinja2, + python-aiohttp-remotes, python-aiohttp-security, + python-aiohttp-session, python-aiohttpd-sse, python-aiojobs, + python-cchardet, python-pycares, python-sentry-sdk, + python-wtforms, python3-setuptools, rcw, rtc-tools, shim, + utp_com, vmtouch, websocketpp + + Removed packages: fftw, lua 5.2.x, luacrypto, perl-time-hires, + python-pyqt, qt, qtuio, tn5250 + + Issues resolved (http://bugs.uclibc.org): + + #10851: Patch to handle numpad Enter key properly + #11066: x11r7 X11 S40xorg leads to a black screen on QEMU x86.. + #11126: Bash Shell Programming using Buildroot + #11426: pps-tools bash dependency + #11476: stdio2.h error invalid use of __builtin_va_arg_pack + #11536: dt-utils building fails with glibc 2.28 + #11546: open-vm-tools with glibc 2.28 + #11566: Fix init script + #11576: Unable to start apache with event MPM on raspberry pi 3 + #11591: [pkgconf 1.5.3] xserver OpenGL support is missing + #11606: libjpeg has no Config.in + #11616: 2018.02.09 fails to build libzlib with full RELRO.. + #11656: Custom device tree and u-boot boot.scr not integrated.. + #11666: Touchscreen with (Py)Qt5 should use tslib instead of evdev + +2018.11.3, Released February 23th, 2019 + + Important / security related fixes. + + Ensure the PLATFORM and OS environment variables are not set, + as they cause build issues for some packages. + + The package list infrastructure now correctly handles packages + installing files with old mtime. + + Linux: Skip hash checks for user supplied downloadable + patches, as no hash checksums are available for those. + + scanpypi: protect against zip-slip vulnerability in zip/tar + handling + + Download: fixes for SSH/SCP support + + SDK: Fix handling of relative symlinks (targets starting with + '.' or '..') + + Updated/fixed packages: bind, dhcpcd, docker-compose, + docker-containerd, docker-engine, dovecot, dovecot-pigeonhole, + dtc, efivar, ghostscript, gnuradio, imagemagick, jpeg-turbo, + libarchive, libb64, libcurl, libgeotiff, libgpiod, libid3tag, + libupnp18, log4cplus, madplay, meson, mosquitto, openssh, php, + poco, postgresql, proftpd, pulseaudio, python, python-django, + python3, qt5base, reaver, runc, sg3_utils, sqlcipher, + swupdate, systemd, unzip, webkitgtk, xenomai + +2018.11.2, Released January 30th, 2019 + + Important / security related fixes. + + Defconfigs: Fixes for imx6slevk, imx7dsabresd, imx8mqevk, Lego + EV3, QEMU AArch64-virt + + Download: Fix scp download handling + + check-package: fix Python 3 support + + get-developers: Fix behaviour when called from elsewhere than + the toplevel directory. + + kconfig: Fix for make linux-menuconfig / uboot-menuconfig from + a clean tree when ccache is enabled. + + cmake: Also set CMAKE_SYSTEM_VERSION in toolchainfile.cmake + + Updated/fixed packages: acpica, apache, apr, avrdude, cargo, + cc-tool, dash, dhcpdump, dmalloc, docker-containerd, efivar, + fwts, glibc, gnuchess, gnupg2, go, leveldb, libarchive, + libassuan, libftdi1, libgpg-error, libhttpparser, libkcapi, + libmad, libsndfile, libsquish, liburiparser, libwebsock, + libxml2, lighttpd, llvm, lm-sensors, lua-msgpack-native, lxc, + mariadb, mbedtls, meson, mosquitto, netatalk, nodejs, odhcp6c, + openresolv, openssh, pango, patchelf, php, python-django, + python-numpy, python-pyyaml, rauc, rp-pppoe, s6-networking, + samba4, sdl_sound, shairport-sync, sqlite, subversion, + sunxi-cedarx, swupdate, systemd, tcpreplay, tekui, tmp2-abrmd, + tpm2-tools, tpm2-tss, udisks, unixodbc, usb_modeswitch, + webkitgtk, wireshark, wolfssl, xapp_rgb, xenomai, xerces + + Issues resolved (http://bugs.uclibc.org): + + #11576: Unable to start apache with event MPM on raspberry pi 3 + 2018.11.1, Released December 20th, 2018 Important / security related fixes. @@ -184,6 +565,26 @@ #11451: Can't find libmpfr.so.4 when using external toolchain on ubuntu.. #11481: Docs: Is external.desc required? +2018.08.4, Released December 20th, 2018 + + Important / security related fixes. + + Defconfigs: Fixes for ci20, orangepi zero plus 2 + + Download wrapper: Fix for urlencode handling + + Updated/fixed packages: c-ares, dante, docker-compose, + domoticz, freetype, ghostscript, gnutls, libcurl, libgpgme, + libid3tag, libiscsi, libmpd, libopenssl, liboping, libpjsip, + linux-firmware, liquid-dsp, luvi, lynx, msgpack, nginx, + nodejs, php, popt, pps-tools, prosody, python-numpy, + python-requests, samba4, sdl2_net, squashfs, swupdate, + systemd, uclibc, vte, webkitgtk, wine, xfsprogs + + Issues resolved (http://bugs.uclibc.org): + + #11426: pps-tools bash dependency + 2018.08.3, Released November 26th, 2018 Important / security related fixes. @@ -722,6 +1123,74 @@ #10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is enabled +2018.02.11, Released February 23th, 2019 + + Important / security related fixes. + + Ensure the PLATFORM and OS environment variables are not set, + as they cause build issues for some packages. + + The package list infrastructure now correctly handles packages + installing files with old mtime. + + Linux: Skip hash checks for user supplied downloadable + patches, as no hash checksums are available for those. + + scanpypi: protect against zip-slip vulnerability in zip/tar + handling + + Updated/fixed packages: bind, dhcpcd, dovecot, ghostscript, + gnuradio, imagemagick, jpeg-turbo, libarchive, libb64, + libcurl, libid3tag, madplay, mosquitto, openssh, php, + postgresql, proftpd, python, python-django, python3, qt5base, + sqlcipher, swupdate, systemd, unzip, webkitgtk + +2018.02.10, Released January 31th, 2019 + + Important / security related fixes. + + Defconfigs: Fixes for Lego EV3, QEMU AArch64-virt + + check-package: fix Python 3 support + + get-developers: Fix behaviour when called from elsewhere than + the toplevel directory. + + cmake: Also set CMAKE_SYSTEM_VERSION in toolchainfile.cmake + + Updated/fixed packages: acpica, apache, apr, asterisk, + avrdude, cargo, cc-tool, dash, dhcpdump, dmalloc, gnuchess, + gnupg2, leveldb, libarchive, libassuan, libftdi1, + libgpg-error, libhttpparser, libmad, libsndfile, libsquish, + liburiparser, libwebsock, libxml2, lighttpd, lm-sensors, + lua-msgpack-native, mbedtls, mosquitto, netatalk, nodejs, + openssh, pango, patchelf, php, python-django, python-pyyaml, + rauc, rp-pppoe, s6-networking, samba4, sdl_sound, + shairport-sync, sqlite, subversion, sunxi-cedarx, tcpreplay, + tekui, usb_modeswitch, webkitgtk, wireshark, wolfssl, + xapp_rgb, xenomai, xerces + + Issues resolved (http://bugs.uclibc.org): + + #11576: Unable to start apache with event MPM on raspberry pi 3 + +2018.02.9, Released December 20th, 2018 + + Important / security related fixes. + + defconfigs: Fixes for ci20 + + Updated/fixed packages: c-ares, dante, freetype, ghostscript, + glibc, gnutls, go, libcurl, libgpgme, libid3tag, libiscsi, + libmpd, libopenssl, libpjsip, linux, liquid-dsp, luvi, lynx, + msgpack, nginx, nodejs, php, popt, pps-tools, python-numpy, + python-requests, samba4, sdl2_net, squashfs, swupdate, uclibc, + wine, webkitgtk, xfsprogs + + Issues resolved (http://bugs.uclibc.org): + + #11426: pps-tools bash dependency + 2018.02.8, Released November 26th, 2018 Important / security related fixes. diff --git a/buildroot/Config.in b/buildroot/Config.in index 03e4eb392..d58d8dc04 100644 --- a/buildroot/Config.in +++ b/buildroot/Config.in @@ -136,10 +136,6 @@ config BR2_SCP string "Secure copy (scp) command" default "scp" -config BR2_SSH - string "Secure shell (ssh) command" - default "ssh" - config BR2_HG string "Mercurial (hg) command" default "hg" @@ -681,6 +677,18 @@ config BR2_COMPILER_PARANOID_UNSAFE_PATH and external toolchain backends (through the toolchain wrapper). +config BR2_FORCE_HOST_BUILD + bool "Force the building of host dependencies" + help + Build all available host dependencies, even if they are + already installed on the system. + + This option can be used to ensure that the download cache of + source archives for packages remain consistent between + different build hosts. + + This option will increase build time. + config BR2_REPRODUCIBLE bool "Make the build reproducible (experimental)" # SOURCE_DATE_EPOCH support in toolchain-wrapper requires GCC 4.4 diff --git a/buildroot/Config.in.legacy b/buildroot/Config.in.legacy index 02321c88a..7e8b51508 100644 --- a/buildroot/Config.in.legacy +++ b/buildroot/Config.in.legacy @@ -143,6 +143,145 @@ comment "----------------------------------------------------" endif ############################################################################### + +comment "Legacy options removed in 2019.02" + +config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK + bool "gst-plugins-bad apexsink option removed" + select BR2_LEGACY + help + The gst-plugins-bad apexsink option was removed. + +config BR2_PACKAGE_QT + bool "qt package removed" + select BR2_LEGACY + help + The qt package was removed. + +config BR2_PACKAGE_QTUIO + bool "qtuio package removed" + select BR2_LEGACY + help + The qtuio package was removed. + +config BR2_PACKAGE_PINENTRY_QT4 + bool "pinentry-qt4 option removed" + select BR2_LEGACY + help + The pinentry-qt4 option was removed. + +config BR2_PACKAGE_POPPLER_QT + bool "poppler qt option removed" + select BR2_LEGACY + help + The poppler qt option was removed. + +config BR2_PACKAGE_OPENCV3_WITH_QT + bool "opencv3 qt backend option removed" + select BR2_LEGACY + help + The opencv3 qt backend option was removed. + +config BR2_PACKAGE_OPENCV_WITH_QT + bool "opencv qt backend option removed" + select BR2_LEGACY + help + The opencv qt backend option was removed. + +config BR2_PACKAGE_AMD_CATALYST_CCCLE + bool "catalyst control center option removed" + select BR2_LEGACY + help + The AMD Catalyst Control Center option was removed. + +config BR2_PACKAGE_SDL_QTOPIA + bool "sdl qtopia video driver option removed" + select BR2_LEGACY + help + The SDL QTopia video driver option was removed. + +config BR2_PACKAGE_PYTHON_PYQT + bool "python-pyqt package removed" + select BR2_LEGACY + help + The python-pyqt package was removed. Consider python-pyqt5 + instead. + +config BR2_PACKAGE_GNURADIO_QTGUI + bool "gnuradio gr-qtgui option removed" + select BR2_LEGACY + help + The gr-qtgui option was removed. + +config BR2_PACKAGE_LUACRYPTO + bool "luacrypto package removed" + select BR2_LEGACY + help + The luacrypto package was removed. Consider luaossl instead. + +config BR2_PACKAGE_TN5250 + bool "tn5250 package removed" + select BR2_LEGACY + help + The tn5250 package was removed. + +config BR2_PACKAGE_BOOST_SIGNALS + bool "Boost signals removed" + select BR2_LEGACY + help + Its removal was announced in boost 1.68 and its deprecation + was announced in 1.54. Users are encouraged to use Signals2 + instead. + +config BR2_PACKAGE_FFTW_PRECISION_SINGLE + bool "single" + select BR2_LEGACY + select BR2_PACKAGE_FFTW_SINGLE + help + This option has been removed in favor of + BR2_PACKAGE_FFTW_SINGLE. + +config BR2_PACKAGE_FFTW_PRECISION_DOUBLE + bool "double" + select BR2_LEGACY + select BR2_PACKAGE_FFTW_DOUBLE + help + This option has been removed in favor of + BR2_PACKAGE_FFTW_DOUBLE. + +config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE + bool "long double" + depends on !(BR2_TOOLCHAIN_BUILDROOT_UCLIBC && \ + (BR2_arm || BR2_mips || BR2_mipsel)) + select BR2_LEGACY + select BR2_PACKAGE_FFTW_LONG_DOUBLE + help + This option has been removed in favor of + BR2_PACKAGE_FFTW_LONG_DOUBLE. + +config BR2_PACKAGE_FFTW_PRECISION_QUAD + bool "quad" + depends on (BR2_i386 || BR2_x86_64) && BR2_USE_WCHAR + select BR2_LEGACY + select BR2_PACKAGE_FFTW_QUAD + help + This option has been removed in favor of + BR2_PACKAGE_FFTW_QUAD. + +config BR2_PACKAGE_LUA_5_2 + bool "Lua 5.2.x version removed" + select BR2_LEGACY + select BR2_PACKAGE_LUA_5_3 + help + The Lua 5.2.x version was removed. + +config BR2_TARGET_GENERIC_PASSWD_MD5 + bool "target passwd md5 format support has been removed" + select BR2_LEGACY + help + The default has been moved to SHA256 and all C libraries + now support that method by default + comment "Legacy options removed in 2018.11" config BR2_TARGET_XLOADER @@ -238,6 +377,34 @@ config BR2_PACKAGE_LIBNFTNL_XML help libnftnl removed integration with libmxml. +config BR2_KERNEL_HEADERS_3_2 + bool "kernel headers version 3.2.x are no longer supported" + select BR2_LEGACY + help + Version 3.2.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_4_1 + bool "kernel headers version 4.1.x are no longer supported" + select BR2_LEGACY + help + Version 4.1.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_4_16 + bool "kernel headers version 4.16.x are no longer supported" + select BR2_LEGACY + help + Version 4.16.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_4_18 + bool "kernel headers version 4.18.x are no longer supported" + select BR2_LEGACY + help + Version 4.18.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + ############################################################################### comment "Legacy options removed in 2018.08" diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index 53467da48..0d185ee97 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -49,8 +49,11 @@ F: package/libressl/ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ +F: package/libwebsockets/ F: package/nginx-naxsi/ +F: package/php/ F: package/policycoreutils/ +F: package/python3/ F: package/python-flask-sqlalchemy/ F: package/python-mutagen/ F: package/python-pip/ @@ -63,6 +66,7 @@ F: package/selinux-python/ F: package/semodule-utils/ F: package/setools/ F: package/sngrep/ +F: package/systemd/ N: Adrian Perez de Castro F: package/brotli/ @@ -98,6 +102,9 @@ F: package/openpgm/ N: Alexander Mukhin F: package/hostapd/ +N: Alexander Sverdlin +F: package/mini-snmpd/ + N: Alexander Varnin F: package/liblog4c-localtime/ @@ -146,6 +153,7 @@ F: package/libunwind/ N: Angelo Compagnucci F: package/corkscrew/ +F: package/fail2ban/ F: package/i2c-tools/ F: package/mender/ F: package/mono/ @@ -160,6 +168,7 @@ F: package/sysdig/ N: Anisse Astier F: package/go/ F: package/nghttp2/ +F: package/pkg-golang.mk N: Anthony Viallard F: package/gnuplot/ @@ -192,6 +201,7 @@ F: package/dehydrated/ F: package/freescale-imx/firmware-imx/ F: package/freescale-imx/imx-lib/ F: package/gstreamer/gst-fsl-plugins/ +F: package/libpagekite/ F: package/lua-bit32/ F: package/owfs/ F: package/python-bottle/ @@ -210,7 +220,6 @@ F: package/ti-cgt-pru/ N: Assaf Inbal F: package/lbase64/ F: package/luabitop/ -F: package/luacrypto/ F: package/luaexpatutils/ F: package/luaposix/ F: package/luasec/ @@ -258,6 +267,7 @@ F: package/alsa-utils/ F: package/apache/ F: package/apr/ F: package/apr-util/ +F: package/asterisk/ F: package/bcg729/ F: package/bluez-tools/ F: package/boinc/ @@ -351,7 +361,6 @@ F: package/perl-mime-base64/ F: package/perl-net-dns/ F: package/perl-net-http/ F: package/perl-netaddr-ip/ -F: package/perl-time-hires/ F: package/perl-timedate/ F: package/perl-uri/ F: package/perl-www-robotrules/ @@ -403,23 +412,25 @@ N: Bogdan Radulescu F: package/iftop/ F: package/ncdu/ +N: Brandon Maier +F: package/vmtouch/ + N: Brock Williams F: package/pdmenu/ -N: Bryan Brinsko -F: package/pps-tools/ - N: Carlo Caione F: package/sunxi-boards/ -N: Carlos Santos -F: package/aer-inject/ +N: Carlos Santos F: package/busybox/ F: package/gtest/ F: package/initscripts/ +F: package/intel-microcode/ F: package/libpam-radius-auth/ F: package/libpam-tacplus/ F: package/modem-manager/ +F: package/pamtester/ +F: package/pcm-tools/ F: package/perl-file-util/ F: package/skeleton-custom/ F: package/skeleton-init-common/ @@ -454,6 +465,7 @@ F: configs/orangepi_plus_defconfig N: Chris Packham F: package/eventlog/ +F: package/gstreamer1/gst1-shark/ F: package/micropython/ F: package/micropython-lib/ F: package/syslog-ng/ @@ -466,11 +478,13 @@ F: linux/linux-ext-aufs.mk F: package/aufs/ F: package/aufs-util/ F: package/batman-adv/ +F: package/docker-cli/ F: package/docker-containerd/ F: package/docker-engine/ F: package/docker-proxy/ F: package/go/ F: package/mosh/ +F: package/pkg-golang.mk F: package/rtl8821au/ F: package/runc/ F: package/tini/ @@ -653,6 +667,8 @@ F: package/pifmrds/ F: package/ympd/ N: Erico Nunes +F: board/aarch64-efi/ +F: configs/aarch64_efi_defconfig F: package/acpica/ F: package/acpitool/ F: package/efibootmgr/ @@ -731,6 +747,7 @@ F: package/cairo/ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ +F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ F: package/gupnp/ @@ -777,6 +794,7 @@ F: package/libxslt/ F: package/mbedtls/ F: package/minissdpd/ F: package/minizip/ +F: package/mongodb/ F: package/motion/ F: package/mutt/ F: package/ncmpc/ @@ -803,11 +821,9 @@ N: Francois Perrad F: board/olimex/a20_olinuxino F: configs/olimex_a20_olinuxino_* F: package/4th/ -F: package/botan/ F: package/chipmunk/ F: package/dado/ F: package/ficl/ -F: package/gdbm/ F: package/libtomcrypt/ F: package/libtommath/ F: package/libump/ @@ -821,12 +837,10 @@ F: package/lua* F: package/lunit/ F: package/lzlib/ F: package/moarvm/ +F: package/netsurf/ F: package/perl* F: package/pkg-perl.mk F: package/pkg-luarocks.mk -F: package/qemu/ -F: package/sdl2_mixer/ -F: package/sdl2_net/ F: package/tekui/ F: package/wsapi-fcgi/ F: package/wsapi-xavante/ @@ -845,13 +859,13 @@ F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ -N: Gaël Portay +N: Gaël Portay F: package/qt5/qt5virtualkeyboard/ F: package/qt5/qt5webengine/ F: package/qt5/qt5webkit/ F: package/qt5/qt5webkit-examples/ -N: Gary Bisson +N: Gary Bisson F: board/boundarydevices/ F: configs/nitrogen* F: package/freescale-imx/ @@ -879,6 +893,7 @@ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: package/minicom/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ @@ -899,6 +914,7 @@ F: package/pigpio/ F: package/python-falcon/ F: package/python-mimeparse/ F: package/python-pigpio/ +F: package/python-wtforms/ N: Guillaume Gardet F: package/c-icap/ @@ -926,7 +942,6 @@ F: package/gr-osmosdr/ F: package/libusbgx/ F: package/python-cheetah/ F: package/python-markdown/ -F: package/python-pyqt/ F: package/python-remi/ F: package/python-sip/ @@ -947,6 +962,9 @@ F: package/angularjs/ N: Ilias Apalodimas F: package/keepalived/ +N: Ilya Averyanov +F: package/exempi/ + N: Ismael Luceno F: package/axel/ @@ -958,6 +976,8 @@ F: board/engicam/ F: board/friendlyarm/nanopi-a64/ F: board/friendlyarm/nanopi-neo2/ F: board/olimex/a64-olinuxino/ +F: board/orangepi/orangepi-lite2/ +F: board/orangepi/orangepi-one-plus F: board/orangepi/orangepi-pc2/ F: board/orangepi/orangepi-prime/ F: board/orangepi/orangepi-win/ @@ -976,6 +996,8 @@ F: configs/engicam_imx6ul_isiot_defconfig F: configs/friendlyarm_nanopi_a64_defconfig F: configs/friendlyarm_nanopi_neo2_defconfig F: configs/olimex_a64_olinuxino_defconfig +F: configs/orangepi_lite2_defconfig +F: configs/orangepi_one_plus_defconfig F: configs/orangepi_pc2_defconfig F: configs/orangepi_prime_defconfig F: configs/orangepi_win_defconfig @@ -984,8 +1006,21 @@ F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig N: James Hilliard +F: package/lua-std-debug/ +F: package/lua-std-normalize/ +F: package/python-aiodns/ +F: package/python-aiohttp/ +F: package/python-aiohttp-jinja2/ +F: package/python-aiohttp-remotes/ +F: package/python-aiohttp-security/ +F: package/python-aiohttp-session/ +F: package/python-aiohttp-sse/ +F: package/python-aiojobs/ +F: package/python-aiorwlock/ F: package/python-async-timeout/ +F: package/python-cchardet/ F: package/python-multidict/ +F: package/python-pycares/ F: package/python-yarl/ N: James Knight @@ -1066,6 +1101,7 @@ F: package/python-libconfig/ N: Johan Oudinet F: package/ejabberd/ +F: package/erlang-eimp/ F: package/erlang-goldrush/ F: package/erlang-jiffy/ F: package/erlang-lager/ @@ -1133,6 +1169,7 @@ F: package/llvm/ F: package/python-cython/ F: package/python-raven/ F: package/python-schedule/ +F: package/python-sentry-sdk/ F: package/python-websockets/ F: package/python-xlib/ @@ -1167,6 +1204,9 @@ F: package/qt5/ N: Julien Floret F: package/lldpd/ +N: Julien Grossholtz +F: package/paho-mqtt-c + N: Julien Viard de Galbert F: package/dieharder/ F: package/easy-rsa/ @@ -1219,10 +1259,15 @@ N: Lionel Orry F: package/mongrel2/ N: Lothar Felten +F: board/bananapi/bananapi-m2-ultra/ +F: configs/bananapi_m2_ultra_defconfig F: package/ti-sgx-demos/ F: package/ti-sgx-km/ F: package/ti-sgx-um/ +N: Louis-Paul Cordier +F: package/intel-gmmlib/ + N: Luca Ceresoli F: board/olimex/a20_olinuxino/ F: board/zynq/ @@ -1312,8 +1357,10 @@ F: package/ratpoison/ N: Mark Corbin F: arch/arch.mk.riscv F: arch/Config.in.riscv +F: board/qemu/riscv32-virt/ F: board/qemu/riscv64-virt/ F: boot/riscv-pk/ +F: configs/qemu_riscv32_virt_defconfig F: configs/qemu_riscv64_virt_defconfig N: Markos Chandras @@ -1361,6 +1408,7 @@ F: package/checkpolicy/ F: package/checksec/ F: package/cgroupfs-mount/ F: package/crda/ +F: package/cunit/ F: package/devmem2/ F: package/dnsmasq/ F: package/dosfstools/ @@ -1383,6 +1431,7 @@ F: package/kvm-unit-tests/ F: package/kvmtool/ F: package/libcsv/ F: package/libcurl/ +F: package/libeastl/ F: package/libfcgi/ F: package/libopenssl/ F: package/libselinux/ @@ -1413,6 +1462,7 @@ F: package/python-posix-ipc/ F: package/python-pypcap/ F: package/python-pyrex/ F: package/raptor/ +F: package/rcw/ F: package/rng-tools/ F: package/rsyslog/ F: package/setools/ @@ -1499,6 +1549,8 @@ F: package/python-spidev/ N: MichaÅ‚ Åyszczek F: board/altera/socrates_cyclone5/ +F: board/pine64/rock64 +F: configs/rock64_defconfig F: configs/socrates_cyclone5_defconfig N: Mike Harmony @@ -1606,6 +1658,7 @@ F: board/openblocks/a6/ F: board/orangepi/ F: board/pandaboard/ F: board/roseapplepi/ +F: boot/shim/ F: configs/minnowboard_max-graphical_defconfig F: configs/minnowboard_max_defconfig F: configs/nexbox_a95x_defconfig @@ -1660,6 +1713,7 @@ F: package/ghostscript-fonts/ F: package/gstreamer1/gst1-interpipe/ F: package/gstreamer1/gst1-validate/ F: package/gstreamer1/gstreamer1-editing-services/ +F: package/iwd/ F: package/libevdev/ F: package/log4cplus/ F: package/postgresql/ @@ -1698,6 +1752,9 @@ F: package/psplash/ F: package/sispmctl/ F: package/zsh/ +N: Philipp Richter +F: package/libtorrent-rasterbar/ + N: Philippe Proulx F: package/lttng-babeltrace/ F: package/lttng-libust/ @@ -1772,6 +1829,9 @@ F: package/subversion/ N: RJ Ascani F: package/azmq/ +N: Robert Rose +F: package/grpc/ + N: Rodrigo Rebello F: package/chocolate-doom/ F: package/irssi/ @@ -1822,6 +1882,7 @@ F: package/python-pysnmp/ F: package/python-pysnmp-apps/ F: package/python-pysnmp-mibs/ F: package/python-tornado/ +F: package/websocketpp/ N: Ryan Coe F: package/inadyn/ @@ -1859,13 +1920,6 @@ N: Scott Fan F: package/libssh/ F: package/x11r7/xdriver_xf86-video-fbturbo/ -N: Sebastien Bourdelin -F: package/atf/ -F: package/cppunit/ -F: package/kyua/ -F: package/lutok/ -F: package/yaml-cpp/ - N: Sébastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ @@ -1902,7 +1956,6 @@ F: package/aoetools/ F: package/curlpp/ F: package/daq/ F: package/libgdiplus/ -F: package/mongodb/ F: package/pimd/ F: package/snort/ F: package/stella/ @@ -1965,7 +2018,6 @@ F: package/cache-calibrator/ F: package/gtest/ F: package/mtdev/ F: package/mtdev2tuio/ -F: package/qtuio/ N: Steve Calfee F: package/python-pymysql/ @@ -2032,6 +2084,7 @@ F: package/perl-net-snmp/ F: package/perl-net-ssh2/ F: package/perl-net-telnet/ F: package/pigz/ +F: package/xenomai/ F: support/scripts/size-stats F: utils/size-stats-compare F: toolchain/ @@ -2084,6 +2137,7 @@ F: package/python-serial/ F: package/qextserialport/ F: package/rpcbind/ F: package/rt-tests/ +F: package/rtc-tools/ F: package/sam-ba/ F: package/scons/ F: package/squashfs/ @@ -2098,29 +2152,21 @@ N: Tzu-Jung Lee F: package/dropwatch/ F: package/tstools/ +N: Vadim Kochan +F: package/brcm-patchram-plus/ + N: Valentin Korenblit F: package/clang/ +F: package/clinfo/ F: package/libclc/ F: package/llvm/ N: Vanya Sergeev F: package/lua-periphery/ -N: Vicente Olivert Riera -F: arch/Config.in.mips -F: package/gnupg2/ -F: package/hidapi/ -F: package/libfm/ -F: package/libfm-extra/ -F: package/libksba/ -F: package/menu-cache/ -F: package/openblas/ -F: package/openmpi/ -F: package/pinentry/ -F: package/trinity/ - N: Vincent Prince F: package/nss-myhostname/ +F: package/utp_com/ N: Vincent Stehlé F: package/i7z/ diff --git a/buildroot/Makefile b/buildroot/Makefile index dd8cc7a9a..2c8146e87 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -2,7 +2,7 @@ # # Copyright (C) 1999-2005 by Erik Andersen # Copyright (C) 2006-2014 by the Buildroot developers -# Copyright (C) 2014-2018 by the Buildroot developers +# Copyright (C) 2014-2019 by the Buildroot developers # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2018.11.1 +export BR2_VERSION := 2019.02.3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1545257000 +BR2_VERSION_EPOCH = 1559893000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -105,22 +105,6 @@ ifneq ($(firstword $(sort $(RUNNING_MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MA $(error You have make '$(RUNNING_MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required) endif -# Parallel execution of this Makefile is disabled because it changes -# the packages building order, that can be a problem for two reasons: -# - If a package has an unspecified optional dependency and that -# dependency is present when the package is built, it is used, -# otherwise it isn't (but compilation happily proceeds) so the end -# result will differ if the order is swapped due to parallel -# building. -# - Also changing the building order can be a problem if two packages -# manipulate the same file in the target directory. -# -# Taking into account the above considerations, if you still want to execute -# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and -# use the -j option when building, e.g: -# make -j$((`getconf _NPROCESSORS_ONLN`+1)) -.NOTPARALLEL: - # absolute path TOPDIR := $(CURDIR) CONFIG_CONFIG_IN = Config.in @@ -151,7 +135,7 @@ nobuild_targets := source %-source \ clean distclean help show-targets graph-depends \ %-graph-depends %-show-depends %-show-version \ graph-build graph-size list-defconfigs \ - savedefconfig printvars + savedefconfig update-defconfig printvars ifeq ($(MAKECMDGOALS),) BR_BUILDING = y else ifneq ($(filter-out $(nobuild_targets),$(MAKECMDGOALS)),) @@ -220,10 +204,7 @@ BR_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf) BUILD_DIR := $(BASE_DIR)/build BINARIES_DIR := $(BASE_DIR)/images -# The target directory is common to all packages, -# but there is one that is specific to each filesystem. BASE_TARGET_DIR := $(BASE_DIR)/target -TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(BASE_TARGET_DIR)) # initial definition so that 'make clean' works for most users, even without # .config. HOST_DIR will be overwritten later when .config is included. HOST_DIR := $(BASE_DIR)/host @@ -246,6 +227,22 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) -include $(BR2_CONFIG) endif +# Parallel execution of this Makefile is disabled because it changes +# the packages building order, that can be a problem for two reasons: +# - If a package has an unspecified optional dependency and that +# dependency is present when the package is built, it is used, +# otherwise it isn't (but compilation happily proceeds) so the end +# result will differ if the order is swapped due to parallel +# building. +# - Also changing the building order can be a problem if two packages +# manipulate the same file in the target directory. +# +# Taking into account the above considerations, if you still want to execute +# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and +# use the -j option when building, e.g: +# make -j$((`getconf _NPROCESSORS_ONLN`+1)) +.NOTPARALLEL: + # timezone and locale may affect build output ifeq ($(BR2_REPRODUCIBLE),y) export TZ = UTC @@ -422,6 +419,8 @@ unexport TERMINFO unexport MACHINE unexport O unexport GCC_COLORS +unexport PLATFORM +unexport OS GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) @@ -457,6 +456,10 @@ TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf # packages compiled for the host go here HOST_DIR := $(call qstrip,$(BR2_HOST_DIR)) +# The target directory is common to all packages, +# but there is one that is specific to each filesystem. +TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(BASE_TARGET_DIR)) + ifneq ($(HOST_DIR),$(BASE_DIR)/host) HOST_DIR_SYMLINK = $(BASE_DIR)/host $(HOST_DIR_SYMLINK): $(BASE_DIR) @@ -468,14 +471,14 @@ BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)" # Location of a file giving a big fat warning that output/target # should not be used as the root filesystem. -TARGET_DIR_WARNING_FILE = $(BASE_TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM +TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM ifeq ($(BR2_CCACHE),y) -CCACHE := $(HOST_DIR)/bin/ccache +CCACHE = $(HOST_DIR)/bin/ccache BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR)) export BR_CACHE_DIR -HOSTCC := $(CCACHE) $(HOSTCC) -HOSTCXX := $(CCACHE) $(HOSTCXX) +HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE) +HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE) else export BR_NO_CCACHE endif @@ -550,9 +553,16 @@ include $(BR2_EXTERNAL_MKS) # # Only trigger the check for default builds. If the user forces building # a package, even if not enabled in the configuration, we want to accept -# it. +# it. However; we also want to be able to force checking the dependencies +# if the user so desires. Forcing a dependency check is useful in the case +# of test-pkg, as we want to make sure during testing, that a package has +# all the dependencies selected in the config file. # ifeq ($(MAKECMDGOALS),) +BR_FORCE_CHECK_DEPENDENCIES = YES +endif + +ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) define CHECK_ONE_DEPENDENCY ifeq ($$($(2)_TYPE),target) @@ -572,10 +582,6 @@ $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ endif -.PHONY: dirs -dirs: $(BUILD_DIR) $(STAGING_DIR) $(BASE_TARGET_DIR) \ - $(HOST_DIR) $(HOST_DIR_SYMLINK) $(BINARIES_DIR) - $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) $(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" syncconfig @@ -602,32 +608,44 @@ sdk: prepare-sdk $(BR2_TAR_HOST_DEPENDENCY) $(Q)mkdir -p $(BINARIES_DIR) $(TAR) czf "$(BINARIES_DIR)/$(BR2_SDK_PREFIX).tar.gz" \ --owner=0 --group=0 --numeric-owner \ - --transform='s#^\.#$(BR2_SDK_PREFIX)#' \ - -C $(HOST_DIR) "." - -# Populating the staging with the base directories is handled by the skeleton package -$(STAGING_DIR): - @mkdir -p $(STAGING_DIR) - @ln -snf $(STAGING_DIR) $(BASE_DIR)/staging + --transform='s#^$(patsubst /%,%,$(HOST_DIR))#$(BR2_SDK_PREFIX)#' \ + -C / $(patsubst /%,%,$(HOST_DIR)) RSYNC_VCS_EXCLUSIONS = \ --exclude .svn --exclude .git --exclude .hg --exclude .bzr \ --exclude CVS -STRIP_FIND_CMD = find $(TARGET_DIR) -ifneq (,$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) -STRIP_FIND_CMD += \( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) -prune -o -endif -STRIP_FIND_CMD += -type f \( -perm /111 -o -name '*.so*' \) -# file exclusions: +# When stripping, obey to BR2_STRIP_EXCLUDE_DIRS and +# BR2_STRIP_EXCLUDE_FILES +STRIP_FIND_COMMON_CMD = \ + find $(TARGET_DIR) \ + $(if $(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS)), \ + \( $(call finddirclauses,$(TARGET_DIR),$(call qstrip,$(BR2_STRIP_EXCLUDE_DIRS))) \) \ + -prune -o \ + ) \ + $(if $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES)), \ + -not \( $(call findfileclauses,$(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) ) + +# Regular stripping for everything, except libpthread, ld-*.so and +# kernel modules: # - libpthread.so: a non-stripped libpthread shared library is needed for # proper debugging of pthread programs using gdb. # - ld.so: a non-stripped dynamic linker library is needed for valgrind # - kernel modules (*.ko): do not function properly when stripped like normal # applications and libraries. Normally kernel modules are already excluded -# by the executable permission check above, so the explicit exclusion is only +# by the executable permission check, so the explicit exclusion is only # done for kernel modules with incorrect permissions. -STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* ld-*.so* *.ko $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print0 +STRIP_FIND_CMD = \ + $(STRIP_FIND_COMMON_CMD) \ + -type f \( -perm /111 -o -name '*.so*' \) \ + -not \( $(call findfileclauses,libpthread*.so* ld-*.so* *.ko) \) \ + -print0 + +# Special stripping (only debugging symbols) for libpthread and ld-*.so. +STRIP_FIND_SPECIAL_LIBS_CMD = \ + $(STRIP_FIND_COMMON_CMD) \ + \( -name 'ld-*.so*' -o -name 'libpthread*.so*' \) \ + -print0 ifeq ($(BR2_ECLIPSE_REGISTER),y) define TOOLCHAIN_ECLIPSE_REGISTER @@ -710,8 +728,14 @@ $(TARGETS_ROOTFS): target-finalize # Avoid the rootfs name leaking down the dependency chain target-finalize: ROOTFS= +host-finalize: $(HOST_DIR_SYMLINK) + +.PHONY: staging-finalize +staging-finalize: + @ln -snf $(STAGING_DIR) $(BASE_DIR)/staging + .PHONY: target-finalize -target-finalize: $(PACKAGES) +target-finalize: $(PACKAGES) host-finalize @$(call MESSAGE,"Finalizing target directory") # Check files that are touched by more than one package ./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt @@ -739,19 +763,8 @@ endif rm -rf $(TARGET_DIR)/usr/share/gtk-doc rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true $(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true + $(STRIP_FIND_SPECIAL_LIBS_CMD) | xargs -0 -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) 2>/dev/null || true -# See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads -# besides the one in which crash occurred; or SIGTRAP kills my program when -# I set a breakpoint" -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) - find $(TARGET_DIR)/lib/ -type f -name 'libpthread*.so*' | \ - xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) -endif - -# Valgrind needs ld.so with enough information, so only strip -# debugging symbols. - find $(TARGET_DIR)/lib/ -type f -name 'ld-*.so*' | \ - xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) test -f $(TARGET_DIR)/etc/ld.so.conf && \ { echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true test -d $(TARGET_DIR)/etc/ld.so.conf.d && \ @@ -769,11 +782,25 @@ endif @$(call MESSAGE,"Sanitizing RPATH in target tree") $(TOPDIR)/support/scripts/fix-rpath target +# For a merged /usr, ensure that /lib, /bin and /sbin and their /usr +# counterparts are appropriately setup as symlinks ones to the others. +ifeq ($(BR2_ROOTFS_MERGED_USR),y) + + @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ + $(call MESSAGE,"Sanity check in overlay $(d)"); \ + not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \ + test -n "$$not_merged_dirs" && { \ + echo "ERROR: The overlay in $(d) is not" \ + "using a merged /usr for the following directories:" \ + $$not_merged_dirs; \ + exit 1; \ + } || true$(sep)) + +endif # merged /usr + @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ $(call MESSAGE,"Copying overlay $(d)"); \ - rsync -a --ignore-times --keep-dirlinks $(RSYNC_VCS_EXCLUSIONS) \ - --chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \ - $(d)/ $(TARGET_DIR)$(sep)) + $(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep)) @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ $(call MESSAGE,"Executing post-build script $(s)"); \ @@ -782,7 +809,7 @@ endif touch $(TARGET_DIR)/usr .PHONY: target-post-image -target-post-image: $(TARGETS_ROOTFS) target-finalize +target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize @rm -f $(ROOTFS_COMMON_TAR) @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \ @@ -811,7 +838,7 @@ legal-info-prepare: $(LEGAL_INFO_DIR) @cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config .PHONY: legal-info -legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ +legal-info: legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \ $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) @cat support/legal-info/README.header >>$(LEGAL_REPORT) @if [ -r $(LEGAL_WARNINGS) ]; then \ @@ -959,13 +986,15 @@ define percent_defconfig endef $(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) +update-defconfig: savedefconfig + savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ $(CONFIG_CONFIG_IN) @$(SED) '/BR2_DEFCONFIG=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) -.PHONY: defconfig savedefconfig +.PHONY: defconfig savedefconfig update-defconfig ################################################################################ # @@ -1047,6 +1076,7 @@ help: @echo ' defconfig - New config with default answer to all options;' @echo ' BR2_DEFCONFIG, if set on the command line, is used as input' @echo ' savedefconfig - Save current config to BR2_DEFCONFIG (minimal config)' + @echo ' update-defconfig - Same as savedefconfig' @echo ' allyesconfig - New config where all options are accepted with yes' @echo ' allnoconfig - New config where all options are answered with no' @echo ' alldefconfig - New config where all options are set to default' @@ -1140,7 +1170,7 @@ release: OUT = buildroot-$(BR2_VERSION) release: git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar $(MAKE) O=$(OUT) manual-html manual-text manual-pdf - $(MAKE) O=$(OUT) manual-clean + $(MAKE) O=$(OUT) clean tar rf $(OUT).tar $(OUT) gzip -9 -c < $(OUT).tar > $(OUT).tar.gz bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2 @@ -1155,9 +1185,7 @@ check-package: .PHONY: .gitlab-ci.yml .gitlab-ci.yml: .gitlab-ci.yml.in - cp $< $@ - (cd configs; LC_ALL=C ls -1 *_defconfig) | sed 's/$$/: *defconfig/' >> $@ - set -o pipefail; ./support/testing/run-tests -l 2>&1 | sed -r -e '/^test_run \((.*)\).*/!d; s//\1: *runtime_test/' | LC_ALL=C sort >> $@ + ./support/scripts/generate-gitlab-ci-yml $< > $@ include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/buildroot/arch/Config.in.arm b/buildroot/arch/Config.in.arm index f0488b468..a9972978d 100644 --- a/buildroot/arch/Config.in.arm +++ b/buildroot/arch/Config.in.arm @@ -376,25 +376,19 @@ config BR2_exynos_m1 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 +if BR2_ARCH_IS_64 config BR2_falkor bool "falkor" - select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_qdf24xx bool "qdf24xx" - select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 -if BR2_ARCH_IS_64 config BR2_thunderx bool "thunderx" select BR2_ARM_CPU_HAS_FP_ARMV8 @@ -440,32 +434,55 @@ if BR2_ARCH_IS_64 comment "armv8.1a cores" config BR2_thunderx2t99 bool "thunderx2t99" - select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_thunderx2t99p1 bool "thunderx2t99p1" - select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_vulcan bool "vulcan" - select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 endif # BR2_ARCH_IS_64 + +if BR2_ARCH_IS_64 +comment "armv8.2a cores" +config BR2_cortex_a55 + bool "cortex-A55" + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_cortex_a75 + bool "cortex-A75" + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +config BR2_cortex_a75_a55 + bool "cortex-A75/A55 big.LITTLE" + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +endif # BR2_ARCH_IS_64 + +if BR2_ARCH_IS_64 +comment "armv8.3a cores" +config BR2_saphira + bool "saphira" + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 +endif # BR2_ARCH_IS_64 endchoice config BR2_ARM_ENABLE_NEON @@ -811,6 +828,12 @@ config BR2_GCC_TARGET_CPU default "thunderx2t99" if BR2_thunderx2t99 default "thunderx2t99p1" if BR2_thunderx2t99p1 default "vulcan" if BR2_vulcan + # armv8.2a + default "cortex-a55" if BR2_cortex_a55 + default "cortex-a75" if BR2_cortex_a75 + default "cortex-a75.cortex-a55" if BR2_cortex_a75_a55 + # armv8.3a + default "saphira" if BR2_saphira config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb diff --git a/buildroot/arch/Config.in.mips b/buildroot/arch/Config.in.mips index e45299f81..7f7aa63f0 100644 --- a/buildroot/arch/Config.in.mips +++ b/buildroot/arch/Config.in.mips @@ -5,6 +5,9 @@ config BR2_MIPS_CPU_MIPS32 config BR2_MIPS_CPU_MIPS32R2 bool select BR2_MIPS_NAN_LEGACY +config BR2_MIPS_CPU_MIPS32R3 + bool + select BR2_MIPS_NAN_LEGACY config BR2_MIPS_CPU_MIPS32R5 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 @@ -18,6 +21,9 @@ config BR2_MIPS_CPU_MIPS64 config BR2_MIPS_CPU_MIPS64R2 bool select BR2_MIPS_NAN_LEGACY +config BR2_MIPS_CPU_MIPS64R3 + bool + select BR2_MIPS_NAN_LEGACY config BR2_MIPS_CPU_MIPS64R5 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 @@ -34,8 +40,8 @@ choice help Specific CPU variant to use - 64bit cabable: 64, 64r2, 64r5, 64r6 - non-64bit capable: 32, 32r2, 32r5, 32r6 + 64bit capable: 64, 64r2, 64r3, 64r5, 64r6 + non-64bit capable: 32, 32r2, 32r3, 32r5, 32r6 config BR2_mips_32 bool "Generic MIPS32" @@ -45,6 +51,10 @@ config BR2_mips_32r2 bool "Generic MIPS32R2" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R2 +config BR2_mips_32r3 + bool "Generic MIPS32R3" + depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R3 config BR2_mips_32r5 bool "Generic MIPS32R5" depends on !BR2_ARCH_IS_64 @@ -95,6 +105,10 @@ config BR2_mips_64r2 bool "Generic MIPS64R2" depends on BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS64R2 +config BR2_mips_64r3 + bool "Generic MIPS64R3" + depends on BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS64R3 config BR2_mips_64r5 bool "Generic MIPS64R5" depends on BR2_ARCH_IS_64 @@ -108,6 +122,20 @@ config BR2_mips_i6400 depends on BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS64R6 select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 +config BR2_mips_octeon2 + bool "Octeon II" + depends on BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS64R2 + help + Marvell (formerly Cavium Networks) Octeon II CN60XX + processors. +config BR2_mips_octeon3 + bool "Octeon III" + depends on BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS64R3 + help + Marvell (formerly Cavium Networks) Octeon III CN7XXX + processors. config BR2_mips_p6600 bool "P6600" depends on BR2_ARCH_IS_64 @@ -135,6 +163,7 @@ endchoice config BR2_MIPS_SOFT_FLOAT bool "Use soft-float" default y + depends on !BR2_mips_octeon3 # hard-float only select BR2_SOFT_FLOAT help If your target CPU does not have a Floating Point Unit (FPU) @@ -213,6 +242,7 @@ config BR2_ENDIAN config BR2_GCC_TARGET_ARCH default "mips32" if BR2_mips_32 default "mips32r2" if BR2_mips_32r2 + default "mips32r3" if BR2_mips_32r3 default "mips32r5" if BR2_mips_32r5 default "mips32r6" if BR2_mips_32r6 default "interaptiv" if BR2_mips_interaptiv @@ -222,9 +252,12 @@ config BR2_GCC_TARGET_ARCH default "mips32r2" if BR2_mips_xburst default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 + default "mips64r3" if BR2_mips_64r3 default "mips64r5" if BR2_mips_64r5 default "mips64r6" if BR2_mips_64r6 default "i6400" if BR2_mips_i6400 + default "octeon2" if BR2_mips_octeon2 + default "octeon3" if BR2_mips_octeon3 default "p6600" if BR2_mips_p6600 config BR2_MIPS_OABI32 diff --git a/buildroot/arch/Config.in.riscv b/buildroot/arch/Config.in.riscv index 4361890bf..097719e84 100644 --- a/buildroot/arch/Config.in.riscv +++ b/buildroot/arch/Config.in.riscv @@ -65,14 +65,35 @@ config BR2_RISCV_ISA_CUSTOM_RVC select BR2_RISCV_ISA_RVC endif +choice + prompt "Target Architecture Size" + default BR2_RISCV_64 + +config BR2_RISCV_32 + bool "32-bit" + config BR2_RISCV_64 - bool - default y + bool "64-bit" select BR2_ARCH_IS_64 +endchoice + choice prompt "Target ABI" - default BR2_RISCV_ABI_LP64 + default BR2_RISCV_ABI_ILP32 if !BR2_ARCH_IS_64 + default BR2_RISCV_ABI_LP64 if BR2_ARCH_IS_64 + +config BR2_RISCV_ABI_ILP32 + bool "ilp32" + depends on !BR2_ARCH_IS_64 + +config BR2_RISCV_ABI_ILP32F + bool "ilp32f" + depends on !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF + +config BR2_RISCV_ABI_ILP32D + bool "ilp32d" + depends on !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD config BR2_RISCV_ABI_LP64 bool "lp64" @@ -88,12 +109,16 @@ config BR2_RISCV_ABI_LP64D endchoice config BR2_ARCH + default "riscv32" if !BR2_ARCH_IS_64 default "riscv64" if BR2_ARCH_IS_64 config BR2_ENDIAN default "LITTLE" config BR2_GCC_TARGET_ABI + default "ilp32" if BR2_RISCV_ABI_ILP32 + default "ilp32f" if BR2_RISCV_ABI_ILP32F + default "ilp32d" if BR2_RISCV_ABI_ILP32D default "lp64" if BR2_RISCV_ABI_LP64 default "lp64f" if BR2_RISCV_ABI_LP64F default "lp64d" if BR2_RISCV_ABI_LP64D diff --git a/buildroot/arch/arch.mk.riscv b/buildroot/arch/arch.mk.riscv index 022d1a680..f3bf2b346 100644 --- a/buildroot/arch/arch.mk.riscv +++ b/buildroot/arch/arch.mk.riscv @@ -5,8 +5,10 @@ ifeq ($(BR2_riscv),y) -ifeq ($(BR2_ARCH_IS_64),y) +ifeq ($(BR2_RISCV_64),y) GCC_TARGET_ARCH := rv64i +else +GCC_TARGET_ARCH := rv32i endif ifeq ($(BR2_RISCV_ISA_RVM),y) diff --git a/buildroot/board/pc/genimage-efi.cfg b/buildroot/board/aarch64-efi/genimage-efi.cfg similarity index 85% rename from buildroot/board/pc/genimage-efi.cfg rename to buildroot/board/aarch64-efi/genimage-efi.cfg index ec96d73dd..f93ab9d64 100644 --- a/buildroot/board/pc/genimage-efi.cfg +++ b/buildroot/board/aarch64-efi/genimage-efi.cfg @@ -6,11 +6,11 @@ image efi-part.vfat { file EFI { image = "efi-part/EFI" } - file bzImage { - image = "bzImage" + file Image { + image = "Image" } } - size = 16M + size = 32M } image disk.img { @@ -27,5 +27,4 @@ image disk.img { partition-type = 0x83 image = "rootfs.ext2" } - } diff --git a/buildroot/board/pc/grub-efi.cfg b/buildroot/board/aarch64-efi/grub.cfg old mode 100755 new mode 100644 similarity index 52% rename from buildroot/board/pc/grub-efi.cfg rename to buildroot/board/aarch64-efi/grub.cfg index 222301a4e..ab88da91b --- a/buildroot/board/pc/grub-efi.cfg +++ b/buildroot/board/aarch64-efi/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /bzImage root=/dev/sda2 rootwait console=tty1 + linux /Image root=/dev/vda2 rootwait console=ttyAMA0 } diff --git a/buildroot/board/aarch64-efi/post-image.sh b/buildroot/board/aarch64-efi/post-image.sh new file mode 100755 index 000000000..f0214dc86 --- /dev/null +++ b/buildroot/board/aarch64-efi/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg diff --git a/buildroot/board/aarch64-efi/readme.txt b/buildroot/board/aarch64-efi/readme.txt new file mode 100644 index 000000000..65a6345b6 --- /dev/null +++ b/buildroot/board/aarch64-efi/readme.txt @@ -0,0 +1,34 @@ + +The aarch64_efi_defconfig allows to build a minimal Linux system that +can boot on all AArch64 servers providing an EFI firmware and ACPI. + +Building and booting +==================== + +$ make aarch64_efi_defconfig +$ make + +The file output/images/disk.img is a complete disk image that can be +booted, it includes the grub2 bootloader, Linux kernel and root +filesystem. + +Testing under Qemu +================== + +This image can also be tested using Qemu: + +qemu-system-aarch64 \ + -M virt \ + -cpu cortex-a57 \ + -m 512 \ + -nographic \ + -bios \ + -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ + -device virtio-blk-device,drive=hd0 \ + -netdev user,id=eth0 \ + -device virtio-net-device,netdev=eth0 + +Note that needs to point to a valid aarch64 UEFI +firmware image for qemu. +It may be provided by your distribution as a edk2-aarch64 or AAVMF +package, in path such as /usr/share/edk2/aarch64/QEMU_EFI.fd . diff --git a/buildroot/board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch b/buildroot/board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch new file mode 100644 index 000000000..64a147c09 --- /dev/null +++ b/buildroot/board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch @@ -0,0 +1,35 @@ +From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001 +From: Shyam Saini +Date: Mon, 15 Apr 2019 16:16:16 +0530 +Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB + +The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which +causes board reset because of larger uImage size. + +Error log snippet: + Booting using the fdt blob at 0x1f00000 + Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN +Must RESET board to recover +resetting ... + +Signed-off-by: Shyam Saini +--- + include/configs/rk3288_common.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h +index 72a54bc0ab..eab7cf4d86 100644 +--- a/include/configs/rk3288_common.h ++++ b/include/configs/rk3288_common.h +@@ -9,6 +9,8 @@ + #include + #include "rockchip-common.h" + ++#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */ ++ + #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY + #define CONFIG_SYS_MALLOC_LEN (32 << 20) + #define CONFIG_SYS_CBSIZE 1024 +-- +2.11.0 + diff --git a/buildroot/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch b/buildroot/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch new file mode 100644 index 000000000..64a147c09 --- /dev/null +++ b/buildroot/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch @@ -0,0 +1,35 @@ +From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001 +From: Shyam Saini +Date: Mon, 15 Apr 2019 16:16:16 +0530 +Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB + +The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which +causes board reset because of larger uImage size. + +Error log snippet: + Booting using the fdt blob at 0x1f00000 + Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN +Must RESET board to recover +resetting ... + +Signed-off-by: Shyam Saini +--- + include/configs/rk3288_common.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h +index 72a54bc0ab..eab7cf4d86 100644 +--- a/include/configs/rk3288_common.h ++++ b/include/configs/rk3288_common.h +@@ -9,6 +9,8 @@ + #include + #include "rockchip-common.h" + ++#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */ ++ + #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY + #define CONFIG_SYS_MALLOC_LEN (32 << 20) + #define CONFIG_SYS_CBSIZE 1024 +-- +2.11.0 + diff --git a/buildroot/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch b/buildroot/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch new file mode 100644 index 000000000..1da1a7540 --- /dev/null +++ b/buildroot/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch @@ -0,0 +1,25 @@ +From 7e3f2c482bc16537a093e87a27f0d465804a88e4 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Tue, 11 Dec 2018 23:04:46 +0100 +Subject: [PATCH] csky: update cmdline for serial console and rootfs on sda1 + +Signed-off-by: Julien Olivain +--- + arch/csky/boot/dts/gx6605s.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/csky/boot/dts/gx6605s.dts b/arch/csky/boot/dts/gx6605s.dts +index ce56106af967..f5d60b21e6f9 100644 +--- a/arch/csky/boot/dts/gx6605s.dts ++++ b/arch/csky/boot/dts/gx6605s.dts +@@ -155,6 +155,6 @@ + }; + + chosen { +- bootargs = "console=tty0 init=/sbin/init root=/dev/sda2 rw rootwait"; ++ bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda1 rw rootwait"; + }; + }; +-- +2.19.2 + diff --git a/buildroot/board/digilent/zybo/genimage.cfg b/buildroot/board/digilent/zybo/genimage.cfg deleted file mode 100644 index f39186d07..000000000 --- a/buildroot/board/digilent/zybo/genimage.cfg +++ /dev/null @@ -1,29 +0,0 @@ -image boot.vfat { - vfat { - files = { - "BOOT.BIN", - "uEnv.txt", - "system.bit", - "zynq-zybo.dtb", - "u-boot-dtb.img", - "uImage" - } - } - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/buildroot/board/digilent/zybo/post-image.sh b/buildroot/board/digilent/zybo/post-image.sh deleted file mode 100755 index 619cb9019..000000000 --- a/buildroot/board/digilent/zybo/post-image.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" -OUTPUT_DIR="${O}/images" - -rm -rf "${GENIMAGE_TMP}" - -cp board/digilent/zybo/uEnv.txt ${BINARIES_DIR} -cp board/digilent/zybo/system.bit ${BINARIES_DIR} - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/buildroot/board/digilent/zybo/readme.txt b/buildroot/board/digilent/zybo/readme.txt deleted file mode 100644 index 4e7454c50..000000000 --- a/buildroot/board/digilent/zybo/readme.txt +++ /dev/null @@ -1,76 +0,0 @@ -Digilent Zybo -============= - -This is the Buildroot board support for the Digilent Zybo. The Zybo is -a development board based on the Xilinx Zynq-7000 based All-Programmable -System-On-Chip. - -Zybo information including schematics, reference designs, and manuals are -available from http://store.digilentinc.com/zybo-zynq-7000-arm-fpga-soc-trainer-board/ . - -If you want a custom FPGA bitstream to be loaded by U-Boot, copy it as -system.bit in board/digilent/zybo/. - -Steps to create a working system for Zybo: - -1) make zynq_zybo_defconfig -2) make -3) write your SD Card with the sdcard.img file using dd by doing - $ sudo dd if=output/images/sdcard.img of=/dev/sdX -4) insert the SD Card and power up your Zybo -5) Expect serial console on the second USB serial port exposed by the board - -The expected output: - - U-Boot SPL 2016.05 (May 20 2016 - 16:16:24) - mmc boot - Trying to boot from MMC1 - reading system.dtb - spl_load_image_fat_os: error reading image system.dtb, err - -1 - reading u-boot-dtb.img - reading u-boot-dtb.img - - - U-Boot 2016.05 (May 20 2016 - 16:16:24 +0200) - - Model: Zynq ZYBO Development Board - Board: Xilinx Zynq - I2C: ready - DRAM: ECC disabled 512 MiB - MMC: sdhci@e0100000: 0 - SF: Detected S25FL128S_64K with page size 256 Bytes, erase size 64 KiB, total 16 MiB - In: serial@e0001000 - Out: serial@e0001000 - Err: serial@e0001000 - Model: Zynq ZYBO Development Board - Board: Xilinx Zynq - Net: ZYNQ GEM: e000b000, phyaddr 0, interface rgmii-id - I2C EEPROM MAC address read failed - - Warning: ethernet@e000b000 (eth0) using random MAC address - 56:64:dd:a7:6d:94 - eth0: ethernet@e000b000 - ... - -Resulting system ----------------- -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -The first partition is a FAT32 partition created at the beginning of the SD Card -that contains the following files : - /BOOT.BIN - /zynq-zybo.dtb - /uEnv.txt - /system.bit - /uImage - /u-boot-dtb.img - -The second partition is an ext4 partition that contains the root filesystem. - -You can alter the booting procedure by modifying the uEnv.txt file -in first partition of the SD card. It is a plain text file in format -= one per line: - -kernel_image=myimage -modeboot=myboot -myboot=... diff --git a/buildroot/board/digilent/zybo/uEnv.txt b/buildroot/board/digilent/zybo/uEnv.txt deleted file mode 100644 index 1042538a5..000000000 --- a/buildroot/board/digilent/zybo/uEnv.txt +++ /dev/null @@ -1,5 +0,0 @@ -bootargs=root=/dev/mmcblk0p2 rootwait rw rootfstype=ext4 -fpga_image=system.bit -fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image}; then echo Booting FPGA from ${fpga_image}; fpga info 0 && fpga loadb 0 0x1000000 $filesize; else echo FPGA image ${fpga_image} was not found, skipping...; fi; -kernel_image=uImage -sdboot=echo Booting from SD...; run fpgaboot; fatload mmc 0 0x1000000 ${kernel_image} && fatload mmc 0 0x2000000 zynq-zybo.dtb && bootm 0x1000000 - 0x2000000 diff --git a/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 index fdb645014..2f8842f8e 100644 --- a/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 +++ b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 @@ -3,7 +3,7 @@ # We mimic the .sdcard Freescale's image format: # * the SD card must have 33 kB free space at the beginning, # * U-Boot is integrated into imx8-boot-sd.bin and is dumped as is, -# * a FAT partition at offset 32MB is containing Image and DTB files +# * a FAT partition at offset 8MB is containing Image and DTB files # * a single root filesystem partition is required (ext2, ext3 or ext4) # diff --git a/buildroot/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch b/buildroot/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch new file mode 100644 index 000000000..b8989cb96 --- /dev/null +++ b/buildroot/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch @@ -0,0 +1,89 @@ +From 27a2cd6a1980adf3002412678c8fdec6528dc47d Mon Sep 17 00:00:00 2001 +From: Trent Piepho +Date: Fri, 6 Apr 2018 17:11:27 -0700 +Subject: [PATCH] imx: Create distinct pre-processed mkimage config files + +Each imx image is created by a separate sub-make and during this process +the mkimage config file is run though cpp. + +The cpp output is to the same file no matter what imx image is being +created. + +This means if two imx images are generated in parallel they will attempt +to independently produce the same pre-processed mkimage config file at +the same time. + +Avoid the problem by making the pre-processed config file name unique +based on the imx image it will be used in. This way each image will +create a unique config file and they won't clobber each other when run +in parallel. + +This should fixed the build bug referenced in b5b0e4e3 ("imximage: +Remove failure when no IVT offset is found"). + +Cc: Breno Lima +Cc: Thomas Petazzoni +Cc: Fabio Estevam +Signed-off-by: Trent Piepho +Tested-by: Fabio Estevam +[fabio: Adapted to imx_v2017.03_4.9.11_1.0.0_ga] +Signed-off-by: Fabio Estevam +--- + arch/arm/imx-common/Makefile | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile +index d862258..f1bae8d 100644 +--- a/arch/arm/imx-common/Makefile ++++ b/arch/arm/imx-common/Makefile +@@ -69,9 +69,11 @@ endif + quiet_cmd_cpp_cfg = CFGS $@ + cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $< + +-IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp ++# mkimage source config file ++IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) + +-$(IMX_CONFIG): %.cfgtmp: % FORCE ++# How to create a cpp processed config file, they all use the same source ++%.cfgout: $(IMX_CONFIG) FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,cpp_cfg) + +@@ -79,7 +81,7 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imxim + -e $(CONFIG_SYS_TEXT_BASE) + u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log + +-u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE ++u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE + $(call if_changed,mkimage) + + ifeq ($(CONFIG_OF_SEPARATE),y) +@@ -87,16 +89,15 @@ MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T i + -e $(CONFIG_SYS_TEXT_BASE) + u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log + +-u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE ++u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE + $(call if_changed,mkimage) + endif + + MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \ + -e $(CONFIG_SPL_TEXT_BASE) +- + SPL: MKIMAGEOUTPUT = SPL.log + +-SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE ++SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE + $(call if_changed,mkimage) + + MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ +@@ -124,4 +125,4 @@ cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \ + spl/u-boot-nand-spl.imx: SPL FORCE + $(call if_changed,u-boot-nand-spl_imx) + +-targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx) ++targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx) +-- +2.7.4 + diff --git a/buildroot/board/freescale/imx8mqevk/readme.txt b/buildroot/board/freescale/imx8mqevk/readme.txt index a32c122f9..e60eba4cb 100644 --- a/buildroot/board/freescale/imx8mqevk/readme.txt +++ b/buildroot/board/freescale/imx8mqevk/readme.txt @@ -21,7 +21,7 @@ You will find in output/images/ the following files: - boot.vfat - fsl-imx8mq-evk.dtb - Image - - imx-boot-imx8mqevk-sd.bin + - imx8-boot-sd.bin - lpddr4_pmu_train_fw.bin - rootfs.ext2 - rootfs.ext4 @@ -69,7 +69,7 @@ Enable HDMI output To enable HDMI output at boot you must provide the video kernel boot argument. To set the video boot argument from U-Boot run after -stoping in U-Boot prompt: +stopping in U-Boot prompt: setenv mmcargs 'setenv bootargs console=${console} root=${mmcroot} video=HDMI-A-1:1920x1080-32@60' saveenv diff --git a/buildroot/board/lego/ev3/genimage.cfg b/buildroot/board/lego/ev3/genimage.cfg index 3da3048d8..14880e8f1 100644 --- a/buildroot/board/lego/ev3/genimage.cfg +++ b/buildroot/board/lego/ev3/genimage.cfg @@ -16,10 +16,15 @@ image flash.bin { flashtype = "nor-16M-256" partition uboot { image = "u-boot.bin" - size = 320K + size = 256K + } + partition dtb { + image = "da850-lego-ev3.dtb" + size = 64K + offset = 0x40000 } partition uimage { - image = "uImage.da850-lego-ev3" + image = "uImage" size = 4M offset = 0x50000 } @@ -35,7 +40,10 @@ image flash.bin { image boot.vfat { vfat { file uImage { - image = "uImage.da850-lego-ev3" + image = "uImage" + } + file da850-lego-ev3.dtb { + image = "da850-lego-ev3.dtb" } } size = 16M diff --git a/buildroot/board/lego/ev3/linux.fragment b/buildroot/board/lego/ev3/linux.fragment index 30dea57b6..79efd27d3 100644 --- a/buildroot/board/lego/ev3/linux.fragment +++ b/buildroot/board/lego/ev3/linux.fragment @@ -1,3 +1,4 @@ +CONFIG_ARM_APPENDED_DTB=n CONFIG_ARCH_DAVINCI_DM644x=n CONFIG_ARCH_DAVINCI_DM355=n CONFIG_ARCH_DAVINCI_DM646x=n @@ -60,3 +61,8 @@ CONFIG_DRM_DUMB_VGA_DAC=n CONFIG_DRM_TINYDRM=y CONFIG_TINYDRM_ST7586=y CONFIG_FB_DA8XX=n +CONFIG_COMMON_CLK_PWM=y +CONFIG_BT=y +CONFIG_BT_HS=n +CONFIG_BT_LE=n +CONFIG_RFKILL=y diff --git a/buildroot/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch b/buildroot/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch deleted file mode 100644 index ee0ce6160..000000000 --- a/buildroot/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cdd8d11858fa34f6e813fae46b5556e9fb3570dc Mon Sep 17 00:00:00 2001 -From: David Lechner -Date: Sun, 19 Nov 2017 19:54:32 -0600 -Subject: [PATCH] configs: legoev3: increase flash image sizes - -This increases the kernel image to 4M and the rootfs image to 10M. - -It is getting hard to get a kernel image to fit in 3M and the rootfs image -size now matches the filesyssize variable. - -Signed-off-by: David Lechner ---- - include/configs/legoev3.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h -index 79fa3c4..2eeaf85 100644 ---- a/include/configs/legoev3.h -+++ b/include/configs/legoev3.h -@@ -204,7 +204,7 @@ - "mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \ - "mmcboot=bootm ${loadaddr}\0" \ - "flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \ -- "flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x300000; sf read ${filesysaddr} 0x350000 0x960000; bootm ${loadaddr}\0" \ -+ "flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x400000; sf read ${filesysaddr} 0x450000 0xA00000; bootm ${loadaddr}\0" \ - "loadimage=fatload mmc 0 ${loadaddr} uImage\0" \ - "loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \ - "bootscript=source ${bootscraddr}\0" \ --- -2.7.4 - diff --git a/buildroot/board/lego/ev3/readme.txt b/buildroot/board/lego/ev3/readme.txt index 8df91ac11..648bca1e9 100644 --- a/buildroot/board/lego/ev3/readme.txt +++ b/buildroot/board/lego/ev3/readme.txt @@ -70,6 +70,13 @@ official Lego Mindstorms EV3 programming software firmware update tool to load the image. To use sdcard.img, use a disk writing tool such as Etcher or dd to write the image to the µSD card. +NOTE: The sdcard.img created by lego_ev3_defconfig won't boot if the official +LEGO firmware is installed on the EV3 (it has an old version of U-Boot that +doesn't know about device tree). You must either set the kernel configuration +option to append the device tree to the kernel or you can create a boot.scr +that chainloads a newer U-Boot or you can install a newer U-Boot in the flash +memory (just flashing u-boot.bin is enough). + Finish ====== @@ -80,3 +87,13 @@ See: - http://botbench.com/blog/2013/08/05/mindsensors-ev3-usb-console-adapter/ The serial port config to use is 115200/8-N-1. + +Bluetooth +========= + +To enable Bluetooth: + + # modprobe hci_uart + # /usr/libexec/bluetooth/bluetoothd & + # bluetoothctl + [bluetooth]# power on diff --git a/buildroot/board/orangepi/orangepi-lite2/extlinux.conf b/buildroot/board/orangepi/orangepi-lite2/extlinux.conf new file mode 100644 index 000000000..1966186a2 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-lite2/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /sun50i-h6-orangepi-lite2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/buildroot/board/orangepi/orangepi-lite2/genimage.cfg b/buildroot/board/orangepi/orangepi-lite2/genimage.cfg new file mode 100644 index 000000000..97251b483 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-lite2/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "Image", + "sun50i-h6-orangepi-lite2.dtb", + "extlinux" + } + } + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/orangepi/orangepi-lite2/post-build.sh b/buildroot/board/orangepi/orangepi-lite2/post-build.sh new file mode 100755 index 000000000..ec20fca7d --- /dev/null +++ b/buildroot/board/orangepi/orangepi-lite2/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/orangepi/orangepi-lite2/readme.txt b/buildroot/board/orangepi/orangepi-lite2/readme.txt new file mode 100644 index 000000000..bed561b56 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-lite2/readme.txt @@ -0,0 +1,44 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Orangepi Lite2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Orangepi Lite2 link: +http://www.orangepi.org/Orange%20Pi%20Lite%202/ + +Wiki link: +https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Lite2 + +How to build +============ + + $ make orangepi_lite2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Orangepi Lite2 and power it up. The console +is on the serial line, 115200 8N1. + +WiFi +==== + + # wpa_passphrase ACCESSPOINTNAME >> /etc/wpa_supplicant.conf + (type password and enter) + # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B + # udhcpc -i wlan0 + # ping google.com diff --git a/buildroot/board/orangepi/orangepi-lite2/rootfs_overlay/lib/firmware/brcm/brcmfmac43455-sdio.txt b/buildroot/board/orangepi/orangepi-lite2/rootfs_overlay/lib/firmware/brcm/brcmfmac43455-sdio.txt new file mode 100755 index 000000000..c1cc4c3c2 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-lite2/rootfs_overlay/lib/firmware/brcm/brcmfmac43455-sdio.txt @@ -0,0 +1,82 @@ +#AP6255_NVRAM_V1.0_29052015 + +NVRAMRev=$Rev: 498373 $ +sromrev=11 +vendid=0x14e4 +devid=0x43ab +manfid=0x2d0 +prodid=0x06e4 +macaddr=00:90:4c:c5:12:38 +nocrc=1 +boardtype=0x6e4 +boardrev=0x1304 +xtalfreq=37400 +#boardflags: 5GHz eTR switch by default +#2.4GHz eTR switch by default +#bit1 for btcoex +boardflags=0x00080201 +boardflags2=0x40000000 +boardflags3=0x48200100 +rxgains2gelnagaina0=0 +rxgains2gtrisoa0=0 +rxgains2gtrelnabypa0=0 +rxgains5gelnagaina0=0 +rxgains5gtrisoa0=0 +rxgains5gtrelnabypa0=0 +rxchain=1 +txchain=1 +aa2g=1 +aa5g=1 +tssipos5g=1 +tssipos2g=1 +femctrl=0 +AvVmid_c0=0,157,1,126,1,126,1,126,1,126 +pa2ga0=-112,6296,-662 +pa2ga1=-165,3699,-515 +pa5ga0=-143,6016,-683,-141,6013,-678,-137,5988,-670,-136,5982,-670 +pa5ga1=-161,3544,-499,-166,3543,-497,-169,3569,-497,-171,3598,-498 +itrsw=1 +pdoffset2g40ma0=10 +pdoffset40ma0=0xaaaa +pdoffset80ma0=0xaaaa +extpagain5g=2 +extpagain2g=2 +tworangetssi2g=1 +tworangetssi5g=1 +# LTECX flags +# WCI2 +ltecxmux=0 +ltecxpadnum=0x0504 +ltecxfnsel=0x22 +ltecxgcigpio=0x32 + +maxp2ga0=64 +ofdmlrbw202gpo=0x0033 +dot11agofdmhrbw202gpo=0x1553 +mcsbw202gpo=0x99355533 + +maxp5ga0=80,82,76,77 + +mcsbw205glpo=0x99755000 +mcsbw205gmpo=0x9df55000 +mcsbw205ghpo=0x99855000 + +mcsbw405glpo=0xb8555000 +mcsbw405gmpo=0xed955000 +mcsbw405ghpo=0xd9755000 + +mcsbw805glpo=0xc8555000 +mcsbw805gmpo=0xe9555000 +mcsbw805ghpo=0xd9555000 + +swctrlmap_2g=0x00040004,0x00020002,0x00040004,0x010a02,0x1ff +swctrlmap_5g=0x00100010,0x00200020,0x00100010,0x010a02,0x2f4 +swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x000 +swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x000 + +vcodivmode=1 +deadman_to=481500000 +ed_thresh2g=-54 +ed_thresh5g=-54 + +muxenab=0x10 diff --git a/buildroot/board/orangepi/orangepi-one-plus/extlinux.conf b/buildroot/board/orangepi/orangepi-one-plus/extlinux.conf new file mode 100644 index 000000000..f573aa17d --- /dev/null +++ b/buildroot/board/orangepi/orangepi-one-plus/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /sun50i-h6-orangepi-one-plus.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/buildroot/board/orangepi/orangepi-one-plus/genimage.cfg b/buildroot/board/orangepi/orangepi-one-plus/genimage.cfg new file mode 100644 index 000000000..ebb07e8b2 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-one-plus/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "Image", + "sun50i-h6-orangepi-one-plus.dtb", + "extlinux" + } + } + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/orangepi/orangepi-one-plus/post-build.sh b/buildroot/board/orangepi/orangepi-one-plus/post-build.sh new file mode 100755 index 000000000..ec20fca7d --- /dev/null +++ b/buildroot/board/orangepi/orangepi-one-plus/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/orangepi/orangepi-one-plus/readme.txt b/buildroot/board/orangepi/orangepi-one-plus/readme.txt new file mode 100644 index 000000000..87f6de851 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-one-plus/readme.txt @@ -0,0 +1,37 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Orangepi One Plus. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Orangepi One Plus link: +http://www.orangepi.org/OrangePiOneplus/ + +Wiki link: +https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+One+Plus + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make orangepi_one_plus_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Orangepi One Plus and power it up. The console +is on the serial line, 115200 8N1. diff --git a/buildroot/board/orangepi/orangepi-pc/linux.fragment b/buildroot/board/orangepi/orangepi-pc/linux.fragment index cdd522452..581b715bd 100644 --- a/buildroot/board/orangepi/orangepi-pc/linux.fragment +++ b/buildroot/board/orangepi/orangepi-pc/linux.fragment @@ -1,3 +1,5 @@ +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_REGULATOR_SY8106A=y CONFIG_DRM_SUN8I_DW_HDMI=y CONFIG_SUN8I_DE2_CCU=y CONFIG_SND_SUN8I_CODEC_ANALOG=y diff --git a/buildroot/board/orangepi/orangepi-zero/linux-extras.config b/buildroot/board/orangepi/orangepi-zero/linux-extras.config index fe00af5ef..2db241de2 100644 --- a/buildroot/board/orangepi/orangepi-zero/linux-extras.config +++ b/buildroot/board/orangepi/orangepi-zero/linux-extras.config @@ -15,3 +15,6 @@ CONFIG_CFG80211_WEXT=y # wireless drivers CONFIG_WLAN=y + +# ondemand cpufreq governor +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y diff --git a/buildroot/board/pc/post-build.sh b/buildroot/board/pc/post-build.sh new file mode 100755 index 000000000..b245cc00c --- /dev/null +++ b/buildroot/board/pc/post-build.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +BOARD_DIR=$(dirname "$0") + +cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg" + +# Copy grub 1st stage to binaries, required for genimage +cp -f "$HOST_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR" diff --git a/buildroot/board/pc/post-image-efi-gpt.sh b/buildroot/board/pc/post-image-efi-gpt.sh new file mode 100755 index 000000000..d2acd8f85 --- /dev/null +++ b/buildroot/board/pc/post-image-efi-gpt.sh @@ -0,0 +1,62 @@ +#!/bin/sh + +set -e + +cd ${BINARIES_DIR} + +# GPT partition type UUIDs +esp_type=c12a7328-f81f-11d2-ba4b-00a0c93ec93b +linux_type=44479540-f297-41b2-9af7-d131d5f0458a + +# Partition UUIDs +efi_part_uuid=$(uuidgen) +root_part_uuid=$(uuidgen) + +# Boot partition offset and size, in 512-byte sectors +efi_part_start=64 +efi_part_size=32768 + +# Rootfs partition offset and size, in 512-byte sectors +root_part_start=$(( efi_part_start + efi_part_size )) +root_part_size=$(( $(stat -c %s rootfs.ext2) / 512 )) + +first_lba=34 +last_lba=$(( root_part_start + root_part_size )) + +# Disk image size in 512-byte sectors +image_size=$(( last_lba + first_lba )) + +cat > efi-part/EFI/BOOT/grub.cfg < +Date: Tue, 5 Feb 2019 22:08:54 +0100 +Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: MichaÅ‚ Åyszczek +--- + Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile b/Makefile +index 8086f3c93e..a6425b5b03 100644 +--- a/Makefile ++++ b/Makefile +@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),) + ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom + endif + ++# rk3328 needs itb image to boot properly ++ifeq ($(CONFIG_ROCKCHIP_RK3328),y) ++ALL-y += u-boot.itb ++endif ++ + # enable combined SPL/u-boot/dtb rules for tegra + ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) + ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin +-- +2.18.1 + diff --git a/buildroot/board/pine64/rock64/post-build.sh b/buildroot/board/pine64/rock64/post-build.sh new file mode 100755 index 000000000..26b53cba8 --- /dev/null +++ b/buildroot/board/pine64/rock64/post-build.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +MKIMAGE=$HOST_DIR/bin/mkimage +BOARD_DIR="$(dirname $0)" + +$MKIMAGE -n rk3328 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl.bin > $BINARIES_DIR/u-boot-tpl-spl.img + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/buildroot/board/pine64/rock64/readme.txt b/buildroot/board/pine64/rock64/readme.txt new file mode 100644 index 000000000..029c67641 --- /dev/null +++ b/buildroot/board/pine64/rock64/readme.txt @@ -0,0 +1,95 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Rock64. With this default configuration you +can log in into board via uart and look around. + +Board homepage: https://www.pine64.org/?page_id=7147 + +Build +===== + +First, load rock64 config for buildroot + + $ make rock64_defconfig + +Optionally make changes to buildroot config (to install more programs) + + $ make menuconfig + +And then build everything + + $ make + +When completed, following files will be generated in output/images directory: + + . + ├── Image + ├── bl31.bin + ├── bl31.elf + ├── rk3328-rock64.dtb + ├── rootfs.ext2 + ├── rootfs.ext4 -> rootfs.ext2 + ├── rootfs.tar + ├── sdcard.img + ├── u-boot-spl.bin + ├── u-boot-tpl-spl.img + ├── u-boot-tpl.bin + ├── u-boot-tpl.img + ├── u-boot.bin + └── u-boot.itb + +Creating bootable SD card +========================= + +!!! THIS COMMAND MAY WIPE YOUR DISK! +!!! MAKE SURE YOU PASSED CORRECT DEVICE! +!!! OR IT THIS WILL WIPE YOUR DISK! + +Simply invoke (as root) + + # dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device (not partition), of= argument may also be +/dev/mmcblk0 if you are using built-in sd card reader. + +Runtime +======= + +Login +----- + +By default, buildroot has no password, just type 'root' as login user, and +you will be logged in. + +Serial console +-------------- + +Serial console needs to be connected to pins (into 40pin rpi compatible part) + +pin 6: gnd +pin 8: tx +pin 10: rx + +Pin numbers are printed on board. + +Uart configuration is not standard. Rock64 uses 1500000 (1,5M) baudrate +with standard 8n1. + +Ethernet +-------- + +To enable ethernet you need to load modules for it: + +# modprobe stmmac +# modprobe dwmac-rk + +and since by default there is no dhcp installed, you need to configure ip +address, remember to change address to fit your network. + +# ifconfig eth0 up +# ip addr add 10.1.1.180/24 dev eth0 +# ping 10.1.1.1 +PING 10.1.1.1 (10.1.1.1): 56 data bytes +64 bytes from 10.1.1.1: seq=0 ttl=64 time=0.695 ms diff --git a/buildroot/board/qemu/aarch64-virt/readme.txt b/buildroot/board/qemu/aarch64-virt/readme.txt index 76fc2d6f3..1ff2fba47 100644 --- a/buildroot/board/qemu/aarch64-virt/readme.txt +++ b/buildroot/board/qemu/aarch64-virt/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-aarch64 -M virt -cpu cortex-a57 -nographic -smp 1 -kernel output/images/Image -append "root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 + qemu-system-aarch64 -M virt -cpu cortex-a53 -nographic -smp 1 -kernel output/images/Image -append "root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 The login prompt will appear in the terminal that started Qemu. diff --git a/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch b/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch index 883bd0de6..a2c0962f8 100644 --- a/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch +++ b/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch @@ -1,10 +1,30 @@ -Signed-Off-by: Waldemar Brodkorb -From LKML. +From 4ac4324dcdaf237aa34545b3795acb2e5c42d10e Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Fri, 1 Feb 2019 11:36:20 +0100 +Subject: [PATCH] arm-versatile-nommu: Linux patch -diff -Nur linux-4.15.13.orig/arch/arm/Kconfig linux-4.15.13/arch/arm/Kconfig ---- linux-4.15.13.orig/arch/arm/Kconfig 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/Kconfig 2018-04-01 03:47:33.415078244 +0100 -@@ -355,6 +355,17 @@ +Originally made by Waldemar Brodkorb from LKML. + +Signed-Off-by: Waldemar Brodkorb +[Gerome: reformated as a Git patch] +Signed-off-by: Gerome Burlats +[Romain: fix Waldemar's authorship in Git patch] +Signed-off-by: Romain Naour +--- + arch/arm/Kconfig | 11 +++++++++++ + arch/arm/Kconfig.debug | 3 ++- + arch/arm/include/asm/mach/map.h | 1 + + arch/arm/mach-versatile/Kconfig | 5 +++-- + arch/arm/mach-versatile/Makefile.boot | 3 +++ + arch/arm/mach-versatile/versatile_dt.c | 4 ++++ + 6 files changed, 24 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/mach-versatile/Makefile.boot + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index e8cd55a5b04c..fc2dbff70394 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -353,6 +353,17 @@ config ARM_SINGLE_ARMV7M select SPARSE_IRQ select USE_OF @@ -22,10 +42,11 @@ diff -Nur linux-4.15.13.orig/arch/arm/Kconfig linux-4.15.13/arch/arm/Kconfig config ARCH_EBSA110 bool "EBSA-110" select ARCH_USES_GETTIMEOFFSET -diff -Nur linux-4.15.13.orig/arch/arm/Kconfig.debug linux-4.15.13/arch/arm/Kconfig.debug ---- linux-4.15.13.orig/arch/arm/Kconfig.debug 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/Kconfig.debug 2018-04-01 03:47:33.416078232 +0100 -@@ -1795,7 +1795,8 @@ +diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug +index f6fcb8a79889..92fc637d3db8 100644 +--- a/arch/arm/Kconfig.debug ++++ b/arch/arm/Kconfig.debug +@@ -1843,7 +1843,8 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ @@ -35,10 +56,11 @@ diff -Nur linux-4.15.13.orig/arch/arm/Kconfig.debug linux-4.15.13/arch/arm/Kconf default "mach/uncompress.h" config EARLY_PRINTK -diff -Nur linux-4.15.13.orig/arch/arm/include/asm/mach/map.h linux-4.15.13/arch/arm/include/asm/mach/map.h ---- linux-4.15.13.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/include/asm/mach/map.h 2018-04-01 03:47:17.587276119 +0100 -@@ -62,6 +62,7 @@ +diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h +index 9b7c328fb207..b1fe9c8b5c3e 100644 +--- a/arch/arm/include/asm/mach/map.h ++++ b/arch/arm/include/asm/mach/map.h +@@ -62,6 +62,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys, #else #define iotable_init(map,num) do { } while (0) #define vm_reserve_area_early(a,s,c) do { } while (0) @@ -46,9 +68,10 @@ diff -Nur linux-4.15.13.orig/arch/arm/include/asm/mach/map.h linux-4.15.13/arch/ #endif #endif -diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig linux-4.15.13/arch/arm/mach-versatile/Kconfig ---- linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/mach-versatile/Kconfig 2018-04-01 03:47:33.417078219 +0100 +diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig +index f5c275434d6c..06ad999d5978 100644 +--- a/arch/arm/mach-versatile/Kconfig ++++ b/arch/arm/mach-versatile/Kconfig @@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 config ARCH_VERSATILE @@ -60,16 +83,19 @@ diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig linux-4.15.13/arch/ select ARM_AMBA select ARM_TIMER_SP804 select ARM_VIC -diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot linux-4.15.13/arch/arm/mach-versatile/Makefile.boot ---- linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.15.13/arch/arm/mach-versatile/Makefile.boot 2018-04-01 03:47:25.644175394 +0100 +diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot +new file mode 100644 +index 000000000000..eacfc3f5c33e +--- /dev/null ++++ b/arch/arm/mach-versatile/Makefile.boot @@ -0,0 +1,3 @@ +# Empty file waiting for deletion once Makefile.boot isn't needed any more. +# Patch waits for application at +# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . -diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c ---- linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 03:47:10.913359555 +0100 +diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c +index 3c8d39c12909..8cfa05a37295 100644 +--- a/arch/arm/mach-versatile/versatile_dt.c ++++ b/arch/arm/mach-versatile/versatile_dt.c @@ -37,7 +37,11 @@ #include @@ -82,3 +108,6 @@ diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.15.1 #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) /* +-- +2.14.5 + diff --git a/buildroot/board/qemu/riscv64-virt/linux.config b/buildroot/board/qemu/riscv32-virt/linux.config similarity index 95% rename from buildroot/board/qemu/riscv64-virt/linux.config rename to buildroot/board/qemu/riscv32-virt/linux.config index d09e8b3bb..c25583f76 100644 --- a/buildroot/board/qemu/riscv64-virt/linux.config +++ b/buildroot/board/qemu/riscv32-virt/linux.config @@ -1,4 +1,4 @@ -CONFIG_ARCH_RV64I=y +CONFIG_ARCH_RV32I=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_PCI=y diff --git a/buildroot/board/qemu/riscv32-virt/readme.txt b/buildroot/board/qemu/riscv32-virt/readme.txt new file mode 100644 index 000000000..2da99580e --- /dev/null +++ b/buildroot/board/qemu/riscv32-virt/readme.txt @@ -0,0 +1,7 @@ +Run the emulation with: + + qemu-system-riscv32 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + +The login prompt will appear in the terminal that started Qemu. + +Tested with QEMU 2.12.1 diff --git a/buildroot/board/qemu/xtensa-lx60/linux-nommu.config b/buildroot/board/qemu/xtensa-lx60/linux-nommu.config index 10f7ee125..8077645ee 100644 --- a/buildroot/board/qemu/xtensa-lx60/linux-nommu.config +++ b/buildroot/board/qemu/xtensa-lx60/linux-nommu.config @@ -6,6 +6,7 @@ CONFIG_XTENSA_VARIANT_CUSTOM_NAME="dc233c" # CONFIG_XTENSA_VARIANT_MMU is not set CONFIG_XTENSA_UNALIGNED_USER=y CONFIG_PREEMPT=y +CONFIG_MEMMAP_CACHEATTR=0x2cccccc7 CONFIG_KERNEL_LOAD_ADDRESS=0x00003000 # CONFIG_PCI is not set CONFIG_XTENSA_PLATFORM_XTFPGA=y diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg index 0d0ca750a..af1d17cde 100644 --- a/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg +++ b/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg @@ -9,6 +9,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "Image" } } diff --git a/buildroot/board/solidrun/clearfog/readme.txt b/buildroot/board/solidrun/clearfog/readme.txt index 6046836f0..60bf95329 100644 --- a/buildroot/board/solidrun/clearfog/readme.txt +++ b/buildroot/board/solidrun/clearfog/readme.txt @@ -15,13 +15,6 @@ built-in microSD card slot *WILL NOT WORK*. The Internet says that you have to upload the first bootloader via UART. This manual does not cover these steps; only MicroSoMs without the eMMC are supported. -Limitations -=========== - -There's no access to the SPI flash in this combination of kernel/uboot/dts. - -There is no support for the SFP. - Build ===== @@ -49,7 +42,7 @@ command as root: dd if=output/images/sdcard.img of=/dev/ conv=fdatasync -*** WARNING! The script will destroy all the card content. Use with care! *** +*** WARNING! The dd command will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in board/solidrun/clearfog/genimage.cfg. diff --git a/buildroot/board/solidrun/macchiatobin/extlinux.conf b/buildroot/board/solidrun/macchiatobin/extlinux.conf new file mode 100644 index 000000000..1008af1af --- /dev/null +++ b/buildroot/board/solidrun/macchiatobin/extlinux.conf @@ -0,0 +1,4 @@ +label Macchiatobin Linux + kernel /boot/Image + devicetree /boot/armada-8040-mcbin.dtb + append console=ttyS0,115200n8 root=/dev/mmcblk1p1 rootwait diff --git a/buildroot/board/solidrun/macchiatobin/linux-extras.config b/buildroot/board/solidrun/macchiatobin/linux-extras.config index 11267d2f8..29fd63062 100644 --- a/buildroot/board/solidrun/macchiatobin/linux-extras.config +++ b/buildroot/board/solidrun/macchiatobin/linux-extras.config @@ -1,3 +1,3 @@ CONFIG_MARVELL_PHY=y CONFIG_MARVELL_10G_PHY=y -CONFIG_PHY_MVEBU_CP110_COMPHY=y +CONFIG_SFP=y diff --git a/buildroot/board/solidrun/macchiatobin/post-build-mainline.sh b/buildroot/board/solidrun/macchiatobin/post-build-mainline.sh new file mode 100755 index 000000000..1f5ff6a61 --- /dev/null +++ b/buildroot/board/solidrun/macchiatobin/post-build-mainline.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/buildroot/board/solidrun/macchiatobin/readme.txt b/buildroot/board/solidrun/macchiatobin/readme.txt index dfbd6e793..dc5d6c794 100644 --- a/buildroot/board/solidrun/macchiatobin/readme.txt +++ b/buildroot/board/solidrun/macchiatobin/readme.txt @@ -15,19 +15,20 @@ How to build There are two build options: mainline support and vendor support. For the mainline BSP, we use: - - Linux v4.15 - - U-Boot v2018.01 + - Linux v4.19.2 + - U-Boot v2018.11 For the vendor BSP, we use the sources available from Marvell Github page at https://github.com/MarvellEmbeddedProcessors, which uses: - - Linux v4.4.52 - - U-Boot v2017.03 + - Linux v4.4.120 + - U-Boot v2018.03 -At the moment mainline support for the board is a work in progress. -Mainline kernel 4.15 enables eth2 in 1Gb (RJ45 connector J5) and -eth0 in 10Gb (SFP connector CON15 and RJ45 connector CON16). -The vendor BSP enables more hardware features out of the box, -e.g. all the network interfaces. +At the moment mainline support for the board is a work in +progress. Mainline kernel 4.19 enables eth2 in 1Gb (RJ45 connector J5), +copper 10Gb interfaces, and automatic configuration of select SFP +modules on the SFP cages. The vendor BSP enables more hardware features +out of the box, but lacks support for SFP detection and automatic +configuration. To use the mainline BSP run the following commands: @@ -73,10 +74,13 @@ Insert the micro SDcard in the MacchiatoBin board and power it up. The serial console is accessible at the micro-USB Type-B connector marked CON9. The serial line settings are 115200 8N1. -By default U-Boot will load its environment from the SPI flash. On the -first boot SPI flash may be empty or it may contain a legacy -environment incompatible with up-to-date mainline U-Boot and -kernel. Then the following commands can be used to boot the board: +Note: the following text only applies to the vendor BSP from +solidrun_macchiatobin_marvell_defconfig. + +By default Marvell provided U-Boot will load its environment from the +SPI flash. On the first boot SPI flash may be empty or it may contain a +legacy environment that prevents proper boot. Then the following +commands can be used to boot the board: => ext4load mmc 1:1 0x01700000 /boot/uEnv-example.txt => env import -t 0x01700000 $filesize diff --git a/buildroot/board/solidrun/macchiatobin/uboot-fragment.config b/buildroot/board/solidrun/macchiatobin/uboot-fragment.config new file mode 100644 index 000000000..717a09424 --- /dev/null +++ b/buildroot/board/solidrun/macchiatobin/uboot-fragment.config @@ -0,0 +1,2 @@ +CONFIG_ENV_IS_IN_MMC=y +# CONFIG_ENV_IS_IN_SPI_FLASH is not set diff --git a/buildroot/boot/Config.in b/buildroot/boot/Config.in index 8e0c8e5df..11856fd9c 100644 --- a/buildroot/boot/Config.in +++ b/buildroot/boot/Config.in @@ -15,6 +15,7 @@ source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" source "boot/riscv-pk/Config.in" source "boot/s500-bootloader/Config.in" +source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ts4800-mbrboot/Config.in" source "boot/uboot/Config.in" diff --git a/buildroot/boot/afboot-stm32/afboot-stm32.mk b/buildroot/boot/afboot-stm32/afboot-stm32.mk index 042b21fa5..5e221cf36 100644 --- a/buildroot/boot/afboot-stm32/afboot-stm32.mk +++ b/buildroot/boot/afboot-stm32/afboot-stm32.mk @@ -6,13 +6,15 @@ AFBOOT_STM32_VERSION = v0.1 AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,$(AFBOOT_STM32_VERSION)) +AFBOOT_STM32_INSTALL_IMAGES = YES +AFBOOT_STM32_INSTALL_TARGET = NO define AFBOOT_STM32_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) all endef -define AFBOOT_STM32_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/stm32*.bin $(BINARIES_DIR) +define AFBOOT_STM32_INSTALL_IMAGES_CMDS + $(INSTALL) -m 0755 -t $(BINARIES_DIR) -D $(@D)/stm32*.bin endef $(eval $(generic-package)) diff --git a/buildroot/boot/arm-trusted-firmware/Config.in b/buildroot/boot/arm-trusted-firmware/Config.in index 885d93e62..823a3510b 100644 --- a/buildroot/boot/arm-trusted-firmware/Config.in +++ b/buildroot/boot/arm-trusted-firmware/Config.in @@ -16,6 +16,11 @@ choice config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION bool "v1.4" +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION + bool "Custom version" + help + This option allows to use a specific official versions + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL bool "Custom tarball" @@ -31,12 +36,18 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION endif +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE + string "ATF version" + depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string default "v1.4" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE \ + if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 23f493653..8ca3864dd 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -13,15 +13,18 @@ ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) ARM_TRUSTED_FIRMWARE_TARBALL = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)) ARM_TRUSTED_FIRMWARE_SITE = $(patsubst %/,%,$(dir $(ARM_TRUSTED_FIRMWARE_TARBALL))) ARM_TRUSTED_FIRMWARE_SOURCE = $(notdir $(ARM_TRUSTED_FIRMWARE_TARBALL)) -BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) else ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y) ARM_TRUSTED_FIRMWARE_SITE = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL)) ARM_TRUSTED_FIRMWARE_SITE_METHOD = git -BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) else +# Handle stable official ATF versions ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) endif +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) +endif + ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) @@ -94,6 +97,13 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += RESET_TO_BL31=1 ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-uboot-tools endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF),y) +define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF + $(INSTALL) -D -m 0644 $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/bl31/bl31.elf \ + $(BINARIES_DIR)/bl31.elf +endef +endif + define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ @@ -104,6 +114,7 @@ endef define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL) + $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF) endef # Configuration check diff --git a/buildroot/boot/barebox/Config.in b/buildroot/boot/barebox/Config.in index 82c400fba..6a8d25154 100644 --- a/buildroot/boot/barebox/Config.in +++ b/buildroot/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2018.10.0" + bool "2018.12.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2018.10.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2018.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/buildroot/boot/barebox/barebox.hash b/buildroot/boot/barebox/barebox.hash index fd34a87e0..ec4e404b1 100644 --- a/buildroot/boot/barebox/barebox.hash +++ b/buildroot/boot/barebox/barebox.hash @@ -1,5 +1,5 @@ -# http://www.barebox.org/download/barebox-2018.10.0.tar.bz2.md5 -md5 f4c89bc92903425c960aa41e997b2251 barebox-2018.10.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2018.12.0.tar.bz2.md5 +md5 f84d7d3562055c80c3eedce0b14d4a0d barebox-2018.12.0.tar.bz2 # Locally calculated -sha256 c25bfeaff7dda8862defd8d9011e7e6d23216ee4fc4e8bb5b91a1efd833a6d1c barebox-2018.10.0.tar.bz2 +sha256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 barebox-2018.12.0.tar.bz2 diff --git a/buildroot/boot/barebox/barebox.mk b/buildroot/boot/barebox/barebox.mk index b811e322b..9e8a9f67b 100644 --- a/buildroot/boot/barebox/barebox.mk +++ b/buildroot/boot/barebox/barebox.mk @@ -28,7 +28,7 @@ $(1)_SITE_METHOD = git else # Handle stable official Barebox versions $(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2 -$(1)_SITE = http://www.barebox.org/download +$(1)_SITE = https://www.barebox.org/download endif $(1)_DEPENDENCIES = host-lzop diff --git a/buildroot/boot/grub2/Config.in b/buildroot/boot/grub2/Config.in index 9a61b3b63..e45133999 100644 --- a/buildroot/boot/grub2/Config.in +++ b/buildroot/boot/grub2/Config.in @@ -2,6 +2,9 @@ config BR2_TARGET_GRUB2_ARCH_SUPPORTS bool default y if BR2_i386 default y if BR2_x86_64 + default y if BR2_arm + default y if BR2_aarch64 + depends on BR2_USE_MMU config BR2_TARGET_GRUB2 bool "grub2" @@ -29,12 +32,14 @@ choice config BR2_TARGET_GRUB2_I386_PC bool "i386-pc" + depends on BR2_i386 || BR2_x86_64 help Select this option if the platform you're targetting is a x86 or x86-64 legacy BIOS based platform. config BR2_TARGET_GRUB2_I386_EFI bool "i386-efi" + depends on BR2_i386 || BR2_x86_64 help Select this option if the platform you're targetting has a 32 bits EFI BIOS. Note that some x86-64 platforms use a 32 @@ -42,14 +47,38 @@ config BR2_TARGET_GRUB2_I386_EFI config BR2_TARGET_GRUB2_X86_64_EFI bool "x86-64-efi" - depends on BR2_ARCH_IS_64 + depends on BR2_x86_64 help Select this option if the platform you're targetting has a 64 bits EFI BIOS. +config BR2_TARGET_GRUB2_ARM_UBOOT + bool "arm-uboot" + depends on BR2_arm + help + Select this option if the platform you're targetting is an + ARM u-boot platform, and you want to boot Grub 2 as an u-boot + compatible image. + +config BR2_TARGET_GRUB2_ARM_EFI + bool "arm-efi" + depends on BR2_arm + help + Select this option if the platform you're targetting is an + ARM platform and you want to boot Grub 2 as an EFI + application. + +config BR2_TARGET_GRUB2_ARM64_EFI + bool "arm64-efi" + depends on BR2_aarch64 + help + Select this option if the platform you're targetting is an + Aarch64 platform and you want to boot Grub 2 as an EFI + application. + endchoice -if BR2_TARGET_GRUB2_I386_PC +if BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_GRUB2_ARM_UBOOT config BR2_TARGET_GRUB2_BOOT_PARTITION string "boot partition" @@ -60,13 +89,15 @@ config BR2_TARGET_GRUB2_BOOT_PARTITION first disk if using a legacy partition table, or 'hd0,gpt1' if using GPT partition table. -endif # BR2_TARGET_GRUB2_I386_PC +endif # BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_GRUB2_ARM_UBOOT config BR2_TARGET_GRUB2_BUILTIN_MODULES string "builtin modules" default "boot linux ext2 fat squash4 part_msdos part_gpt normal biosdisk" if BR2_TARGET_GRUB2_I386_PC default "boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop" \ - if BR2_TARGET_GRUB2_I386_EFI || BR2_TARGET_GRUB2_X86_64_EFI + if BR2_TARGET_GRUB2_I386_EFI || BR2_TARGET_GRUB2_X86_64_EFI || \ + BR2_TARGET_GRUB2_ARM_EFI || BR2_TARGET_GRUB2_ARM64_EFI + default "linux ext2 fat part_msdos normal" if BR2_TARGET_GRUB2_ARM_UBOOT config BR2_TARGET_GRUB2_BUILTIN_CONFIG string "builtin config" @@ -76,6 +107,15 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG device and other configuration parameters, but however menu entries cannot be described in this embedded configuration. +config BR2_TARGET_GRUB2_INSTALL_TOOLS + bool "install tools" + help + Install support tools to interact with GNU GRUB Multiboot + boot loader. + + This will also install the Grub 2 loadable modules to the + target. + endif # BR2_TARGET_GRUB2 comment "grub2 needs a toolchain w/ wchar" diff --git a/buildroot/boot/grub2/grub2.mk b/buildroot/boot/grub2/grub2.mk index 35aea4128..65371f017 100644 --- a/buildroot/boot/grub2/grub2.mk +++ b/buildroot/boot/grub2/grub2.mk @@ -9,7 +9,15 @@ GRUB2_SITE = http://ftp.gnu.org/gnu/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ GRUB2_LICENSE_FILES = COPYING -GRUB2_DEPENDENCIES = host-bison host-flex +GRUB2_DEPENDENCIES = host-bison host-flex host-grub2 +HOST_GRUB2_DEPENDENCIES = host-bison host-flex +GRUB2_INSTALL_IMAGES = YES + +ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y) +GRUB2_INSTALL_TARGET = YES +else +GRUB2_INSTALL_TARGET = NO +endif GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)) GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG)) @@ -36,29 +44,48 @@ GRUB2_PREFIX = /EFI/BOOT GRUB2_TUPLE = x86_64-efi GRUB2_TARGET = x86_64 GRUB2_PLATFORM = efi +else ifeq ($(BR2_TARGET_GRUB2_ARM_UBOOT),y) +GRUB2_IMAGE = $(BINARIES_DIR)/boot-part/grub/grub.img +GRUB2_CFG = $(BINARIES_DIR)/boot-part/grub/grub.cfg +GRUB2_PREFIX = ($(GRUB2_BOOT_PARTITION))/boot/grub +GRUB2_TUPLE = arm-uboot +GRUB2_TARGET = arm +GRUB2_PLATFORM = uboot +else ifeq ($(BR2_TARGET_GRUB2_ARM_EFI),y) +GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootarm.efi +GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg +GRUB2_PREFIX = /EFI/BOOT +GRUB2_TUPLE = arm-efi +GRUB2_TARGET = arm +GRUB2_PLATFORM = efi +else ifeq ($(BR2_TARGET_GRUB2_ARM64_EFI),y) +GRUB2_IMAGE = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootaa64.efi +GRUB2_CFG = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg +GRUB2_PREFIX = /EFI/BOOT +GRUB2_TUPLE = arm64-efi +GRUB2_TARGET = aarch64 +GRUB2_PLATFORM = efi endif # Grub2 is kind of special: it considers CC, LD and so on to be the -# tools to build the native tools (i.e to be executed on the build -# machine), and uses TARGET_CC, TARGET_CFLAGS, TARGET_CPPFLAGS, -# TARGET_LDFLAGS to build the bootloader itself. However, to add to -# the confusion, it also uses NM, OBJCOPY and STRIP to build the -# bootloader itself; none of these are used to build the native -# tools. +# tools to build the host programs and uses TARGET_CC, TARGET_CFLAGS, +# TARGET_CPPFLAGS, TARGET_LDFLAGS to build the bootloader itself. # # NOTE: TARGET_STRIP is overridden by !BR2_STRIP_strip, so always # use the cross compile variant to ensure grub2 builds +HOST_GRUB2_CONF_ENV = \ + CPP="$(HOSTCC) -E" + GRUB2_CONF_ENV = \ - $(HOST_CONFIGURE_OPTS) \ - CPP="$(HOSTCC) -E" \ + CPP="$(TARGET_CC) -E" \ TARGET_CC="$(TARGET_CC)" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - NM="$(TARGET_NM)" \ - OBJCOPY="$(TARGET_OBJCOPY)" \ - STRIP="$(TARGET_CROSS)strip" + TARGET_NM="$(TARGET_NM)" \ + TARGET_OBJCOPY="$(TARGET_OBJCOPY)" \ + TARGET_STRIP="$(TARGET_CROSS)strip" GRUB2_CONF_OPTS = \ --target=$(GRUB2_TARGET) \ @@ -72,12 +99,13 @@ GRUB2_CONF_OPTS = \ --enable-libzfs=no \ --disable-werror -# We don't want all the native tools and Grub2 modules to be installed -# in the target. So we in fact install everything into the host -# directory, and the image generation process (below) will use the -# grub-mkimage tool and Grub2 modules from the host directory. - -GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install +HOST_GRUB2_CONF_OPTS = \ + --disable-grub-mkfont \ + --enable-efiemu=no \ + ac_cv_lib_lzma_lzma_code=no \ + --enable-device-mapper=no \ + --enable-libzfs=no \ + --disable-werror ifeq ($(BR2_TARGET_GRUB2_I386_PC),y) define GRUB2_IMAGE_INSTALL_ELTORITO @@ -86,10 +114,10 @@ define GRUB2_IMAGE_INSTALL_ELTORITO endef endif -define GRUB2_IMAGE_INSTALLATION +define GRUB2_INSTALL_IMAGES_CMDS mkdir -p $(dir $(GRUB2_IMAGE)) - $(HOST_DIR)/bin/grub-mkimage \ - -d $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE) \ + $(HOST_DIR)/usr/bin/grub-mkimage \ + -d $(@D)/grub-core/ \ -O $(GRUB2_TUPLE) \ -o $(GRUB2_IMAGE) \ -p "$(GRUB2_PREFIX)" \ @@ -99,14 +127,14 @@ define GRUB2_IMAGE_INSTALLATION $(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG) $(GRUB2_IMAGE_INSTALL_ELTORITO) endef -GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_IMAGE_INSTALLATION ifeq ($(GRUB2_PLATFORM),efi) define GRUB2_EFI_STARTUP_NSH echo $(notdir $(GRUB2_IMAGE)) > \ $(BINARIES_DIR)/efi-part/startup.nsh endef -GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_EFI_STARTUP_NSH +GRUB2_POST_INSTALL_IMAGES_HOOKS += GRUB2_EFI_STARTUP_NSH endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/boot/grub2/readme.txt b/buildroot/boot/grub2/readme.txt index f6fd4566f..0282fbdd1 100644 --- a/buildroot/boot/grub2/readme.txt +++ b/buildroot/boot/grub2/readme.txt @@ -53,8 +53,8 @@ To test your BIOS image in Qemu qemu-system-{i386,x86-64} -hda disk.img -Notes on using Grub2 for EFI-based platforms -============================================ +Notes on using Grub2 for x86/x86_64 EFI-based platforms +======================================================= 1. Create a disk image dd if=/dev/zero of=disk.img bs=1M count=32 @@ -83,16 +83,108 @@ Notes on using Grub2 for EFI-based platforms sudo losetup -d /dev/loop0 7. Your disk.img is ready! -To test your EFI image in Qemu ------------------------------- +To test your i386/x86-64 EFI image in Qemu +------------------------------------------ 1. Download the EFI BIOS for Qemu Version IA32 or X64 depending on the chosen Grub2 platform (i386-efi vs. x86-64-efi) - http://sourceforge.net/projects/edk2/files/OVMF/ + https://www.kraxel.org/repos/jenkins/edk2/ + (or use one provided by your distribution as OVMF) 2. Extract, and rename OVMF.fd to bios.bin and CirrusLogic5446.rom to vgabios-cirrus.bin. 3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img 4. Make sure to pass pci=nocrs to the kernel command line, to workaround a bug in the EFI BIOS regarding the EFI framebuffer. + +Notes on using Grub2 for ARM u-boot-based platforms +=================================================== + +The following steps show how to use the Grub2 arm-uboot platform +support in the simplest way possible and with a single +buildroot-generated filesystem. + + 1. Load qemu_arm_vexpress_defconfig + + 2. Enable u-boot with the vexpress_ca9x4 board name and with + u-boot.elf image format. + + 3. Enable grub2 for the arm-uboot platform. + + 4. Enable "Install kernel image to /boot in target" in the kernel + menu to populate a /boot directory with zImage in it. + + 5. The upstream u-boot vexpress_ca9x4 doesn't have CONFIG_API enabled + by default, which is required. + + Before building, patch u-boot (for example, make u-boot-extract to + edit the source before building) file + include/configs/vexpress_common.h to define: + + #define CONFIG_API + #define CONFIG_SYS_MMC_MAX_DEVICE 1 + + 6. Create a custom grub2 config file with the following contents and + set its path in BR2_TARGET_GRUB2_CFG: + + set default="0" + set timeout="5" + + menuentry "Buildroot" { + set root='(hd0)' + linux /boot/zImage root=/dev/mmcblk0 console=ttyAMA0 + devicetree /boot/vexpress-v2p-ca9.dtb + } + + 7. Create a custom builtin config file with the following contents + and set its path in BR2_TARGET_GRUB2_BUILTIN_CONFIG: + + set root=(hd0) + set prefix=/boot/grub + + 8. Create a custom post-build script which copies files from + ${BINARIES_DIR}/boot-part to $(TARGET_DIR)/boot (set its path in + BR2_ROOTFS_POST_BUILD_SCRIPT): + + #!/bin/sh + cp -r ${BINARIES_DIR}/boot-part/* ${TARGET_DIR}/boot/ + + 9. make + +10. Run qemu with: + + qemu-system-arm -M vexpress-a9 -kernel output/images/u-boot -m 1024 \ + -nographic -sd output/images/rootfs.ext2 + +11. In u-boot, stop at the prompt and run grub2 with: + + => ext2load mmc 0:0 ${loadaddr} /boot/grub/grub.img + => bootm + +12. This should bring the grub2 menu, upon which selecting the "Buildroot" + entry should boot Linux. + + +Notes on using Grub2 for Aarch64 EFI-based platforms +==================================================== + +The following steps show how to use the Grub2 arm64-efi platform, +using qemu and EFI firmware built for qemu. + + 1. Load aarch64_efi_defconfig + + 2. make + + 3. Download the EFI firmware for qemu aarch64 + https://www.kraxel.org/repos/jenkins/edk2/ + (or use one provided by your distribution as OVMF-aarch64 or AAVMF) + + 4. Run qemu with: + + qemu-system-aarch64 -M virt -cpu cortex-a57 -m 512 -nographic \ + -bios /QEMU_EFI.fd -hda output/images/disk.img \ + -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 + + 5. This should bring the grub2 menu, upon which selecting the + "Buildroot" entry should boot Linux. diff --git a/buildroot/boot/gummiboot/Config.in b/buildroot/boot/gummiboot/Config.in index 11dbc4f6b..1b5c4279f 100644 --- a/buildroot/boot/gummiboot/Config.in +++ b/buildroot/boot/gummiboot/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_GUMMIBOOT bool "gummiboot" depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS select BR2_PACKAGE_GNU_EFI select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/buildroot/boot/shim/Config.in b/buildroot/boot/shim/Config.in new file mode 100644 index 000000000..ea6650f54 --- /dev/null +++ b/buildroot/boot/shim/Config.in @@ -0,0 +1,19 @@ +config BR2_TARGET_SHIM + bool "shim" + depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS + # ARM32 build currently broken + depends on !BR2_ARM_CPU_HAS_ARM + select BR2_PACKAGE_GNU_EFI + help + Boot loader to chain-load signed boot loaders under Secure + Boot. + + This package provides a minimalist boot loader which allows + verifying signatures of other UEFI binaries against either + the Secure Boot DB/DBX or against a built-in signature + database. Its purpose is to allow a small, + infrequently-changing binary to be signed by the UEFI CA, + while allowing an OS distributor to revision their main + bootloader independently of the CA. + + https://github.com/rhboot/shim diff --git a/buildroot/boot/shim/shim.hash b/buildroot/boot/shim/shim.hash new file mode 100644 index 000000000..318390f80 --- /dev/null +++ b/buildroot/boot/shim/shim.hash @@ -0,0 +1,3 @@ +# locally computed hash +sha256 279d19cc95b9974ea2379401a6a0653d949c3fa3d61f0c4bd6a7b9e840bdc425 shim-15.tar.gz +sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/buildroot/boot/shim/shim.mk b/buildroot/boot/shim/shim.mk new file mode 100644 index 000000000..ba5bc5195 --- /dev/null +++ b/buildroot/boot/shim/shim.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# shim +# +################################################################################ + +SHIM_VERSION = 15 +SHIM_SITE = $(call github,rhboot,shim,$(SHIM_VERSION)) +SHIM_LICENSE = BSD-2-Clause +SHIM_LICENSE_FILES = COPYRIGHT +SHIM_DEPENDENCIES = gnu-efi +SHIM_INSTALL_TARGET = NO +SHIM_INSTALL_IMAGES = YES + +SHIM_MAKE_OPTS = \ + ARCH="$(GNU_EFI_PLATFORM)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + DASHJ="-j$(PARALLEL_JOBS)" \ + EFI_INCLUDE="$(STAGING_DIR)/usr/include/efi" \ + EFI_PATH="$(STAGING_DIR)/usr/lib" \ + LIBDIR="$(STAGING_DIR)/usr/lib" + +define SHIM_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS) +endef + +define SHIM_INSTALL_IMAGES_CMDS + $(INSTALL) -m 0755 -t $(BINARIES_DIR) $(@D)/*.efi +endef + +$(eval $(generic-package)) diff --git a/buildroot/boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch b/buildroot/boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch new file mode 100644 index 000000000..17a6d37ce --- /dev/null +++ b/buildroot/boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch @@ -0,0 +1,45 @@ +From 44a1b42e561b9a257209300e2860b901b100cc17 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Tue, 26 Feb 2019 08:07:22 -0300 +Subject: [PATCH] Fix build with gnu-efi version 3.0.9 + +Adapt a patch already applied upstream to prevent multiple definitions +of 'memset' and 'memcpy'. + +Signed-off-by: Carlos Santos +(adapted from commit 363d61c4f112b972649b19d67e96b9321f738f00) +--- + mk/lib.mk | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/mk/lib.mk b/mk/lib.mk +index ceb95bd0..c9b6eaf3 100644 +--- a/mk/lib.mk ++++ b/mk/lib.mk +@@ -186,9 +186,9 @@ MINLIBOBJS = \ + # $(LIBVESA_OBJS) + + CORELIBOBJS = \ +- memcpy.o memset.o memcmp.o printf.o strncmp.o vfprintf.o \ ++ memcmp.o printf.o strncmp.o vfprintf.o \ + strlen.o vsnprintf.o snprintf.o stpcpy.o strcmp.o strdup.o \ +- strcpy.o strncpy.o setjmp.o fopen.o fread.o fread2.o puts.o \ ++ strcpy.o strncpy.o fopen.o fread.o fread2.o puts.o \ + strtoul.o strntoumax.o strcasecmp.o \ + sprintf.o strlcat.o strchr.o strlcpy.o strncasecmp.o ctypes.o \ + fputs.o fwrite2.o fwrite.o fgetc.o fclose.o lmalloc.o \ +@@ -203,6 +203,11 @@ CORELIBOBJS = \ + $(LIBENTRY_OBJS) \ + $(LIBMODULE_OBJS) + ++ifndef EFI_BUILD ++# For EFI, these are part of gnu-efi ++CORELIBOBJS += setjmp.o memcpy.o memset.o ++endif ++ + LDFLAGS = -m elf_$(ARCH) --hash-style=gnu -T $(com32)/lib/$(ARCH)/elf.ld + + .SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss +-- +2.14.5 + diff --git a/buildroot/boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch b/buildroot/boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch new file mode 100644 index 000000000..fedd81569 --- /dev/null +++ b/buildroot/boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch @@ -0,0 +1,47 @@ +From beb526ca925983c7da229043790ecd552d910650 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Thu, 4 Apr 2019 23:24:31 -0700 +Subject: [PATCH] Fix build with binutils note gnu property section + +This fixes the following build error with newer binutils: + + objcopy -O binary mbr.elf mbr.bin + perl /build/syslinux/src/syslinux/mbr/checksize.pl mbr.bin + mbr.bin: too big (452 > 440) + +Corresponding bug reports: + + - https://bugs.archlinux.org/task/60405 + - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414 + +Strips the .note.gnu.property in the linker scripts for the MBRs. + +Signed-off-by: Christian Stewart +--- + mbr/i386/mbr.ld | 1 + + mbr/x86_64/mbr.ld | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld +index d14ba802..53683461 100644 +--- a/mbr/i386/mbr.ld ++++ b/mbr/i386/mbr.ld +@@ -70,4 +70,5 @@ SECTIONS + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + /DISCARD/ : { *(.note.GNU-stack) } ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld +index ae27d49a..b8c0d895 100644 +--- a/mbr/x86_64/mbr.ld ++++ b/mbr/x86_64/mbr.ld +@@ -69,4 +69,5 @@ SECTIONS + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + /DISCARD/ : { *(.note.GNU-stack) } ++ /DISCARD/ : { *(.note.gnu.property) } + } +-- +2.21.0 + diff --git a/buildroot/boot/syslinux/Config.in b/buildroot/boot/syslinux/Config.in index e969d53fd..339a97f0e 100644 --- a/buildroot/boot/syslinux/Config.in +++ b/buildroot/boot/syslinux/Config.in @@ -44,6 +44,7 @@ config BR2_TARGET_SYSLINUX_MBR config BR2_TARGET_SYSLINUX_EFI bool "install efi" + depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS select BR2_PACKAGE_GNU_EFI help Install the 'efi' image, to boot from an EFI environment. diff --git a/buildroot/boot/uboot/Config.in b/buildroot/boot/uboot/Config.in index ac6f8bc8c..bd1b248e9 100644 --- a/buildroot/boot/uboot/Config.in +++ b/buildroot/boot/uboot/Config.in @@ -179,6 +179,19 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31 variable pointing to ATF's BL31 binary, is passed during the Buildroot build. +choice + prompt "U-Boot ATF BL31 format" + default BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN + depends on BR2_TARGET_UBOOT_NEEDS_ATF_BL31 + +config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN + bool "bl31.bin" + +config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF + bool "bl31.elf" + +endchoice + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/buildroot/boot/uboot/uboot.mk b/buildroot/boot/uboot/uboot.mk index cbdfee6ac..3c070b41b 100644 --- a/buildroot/boot/uboot/uboot.mk +++ b/buildroot/boot/uboot/uboot.mk @@ -137,8 +137,12 @@ UBOOT_MAKE_OPTS += \ ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31),y) UBOOT_DEPENDENCIES += arm-trusted-firmware +ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF),y) +UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.elf +else UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin endif +endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc @@ -227,8 +231,9 @@ UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig # (which is typically wchar) but link with # $(HOST_DIR)/lib/libncurses.so (which is not). We don't actually # need any host-package for kconfig, so remove the HOSTCC/HOSTLDFLAGS -# override again. -UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC)" HOSTLDFLAGS="" +# override again. In addition, host-ccache is not ready at kconfig +# time, so use HOSTCC_NOCCACHE. +UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTLDFLAGS="" define UBOOT_HELP_CMDS @echo ' uboot-menuconfig - Run U-Boot menuconfig' @echo ' uboot-savedefconfig - Run U-Boot savedefconfig' diff --git a/buildroot/configs/aarch64_efi_defconfig b/buildroot/configs/aarch64_efi_defconfig new file mode 100644 index 000000000..e87193218 --- /dev/null +++ b/buildroot/configs/aarch64_efi_defconfig @@ -0,0 +1,38 @@ +# Architecture +BR2_aarch64=y + +# Toolchain, required for eudev and grub +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + +## Required tools to create bootable media +BR2_PACKAGE_HOST_GENIMAGE=y + +# Bootloader +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_AARCH64_EFI=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg" + +# Linux headers same as kernel, a 4.18 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Host tools for genimage +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/amarula_vyasa_rk3288_defconfig b/buildroot/configs/amarula_vyasa_rk3288_defconfig index 88fb6abbe..b1267f857 100644 --- a/buildroot/configs/amarula_vyasa_rk3288_defconfig +++ b/buildroot/configs/amarula_vyasa_rk3288_defconfig @@ -44,3 +44,4 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/vyasa/genimage.cfg" BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/vyasa/post-build.sh" +BR2_GLOBAL_PATCH_DIR="board/amarula/vyasa/patches/" diff --git a/buildroot/configs/asus_tinker_rk3288_defconfig b/buildroot/configs/asus_tinker_rk3288_defconfig index a0df3de8a..b14cb0a2c 100644 --- a/buildroot/configs/asus_tinker_rk3288_defconfig +++ b/buildroot/configs/asus_tinker_rk3288_defconfig @@ -43,3 +43,4 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker/post-build.sh" +BR2_GLOBAL_PATCH_DIR="board/asus/tinker/patches/" diff --git a/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 9985b6472..1ae4b853d 100644 --- a/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -67,6 +67,7 @@ BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" diff --git a/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index bc5414c4f..e140a44e4 100644 --- a/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -83,6 +83,7 @@ BR2_PACKAGE_VIM=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y diff --git a/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index a1e34ab81..da1c4eb73 100644 --- a/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -82,6 +82,7 @@ BR2_PACKAGE_VIM=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y diff --git a/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index f20e114ff..cfac503fa 100644 --- a/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -83,6 +83,7 @@ BR2_PACKAGE_VIM=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y diff --git a/buildroot/configs/bananapro_defconfig b/buildroot/configs/bananapro_defconfig index b4141e360..136a166d7 100644 --- a/buildroot/configs/bananapro_defconfig +++ b/buildroot/configs/bananapro_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.32" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.91" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment" @@ -39,7 +39,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/beaglebone_defconfig b/buildroot/configs/beaglebone_defconfig index 2d9fba57d..b4f152fd6 100644 --- a/buildroot/configs/beaglebone_defconfig +++ b/buildroot/configs/beaglebone_defconfig @@ -26,3 +26,5 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/csky_gx6605s_defconfig b/buildroot/configs/csky_gx6605s_defconfig index 5f39c536a..d0a2aadc6 100644 --- a/buildroot/configs/csky_gx6605s_defconfig +++ b/buildroot/configs/csky_gx6605s_defconfig @@ -1,8 +1,9 @@ BR2_csky=y +BR2_GLOBAL_PATCH_DIR="board/csky/gx6605s/patches" BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/c-sky/tools/raw/master/csky-linux-tools-x86_64-glibc-linux-4.9.2-20170227.tar.gz" +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/c-sky/tools/raw/master/csky-linux-tools-x86_64-glibc-linux-4.9.56-20180128.tar.gz" BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="csky-linux" -BR2_TOOLCHAIN_EXTERNAL_GCC_4_5=y +BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y @@ -10,7 +11,7 @@ BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/c-sky/linux-4.9.y/archive/314c498ddc8c43a66ca96ff3af7da98e10fa1cc6.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/c-sky/linux-4.9.y/archive/6064a9bdf48cefbccc4f6472dd04251f0dec1931.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="gx66xx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="gx6605s" diff --git a/buildroot/configs/freescale_imx7dsabresd_defconfig b/buildroot/configs/freescale_imx7dsabresd_defconfig index 3563d1e1b..9d00a53eb 100644 --- a/buildroot/configs/freescale_imx7dsabresd_defconfig +++ b/buildroot/configs/freescale_imx7dsabresd_defconfig @@ -2,6 +2,9 @@ BR2_arm=y BR2_cortex_a7=y +# patches +BR2_GLOBAL_PATCH_DIR="board/freescale/imx7dsdb/patches" + # Linux headers same as kernel, a 4.9 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y diff --git a/buildroot/configs/freescale_imx8mqevk_defconfig b/buildroot/configs/freescale_imx8mqevk_defconfig index a6e9b940b..895713b1c 100644 --- a/buildroot/configs/freescale_imx8mqevk_defconfig +++ b/buildroot/configs/freescale_imx8mqevk_defconfig @@ -1,13 +1,13 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.51_8mq_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.62_1.0.0_beta" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8mq-evk" @@ -20,14 +20,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.9.51_8mq_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.62_1.0.0_beta" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.51_8mq_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.62_1.0.0_beta" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/buildroot/configs/grinn_chiliboard_defconfig b/buildroot/configs/grinn_chiliboard_defconfig index 81d7bae91..84f24e1cc 100644 --- a/buildroot/configs/grinn_chiliboard_defconfig +++ b/buildroot/configs/grinn_chiliboard_defconfig @@ -1,7 +1,6 @@ BR2_arm=y BR2_cortex_a8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyO0" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/chiliboard/post-image.sh" BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/grinn_liteboard_defconfig b/buildroot/configs/grinn_liteboard_defconfig index 5f3ca0755..84f1735e2 100644 --- a/buildroot/configs/grinn_liteboard_defconfig +++ b/buildroot/configs/grinn_liteboard_defconfig @@ -1,7 +1,6 @@ BR2_arm=y BR2_cortex_a7=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh" BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/imx23evk_defconfig b/buildroot/configs/imx23evk_defconfig index fe0744036..87610d1b7 100644 --- a/buildroot/configs/imx23evk_defconfig +++ b/buildroot/configs/imx23evk_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-evk" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx23evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem diff --git a/buildroot/configs/imx6-sabresd_defconfig b/buildroot/configs/imx6-sabresd_defconfig index 89ffa0291..c2924b2e3 100644 --- a/buildroot/configs/imx6-sabresd_defconfig +++ b/buildroot/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/buildroot/configs/imx6-sabresd_qt5_defconfig b/buildroot/configs/imx6-sabresd_qt5_defconfig index 2534d5cb8..4616f57ea 100644 --- a/buildroot/configs/imx6-sabresd_qt5_defconfig +++ b/buildroot/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/buildroot/configs/imx6slevk_defconfig b/buildroot/configs/imx6slevk_defconfig index be4b42e88..90a02964e 100644 --- a/buildroot/configs/imx6slevk_defconfig +++ b/buildroot/configs/imx6slevk_defconfig @@ -11,7 +11,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6slevk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y diff --git a/buildroot/configs/lego_ev3_defconfig b/buildroot/configs/lego_ev3_defconfig index 028192413..cf2809059 100644 --- a/buildroot/configs/lego_ev3_defconfig +++ b/buildroot/configs/lego_ev3_defconfig @@ -2,28 +2,33 @@ BR2_arm=y BR2_arm926t=y -# Build options -BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches" +# Toolchain +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # system BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh" -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" BR2_LINUX_KERNEL_DEFCONFIG="davinci_all" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lego/ev3/linux.fragment" +BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xc0008000" -BR2_LINUX_KERNEL_APPENDED_UIMAGE=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="da850-lego-ev3" # Target packages BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/lego/ev3/busybox.fragment" +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560=y # filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -36,7 +41,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3" # host diff --git a/buildroot/configs/minnowboard_max-graphical_defconfig b/buildroot/configs/minnowboard_max-graphical_defconfig index f05e791a6..921dae310 100644 --- a/buildroot/configs/minnowboard_max-graphical_defconfig +++ b/buildroot/configs/minnowboard_max-graphical_defconfig @@ -3,7 +3,7 @@ BR2_x86_64=y BR2_x86_silvermont=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y # needed for TARGET_GRUB2 @@ -23,7 +23,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # Linux BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" diff --git a/buildroot/configs/minnowboard_max_defconfig b/buildroot/configs/minnowboard_max_defconfig index 9495bf376..523ddffd5 100644 --- a/buildroot/configs/minnowboard_max_defconfig +++ b/buildroot/configs/minnowboard_max_defconfig @@ -7,8 +7,8 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh" -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for grub2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -23,7 +23,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" diff --git a/buildroot/configs/nexbox_a95x_defconfig b/buildroot/configs/nexbox_a95x_defconfig index 5fc009940..4820d47d5 100644 --- a/buildroot/configs/nexbox_a95x_defconfig +++ b/buildroot/configs/nexbox_a95x_defconfig @@ -1,16 +1,17 @@ BR2_aarch64=y BR2_cortex_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/nexbox/a95x/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nexbox/a95x/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-nexbox-a95x amlogic/meson-gxl-s905x-nexbox-a95x" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig index 716995aa7..b61d56f42 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,13 +18,18 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.15" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y +# sunxi packages +BR2_PACKAGE_SUNXI_TOOLS=y +BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y + # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y @@ -34,7 +39,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime_defconfig index ed8ea8623..5677b0312 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,13 +18,18 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.15" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y +# sunxi packages +BR2_PACKAGE_SUNXI_TOOLS=y +BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y + # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y @@ -34,7 +39,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/olimex_imx233_olinuxino_defconfig b/buildroot/configs/olimex_imx233_olinuxino_defconfig index 89ab5952c..232d9d0dc 100644 --- a/buildroot/configs/olimex_imx233_olinuxino_defconfig +++ b/buildroot/configs/olimex_imx233_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -14,7 +14,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.2" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/orangepi_lite2_defconfig b/buildroot/configs/orangepi_lite2_defconfig new file mode 100644 index 000000000..c6be1c46b --- /dev/null +++ b/buildroot/configs/orangepi_lite2_defconfig @@ -0,0 +1,60 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="h6-v1.0a" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-lite2" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Lite2" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite2/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-lite2/post-build.sh" +BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-lite2/rootfs_overlay" + +# wireless firmware +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y + +# wireless tools +BR2_PACKAGE_IW=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y +BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y diff --git a/buildroot/configs/orangepi_one_plus_defconfig b/buildroot/configs/orangepi_one_plus_defconfig new file mode 100644 index 000000000..1084d4223 --- /dev/null +++ b/buildroot/configs/orangepi_one_plus_defconfig @@ -0,0 +1,46 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one_plus" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-one-plus" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi One+" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one-plus/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one-plus/post-build.sh" diff --git a/buildroot/configs/orangepi_pc_defconfig b/buildroot/configs/orangepi_pc_defconfig index 313b7ab3a..130a4e708 100644 --- a/buildroot/configs/orangepi_pc_defconfig +++ b/buildroot/configs/orangepi_pc_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/orangepi_zero_defconfig b/buildroot/configs/orangepi_zero_defconfig index 87962152f..3c65665cd 100644 --- a/buildroot/configs/orangepi_zero_defconfig +++ b/buildroot/configs/orangepi_zero_defconfig @@ -3,13 +3,13 @@ BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/pc_x86_64_bios_defconfig b/buildroot/configs/pc_x86_64_bios_defconfig index 6e9220bb3..1c1f7a366 100644 --- a/buildroot/configs/pc_x86_64_bios_defconfig +++ b/buildroot/configs/pc_x86_64_bios_defconfig @@ -19,7 +19,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh support/scripts/genimage.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg" # Linux headers same as kernel, a 4.18 series diff --git a/buildroot/configs/pc_x86_64_efi_defconfig b/buildroot/configs/pc_x86_64_efi_defconfig index 2a76f403d..324de35df 100644 --- a/buildroot/configs/pc_x86_64_efi_defconfig +++ b/buildroot/configs/pc_x86_64_efi_defconfig @@ -10,7 +10,6 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Required tools to create bootable media BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # Bootloader @@ -22,8 +21,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-efi.cfg" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi-gpt.sh" # Linux headers same as kernel, a 4.18 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y diff --git a/buildroot/configs/qemu_aarch64_virt_defconfig b/buildroot/configs/qemu_aarch64_virt_defconfig index 2706544e5..638e18beb 100644 --- a/buildroot/configs/qemu_aarch64_virt_defconfig +++ b/buildroot/configs/qemu_aarch64_virt_defconfig @@ -1,5 +1,6 @@ # Architecture BR2_aarch64=y +BR2_cortex_a53=y # System BR2_SYSTEM_DHCP="eth0" @@ -10,13 +11,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/qemu_arm_versatile_defconfig b/buildroot/configs/qemu_arm_versatile_defconfig index 348b91bc9..ce7cb5efe 100644 --- a/buildroot/configs/qemu_arm_versatile_defconfig +++ b/buildroot/configs/qemu_arm_versatile_defconfig @@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/qemu_arm_versatile_nommu_defconfig b/buildroot/configs/qemu_arm_versatile_nommu_defconfig index 910c38243..81fb5b6ca 100644 --- a/buildroot/configs/qemu_arm_versatile_nommu_defconfig +++ b/buildroot/configs/qemu_arm_versatile_nommu_defconfig @@ -21,13 +21,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/qemu_arm_vexpress_defconfig b/buildroot/configs/qemu_arm_vexpress_defconfig index 34a50aa8d..66f198ac5 100644 --- a/buildroot/configs/qemu_arm_vexpress_defconfig +++ b/buildroot/configs/qemu_arm_vexpress_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/buildroot/configs/qemu_m68k_mcf5208_defconfig b/buildroot/configs/qemu_m68k_mcf5208_defconfig index 8f8d0a048..44fd918ec 100644 --- a/buildroot/configs/qemu_m68k_mcf5208_defconfig +++ b/buildroot/configs/qemu_m68k_mcf5208_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_m68k_q800_defconfig b/buildroot/configs/qemu_m68k_q800_defconfig index d9238b650..0dd90a97b 100644 --- a/buildroot/configs/qemu_m68k_q800_defconfig +++ b/buildroot/configs/qemu_m68k_q800_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_microblazebe_mmu_defconfig b/buildroot/configs/qemu_microblazebe_mmu_defconfig index 3055a0f8c..95fdfeda6 100644 --- a/buildroot/configs/qemu_microblazebe_mmu_defconfig +++ b/buildroot/configs/qemu_microblazebe_mmu_defconfig @@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/buildroot/configs/qemu_microblazeel_mmu_defconfig b/buildroot/configs/qemu_microblazeel_mmu_defconfig index 073a7173f..7400dafa5 100644 --- a/buildroot/configs/qemu_microblazeel_mmu_defconfig +++ b/buildroot/configs/qemu_microblazeel_mmu_defconfig @@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/buildroot/configs/qemu_mips32r2_malta_defconfig b/buildroot/configs/qemu_mips32r2_malta_defconfig index d07bc1100..0ee7a5888 100644 --- a/buildroot/configs/qemu_mips32r2_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2_malta_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips32r2el_malta_defconfig b/buildroot/configs/qemu_mips32r2el_malta_defconfig index 55e68b1fd..075088df8 100644 --- a/buildroot/configs/qemu_mips32r2el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2el_malta_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips32r6_malta_defconfig b/buildroot/configs/qemu_mips32r6_malta_defconfig index 580239336..b0bf94ce7 100644 --- a/buildroot/configs/qemu_mips32r6_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6_malta_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips32r6el_malta_defconfig b/buildroot/configs/qemu_mips32r6el_malta_defconfig index 93e2a8650..077d836da 100644 --- a/buildroot/configs/qemu_mips32r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6el_malta_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64_malta_defconfig b/buildroot/configs/qemu_mips64_malta_defconfig index 99b457a9f..12502eac6 100644 --- a/buildroot/configs/qemu_mips64_malta_defconfig +++ b/buildroot/configs/qemu_mips64_malta_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64el_malta_defconfig b/buildroot/configs/qemu_mips64el_malta_defconfig index f2dacbd76..5ddb759bb 100644 --- a/buildroot/configs/qemu_mips64el_malta_defconfig +++ b/buildroot/configs/qemu_mips64el_malta_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64r6_malta_defconfig b/buildroot/configs/qemu_mips64r6_malta_defconfig index d291213db..bfa32f657 100644 --- a/buildroot/configs/qemu_mips64r6_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6_malta_defconfig @@ -10,13 +10,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64r6el_malta_defconfig b/buildroot/configs/qemu_mips64r6el_malta_defconfig index 4740bdee2..2fd855d79 100644 --- a/buildroot/configs/qemu_mips64r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6el_malta_defconfig @@ -10,13 +10,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_nios2_10m50_defconfig b/buildroot/configs/qemu_nios2_10m50_defconfig index cff219257..c07abc371 100644 --- a/buildroot/configs/qemu_nios2_10m50_defconfig +++ b/buildroot/configs/qemu_nios2_10m50_defconfig @@ -1,10 +1,13 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/qemu_or1k_defconfig b/buildroot/configs/qemu_or1k_defconfig index 636a0d25b..3fc53f418 100644 --- a/buildroot/configs/qemu_or1k_defconfig +++ b/buildroot/configs/qemu_or1k_defconfig @@ -5,12 +5,12 @@ BR2_or1k=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4,16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4,19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/buildroot/configs/qemu_ppc64_e5500_defconfig b/buildroot/configs/qemu_ppc64_e5500_defconfig index 7a325a507..59b863691 100644 --- a/buildroot/configs/qemu_ppc64_e5500_defconfig +++ b/buildroot/configs/qemu_ppc64_e5500_defconfig @@ -6,12 +6,12 @@ BR2_powerpc_e5500=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/qemu_ppc64_pseries_defconfig b/buildroot/configs/qemu_ppc64_pseries_defconfig index d2d69f1c3..5f55b246f 100644 --- a/buildroot/configs/qemu_ppc64_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64_pseries_defconfig @@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc64le_pseries_defconfig b/buildroot/configs/qemu_ppc64le_pseries_defconfig index 9a85f76dd..8356e4e25 100644 --- a/buildroot/configs/qemu_ppc64le_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64le_pseries_defconfig @@ -10,12 +10,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc_g3beige_defconfig b/buildroot/configs/qemu_ppc_g3beige_defconfig index 451a9b52d..4b2f3ed2f 100644 --- a/buildroot/configs/qemu_ppc_g3beige_defconfig +++ b/buildroot/configs/qemu_ppc_g3beige_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig index 38e41a7fa..98985b7b7 100644 --- a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig +++ b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig @@ -9,13 +9,13 @@ BR2_SYSTEM_DHCP="eth0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -23,3 +23,6 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig b/buildroot/configs/qemu_ppc_virtex_ml507_defconfig index 6824afca3..eddaf3558 100644 --- a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig +++ b/buildroot/configs/qemu_ppc_virtex_ml507_defconfig @@ -6,8 +6,8 @@ BR2_powerpc_440=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Use soft float BR2_SOFT_FLOAT=y @@ -15,9 +15,12 @@ BR2_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux.config" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="virtex440-ml507" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/qemu_riscv32_virt_defconfig b/buildroot/configs/qemu_riscv32_virt_defconfig new file mode 100644 index 000000000..fb37da6a8 --- /dev/null +++ b/buildroot/configs/qemu_riscv32_virt_defconfig @@ -0,0 +1,25 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_32=y + +# System +BR2_SYSTEM_DHCP="eth0" +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y + +# Linux headers same as kernel, a 4.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux.config" + +# Bootloader +BR2_TARGET_RISCV_PK=y diff --git a/buildroot/configs/qemu_riscv64_virt_defconfig b/buildroot/configs/qemu_riscv64_virt_defconfig index 59343ee98..65dbef413 100644 --- a/buildroot/configs/qemu_riscv64_virt_defconfig +++ b/buildroot/configs/qemu_riscv64_virt_defconfig @@ -1,5 +1,6 @@ # Architecture BR2_riscv=y +BR2_RISCV_64=y # System BR2_SYSTEM_DHCP="eth0" @@ -9,16 +10,15 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.20 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv64-virt/linux.config" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y # Bootloader BR2_TARGET_RISCV_PK=y diff --git a/buildroot/configs/qemu_sh4_r2d_defconfig b/buildroot/configs/qemu_sh4_r2d_defconfig index ec4a91c99..e194d7ecf 100644 --- a/buildroot/configs/qemu_sh4_r2d_defconfig +++ b/buildroot/configs/qemu_sh4_r2d_defconfig @@ -11,13 +11,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/buildroot/configs/qemu_sh4eb_r2d_defconfig b/buildroot/configs/qemu_sh4eb_r2d_defconfig index e7dbd46a2..f1aad8b64 100644 --- a/buildroot/configs/qemu_sh4eb_r2d_defconfig +++ b/buildroot/configs/qemu_sh4eb_r2d_defconfig @@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/buildroot/configs/qemu_sparc64_sun4u_defconfig b/buildroot/configs/qemu_sparc64_sun4u_defconfig index baa8dbfb5..f4da2bc08 100644 --- a/buildroot/configs/qemu_sparc64_sun4u_defconfig +++ b/buildroot/configs/qemu_sparc64_sun4u_defconfig @@ -9,12 +9,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/buildroot/configs/qemu_sparc_ss10_defconfig b/buildroot/configs/qemu_sparc_ss10_defconfig index 9943781a5..e027b73eb 100644 --- a/buildroot/configs/qemu_sparc_ss10_defconfig +++ b/buildroot/configs/qemu_sparc_ss10_defconfig @@ -9,12 +9,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/buildroot/configs/qemu_x86_64_defconfig b/buildroot/configs/qemu_x86_64_defconfig index 12b30bf76..afa239693 100644 --- a/buildroot/configs/qemu_x86_64_defconfig +++ b/buildroot/configs/qemu_x86_64_defconfig @@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" diff --git a/buildroot/configs/qemu_x86_defconfig b/buildroot/configs/qemu_x86_defconfig index 985ff32b4..3441ad5cb 100644 --- a/buildroot/configs/qemu_x86_defconfig +++ b/buildroot/configs/qemu_x86_defconfig @@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/buildroot/configs/qemu_xtensa_lx60_defconfig b/buildroot/configs/qemu_xtensa_lx60_defconfig index a735c991c..4287e6abe 100644 --- a/buildroot/configs/qemu_xtensa_lx60_defconfig +++ b/buildroot/configs/qemu_xtensa_lx60_defconfig @@ -11,15 +11,18 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig b/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig index f4d6837bc..37b674358 100644 --- a/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig @@ -15,15 +15,18 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" + +# Kernel needs mkimage +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/raspberrypi0_defconfig b/buildroot/configs/raspberrypi0_defconfig index 20f40fa6f..2c8030d03 100644 --- a/buildroot/configs/raspberrypi0_defconfig +++ b/buildroot/configs/raspberrypi0_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,6d27aa156c26977dfd079a7107e31670127d17d3)/linux-6d27aa156c26977dfd079a7107e31670127d17d3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/buildroot/configs/raspberrypi0w_defconfig b/buildroot/configs/raspberrypi0w_defconfig index d3f550cf2..7149d91ba 100644 --- a/buildroot/configs/raspberrypi0w_defconfig +++ b/buildroot/configs/raspberrypi0w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,6d27aa156c26977dfd079a7107e31670127d17d3)/linux-6d27aa156c26977dfd079a7107e31670127d17d3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w" diff --git a/buildroot/configs/raspberrypi2_defconfig b/buildroot/configs/raspberrypi2_defconfig index 688ec557d..343ae7b2f 100644 --- a/buildroot/configs/raspberrypi2_defconfig +++ b/buildroot/configs/raspberrypi2_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,6d27aa156c26977dfd079a7107e31670127d17d3)/linux-6d27aa156c26977dfd079a7107e31670127d17d3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi3_64_defconfig b/buildroot/configs/raspberrypi3_64_defconfig index a67c62026..43687d29f 100644 --- a/buildroot/configs/raspberrypi3_64_defconfig +++ b/buildroot/configs/raspberrypi3_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,6d27aa156c26977dfd079a7107e31670127d17d3)/linux-6d27aa156c26977dfd079a7107e31670127d17d3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi3_defconfig b/buildroot/configs/raspberrypi3_defconfig index 75f2dec9d..9ad5b54b7 100644 --- a/buildroot/configs/raspberrypi3_defconfig +++ b/buildroot/configs/raspberrypi3_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,6d27aa156c26977dfd079a7107e31670127d17d3)/linux-6d27aa156c26977dfd079a7107e31670127d17d3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi3_qt5we_defconfig b/buildroot/configs/raspberrypi3_qt5we_defconfig index c8d0be8cb..276c7cd55 100644 --- a/buildroot/configs/raspberrypi3_qt5we_defconfig +++ b/buildroot/configs/raspberrypi3_qt5we_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,6d27aa156c26977dfd079a7107e31670127d17d3)/linux-6d27aa156c26977dfd079a7107e31670127d17d3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi_defconfig b/buildroot/configs/raspberrypi_defconfig index 3e0861f67..97573acaf 100644 --- a/buildroot/configs/raspberrypi_defconfig +++ b/buildroot/configs/raspberrypi_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,6d27aa156c26977dfd079a7107e31670127d17d3)/linux-6d27aa156c26977dfd079a7107e31670127d17d3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/buildroot/configs/rock64_defconfig b/buildroot/configs/rock64_defconfig new file mode 100644 index 000000000..30bf12c06 --- /dev/null +++ b/buildroot/configs/rock64_defconfig @@ -0,0 +1,38 @@ +BR2_aarch64=y +BR2_GLOBAL_PATCH_DIR="board/pine64/rock64/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rock64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/rock64/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.19" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-rock64" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v1.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ayufan-rock64/linux-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="2017.09-rockchip-ayufan-1035-gd646df03ac" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock64-rk3328" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin tpl/u-boot-tpl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/solidrun_clearfog_defconfig b/buildroot/configs/solidrun_clearfog_defconfig index 8c6cb83a5..fd6f278aa 100644 --- a/buildroot/configs/solidrun_clearfog_defconfig +++ b/buildroot/configs/solidrun_clearfog_defconfig @@ -5,8 +5,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_NEON=y -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +# Linux headers same as kernel, a 4.20 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y # System configuration BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/clearfog/post-build.sh" @@ -16,7 +16,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.20" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -33,7 +33,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/buildroot/configs/solidrun_macchiatobin_mainline_defconfig b/buildroot/configs/solidrun_macchiatobin_mainline_defconfig index d303b2f75..8e5fbfa4e 100644 --- a/buildroot/configs/solidrun_macchiatobin_mainline_defconfig +++ b/buildroot/configs/solidrun_macchiatobin_mainline_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TARGET_GENERIC_HOSTNAME="mcbin" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin" @@ -19,14 +19,17 @@ BR2_TARGET_MV_DDR_MARVELL=y # U-Boot BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_USE_DEFCONFIG=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_mcbin-88f8040" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/uboot-fragment.config" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.2" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin" @@ -41,4 +44,4 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/macchiatobin/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/macchiatobin/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/macchiatobin/post-build-mainline.sh" diff --git a/buildroot/configs/zynq_zybo_defconfig b/buildroot/configs/zynq_zybo_defconfig deleted file mode 100644 index ee6fa060b..000000000 --- a/buildroot/configs/zynq_zybo_defconfig +++ /dev/null @@ -1,30 +0,0 @@ -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_NEON=y -BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/digilent/zybo/post-image.sh" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.4" -BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zybo" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zybo" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_ZYNQ_IMAGE=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/docs/manual/adding-packages-luarocks.txt b/buildroot/docs/manual/adding-packages-luarocks.txt index ec3d4e7cc..df97cdd50 100644 --- a/buildroot/docs/manual/adding-packages-luarocks.txt +++ b/buildroot/docs/manual/adding-packages-luarocks.txt @@ -50,6 +50,16 @@ Finally, on line 16, we invoke the +luarocks-package+ macro that generates all the Makefile rules that actually allows the package to be built. +Most of these details can be retrieved from the +rock+ and +rockspec+. +So, this file and the Config.in file can be generated by running the +command +luarocks buildroot foo lua-foo+ in the Buildroot +directory. This command runs a specific Buildroot addon of +luarocks+ +that will automatically generate a Buildroot package. The result must +still be manually inspected and possibly modified. + +* The +package/Config.in+ file has to be updated manually to include the + generated Config.in files. + [[luarocks-package-reference]] ==== +luarocks-package+ reference diff --git a/buildroot/docs/manual/adding-packages-meson.txt b/buildroot/docs/manual/adding-packages-meson.txt index c52fe1050..30c338f48 100644 --- a/buildroot/docs/manual/adding-packages-meson.txt +++ b/buildroot/docs/manual/adding-packages-meson.txt @@ -85,6 +85,12 @@ A few additional variables, specific to the Meson infrastructure, can also be defined. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them. +* +FOO_SUBDIR+ may contain the name of a subdirectory inside the + package that contains the main meson.build file. This is useful, + if for example, the main meson.build file is not at the root of + the tree extracted by the tarball. If +HOST_FOO_SUBDIR+ is not + specified, it defaults to +FOO_SUBDIR+. + * +FOO_CONF_ENV+, to specify additional environment variables to pass to +meson+ for the configuration step. By default, empty. @@ -94,3 +100,6 @@ will therefore only use a few of them. * +FOO_NINJA_ENV+, to specify additional environment variables to pass to +ninja+, meson companion tool in charge of the build operations. By default, empty. + +* +FOO_NINJA_OPTS+, to specify a space-separated list of targets to build. By + default, empty, to build the default target(s). diff --git a/buildroot/docs/manual/adding-packages-python.txt b/buildroot/docs/manual/adding-packages-python.txt index 5eb6ba51b..15137cfd6 100644 --- a/buildroot/docs/manual/adding-packages-python.txt +++ b/buildroot/docs/manual/adding-packages-python.txt @@ -113,6 +113,12 @@ optionally be defined, depending on the package's needs. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them, or none. +* +PYTHON_FOO_SUBDIR+ may contain the name of a subdirectory inside the + package that contains the main +setup.py+ file. This is useful, + if for example, the main +setup.py+ file is not at the root of + the tree extracted by the tarball. If +HOST_PYTHON_FOO_SUBDIR+ is not + specified, it defaults to +PYTHON_FOO_SUBDIR+. + * +PYTHON_FOO_ENV+, to specify additional environment variables to pass to the Python +setup.py+ script (for both the build and install steps). Note that the infrastructure is automatically passing diff --git a/buildroot/docs/manual/adding-packages-rebar.txt b/buildroot/docs/manual/adding-packages-rebar.txt index be9ede011..d78b3171d 100644 --- a/buildroot/docs/manual/adding-packages-rebar.txt +++ b/buildroot/docs/manual/adding-packages-rebar.txt @@ -86,6 +86,12 @@ If the package bundles a _rebar_ utility, but can use the generic * +ERLANG_FOOBAR_REBAR_ENV+, to specify additional environment variables to pass to the _rebar_ utility. +* +ERLANG_FOOBAR_KEEP_DEPENDENCIES+, to keep the dependencies + described in the rebar.config file. Valid values are +YES+ or +NO+ + (the default). Unless this variable is set to +YES+, the _rebar_ + infrastructure removes such dependencies in a post-patch hook to + ensure rebar does not download nor compile them. + With the rebar infrastructure, all the steps required to build and install the packages are already defined, and they generally work well for most rebar-based packages. However, when required, it is diff --git a/buildroot/docs/manual/adding-packages-waf.txt b/buildroot/docs/manual/adding-packages-waf.txt index 43b557c07..ffc004c29 100644 --- a/buildroot/docs/manual/adding-packages-waf.txt +++ b/buildroot/docs/manual/adding-packages-waf.txt @@ -60,10 +60,16 @@ the generic infrastructure also exist in the Waf infrastructure: An additional variable, specific to the Waf infrastructure, can also be defined. +* +LIBFOO_SUBDIR+ may contain the name of a subdirectory inside the + package that contains the main wscript file. This is useful, + if for example, the main wscript file is not at the root of + the tree extracted by the tarball. If +HOST_LIBFOO_SUBDIR+ is not + specified, it defaults to +LIBFOO_SUBDIR+. + * +LIBFOO_NEEDS_EXTERNAL_WAF+ can be set to +YES+ or +NO+ to tell Buildroot to use the bundled +waf+ executable. If set to +NO+, the default, then Buildroot will use the waf executable provided in the - package source tree; if set to +YES+, then Buidlroot will download, + package source tree; if set to +YES+, then Buildroot will download, install waf as a host tool and use it to build the package. * +LIBFOO_WAF_OPTS+, to specify additional options to pass to the diff --git a/buildroot/docs/manual/contribute.txt b/buildroot/docs/manual/contribute.txt index 60bfb961f..5530ce154 100644 --- a/buildroot/docs/manual/contribute.txt +++ b/buildroot/docs/manual/contribute.txt @@ -194,14 +194,29 @@ bisect+ to locate the origin of a problem. First of all, it is essential that the patch has a good commit message. The commit message should start with a separate line with a -brief summary of the change, starting with the name of the affected -package. The body of the commit message should describe _why_ this +brief summary of the change, prefixed by the area touched by the +patch. A few examples of good commit titles: + +* +package/linuxptp: bump version to 2.0+ + +* +configs/imx23evk: bump Linux version to 4.19+ + +* +package/pkg-generic: postpone evaluation of dependency conditions+ + +* +boot/uboot: needs host-{flex,bison}+ + +* +support/testing: add python-ubjson tests+ + +The description that follows the prefix should start with a lower case +letter (i.e "bump", "needs", "postpone", "add" in the above examples). + +Second, the body of the commit message should describe _why_ this change is needed, and if necessary also give details about _how_ it was done. When writing the commit message, think of how the reviewers will read it, but also think about how you will read it when you look at this change again a few years down the line. -Second, the patch itself should do only one change, but do it +Third, the patch itself should do only one change, but do it completely. Two unrelated or weakly related changes should usually be done in two separate patches. This usually means that a patch affects only a single package. If several changes are related, it is often diff --git a/buildroot/docs/manual/customize-rootfs.txt b/buildroot/docs/manual/customize-rootfs.txt index 44fc46067..6b72a37b3 100644 --- a/buildroot/docs/manual/customize-rootfs.txt +++ b/buildroot/docs/manual/customize-rootfs.txt @@ -22,6 +22,12 @@ A filesystem overlay is a tree of files that is copied directly etc., files called +.empty+ and files ending in +~+ are excluded from the copy. + +When +BR2_ROOTFS_MERGED_USR+ is enabled, then the overlay must not + contain the '/bin', '/lib' or '/sbin' directories, as Buildroot will + create them as symbolic links to the relevant folders in '/usr'. In + such a situation, should the overlay have any programs or libraries, + they should be placed in '/usr/bin', '/usr/sbin' and '/usr/lib'. ++ As shown in xref:customize-dir-structure[], the recommended path for this overlay is +board///rootfs-overlay+. @@ -100,6 +106,15 @@ To enable this feature, enable config option +System configuration+ menu. If you specify a relative path, it will be relative to the root of the Buildroot tree. + +Custom skeletons don't need to contain the '/bin', '/lib' or '/sbin' + directories, since they are created automatically during the build. + When +BR2_ROOTFS_MERGED_USR+ is enabled, then the custom skeleton must + not contain the '/bin', '/lib' or '/sbin' directories, as Buildroot + will create them as symbolic links to the relevant folders in '/usr'. + In such a situation, should the skeleton have any programs or + libraries, they should be placed in '/usr/bin', '/usr/sbin' and + '/usr/lib'. ++ This method is not recommended because it duplicates the entire skeleton, which prevents taking advantage of the fixes or improvements brought to the default skeleton in later Buildroot releases. diff --git a/buildroot/docs/manual/developers.txt b/buildroot/docs/manual/developers.txt index 0da499e10..7058d57b2 100644 --- a/buildroot/docs/manual/developers.txt +++ b/buildroot/docs/manual/developers.txt @@ -6,7 +6,7 @@ The main Buildroot directory contains a file named +DEVELOPERS+ that lists the developers involved with various areas of Buildroot. Thanks -to this file, the +get-developer+ tool allows to: +to this file, the +get-developers+ tool allows to: - Calculate the list of developers to whom patches should be sent, by parsing the patches and matching the modified files with the @@ -26,21 +26,21 @@ to include in his patch the appropriate modification to the The +DEVELOPERS+ file format is documented in detail inside the file itself. -The +get-developer+ tool, located in +utils/+ allows to use +The +get-developers+ tool, located in +utils/+ allows to use the +DEVELOPERS+ file for various tasks: - When passing one or several patches as command line argument, - +get-developer+ will return the appropriate +git send-email+ + +get-developers+ will return the appropriate +git send-email+ command. If the +-e+ option is passed, only the email addresses are printed in a format suitable for +git send-email --cc-cmd+. -- When using the +-a + command line option, +get-developer+ will +- When using the +-a + command line option, +get-developers+ will return the list of developers in charge of the given architecture. -- When using the +-p + command line option, +get-developer+ +- When using the +-p + command line option, +get-developers+ will return the list of developers in charge of the given package. -- When using the +-c+ command line option, +get-developer+ will look +- When using the +-c+ command line option, +get-developers+ will look at all files under version control in the Buildroot repository, and list the ones that are not handled by any developer. The purpose of this option is to help completing the +DEVELOPERS+ file. diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 75b70d60a..bc5aa774d 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,9 +1,9 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Integration with Eclipse
8.12. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Frequently Asked Questions & Troubleshooting
10.1. The boot hangs after Starting network…
10.2. Why is there no compiler on the target?
10.3. Why are there no development files on the target?
10.4. Why is there no documentation on the target?
10.5. Why are some packages not visible in the Buildroot config menu?
10.6. Why not use the target directory as a chroot directory?
10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
10.8. How to speed-up the build process?
11. Known issues
12. Legal notice and licensing
12.1. Complying with open source licenses
12.2. Complying with the Buildroot license
13. Beyond Buildroot
13.1. Boot the generated images
13.2. Chroot
III. Developer guide
14. How Buildroot works
15. Coding style
15.1. Config.in file
15.2. The .mk file
15.3. The documentation
15.4. Support scripts
16. Adding support for a particular board
17. Adding new packages to Buildroot
17.1. Package directory
17.2. Config files
17.3. The .mk file
17.4. The .hash file
17.5. Infrastructure for packages with specific build systems
17.6. Infrastructure for autotools-based packages
17.7. Infrastructure for CMake-based packages
17.8. Infrastructure for Python packages
17.9. Infrastructure for LuaRocks-based packages
17.10. Infrastructure for Perl/CPAN packages
17.11. Infrastructure for virtual packages
17.12. Infrastructure for packages using kconfig for configuration files
17.13. Infrastructure for rebar-based packages
17.14. Infrastructure for Waf-based packages
17.15. Infrastructure for Meson-based packages
17.16. Integration of Cargo-based packages
17.17. Infrastructure for Go packages
17.18. Infrastructure for packages building kernel modules
17.19. Infrastructure for asciidoc documents
17.20. Infrastructure specific to the Linux kernel package
17.21. Hooks available in the various build steps
17.22. Gettext integration and interaction with packages
17.23. Tips and tricks
17.24. Conclusion
18. Patching a package
18.1. Providing patches
18.2. How patches are applied
18.3. Format and licensing of the package patches
18.4. Integrating patches found on the Web
19. Download infrastructure
20. Debugging Buildroot
21. Contributing to Buildroot
21.1. Reproducing, analyzing and fixing bugs
21.2. Analyzing and fixing autobuild failures
21.3. Reviewing and testing patches
21.4. Work on items from the TODO list
21.5. Submitting patches
21.6. Reporting issues/bugs or getting help
22. DEVELOPERS file and get-developers
IV. Appendix
23. Makedev syntax documentation
24. Makeusers syntax documentation
25. Migrating from older Buildroot versions
25.1. Migrating to 2016.11
25.2. Migrating to 2017.08

List of Examples

17.1. Config script: divine package
17.2. Config script: imagemagick package:

Buildroot 2018.11.1 manual generated on 2018-12-19 -22:05:45 UTC from git revision 29675f8e54

The Buildroot manual is written by the Buildroot developers. +The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Integration with Eclipse
8.12. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Frequently Asked Questions & Troubleshooting
10.1. The boot hangs after Starting network…
10.2. Why is there no compiler on the target?
10.3. Why are there no development files on the target?
10.4. Why is there no documentation on the target?
10.5. Why are some packages not visible in the Buildroot config menu?
10.6. Why not use the target directory as a chroot directory?
10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
10.8. How to speed-up the build process?
11. Known issues
12. Legal notice and licensing
12.1. Complying with open source licenses
12.2. Complying with the Buildroot license
13. Beyond Buildroot
13.1. Boot the generated images
13.2. Chroot
III. Developer guide
14. How Buildroot works
15. Coding style
15.1. Config.in file
15.2. The .mk file
15.3. The documentation
15.4. Support scripts
16. Adding support for a particular board
17. Adding new packages to Buildroot
17.1. Package directory
17.2. Config files
17.3. The .mk file
17.4. The .hash file
17.5. Infrastructure for packages with specific build systems
17.6. Infrastructure for autotools-based packages
17.7. Infrastructure for CMake-based packages
17.8. Infrastructure for Python packages
17.9. Infrastructure for LuaRocks-based packages
17.10. Infrastructure for Perl/CPAN packages
17.11. Infrastructure for virtual packages
17.12. Infrastructure for packages using kconfig for configuration files
17.13. Infrastructure for rebar-based packages
17.14. Infrastructure for Waf-based packages
17.15. Infrastructure for Meson-based packages
17.16. Integration of Cargo-based packages
17.17. Infrastructure for Go packages
17.18. Infrastructure for packages building kernel modules
17.19. Infrastructure for asciidoc documents
17.20. Infrastructure specific to the Linux kernel package
17.21. Hooks available in the various build steps
17.22. Gettext integration and interaction with packages
17.23. Tips and tricks
17.24. Conclusion
18. Patching a package
18.1. Providing patches
18.2. How patches are applied
18.3. Format and licensing of the package patches
18.4. Integrating patches found on the Web
19. Download infrastructure
20. Debugging Buildroot
21. Contributing to Buildroot
21.1. Reproducing, analyzing and fixing bugs
21.2. Analyzing and fixing autobuild failures
21.3. Reviewing and testing patches
21.4. Work on items from the TODO list
21.5. Submitting patches
21.6. Reporting issues/bugs or getting help
22. DEVELOPERS file and get-developers
IV. Appendix
23. Makedev syntax documentation
24. Makeusers syntax documentation
25. Migrating from older Buildroot versions
25.1. Migrating to 2016.11
25.2. Migrating to 2017.08

List of Examples

17.1. Config script: divine package
17.2. Config script: imagemagick package:

Buildroot 2019.02.3 manual generated on 2019-06-07 +07:39:11 UTC from git revision 3e8b918b87

The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the -COPYING -file in the Buildroot sources for the full text of this license.

Copyright © 2004-2018 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of +COPYING +file in the Buildroot sources for the full text of this license.

Copyright © 2004-2019 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of building a complete Linux system for an embedded system, using cross-compilation.

In order to achieve this, Buildroot is able to generate a cross-compilation toolchain, a root filesystem, a Linux kernel image @@ -16,8 +16,8 @@ processors everyone is used to having in his PC. They can be PowerPC processors, MIPS processors, ARM processors, etc.

Buildroot supports numerous processors and their variants; it also comes with default configurations for several boards available off-the-shelf. Besides this, a number of third-party projects are based on, -or develop their BSP [1] or -SDK [2] on top of Buildroot.


[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the +or develop their BSP [1] or +SDK [2] on top of Buildroot.


[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the compilation, certain standard Linux utilities are expected to be already installed on the host system. Below you will find an overview of the mandatory and optional packages (note that package names may vary @@ -52,7 +52,7 @@ Build tools:

  • cpio
  • -python (version 2.6 or any later) +python (version 2.7 or any later)
  • unzip
  • @@ -272,7 +272,7 @@ processor. Under most Linux systems, the compilation toolchain uses the GNU libc (glibc) as the C standard library. This compilation toolchain is called the "host compilation toolchain". The machine on which it is running, and on which you’re working, is called the "host -system" [3].

    The compilation toolchain is provided by your distribution, and +system" [3].

    The compilation toolchain is provided by your distribution, and Buildroot has nothing to do with it (other than using it to build a cross-compilation toolchain and other tools that are run on the development host).

    As said above, the compilation toolchain that comes with your system @@ -547,7 +547,7 @@ The third solution is systemd. http://www.freedesktop.org/wiki/Software/systemd.

    • The solution recommended by Buildroot developers is to use the BusyBox init as it is sufficient for most embedded -systems. systemd can be used for more complex situations.


    [3] This terminology differs from what is used by GNU +systems. systemd can be used for more complex situations.


    [3] This terminology differs from what is used by GNU configure, where the host is the machine on which the application will run (which is usually the same as target)

    Chapter 7. Configuration of other components

    Before attempting to modify any of the components below, make sure you have already configured Buildroot itself, and have enabled the @@ -1018,12 +1018,18 @@ build the package

    install-target

    target package: Run the installation of the package in the target directory, if necessary

    install

    target package: Run the 2 previous installation commands

    host package: Run the installation of the package in the host -directory

    Additionally, there are some other useful make targets:

    command/target Description

    show-depends

    Displays the dependencies required to build the -package

    graph-depends

    Generate a dependency graph of the package, in the +directory

    Additionally, there are some other useful make targets:

    \n" % current_version) + # Latest version + if pkg.latest_version[0] == RM_API_STATUS_ERROR: + td_class.append("version-error") + if pkg.latest_version[1] is None: + td_class.append("version-unknown") + elif pkg.latest_version[1] != pkg.current_version: + td_class.append("version-needs-update") + else: + td_class.append("version-good") + + if pkg.latest_version[0] == RM_API_STATUS_ERROR: + latest_version_text = "Error" + elif pkg.latest_version[0] == RM_API_STATUS_NOT_FOUND: + latest_version_text = "Not found" + else: + if pkg.latest_version[1] is None: + latest_version_text = "Found, but no version" + else: + latest_version_text = "%s" % \ + (pkg.latest_version[2], str(pkg.latest_version[1])) + + latest_version_text += "
    " + + if pkg.latest_version[0] == RM_API_STATUS_FOUND_BY_DISTRO: + latest_version_text += "found by distro" + else: + latest_version_text += "found by guess" + + f.write(" \n" % + (" ".join(td_class), latest_version_text)) + # Warnings td_class = ["centered"] if pkg.warnings == 0: @@ -502,6 +635,7 @@ def dump_html_all_pkgs(f, packages): + @@ -532,6 +666,16 @@ def dump_html_stats(f, stats): stats["no-hash"]) f.write(" \n" % stats["patches"]) + f.write("\n" % + stats["rmo-mapping"]) + f.write("\n" % + stats["rmo-no-mapping"]) + f.write("\n" % + stats["version-uptodate"]) + f.write("\n" % + stats["version-not-uptodate"]) + f.write("\n" % + stats["version-unknown"]) f.write("
    command/target Description

    show-depends

    Displays the first-order dependencies required to build the +package

    show-recursive-depends

    Recursively displays the dependencies + required to build the package

    show-rdepends

    Displays the first-order reverse dependencies of + the package (i.e packages that directly depend on it)

    show-recursive-rdepends

    Recursively displays the reverse + dependencies of the package (i.e the packages that depend on it, + directly or indirectly)

    graph-depends

    Generate a dependency graph of the package, in the context of the current Buildroot configuration. See this section Section 8.8, “Graphing the dependencies between packages†for more details about dependency -graphs.

    dirclean

    Remove the whole package build directory

    reinstall

    Re-run the install commands

    rebuild

    Re-run the compilation commands - this only makes +graphs.

    graph-rdepends

    Generate a graph of this package reverse + dependencies (i.e the packages that depend on it, directly or + indirectly)

    dirclean

    Remove the whole package build directory

    reinstall

    Re-run the install commands

    rebuild

    Re-run the compilation commands - this only makes sense when using the OVERRIDE_SRCDIR feature or when you modified a file directly in the build directory

    reconfigure

    Re-run the configure commands, then rebuild - this only makes sense when using the OVERRIDE_SRCDIR feature or when you modified a @@ -1046,10 +1052,19 @@ an appropriate solution, because this directory is removed on <pkg>_OVERRIDE_SRCDIR mechanism. Buildroot reads an override file, which allows the user to tell Buildroot the location of the -source for certain packages. By default this override file is named -local.mk and located in the top directory of the Buildroot source -tree, but a different location can be specified through the -BR2_PACKAGE_OVERRIDE_FILE configuration option.

    In this override file, Buildroot expects to find lines of the form:

    <pkg1>_OVERRIDE_SRCDIR = /path/to/pkg1/sources
+source for certain packages.
    The default location of the override file is $(CONFIG_DIR)/local.mk,
+as defined by the BR2_PACKAGE_OVERRIDE_FILE configuration option.
+$(CONFIG_DIR) is the location of the Buildroot .config file, so
+local.mk by default lives side-by-side with the .config file,
+which means:
    • 
+In the top-level Buildroot source directory for in-tree builds
+  (i.e., when O= is not used)
+
    • 
+In the out-of-tree directory for out-of-tree builds (i.e., when
+  O= is used)
+
    If a different location than these defaults is required, it can be
+specified through the BR2_PACKAGE_OVERRIDE_FILE configuration
+option.
    In this override file, Buildroot expects to find lines of the form:
    <pkg1>_OVERRIDE_SRCDIR = /path/to/pkg1/sources
 <pkg2>_OVERRIDE_SRCDIR = /path/to/pkg2/sources
    For example:
    LINUX_OVERRIDE_SRCDIR = /home/bob/linux/
 BUSYBOX_OVERRIDE_SRCDIR = /home/bob/busybox/
    When Buildroot finds that for a given package, an
 <pkg>_OVERRIDE_SRCDIR has been defined, it will no longer attempt to
@@ -1439,7 +1454,11 @@ Root filesystem overlays (BR2_ROOTFS_OVERLAY)
   it will be relative to the root of the Buildroot tree. Hidden
   directories of version control systems, like .git, .svn, .hg,
   etc., files called .empty and files ending in ~ are excluded from
-  the copy.
    As shown in Section 9.1, “Recommended directory structureâ€, the recommended path for
+  the copy.
    When BR2_ROOTFS_MERGED_USR is enabled, then the overlay must not
+  contain the /bin, /lib or /sbin directories, as Buildroot will
+  create them as symbolic links to the relevant folders in /usr.  In
+  such a situation, should the overlay have any programs or libraries,
+  they should be placed in /usr/bin, /usr/sbin and /usr/lib.
    As shown in Section 9.1, “Recommended directory structureâ€, the recommended path for
   this overlay is board/<company>/<boardname>/rootfs-overlay.
    
 Post-build scripts (BR2_ROOTFS_POST_BUILD_SCRIPT)
 
    Post-build scripts are shell scripts called after Buildroot builds
@@ -1497,7 +1516,14 @@ Custom target skeleton (BR2_ROOTFS_SKELETON_CUSTOM)
   BR2_ROOTFS_SKELETON_CUSTOM and set BR2_ROOTFS_SKELETON_CUSTOM_PATH
   to the path of your custom skeleton. Both options are available in the
   System configuration menu. If you specify a relative path, it will
-  be relative to the root of the Buildroot tree.
    This method is not recommended because it duplicates the entire
+  be relative to the root of the Buildroot tree.
    Custom skeletons don’t need to contain the /bin, /lib or /sbin
+  directories, since they are created automatically during the build.
+  When BR2_ROOTFS_MERGED_USR is enabled, then the custom skeleton must
+  not contain the /bin, /lib or /sbin directories, as Buildroot
+  will create them as symbolic links to the relevant folders in /usr.
+  In such a situation, should the skeleton have any programs or
+  libraries, they should be placed in /usr/bin, /usr/sbin and
+  /usr/lib.
    This method is not recommended because it duplicates the entire
   skeleton, which prevents taking advantage of the fixes or improvements
   brought to the default skeleton in later Buildroot releases.
    
 Post-fakeroot scripts (BR2_ROOTFS_POST_FAKEROOT_SCRIPT)
@@ -2653,7 +2679,7 @@ flags.
 The argument to be given to LIBFOO_CONFIG_SCRIPTS is the file name(s)
 of the shell script(s) needing fixing. All these names are relative to
 $(STAGING_DIR)/usr/bin and if needed multiple names can be given.
    In addition, the scripts listed in LIBFOO_CONFIG_SCRIPTS are removed
-from $(TARGET_DIR)/usr/bin, since they are not needed on the target.
    Example 17.1. Config script: divine package
    Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.
    So its fixup would be:
    DIVINE_CONFIG_SCRIPTS = divine-config

    Example 17.2. Config script: imagemagick package:
    Package imagemagick installs the following scripts:
+from $(TARGET_DIR)/usr/bin, since they are not needed on the target.
    Example 17.1. Config script: divine package
    Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.
    So its fixup would be:
    DIVINE_CONFIG_SCRIPTS = divine-config

    Example 17.2. Config script: imagemagick package:
    Package imagemagick installs the following scripts:
 $(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config
    So it’s fixup would be:
    IMAGEMAGICK_CONFIG_SCRIPTS = \
    Magick-config Magick++-config \
    MagickCore-config MagickWand-config Wand-config

    On line 14, we specify the list of dependencies this package relies
@@ -3393,6 +3419,12 @@ Similarly, it is not needed to add host-setuptools
 optionally be defined, depending on the package’s needs. Many of them
 are only useful in very specific cases, typical packages will
 therefore only use a few of them, or none.
    • 
+PYTHON_FOO_SUBDIR may contain the name of a subdirectory inside the
+  package that contains the main setup.py file. This is useful,
+  if for example, the main setup.py file is not at the root of
+  the tree extracted by the tarball. If HOST_PYTHON_FOO_SUBDIR is not
+  specified, it defaults to PYTHON_FOO_SUBDIR.
+
    • 
 PYTHON_FOO_ENV, to specify additional environment variables to
   pass to the Python setup.py script (for both the build and install
   steps). Note that the infrastructure is automatically passing
@@ -3500,7 +3532,15 @@ makes the link between the two names.
      On line 9, we declare our dependenci
 are built before the build process of our package starts.
      On lines 11-12, we tell Buildroot to pass custom options to LuaRocks when it is
 building the package.
      On lines 13-14, we specify the licensing terms for the package.
      Finally, on line 16, we invoke the luarocks-package
 macro that generates all the Makefile rules that actually allows the
-package to be built.
    17.9.2. luarocks-package reference
    LuaRocks is a deployment and management system for Lua modules, and supports
+package to be built.
    Most of these details can be retrieved from the rock and rockspec.
+So, this file and the Config.in file can be generated by running the
+command luarocks buildroot foo lua-foo in the Buildroot
+directory. This command runs a specific Buildroot addon of luarocks
+that will automatically generate a Buildroot package. The result must
+still be manually inspected and possibly modified.
    • 
+The package/Config.in file has to be updated manually to include the
+  generated Config.in files.
+
    17.9.2. luarocks-package reference
    LuaRocks is a deployment and management system for Lua modules, and supports
 various build.type: builtin, make and cmake. In the context of
 Buildroot, the luarocks-package infrastructure only supports the builtin
 mode. LuaRocks packages that use the make or cmake build mechanisms
@@ -3790,6 +3830,12 @@ cases, typical packages will therefore only use a few of them.
    
 ERLANG_FOOBAR_REBAR_ENV, to specify additional environment
   variables to pass to the rebar utility.
+
  • 
+ERLANG_FOOBAR_KEEP_DEPENDENCIES, to keep the dependencies
+  described in the rebar.config file. Valid values are YES or NO
+  (the default). Unless this variable is set to YES, the rebar
+  infrastructure removes such dependencies in a post-patch hook to
+  ensure rebar does not download nor compile them.
 
    • With the rebar infrastructure, all the steps required to build
 and install the packages are already defined, and they generally work
 well for most rebar-based packages. However, when required, it is
@@ -3829,10 +3875,16 @@ the generic infrastructure also exist in the Waf infrastructure:
 LIBFOO_SUBDIR, LIBFOO_DEPENDENCIES, LIBFOO_INSTALL_STAGING,
 LIBFOO_INSTALL_TARGET.
    An additional variable, specific to the Waf infrastructure, can
 also be defined.
    • 
+LIBFOO_SUBDIR may contain the name of a subdirectory inside the
+  package that contains the main wscript file. This is useful,
+  if for example, the main wscript file is not at the root of
+  the tree extracted by the tarball. If HOST_LIBFOO_SUBDIR is not
+  specified, it defaults to LIBFOO_SUBDIR.
+
    • 
 LIBFOO_NEEDS_EXTERNAL_WAF can be set to YES or NO to tell
   Buildroot to use the bundled waf executable. If set to NO, the
   default, then Buildroot will use the waf executable provided in the
-  package source tree; if set to YES, then Buidlroot will download,
+  package source tree; if set to YES, then Buildroot will download,
   install waf as a host tool and use it to build the package.
 
    • 
 LIBFOO_WAF_OPTS, to specify additional options to pass to the
@@ -3899,6 +3951,12 @@ infrastructure also exist in the Meson infrastructure: FOO
 FOO_INSTALL_STAGING, FOO_INSTALL_TARGET.
      A few additional variables, specific to the Meson infrastructure, can also be
 defined. Many of them are only useful in very specific cases, typical packages
 will therefore only use a few of them.
      • 
+FOO_SUBDIR may contain the name of a subdirectory inside the
+  package that contains the main meson.build file. This is useful,
+  if for example, the main meson.build file is not at the root of
+  the tree extracted by the tarball. If HOST_FOO_SUBDIR is not
+  specified, it defaults to FOO_SUBDIR.
+
      • 
 FOO_CONF_ENV, to specify additional environment variables to pass to
   meson for the configuration step. By default, empty.
 
      • 
@@ -3908,6 +3966,9 @@ will therefore only use a few of them.
          FOO_NINJA_ENV, to specify additional environment variables to pass to
   ninja, meson companion tool in charge of the build operations. By default,
   empty.
+
        • 
+FOO_NINJA_OPTS, to specify a space-separated list of targets to build. By
+  default, empty, to build the default target(s).
 
    17.16. Integration of Cargo-based packages
    Cargo is the package manager for the Rust programming language. It allows the
 user to build programs or libraries written in Rust, but it also downloads and
 manages their dependencies, to ensure repeatable builds. Cargo packages are
@@ -4833,12 +4894,23 @@ the git repository, to make it easy to find back in the history how
 and why things have changed, and to make it possible to use git
 bisect to locate the origin of a problem.
    First of all, it is essential that the patch has a good commit
 message. The commit message should start with a separate line with a
-brief summary of the change, starting with the name of the affected
-package. The body of the commit message should describe why this
+brief summary of the change, prefixed by the area touched by the
+patch. A few examples of good commit titles:
    • 
+package/linuxptp: bump version to 2.0
+
    • 
+configs/imx23evk: bump Linux version to 4.19
+
    • 
+package/pkg-generic: postpone evaluation of dependency conditions
+
    • 
+boot/uboot: needs host-{flex,bison}
+
    • 
+support/testing: add python-ubjson tests
+
    The description that follows the prefix should start with a lower case
+letter (i.e "bump", "needs", "postpone", "add" in the above examples).
    Second, the body of the commit message should describe why this
 change is needed, and if necessary also give details about how it
 was done. When writing the commit message, think of how the reviewers
 will read it, but also think about how you will read it when you look
-at this change again a few years down the line.
    Second, the patch itself should do only one change, but do it
+at this change again a few years down the line.
    Third, the patch itself should do only one change, but do it
 completely. Two unrelated or weakly related changes should usually be
 done in two separate patches. This usually means that a patch affects
 only a single package. If several changes are related, it is often
@@ -4916,7 +4988,7 @@ large number of commits in the series;
 
  • 
 deep impact of the changes in the rest of the project;
 
  • 
-RFC [4];
+RFC [4];
 
  • 
 whenever you feel it will help presenting your work, your choices,
   the review process, etc.
@@ -4998,9 +5070,9 @@ pastebin service. Note that not all available pastebin services will
 preserve Unix-style line terminators when downloading raw pastes.
 Following pastebin services are known to work correctly:
 - https://gist.github.com/
-- http://code.bulix.org/

    • [4] RFC: (Request for comments) change proposal
    Chapter 22. DEVELOPERS file and get-developers
    The main Buildroot directory contains a file named DEVELOPERS that
+- http://code.bulix.org/

    [4] RFC: (Request for comments) change proposal
    Chapter 22. DEVELOPERS file and get-developers
    The main Buildroot directory contains a file named DEVELOPERS that
 lists the developers involved with various areas of Buildroot. Thanks
-to this file, the get-developer tool allows to:
    • 
+to this file, the get-developers tool allows to:
      • 
 Calculate the list of developers to whom patches should be sent, by
   parsing the patches and matching the modified files with the
   relevant developers. See Section 21.5, “Submitting patches†for details.
@@ -5014,20 +5086,20 @@ functionality in Buildroot, to register themselves in the 
 file. As an example, we expect a developer contributing a new package
 to include in his patch the appropriate modification to the
 DEVELOPERS file.
        The DEVELOPERS file format is documented in detail inside the file
-itself.
        The get-developer tool, located in utils/ allows to use
+itself.
        The get-developers tool, located in utils/ allows to use
 the DEVELOPERS file for various tasks:
        • 
 When passing one or several patches as command line argument,
-  get-developer will return the appropriate git send-email
+  get-developers will return the appropriate git send-email
   command. If the -e option is passed, only the email addresses are
   printed in a format suitable for git send-email --cc-cmd.
 
        • 
-When using the -a <arch> command line option, get-developer will
+When using the -a <arch> command line option, get-developers will
   return the list of developers in charge of the given architecture.
 
        • 
-When using the -p <package> command line option, get-developer
+When using the -p <package> command line option, get-developers
   will return the list of developers in charge of the given package.
 
        • 
-When using the -c command line option, get-developer will look
+When using the -c command line option, get-developers will look
   at all files under version control in the Buildroot repository, and
   list the ones that are not handled by any developer. The purpose of
   this option is to help completing the DEVELOPERS file.
diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf
index cf3fcec04..76215b7e6 100644
Binary files a/buildroot/docs/manual/manual.pdf and b/buildroot/docs/manual/manual.pdf differ
diff --git a/buildroot/docs/manual/manual.text b/buildroot/docs/manual/manual.text
index d89d34508..545202cd9 100644
--- a/buildroot/docs/manual/manual.text
+++ b/buildroot/docs/manual/manual.text
@@ -161,16 +161,16 @@ List of Examples
 
 ---------------------------------------------------------------------
 
-Buildroot 2018.11.1 manual generated on 2018-12-19 22:05:51 UTC from
-git revision 29675f8e54
+Buildroot 2019.02.3 manual generated on 2019-06-07 07:39:18 UTC from
+git revision 3e8b918b87
 
 The Buildroot manual is written by the Buildroot developers. It is
 licensed under the GNU General Public License, version 2. Refer to
 the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id=
-29675f8e54d36660a7c0a0c3b54b9cc612395e9a] file in the Buildroot
+3e8b918b871f484b3ef57832aa41982e368d74c2] file in the Buildroot
 sources for the full text of this license.
 
-Copyright © 2004-2018 The Buildroot developers
+Copyright © 2004-2019 The Buildroot developers
 
 Part I. Getting started
 
@@ -244,7 +244,7 @@ vary between distributions).
       + perl (version 5.8.7 or any later)
       + tar
       + cpio
-      + python (version 2.6 or any later)
+      + python (version 2.7 or any later)
       + unzip
       + rsync
       + file (must be in /usr/bin/file)
@@ -1716,31 +1716,54 @@ The package build targets are (in the order they are executed):
 Additionally, there are some other useful make targets:
 
 +------------------------------------------------------------+
-|  command/   |Description                                   |
-|   target    |                                              |
-|-------------+----------------------------------------------|
-|show-depends |Displays the dependencies required to build   |
-|             |the package                                   |
-|-------------+----------------------------------------------|
-|graph-depends|Generate a dependency graph of the package, in|
-|             |the context of the current Buildroot          |
-|             |configuration. See this section Section 8.8,  |
-|             |“Graphing the dependencies between packages† |
-|             |for more details about dependency graphs.     |
-|-------------+----------------------------------------------|
-|  dirclean   |Remove the whole package build directory      |
-|-------------+----------------------------------------------|
-|  reinstall  |Re-run the install commands                   |
-|-------------+----------------------------------------------|
-|   rebuild   |Re-run the compilation commands - this only   |
-|             |makes sense when using the OVERRIDE_SRCDIR    |
-|             |feature or when you modified a file directly  |
-|             |in the build directory                        |
-|-------------+----------------------------------------------|
-| reconfigure |Re-run the configure commands, then rebuild - |
-|             |this only makes sense when using the          |
-|             |OVERRIDE_SRCDIR feature or when you modified a|
-|             |file directly in the build directory          |
+|    command/target     |Description                         |
+|-----------------------+------------------------------------|
+|     show-depends      |Displays the first-order            |
+|                       |dependencies required to build the  |
+|                       |package                             |
+|-----------------------+------------------------------------|
+|show-recursive-depends |Recursively displays the            |
+|                       |dependencies required to build the  |
+|                       |package                             |
+|-----------------------+------------------------------------|
+|     show-rdepends     |Displays the first-order reverse    |
+|                       |dependencies of the package (i.e    |
+|                       |packages that directly depend on it)|
+|-----------------------+------------------------------------|
+|show-recursive-rdepends|Recursively displays the reverse    |
+|                       |dependencies of the package (i.e the|
+|                       |packages that depend on it, directly|
+|                       |or indirectly)                      |
+|-----------------------+------------------------------------|
+|     graph-depends     |Generate a dependency graph of the  |
+|                       |package, in the context of the      |
+|                       |current Buildroot configuration. See|
+|                       |this section Section 8.8, “Graphing |
+|                       |the dependencies between packages† |
+|                       |for more details about dependency   |
+|                       |graphs.                             |
+|-----------------------+------------------------------------|
+|    graph-rdepends     |Generate a graph of this package    |
+|                       |reverse dependencies (i.e the       |
+|                       |packages that depend on it, directly|
+|                       |or indirectly)                      |
+|-----------------------+------------------------------------|
+|       dirclean        |Remove the whole package build      |
+|                       |directory                           |
+|-----------------------+------------------------------------|
+|       reinstall       |Re-run the install commands         |
+|-----------------------+------------------------------------|
+|        rebuild        |Re-run the compilation commands -   |
+|                       |this only makes sense when using the|
+|                       |OVERRIDE_SRCDIR feature or when you |
+|                       |modified a file directly in the     |
+|                       |build directory                     |
+|-----------------------+------------------------------------|
+|      reconfigure      |Re-run the configure commands, then |
+|                       |rebuild - this only makes sense when|
+|                       |using the OVERRIDE_SRCDIR feature or|
+|                       |when you modified a file directly in|
+|                       |the build directory                 |
 +------------------------------------------------------------+
 
 8.12.6. Using Buildroot during development
@@ -1770,10 +1793,21 @@ clean.
 Therefore, Buildroot provides a specific mechanism for this use case:
 the _OVERRIDE_SRCDIR mechanism. Buildroot reads an override
 file, which allows the user to tell Buildroot the location of the
-source for certain packages. By default this override file is named
-local.mk and located in the top directory of the Buildroot source
-tree, but a different location can be specified through the
-BR2_PACKAGE_OVERRIDE_FILE configuration option.
+source for certain packages.
+
+The default location of the override file is $(CONFIG_DIR)/local.mk,
+as defined by the BR2_PACKAGE_OVERRIDE_FILE configuration option. $
+(CONFIG_DIR) is the location of the Buildroot .config file, so
+local.mk by default lives side-by-side with the .config file, which
+means:
+
+  * In the top-level Buildroot source directory for in-tree builds
+    (i.e., when O= is not used)
+  * In the out-of-tree directory for out-of-tree builds (i.e., when O
+    = is used)
+
+If a different location than these defaults is required, it can be
+specified through the BR2_PACKAGE_OVERRIDE_FILE configuration option.
 
 In this override file, Buildroot expects to find lines of the form:
 
@@ -2346,6 +2380,13 @@ Root filesystem overlays (BR2_ROOTFS_OVERLAY)
     .svn, .hg, etc., files called .empty and files ending in ~ are
     excluded from the copy.
 
+    When BR2_ROOTFS_MERGED_USR is enabled, then the overlay must not
+    contain the /bin, /lib or /sbin directories, as Buildroot will
+    create them as symbolic links to the relevant folders in /usr. In
+    such a situation, should the overlay have any programs or
+    libraries, they should be placed in /usr/bin, /usr/sbin and /usr/
+    lib.
+
     As shown in Section 9.1, “Recommended directory structureâ€, the
     recommended path for this overlay is board///
     rootfs-overlay.
@@ -2431,6 +2472,15 @@ Custom target skeleton (BR2_ROOTFS_SKELETON_CUSTOM)
     menu. If you specify a relative path, it will be relative to the
     root of the Buildroot tree.
 
+    Custom skeletons don’t need to contain the /bin, /lib or /sbin
+    directories, since they are created automatically during the
+    build. When BR2_ROOTFS_MERGED_USR is enabled, then the custom
+    skeleton must not contain the /bin, /lib or /sbin directories, as
+    Buildroot will create them as symbolic links to the relevant
+    folders in /usr. In such a situation, should the skeleton have
+    any programs or libraries, they should be placed in /usr/bin, /
+    usr/sbin and /usr/lib.
+
     This method is not recommended because it duplicates the entire
     skeleton, which prevents taking advantage of the fixes or
     improvements brought to the default skeleton in later Buildroot
@@ -4877,6 +4927,11 @@ can optionally be defined, depending on the package’s needs. Many of
 them are only useful in very specific cases, typical packages will
 therefore only use a few of them, or none.
 
+  * PYTHON_FOO_SUBDIR may contain the name of a subdirectory inside
+    the package that contains the main setup.py file. This is useful,
+    if for example, the main setup.py file is not at the root of the
+    tree extracted by the tarball. If HOST_PYTHON_FOO_SUBDIR is not
+    specified, it defaults to PYTHON_FOO_SUBDIR.
   * PYTHON_FOO_ENV, to specify additional environment variables to
     pass to the Python setup.py script (for both the build and
     install steps). Note that the infrastructure is automatically
@@ -5046,6 +5101,16 @@ Finally, on line 16, we invoke the luarocks-package macro that
 generates all the Makefile rules that actually allows the package to
 be built.
 
+Most of these details can be retrieved from the rock and rockspec.
+So, this file and the Config.in file can be generated by running the
+command luarocks buildroot foo lua-foo in the Buildroot directory.
+This command runs a specific Buildroot addon of luarocks that will
+automatically generate a Buildroot package. The result must still be
+manually inspected and possibly modified.
+
+  * The package/Config.in file has to be updated manually to include
+    the generated Config.in files.
+
 17.9.2. luarocks-package reference
 
 LuaRocks is a deployment and management system for Lua modules, and
@@ -5491,6 +5556,11 @@ typical packages will therefore only use a few of them.
 
   * ERLANG_FOOBAR_REBAR_ENV, to specify additional environment
     variables to pass to the rebar utility.
+  * ERLANG_FOOBAR_KEEP_DEPENDENCIES, to keep the dependencies
+    described in the rebar.config file. Valid values are YES or NO
+    (the default). Unless this variable is set to YES, the rebar
+    infrastructure removes such dependencies in a post-patch hook to
+    ensure rebar does not download nor compile them.
 
 With the rebar infrastructure, all the steps required to build and
 install the packages are already defined, and they generally work
@@ -5559,10 +5629,15 @@ LIBFOO_INSTALL_TARGET.
 An additional variable, specific to the Waf infrastructure, can also
 be defined.
 
+  * LIBFOO_SUBDIR may contain the name of a subdirectory inside the
+    package that contains the main wscript file. This is useful, if
+    for example, the main wscript file is not at the root of the tree
+    extracted by the tarball. If HOST_LIBFOO_SUBDIR is not specified,
+    it defaults to LIBFOO_SUBDIR.
   * LIBFOO_NEEDS_EXTERNAL_WAF can be set to YES or NO to tell
     Buildroot to use the bundled waf executable. If set to NO, the
     default, then Buildroot will use the waf executable provided in
-    the package source tree; if set to YES, then Buidlroot will
+    the package source tree; if set to YES, then Buildroot will
     download, install waf as a host tool and use it to build the
     package.
   * LIBFOO_WAF_OPTS, to specify additional options to pass to the waf
@@ -5662,6 +5737,11 @@ A few additional variables, specific to the Meson infrastructure, can
 also be defined. Many of them are only useful in very specific cases,
 typical packages will therefore only use a few of them.
 
+  * FOO_SUBDIR may contain the name of a subdirectory inside the
+    package that contains the main meson.build file. This is useful,
+    if for example, the main meson.build file is not at the root of
+    the tree extracted by the tarball. If HOST_FOO_SUBDIR is not
+    specified, it defaults to FOO_SUBDIR.
   * FOO_CONF_ENV, to specify additional environment variables to pass
     to meson for the configuration step. By default, empty.
   * FOO_CONF_OPTS, to specify additional options to pass to meson for
@@ -5669,6 +5749,8 @@ typical packages will therefore only use a few of them.
   * FOO_NINJA_ENV, to specify additional environment variables to
     pass to ninja, meson companion tool in charge of the build
     operations. By default, empty.
+  * FOO_NINJA_OPTS, to specify a space-separated list of targets to
+    build. By default, empty, to build the default target(s).
 
 17.16. Integration of Cargo-based packages
 
@@ -6974,14 +7056,26 @@ use git bisect to locate the origin of a problem.
 
 First of all, it is essential that the patch has a good commit
 message. The commit message should start with a separate line with a
-brief summary of the change, starting with the name of the affected
-package. The body of the commit message should describe why this
+brief summary of the change, prefixed by the area touched by the
+patch. A few examples of good commit titles:
+
+  * package/linuxptp: bump version to 2.0
+  * configs/imx23evk: bump Linux version to 4.19
+  * package/pkg-generic: postpone evaluation of dependency conditions
+  * boot/uboot: needs host-{flex,bison}
+  * support/testing: add python-ubjson tests
+
+The description that follows the prefix should start with a lower
+case letter (i.e "bump", "needs", "postpone", "add" in the above
+examples).
+
+Second, the body of the commit message should describe why this
 change is needed, and if necessary also give details about how it was
 done. When writing the commit message, think of how the reviewers
 will read it, but also think about how you will read it when you look
 at this change again a few years down the line.
 
-Second, the patch itself should do only one change, but do it
+Third, the patch itself should do only one change, but do it
 completely. Two unrelated or weakly related changes should usually be
 done in two separate patches. This usually means that a patch affects
 only a single package. If several changes are related, it is often
@@ -7239,7 +7333,7 @@ Chapter 22. DEVELOPERS file and get-developers
 
 The main Buildroot directory contains a file named DEVELOPERS that
 lists the developers involved with various areas of Buildroot. Thanks
-to this file, the get-developer tool allows to:
+to this file, the get-developers tool allows to:
 
   * Calculate the list of developers to whom patches should be sent,
     by parsing the patches and matching the modified files with the
@@ -7259,23 +7353,23 @@ DEVELOPERS file.
 The DEVELOPERS file format is documented in detail inside the file
 itself.
 
-The get-developer tool, located in utils/ allows to use the
+The get-developers tool, located in utils/ allows to use the
 DEVELOPERS file for various tasks:
 
   * When passing one or several patches as command line argument,
-    get-developer will return the appropriate git send-email command.
-    If the -e option is passed, only the email addresses are printed
-    in a format suitable for git send-email --cc-cmd.
-  * When using the -a  command line option, get-developer will
+    get-developers will return the appropriate git send-email
+    command. If the -e option is passed, only the email addresses are
+    printed in a format suitable for git send-email --cc-cmd.
+  * When using the -a  command line option, get-developers will
     return the list of developers in charge of the given
     architecture.
-  * When using the -p  command line option, get-developer
+  * When using the -p  command line option, get-developers
     will return the list of developers in charge of the given
     package.
-  * When using the -c command line option, get-developer will look at
-    all files under version control in the Buildroot repository, and
-    list the ones that are not handled by any developer. The purpose
-    of this option is to help completing the DEVELOPERS file.
+  * When using the -c command line option, get-developers will look
+    at all files under version control in the Buildroot repository,
+    and 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.
diff --git a/buildroot/docs/manual/manual.txt b/buildroot/docs/manual/manual.txt
index 9d5076047..4eb4ba9bf 100644
--- a/buildroot/docs/manual/manual.txt
+++ b/buildroot/docs/manual/manual.txt
@@ -12,7 +12,7 @@ It is licensed under the GNU General Public License, version 2. Refer to the
 http://git.buildroot.org/buildroot/tree/COPYING?id={sys:git rev-parse HEAD}[COPYING]
 file in the Buildroot sources for the full text of this license.
 
-Copyright (C) 2004-2018 The Buildroot developers
+Copyright (C) 2004-2019 The Buildroot developers
 
 image::logo.png[]
 
diff --git a/buildroot/docs/manual/package-make-target.txt b/buildroot/docs/manual/package-make-target.txt
index c91106e8e..795c7d46d 100644
--- a/buildroot/docs/manual/package-make-target.txt
+++ b/buildroot/docs/manual/package-make-target.txt
@@ -59,14 +59,28 @@ Additionally, there are some other useful make targets:
 |===================================================
 | command/target    | Description
 
-| +show-depends+    | Displays the dependencies required to build the
+| +show-depends+    | Displays the first-order dependencies required to build the
 package
 
+| +show-recursive-depends+ | Recursively displays the dependencies
+  required to build the package
+
+| +show-rdepends+   | Displays the first-order reverse dependencies of
+  the package (i.e packages that directly depend on it)
+
+| +show-recursive-rdepends+ | Recursively displays the reverse
+  dependencies of the package (i.e the packages that depend on it,
+  directly or indirectly)
+
 | +graph-depends+   | Generate a dependency graph of the package, in the
 context of the current Buildroot configuration. See
 xref:graph-depends[this section] for more details about dependency
 graphs.
 
+| +graph-rdepends+  | Generate a graph of this package reverse
+  dependencies (i.e the packages that depend on it, directly or
+  indirectly)
+
 | +dirclean+        | Remove the whole package build directory
 
 | +reinstall+       | Re-run the install commands
diff --git a/buildroot/docs/manual/prerequisite.txt b/buildroot/docs/manual/prerequisite.txt
index 66e1b88f1..dcd3fd255 100644
--- a/buildroot/docs/manual/prerequisite.txt
+++ b/buildroot/docs/manual/prerequisite.txt
@@ -32,7 +32,7 @@ between distributions).
 ** +perl+ (version 5.8.7 or any later)
 ** +tar+
 ** +cpio+
-** +python+ (version 2.6 or any later)
+** +python+ (version 2.7 or any later)
 ** +unzip+
 ** +rsync+
 ** +file+ (must be in +/usr/bin/file+)
diff --git a/buildroot/docs/manual/using-buildroot-development.txt b/buildroot/docs/manual/using-buildroot-development.txt
index 3389a37b3..65a9f1a3f 100644
--- a/buildroot/docs/manual/using-buildroot-development.txt
+++ b/buildroot/docs/manual/using-buildroot-development.txt
@@ -28,10 +28,22 @@ clean+.
 Therefore, Buildroot provides a specific mechanism for this use case:
 the +_OVERRIDE_SRCDIR+ mechanism. Buildroot reads an _override_
 file, which allows the user to tell Buildroot the location of the
-source for certain packages. By default this _override_ file is named
-+local.mk+ and located in the top directory of the Buildroot source
-tree, but a different location can be specified through the
-+BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
+source for certain packages.
+
+The default location of the override file is +$(CONFIG_DIR)/local.mk+,
+as defined by the +BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
++$(CONFIG_DIR)+ is the location of the Buildroot +.config+ file, so
++local.mk+ by default lives side-by-side with the +.config+ file,
+which means:
+
+* In the top-level Buildroot source directory for in-tree builds
+  (i.e., when +O=+ is not used)
+* In the out-of-tree directory for out-of-tree builds (i.e., when
+  +O=+ is used)
+
+If a different location than these defaults is required, it can be
+specified through the +BR2_PACKAGE_OVERRIDE_FILE+ configuration
+option.
 
 In this _override_ file, Buildroot expects to find lines of the form:
 
diff --git a/buildroot/docs/website/association.html b/buildroot/docs/website/association.html
new file mode 100644
index 000000000..0215f8587
--- /dev/null
+++ b/buildroot/docs/website/association.html
@@ -0,0 +1,122 @@
+
+
+
          
+  
          
+    
          
+      
          
+	
          Association
          
+	
          
+
+	  
          The Buildroot open-source project is supported by a
+	  non-profit organization called the Buildroot
+	  Association. The goal of this non-profit
+	  organization is to engage actions to promote, help
+	  develop and democratise the Buildroot project.
          
+
+	  
          This non-profit organization is registered as a legal
+	  entity in France, more precisely as an association loi
+	  1901.
          
+
+	  
          This organization can receive funding from members,
+	  donors and sponsors. This funding is then used to pay for:
          
+
+	  
            
+	    
          • the meeting rooms used during the Buildroot
+	      Developers Meeting twice per year;
            • 
+	    
          • travel expenses for contributors
+	      willing to attend the Buildroot Developers
+	      Meeting, and not covered by their employer to do
+	      so;
            • 
+	    
          • renting servers and services used to host the
+	      Buildroot infrastructure.
            • 
+	  
          
+
+	  
          The bylaws of the association are available
+	  in French
+	  (official) and
+	  in English
+	  (unofficial translation). The association was declared on
+	  March 14, 2016 to the Préfecture de Haute-Garonne
+	  (France) and is registered under the n°W313024278. See this
+	  official receipt
+	  from the French authorities.
          
+
+	  
          Our accounting is fully public, including the bank
+	  account summaries,
+	  see accounting. Numerous
+	  other administrative documents related to the association
+	  are available on
+	  its Github
+	  repository
          
+	
          
+      
          
+
+      
          
+	
          Becoming a member
          
+	
          
+
+	  
          To become a member, an individual or a company simply has
+	  to pay its yearly membership. For an individual, the minimum
+	  membership fee per year is 10 EUR. For a company, the
+	  minimum membership fee per year is 150 EUR. Individuals and
+	  companies are free to give more than the minimum
+	  required.
          
+
+	  
          The membership is valid for the current civil year, i.e
+	  any membership fee paid in 2019 is valid through December 31,
+	  2019.
          
+
+	  
          Once the membership fee is received, it will be listed in
+	  the
+	  association accounting
+	  files, which serve as the official list of
+	  members. Therefore, members accept that their name and the
+	  amount of their membership fee is made public.
          
+
+	  
          There are two possibilities to pay the membership
+	  fee:
          
+
+	  
            
+
+	    
          • A direct wire-transfer to the association bank
+	    account. Since the bank account is located in France, this
+	    is completely free of charge for any person or company
+	    located in the European Union. The IBAN number of the
+	    association bank account is FR53 2004 1010 1615 0958
+	    0P03 772.
            • 
+
+	    
          • A Paypal payment to the association Paypal account,
+	    whose address
+	    is buildroot-association@buildroot.org.
            • 
+
+	  
          
+
+	
          
+      
          
+
+      
          
+	
          Sponsoring the project
          
+	
          
+
+	  
          Companies willing to help the Buildroot project can do so
+	  by making a donation to the Buildroot
+	  Association. In exchange for these donations, companies
+	  will be listed on our Sponsors
+	  page and will be thanked in our release announcements.
          
+
+	  
          As the Buildroot Association is a legal entity
+	  registered in France, it is able to deliver a bill and/or
+	  receipt.
          
+
+	  
          Please
+	  contact buildroot-association@buildroot.org
+	  if you are a company interested in making a donation.
          
+
+	
          
+      
          
+
+    
          
+  
          
+
          
+
+
diff --git a/buildroot/docs/website/copyright.txt b/buildroot/docs/website/copyright.txt
index b8ad36af9..600bf7df7 100644
--- a/buildroot/docs/website/copyright.txt
+++ b/buildroot/docs/website/copyright.txt
@@ -1,6 +1,6 @@
 
 The code and graphics on this website (and it's mirror sites, if any) are
-Copyright (c) 1999-2005 by Erik Andersen, 2006-2018 The Buildroot
+Copyright (c) 1999-2005 by Erik Andersen, 2006-2019 The Buildroot
 developers. All rights reserved.
 
 Documents on this Web site including their graphical elements, design, and
diff --git a/buildroot/docs/website/download.html b/buildroot/docs/website/download.html
index b447251a1..a3d69cdcd 100644
--- a/buildroot/docs/website/download.html
+++ b/buildroot/docs/website/download.html
@@ -8,113 +8,113 @@
     
          Download
          
     
          
 
-      
          Latest long term support release: 2018.02.8
          
+      
          Latest stable / long term support release: 2019.02
          
 
       
          
 	
          
 	  
          
 	    
          
 	      
          
-		
+		
 	      
          
 	      
          
-		
+		
 	      
          
 	    
          
 	  
          
-	  
          buildroot-2018.02.8.tar.gz
          
-	  
          PGP signature
          
+	  
          buildroot-2019.02.tar.gz
          
+	  
          PGP signature
          
 	
          
 	
          
 	  
          
 	    
          
 	      
          
-		
+		
 	      
          
 	      
          
-		
+		
 	      
          
 	    
          
 	  
          
 
-	  
          buildroot-2018.02.8.tar.bz2
          
-	  
          PGP signature
          
-	
          
-      
          
-
-      
          Latest stable release: 2018.11
          
-
-      
          
-	
          
-	  
          
-	    
          
-	      
          
-		
-	      
          
-	      
          
-		
-	      
          
-	    
          
-	  
          
-	  
          buildroot-2018.11.tar.gz
          
-	  
          PGP signature
          
-	
          
-	
          
-	  
          
-	    
          
-	      
          
-		
-	      
          
-	      
          
-		
-	      
          
-	    
          
-	  
          
-
-	  
          buildroot-2018.11.tar.bz2
          
-	  
          PGP signature
          
+	  
          buildroot-2019.02.tar.bz2
          
+	  
          PGP signature
          
 	
          
       
          
 
       This and earlier releases (and their PGP signatures) can always be downloaded from
       http://buildroot.net/downloads/.
     
          
   
        
--->
+
   
        
     
        Source code
        
     
        
diff --git a/buildroot/docs/website/footer.html b/buildroot/docs/website/footer.html
index 2811fc5c0..82901b7ee 100644
--- a/buildroot/docs/website/footer.html
+++ b/buildroot/docs/website/footer.html
@@ -1,6 +1,7 @@
-	
-	
-	
+	
+	
+	
+	
 	
 
 
diff --git a/buildroot/docs/website/header.html b/buildroot/docs/website/header.html
index ef6724f28..e1909291f 100644
--- a/buildroot/docs/website/header.html
+++ b/buildroot/docs/website/header.html
@@ -10,12 +10,12 @@
 
 	Buildroot - Making Embedded Linux Easy
 
-	
+	
 	
 
 	
 
 
@@ -43,6 +43,8 @@
 					 Contribute
        • 
 				
      • 
 					 Sponsors
        • 
+				
      • 
+					 Association
        • 
 				
      • 
 					
 					Download
        • 
diff --git a/buildroot/docs/website/images/zillabit-logo.png b/buildroot/docs/website/images/zillabit-logo.png
new file mode 100644
index 000000000..6a2ac31f5
Binary files /dev/null and b/buildroot/docs/website/images/zillabit-logo.png differ
diff --git a/buildroot/docs/website/js/buildroot.js b/buildroot/docs/website/js/buildroot.js
index ec28cbb75..48fafa67a 100644
--- a/buildroot/docs/website/js/buildroot.js
+++ b/buildroot/docs/website/js/buildroot.js
@@ -1,52 +1,51 @@
 function load_activity(feedurl, divid) {
-    var yqlURL = "https://query.yahooapis.com/v1/public/yql";
-    var yqlQS = "?q=select%20entry%20from%20xml%20where%20url%20%3D%20'";
-    var yqlOPTS = "'%20limit%2010&format=json&callback=";
-    var container = document.getElementById(divid);
-    var url = yqlURL + yqlQS + encodeURIComponent(feedurl) + yqlOPTS;
-
-    $.getJSON(url, function(data){
-        var result = data.query.results;
-        var loaded = 0;
-        var nb_display = 8;
+    let container = document.getElementById(divid);
+    $.ajax({
+      url: "https://cors.io/?" + feedurl
+    })
+    .done(function(data){
+        let x2js = new X2JS();
+        let result = x2js.xml_str2json(data);
+        let loaded = 0;
+        let nb_display = 8;
         if (result==null) return;
-        for (var i = 0; i < result.feed.length; i++) {
-            var entry = result.feed[i].entry;
-            if (entry.title.indexOf("git commit") != -1)
+        for (let i = 0; i < result.feed.entry.length; i++) {
+            let entry = result.feed.entry[i];
+            if (entry.title.indexOf("git commit") !== -1)
                 continue;
             loaded += 1;
             if (loaded > nb_display)
                 break;
-            var div = document.createElement("p");
-            var link = document.createElement("a");
-            var d = new Date(entry.published);
-            var data = '[' + d.toLocaleDateString() + '] ' + entry.title
-            var text = document.createTextNode(data);
+            let div = document.createElement("p");
+            let link = document.createElement("a");
+            let d = new Date(entry.published);
+            let data = '[' + d.toLocaleDateString() + '] ' + entry.title;
+            let text = document.createTextNode(data);
             link.appendChild(text);
             link.title = entry.title;
-            link.href = entry.link.href;
+            link.href = entry.link._href;
             div.appendChild(link);
             container.appendChild(div);
         }
-        var empty = nb_display - loaded;
-        for (var i = 0; i < empty; i++) {
+        let empty = nb_display - loaded;
+        for (let i = 0; i < empty; i++) {
             container.appendChild(document.createElement("p"));
         }
     });
 }
 
 function google_analytics() {
-    var _gaq = _gaq || [];
+    let _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-21761074-1']);
     _gaq.push(['_setDomainName', 'none']);
     _gaq.push(['_setAllowLinker', true]);
     _gaq.push(['_trackPageview']);
 
-    var ga = document.createElement('script');
+    let ga = document.createElement('script');
     ga.type = 'text/javascript';
     ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0];
+    ga.src = ('https:' === document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    let s = document.getElementsByTagName('script')[0];
     s.parentNode.insertBefore(ga, s);
 }
 
@@ -55,11 +54,11 @@ function showTooltip(elem, msg) {
     elem.setAttribute('aria-label', msg);
 }
 
-var clipboard = new Clipboard('.btn');
+let clipboard = new Clipboard('.btn');
 
 $(function () {
   $('[data-toggle="tooltip"]').tooltip()
-})
+});
 
 clipboard.on('success', function(e) {
     e.clearSelection();
@@ -68,8 +67,8 @@ clipboard.on('success', function(e) {
 
 $(function() {
   $('a[href*=\\#]:not([href=\\#])').click(function() {
-    if (location.pathname.replace(/^\//,'') == this.pathname.replace(/^\//,'') && location.hostname == this.hostname) {
-      var target = $(this.hash);
+    if (location.pathname.replace(/^\//,'') === this.pathname.replace(/^\//,'') && location.hostname === this.hostname) {
+        let target = $(this.hash);
       target = target.length ? target : $('[name=' + this.hash.slice(1) +']');
       if (target.length) {
         $('html,body').animate({
@@ -82,9 +81,9 @@ $(function() {
 });
 
 jQuery(document).ready(function($) {
-    var url = window.location.href;
+    let url = window.location.href;
     // Get the basename of the URL
-    url = url.split(/[\\/]/).pop()
+    url = url.split(/[\\/]/).pop();
     $('.nav a[href="/' + url + '"]').parent().addClass('active');
 
     load_activity("http://buildroot-busybox.2317881.n4.nabble.com/Buildroot-busybox-ft2.xml", "mailing-list-activity");
diff --git a/buildroot/docs/website/news.html b/buildroot/docs/website/news.html
index dc495e8d8..6fe12c708 100644
--- a/buildroot/docs/website/news.html
+++ b/buildroot/docs/website/news.html
@@ -9,6 +9,230 @@
 
        News
        
 
          
 
+  
        • 
+    
          
+    
          
+      
          
+	
          2019.02 released
          
+	
          4 March 2019
          
+      
          
+      
          
+	
          The stable 2019.02 release is out - Thanks to everyone
+	  contributing and testing the release candidates. See the
+	  CHANGES
+	  file for more details
+	  and go to the downloads page to pick up the
+	  2019.02 release.
          
+
+	  
          Notice that this is a long term support release which will be
+	  supported with security and other important fixes until March 2020.
          
+      
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2019.02-rc3 released
          
+	
          1 March 2019
          
+      
          
+      
          
+        
          Another week, another release candidate with more cleanups
+          and build fixes. See the
+	  CHANGES
+	  file for details.
          
+
+	
          Head to the downloads page to pick up the
+	  2019.02-rc3
+	  release candidate, and report any problems found to the
+	  mailing list or
+	  bug tracker.
          
+      
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2018.11.3 released
          
+	
          23 February 2019
          
+      
          
+      
          
+	
          The 2018.11.3 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2018.11.2 release. See the
+	  CHANGES
+	  file for more details, read the
+	  announcement
+	  and go to the downloads page to pick up the
+	  2018.11.3 release.
          
+      
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2018.02.11 released
          
+	
          23 February 2019
          
+      
          
+      
          
+	
          The 2018.02.11 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2018.02.10 release. See the
+	  CHANGES
+	  file for more details, read the
+	  announcement
+	  and go to the downloads page to pick up the
+	  2018.02.11 release.
          
+      
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2019.02-rc2 released
          
+	
          23 February 2019
          
+      
          
+      
          
+        
          Another week, another release candidate with more cleanups
+          and build fixes. See the
+	  CHANGES
+	  file for details.
          
+
+	
          Head to the downloads page to pick up the
+	  2019.02-rc2
+	  release candidate, and report any problems found to the
+	  mailing list or
+	  bug tracker.
          
+      
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2019.02-rc1 released
          
+	
          13 February 2019
          
+      
          
+      
          
+	
          We have a new release candidate! Lots of changes all over the
+	  tree, see the
+	  CHANGES
+	  file for details and read the
+	  announcement.
+	
          
+
+	
          Head to the downloads page to pick up the
+	  2019.02-rc1
+	    release candidate, and report any problems found to the
+	  mailing list or
+	  bug tracker.
          
+      
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2018.02.10 released
          
+	
          31 January 2019
          
+      
          
+      
          
+	
          The 2018.02.10 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2018.02.9 release. See the
+	  CHANGES
+	  file for more details, read the
+	  announcement
+	  and go to the downloads page to pick up the
+	  2018.02.10 release.
          
+      
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2018.11.2 released
          
+	
          30 January 2019
          
+      
          
+      
          
+	
          The 2018.11.2 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2018.11.1 release. See the
+	  CHANGES
+	  file for more details, read the
+	  announcement
+	  and go to the downloads page to pick up the
+	  2018.11.2 release.
          
+      
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2018.02.9 released
          
+	
          20 December 2018
          
+      
          
+      
          
+	
          The 2018.02.9 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2018.02.8 release. See the
+	  CHANGES
+	  file for more details, read the
+	  announcement
+	  and go to the downloads page to pick up the
+	  2018.02.9 release.
          
+      
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2018.08.4 released, 2018.08 series EOL
          
+	
          20 December 2018
          
+      
          
+      
          
+	
          The 2018.08.4 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2018.08.3 release. See the
+	  CHANGES
+	  file for more details, read the
+	  announcement
+	  and go to the downloads page to pick up the
+	  2018.08.4 release.
          
+        
          Notice that the 2018.08 series is now end of life, please
+          consider migrating to 2018.11 instead.
          
+     
          
+    
          
+  
          • 
+
+  
        • 
+    
          
+    
          
+      
          
+	
          2018.11.1 released
          
+	
          19 December 2018
          
+      
          
+      
          
+	
          The 2018.11.1 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2018.11 release. See the
+	  CHANGES
+	  file for more details, read the
+	  announcement
+	  and go to the downloads page to pick up the
+	  2018.11.1 release.
          
+      
          
+    
          
+  
          • 
+
   
        • 
     
          
     
          
@@ -20,7 +244,8 @@
 	
          The stable 2018.11 release is out - Thanks to everyone
 	  contributing and testing the release candidates. See the
 	  CHANGES
-	  file for more details
+	  file for more details, read the
+	  announcement
 	  and go to the downloads page to pick up the
 	  2018.11 release.
          
       
          
diff --git a/buildroot/docs/website/sponsors.html b/buildroot/docs/website/sponsors.html
index 60f0e5593..7370ecb01 100644
--- a/buildroot/docs/website/sponsors.html
+++ b/buildroot/docs/website/sponsors.html
@@ -4,6 +4,23 @@
 
          
 
          
 
+  
          
+    
          Sponsor of the Buildroot.org domain
          
+    
          
+      
          
+	
          The Buildroot community would like to thank
+          Zillabit for
+	  donating the buildroot.org domain name and sponsoring
+	  the registration fees 2009 - 2019.
          
+       
          
+      
          
+	
+	  
+	
+      
          
+    
          
+  
          
+
   
          
     
          Sponsors of the Buildroot Developers Meeting @ ELCE 2018
          
     
          
diff --git a/buildroot/fs/common.mk b/buildroot/fs/common.mk
index e4a6a4897..b361ecce2 100644
--- a/buildroot/fs/common.mk
+++ b/buildroot/fs/common.mk
@@ -28,12 +28,14 @@
 # macro will automatically generate a compressed filesystem image.
 
 FS_DIR = $(BUILD_DIR)/buildroot-fs
-FULL_DEVICE_TABLE = $(FS_DIR)/device_table.txt
 ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \
 	$(BR2_ROOTFS_STATIC_DEVICE_TABLE))
-USERS_TABLE = $(FS_DIR)/users_table.txt
+
 ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES))
 
+ROOTFS_FULL_DEVICES_TABLE = $(FS_DIR)/full_devices_table.txt
+ROOTFS_FULL_USERS_TABLE = $(FS_DIR)/full_users_table.txt
+
 ifeq ($(BR2_REPRODUCIBLE),y)
 define ROOTFS_REPRODUCIBLE
 	find $(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$(SOURCE_DATE_EPOCH)
@@ -51,17 +53,18 @@ rootfs-common: $(ROOTFS_COMMON_DEPENDENCIES) target-finalize
 	rm -rf $(FS_DIR)
 	mkdir -p $(FS_DIR)
 
-	$(call PRINTF,$(PACKAGES_USERS)) >> $(USERS_TABLE)
+	$(call PRINTF,$(PACKAGES_USERS)) >> $(ROOTFS_FULL_USERS_TABLE)
 ifneq ($(ROOTFS_USERS_TABLES),)
-	cat $(ROOTFS_USERS_TABLES) >> $(USERS_TABLE)
+	cat $(ROOTFS_USERS_TABLES) >> $(ROOTFS_FULL_USERS_TABLE)
 endif
+
+	$(call PRINTF,$(PACKAGES_PERMISSIONS_TABLE)) > $(ROOTFS_FULL_DEVICES_TABLE)
 ifneq ($(ROOTFS_DEVICE_TABLES),)
-	cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)
+	cat $(ROOTFS_DEVICE_TABLES) >> $(ROOTFS_FULL_DEVICES_TABLE)
+endif
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
-	$(call PRINTF,$(PACKAGES_DEVICES_TABLE)) >> $(FULL_DEVICE_TABLE)
+	$(call PRINTF,$(PACKAGES_DEVICES_TABLE)) >> $(ROOTFS_FULL_DEVICES_TABLE)
 endif
-endif
-	$(call PRINTF,$(PACKAGES_PERMISSIONS_TABLE)) >> $(FULL_DEVICE_TABLE)
 
 rootfs-common-show-depends:
 	@echo $(ROOTFS_COMMON_DEPENDENCIES)
@@ -70,6 +73,8 @@ rootfs-common-show-depends:
 # all variable references except the arguments must be $$-quoted.
 define inner-rootfs
 
+ROOTFS_$(2)_IMAGE_NAME ?= rootfs.$(1)
+ROOTFS_$(2)_FINAL_IMAGE_NAME = $$(strip $$(ROOTFS_$(2)_IMAGE_NAME))
 ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1)
 ROOTFS_$(2)_TARGET_DIR = $$(ROOTFS_$(2)_DIR)/target
 
@@ -104,10 +109,11 @@ ROOTFS_$(2)_COMPRESS_EXT = .xz
 ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c
 endif
 
-$$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2)
-$$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot
-$$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
-	@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
+$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): ROOTFS=$(2)
+$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot
+$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES)
+	@$$(call MESSAGE,"Generating filesystem image $$(ROOTFS_$(2)_FINAL_IMAGE_NAME)")
+	mkdir -p $$(@D)
 	rm -rf $$(ROOTFS_$(2)_DIR)
 	mkdir -p $$(ROOTFS_$(2)_DIR)
 	rsync -auH \
@@ -119,8 +125,8 @@ $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
 	echo "set -e" >> $$(FAKEROOT_SCRIPT)
 
 	echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
-	PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT)
-	echo "$$(HOST_DIR)/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
+	PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(ROOTFS_FULL_USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT)
+	echo "$$(HOST_DIR)/bin/makedevs -d $$(ROOTFS_FULL_DEVICES_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
 	$$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\
 		echo "echo '$$(TERM_BOLD)>>>   Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \
 		echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep))
@@ -132,7 +138,7 @@ $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
 	$$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT)
 	$$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT)
 	chmod a+x $$(FAKEROOT_SCRIPT)
-	PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
+	PATH=$$(BR_PATH) FAKEROOTDONTTRYCHOWN=1 $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
 	$(Q)rm -rf $$(TARGET_DIR)
 ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),)
 	PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT)
@@ -142,7 +148,7 @@ endif
 rootfs-$(1)-show-depends:
 	@echo $$(ROOTFS_$(2)_DEPENDENCIES)
 
-rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1)
+rootfs-$(1): $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME)
 
 .PHONY: rootfs-$(1) rootfs-$(1)-show-depends
 
diff --git a/buildroot/linux/Config.ext.in b/buildroot/linux/Config.ext.in
index acc8a0474..32dacbdf0 100644
--- a/buildroot/linux/Config.ext.in
+++ b/buildroot/linux/Config.ext.in
@@ -4,9 +4,11 @@ menu "Linux Kernel Extensions"
 # Xenomai
 config BR2_LINUX_KERNEL_EXT_XENOMAI
 	bool "Adeos/Xenomai Real-time patch"
-	depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS
+	depends on BR2_USE_MMU # xenomai
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xenomai
+	depends on BR2_TOOLCHAIN_HAS_THREADS # xenomai
+	depends on !BR2_TOOLCHAIN_USES_MUSL # xenomai
 	select BR2_PACKAGE_XENOMAI
 	help
 	  Xenomai is split in two parts: a kernel part and a userspace
@@ -34,7 +36,9 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
 	  and verify that your kernel version in buildroot matches.
 
 comment "xenomai needs a uClibc or glibc toolchain w/ threads"
-	depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL
 
 #-------------------------------------------------------------------------------
diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in
index 6b216140a..6f93c2122 100644
--- a/buildroot/linux/Config.in
+++ b/buildroot/linux/Config.in
@@ -29,11 +29,13 @@ config BR2_LINUX_NEEDS_MODULES
 choice
 	prompt "Kernel version"
 
+# We are intentionally staying at 4.19 for the next Buildroot LTS
+# release (2019.02)
 config BR2_LINUX_KERNEL_LATEST_VERSION
 	bool "Latest version (4.19)"
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-	bool "Latest CIP SLTS version (v4.4.154-cip28)"
+	bool "Latest CIP SLTS version (v4.4.176-cip31)"
 	help
 	  CIP launched in the spring of 2016 to address the needs of
 	  organizations in industries such as power generation and
@@ -120,8 +122,8 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.18.20" if BR2_LINUX_KERNEL_LATEST_VERSION
-	default "v4.4.154-cip28" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+	default "4.19.47" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "v4.4.176-cip31" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
@@ -255,7 +257,7 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE
 
 config BR2_LINUX_KERNEL_IMAGE
 	bool "Image"
-	depends on BR2_aarch64
+	depends on BR2_aarch64 || BR2_riscv
 
 config BR2_LINUX_KERNEL_LINUX_BIN
 	bool "linux.bin"
@@ -392,6 +394,14 @@ config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
 	  You can provide a list of dts paths to copy and
 	  build, separated by spaces.
 
+config BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT
+	bool "Build Device Tree with overlay support"
+	help
+	  If enabled, pass the "-@" option to dtc, such that
+	  symbols are generated in the compiled Device Tree.
+	  Choose this option to support Device Tree overlays
+	  on the target system.
+
 endif
 
 config BR2_LINUX_KERNEL_INSTALL_TARGET
diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash
index 2932aeba1..1f580c86c 100644
--- a/buildroot/linux/linux.hash
+++ b/buildroot/linux/linux.hash
@@ -1,9 +1,6 @@
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256 68ac319e0fb7edd6b6051541d9cf112cd4f77a29e16a69ae1e133ff51117f653  linux-4.18.20.tar.xz
-sha256 41026d713ba4f7a5e9d514b876ce4ed28a1d993c0c58b42b2a2597d6a0e83021  linux-4.16.18.tar.xz
-sha256 da9260a9022b917733201b89b5314847cb3332c31e70acb5e9b547956c266e28  linux-4.14.86.tar.xz
-sha256 0eb76464a696675fd4f8762e390328a377e973bfa263b00544ca1b5b10ac2cbf  linux-4.9.143.tar.xz
-sha256 bf10effd995aa183b553cedd764c577137a9f97dc8709e2e1c04b1e0f4e6415a  linux-4.4.166.tar.xz
-sha256 6ad9389e55e0ea57768eae173747058a4487fa3630e10a7999cfec9f945e559c  linux-4.1.52.tar.xz
-# From https://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
-sha256 ad96d797571496c969aa71bf5d08e9d2a8c84458090d29a120f1b2981185a99e  linux-3.2.102.tar.xz
+sha256 d011245629b980d4c15febf080b54804aaf215167b514a3577feddb2495f8a3e  linux-4.20.17.tar.xz
+sha256 5d08f3890e7ca2b94529675120f170c5b764f795e6dd184a1190c23a40ef5365  linux-4.19.47.tar.xz
+sha256 25f58cb56bde388ac9bcee984f5f2d0ca094b0a8af6b92ad1f5b2fd0e6725b85  linux-4.14.123.tar.xz
+sha256 d25a490d62a3e96a587333e163862585eac4086fc8d4893b4ec1711e7d387c5f  linux-4.9.180.tar.xz
+sha256 1a450217d381bb7fd259d026d3b7a57c717e8d1f66754cd6fcc9df3c4a8a6a7a  linux-4.4.180.tar.xz
diff --git a/buildroot/linux/linux.mk b/buildroot/linux/linux.mk
index 7f6100cf3..dd182d06b 100644
--- a/buildroot/linux/linux.mk
+++ b/buildroot/linux/linux.mk
@@ -30,22 +30,17 @@ else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y)
 LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
 LINUX_SITE_METHOD = svn
 else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION),y)
-LINUX_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-cip.git
+LINUX_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git
 else ifneq ($(findstring -rc,$(LINUX_VERSION)),)
 # Since 4.12-rc1, -rc kernels are generated from cgit. This also works for
 # older -rc kernels.
 LINUX_SITE = https://git.kernel.org/torvalds/t
 else
 LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
-# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
-# to use the $(word) function. We support versions such as 4.0, 3.1,
-# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
 ifeq ($(findstring x2.6.,x$(LINUX_VERSION)),x2.6.)
 LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
-else ifeq ($(findstring x3.,x$(LINUX_VERSION)),x3.)
-LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
-else ifeq ($(findstring x4.,x$(LINUX_VERSION)),x4.)
-LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
+else
+LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_VERSION))).x
 endif
 endif
 
@@ -55,14 +50,22 @@ endif
 
 LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 
+# We have no way to know the hashes for user-supplied patches.
+BR_NO_CHECK_HASH_FOR += $(notdir $(LINUX_PATCHES))
+
 # We rely on the generic package infrastructure to download and apply
 # remote patches (downloaded from ftp, http or https). For local
 # patches, we can't rely on that infrastructure, because there might
 # be directories in the patch list (unlike for other packages).
 LINUX_PATCH = $(filter ftp://% http://% https://%,$(LINUX_PATCHES))
 
+LINUX_MAKE_ENV = \
+	$(TARGET_MAKE_ENV) \
+	BR_BINARIES_DIR=$(BINARIES_DIR)
+
 LINUX_INSTALL_IMAGES = YES
-LINUX_DEPENDENCIES = host-kmod
+LINUX_DEPENDENCIES = host-kmod \
+	$(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode)
 
 # Starting with 4.16, the generated kconfig paser code is no longer
 # shipped with the kernel sources, so we need flex and bison, but
@@ -97,7 +100,13 @@ LINUX_DEPENDENCIES += host-openssl
 endif
 
 ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y)
-LINUX_DEPENDENCIES += host-elfutils
+LINUX_DEPENDENCIES += host-elfutils host-pkgconf
+LINUX_MAKE_ENV += \
+	PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+	PKG_CONFIG_SYSROOT_DIR="/" \
+	PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
+	PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"
 endif
 
 # If host-uboot-tools is selected by the user, assume it is needed to
@@ -121,10 +130,6 @@ LINUX_MAKE_FLAGS = \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	DEPMOD=$(HOST_DIR)/sbin/depmod
 
-LINUX_MAKE_ENV = \
-	$(TARGET_MAKE_ENV) \
-	BR_BINARIES_DIR=$(BINARIES_DIR)
-
 ifeq ($(BR2_REPRODUCIBLE),y)
 LINUX_MAKE_ENV += \
 	KBUILD_BUILD_VERSION=1 \
@@ -143,6 +148,10 @@ ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y)
 LINUX_MAKE_ENV += KCFLAGS=-Wno-attribute-alias
 endif
 
+ifeq ($(BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT),y)
+LINUX_MAKE_ENV += DTC_FLAGS=-@
+endif
+
 # Get the real Linux version, which tells us where kernel modules are
 # going to be installed in the target filesystem.
 LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null`
@@ -269,13 +278,16 @@ endif
 LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES))
 LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
 
-# LINUX_MAKE_FLAGS overrides HOSTCC to allow the kernel build to find our
-# host-openssl and host-libelf. However, this triggers a bug in the kconfig
-# build script that causes it to build with /usr/include/ncurses.h (which is
-# typically wchar) but link with $(HOST_DIR)/lib/libncurses.so (which is not).
-# We don't actually need any host-package for kconfig, so remove the HOSTCC
-# override again.
-LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) HOSTCC="$(HOSTCC)"
+# LINUX_MAKE_FLAGS overrides HOSTCC to allow the kernel build to find
+# our host-openssl and host-libelf. However, this triggers a bug in
+# the kconfig build script that causes it to build with
+# /usr/include/ncurses.h (which is typically wchar) but link with
+# $(HOST_DIR)/lib/libncurses.so (which is not).  We don't actually
+# need any host-package for kconfig, so remove the HOSTCC override
+# again. In addition, even though linux depends on the toolchain and
+# therefore host-ccache would be ready, we use HOSTCC_NOCCACHE for
+# consistency with other kconfig packages.
+LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) HOSTCC="$(HOSTCC_NOCCACHE)"
 
 # If no package has yet set it, set it from the Kconfig option
 LINUX_NEEDS_MODULES ?= $(BR2_LINUX_NEEDS_MODULES)
@@ -324,6 +336,9 @@ define LINUX_KCONFIG_FIXUP_CMDS
 	$(if $(BR2_PACKAGE_AUDIT),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT,$(@D)/.config))
+	$(if $(BR2_PACKAGE_INTEL_MICROCODE),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE,$(@D)/.config)
+		$(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL,$(@D)/.config))
 	$(if $(BR2_PACKAGE_KTAP),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS,$(@D)/.config)
@@ -331,6 +346,8 @@ define LINUX_KCONFIG_FIXUP_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER,$(@D)/.config))
 	$(if $(BR2_PACKAGE_LINUX_TOOLS_PERF),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config))
+	$(if $(BR2_PACKAGE_PCM_TOOLS),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_X86_MSR,$(@D)/.config))
 	$(if $(BR2_PACKAGE_SYSTEMD),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)
@@ -423,15 +440,16 @@ endif
 endif
 
 # Compilation. We make sure the kernel gets rebuilt when the
-# configuration has changed.
+# configuration has changed. We call the 'all' and
+# '$(LINUX_TARGET_NAME)' targets separately because calling them in
+# the same $(MAKE) invocation has shown to cause parallel build
+# issues.
 define LINUX_BUILD_CMDS
 	$(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \
 		cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/
 	)
+	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all
 	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
-		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
-	fi
 	$(LINUX_BUILD_DTB)
 	$(LINUX_APPEND_DTB)
 endef
diff --git a/buildroot/package/Config.in b/buildroot/package/Config.in
index 28d3ef82a..cc232b9fb 100644
--- a/buildroot/package/Config.in
+++ b/buildroot/package/Config.in
@@ -82,6 +82,7 @@ menu "Debugging, profiling and benchmark"
 	source "package/blktrace/Config.in"
 	source "package/bonnie/Config.in"
 	source "package/cache-calibrator/Config.in"
+	source "package/clinfo/Config.in"
 	source "package/dhrystone/Config.in"
 	source "package/dieharder/Config.in"
 	source "package/dmalloc/Config.in"
@@ -114,6 +115,7 @@ menu "Debugging, profiling and benchmark"
 	source "package/nmon/Config.in"
 	source "package/oprofile/Config.in"
 	source "package/pax-utils/Config.in"
+	source "package/pcm-tools/Config.in"
 	source "package/pv/Config.in"
 	source "package/racehound/Config.in"
 	source "package/ramsmp/Config.in"
@@ -131,6 +133,7 @@ menu "Debugging, profiling and benchmark"
 	source "package/trinity/Config.in"
 	source "package/uclibc-ng-test/Config.in"
 	source "package/valgrind/Config.in"
+	source "package/vmtouch/Config.in"
 	source "package/whetstone/Config.in"
 endmenu
 
@@ -141,6 +144,7 @@ menu "Development tools"
 	source "package/check/Config.in"
 	source "package/cmake/Config.in"
 	source "package/cppunit/Config.in"
+	source "package/cunit/Config.in"
 	source "package/cvs/Config.in"
 	source "package/cxxtest/Config.in"
 	source "package/diffutils/Config.in"
@@ -267,6 +271,7 @@ comment "Graphic applications"
 	source "package/kmscube/Config.in"
 	source "package/libva-utils/Config.in"
 	source "package/mesa3d-demos/Config.in"
+	source "package/netsurf/Config.in"
 	source "package/pngquant/Config.in"
 	source "package/qt5cinex/Config.in"
 	source "package/rrdtool/Config.in"
@@ -307,16 +312,14 @@ comment "Graphic libraries"
 	source "package/tk/Config.in"
 
 comment "Other GUIs"
-	source "package/qt/Config.in"
 	source "package/qt5/Config.in"
 	source "package/kf5/Config.in"
-if BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+if BR2_PACKAGE_QT5
 comment "QT libraries and helper libraries"
 	source "package/cutelyst/Config.in"
 	source "package/grantlee/Config.in"
 	source "package/qextserialport/Config.in"
 	source "package/qjson/Config.in"
-	source "package/qtuio/Config.in"
 	source "package/quazip/Config.in"
 	source "package/qwt/Config.in"
 endif
@@ -495,6 +498,7 @@ endmenu
 	source "package/rng-tools/Config.in"
 	source "package/rpi-userland/Config.in"
 	source "package/rs485conf/Config.in"
+	source "package/rtc-tools/Config.in"
 	source "package/rtl8188eu/Config.in"
 	source "package/rtl8189fs/Config.in"
 	source "package/rtl8723bs/Config.in"
@@ -550,6 +554,7 @@ menu "Interpreter languages and scripting"
 	source "package/erlang/Config.in"
 if BR2_PACKAGE_ERLANG
 menu "Erlang libraries/modules"
+	source "package/erlang-eimp/Config.in"
 	source "package/erlang-goldrush/Config.in"
 	source "package/erlang-jiffy/Config.in"
 	source "package/erlang-lager/Config.in"
@@ -618,11 +623,12 @@ menu "Lua libraries/modules"
 	source "package/lua-msgpack-native/Config.in"
 	source "package/lua-periphery/Config.in"
 	source "package/lua-sdl2/Config.in"
+	source "package/lua-std-debug/Config.in"
+	source "package/lua-std-normalize/Config.in"
 	source "package/lua-stdlib/Config.in"
 	source "package/lua-testmore/Config.in"
 	source "package/lua-utf8/Config.in"
 	source "package/luabitop/Config.in"
-	source "package/luacrypto/Config.in"
 	source "package/luadbi/Config.in"
 	source "package/luadbi-sqlite3/Config.in"
 	source "package/luaexpat/Config.in"
@@ -756,7 +762,6 @@ menu "Perl libraries/modules"
 	source "package/perl-sys-cpu/Config.in"
 	source "package/perl-sys-meminfo/Config.in"
 	source "package/perl-sys-mmap/Config.in"
-	source "package/perl-time-hires/Config.in"
 	source "package/perl-time-parsedate/Config.in"
 	source "package/perl-timedate/Config.in"
 	source "package/perl-try-tiny/Config.in"
@@ -794,6 +799,15 @@ endif
 if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 menu "External python modules"
 	source "package/python-aiocoap/Config.in"
+	source "package/python-aiodns/Config.in"
+	source "package/python-aiohttp/Config.in"
+	source "package/python-aiohttp-jinja2/Config.in"
+	source "package/python-aiohttp-remotes/Config.in"
+	source "package/python-aiohttp-security/Config.in"
+	source "package/python-aiohttp-session/Config.in"
+	source "package/python-aiohttp-sse/Config.in"
+	source "package/python-aiorwlock/Config.in"
+	source "package/python-aiojobs/Config.in"
 	source "package/python-alsaaudio/Config.in"
 	source "package/python-argh/Config.in"
 	source "package/python-arrow/Config.in"
@@ -813,6 +827,7 @@ menu "External python modules"
 	source "package/python-cached-property/Config.in"
 	source "package/python-can/Config.in"
 	source "package/python-cbor/Config.in"
+	source "package/python-cchardet/Config.in"
 	source "package/python-certifi/Config.in"
 	source "package/python-cffi/Config.in"
 	source "package/python-characteristic/Config.in"
@@ -949,6 +964,7 @@ menu "External python modules"
 	source "package/python-pyasn-modules/Config.in"
 	source "package/python-pyasn1/Config.in"
 	source "package/python-pyasn1-modules/Config.in"
+	source "package/python-pycares/Config.in"
 	source "package/python-pycli/Config.in"
 	source "package/python-pycparser/Config.in"
 	source "package/python-pycrypto/Config.in"
@@ -971,7 +987,6 @@ menu "External python modules"
 	source "package/python-pyparted/Config.in"
 	source "package/python-pypcap/Config.in"
 	source "package/python-pyqrcode/Config.in"
-	source "package/python-pyqt/Config.in"
 	source "package/python-pyqt5/Config.in"
 	source "package/python-pyratemp/Config.in"
 	source "package/python-pyro/Config.in"
@@ -1009,6 +1024,7 @@ menu "External python modules"
 	source "package/python-secretstorage/Config.in"
 	source "package/python-see/Config.in"
 	source "package/python-semver/Config.in"
+	source "package/python-sentry-sdk/Config.in"
 	source "package/python-serial/Config.in"
 	source "package/python-serial-asyncio/Config.in"
 	source "package/python-service-identity/Config.in"
@@ -1066,6 +1082,7 @@ menu "External python modules"
 	source "package/python-wrapt/Config.in"
 	source "package/python-ws4py/Config.in"
 	source "package/python-wsaccel/Config.in"
+	source "package/python-wtforms/Config.in"
 	source "package/python-xlib/Config.in"
 	source "package/python-xlrd/Config.in"
 	source "package/python-xlsxwriter/Config.in"
@@ -1229,6 +1246,7 @@ menu "Graphics"
 	source "package/cairomm/Config.in"
 	source "package/chipmunk/Config.in"
 	source "package/exiv2/Config.in"
+	source "package/exempi/Config.in"
 	source "package/fltk/Config.in"
 	source "package/fontconfig/Config.in"
 	source "package/freetype/Config.in"
@@ -1243,6 +1261,7 @@ menu "Graphics"
 	source "package/harfbuzz/Config.in"
 	source "package/ijs/Config.in"
 	source "package/imlib2/Config.in"
+	source "package/intel-gmmlib/Config.in"
 	source "package/irrlicht/Config.in"
 	source "package/jasper/Config.in"
 	source "package/jpeg/Config.in"
@@ -1495,6 +1514,7 @@ menu "Networking"
 	source "package/freeradius-client/Config.in"
 	source "package/geoip/Config.in"
 	source "package/glib-networking/Config.in"
+	source "package/grpc/Config.in"
 	source "package/gssdp/Config.in"
 	source "package/gupnp/Config.in"
 	source "package/gupnp-av/Config.in"
@@ -1539,6 +1559,7 @@ menu "Networking"
 	source "package/liboauth/Config.in"
 	source "package/liboping/Config.in"
 	source "package/libosip2/Config.in"
+	source "package/libpagekite/Config.in"
 	source "package/libpcap/Config.in"
 	source "package/libpjsip/Config.in"
 	source "package/librsync/Config.in"
@@ -1550,6 +1571,7 @@ menu "Networking"
 	source "package/libstrophe/Config.in"
 	source "package/libtirpc/Config.in"
 	source "package/libtorrent/Config.in"
+	source "package/libtorrent-rasterbar/Config.in"
 	source "package/libupnp/Config.in"
 	source "package/libupnp18/Config.in"
 	source "package/libupnpp/Config.in"
@@ -1583,6 +1605,7 @@ menu "Networking"
 	source "package/thrift/Config.in"
 	source "package/usbredir/Config.in"
 	source "package/wampcc/Config.in"
+	source "package/websocketpp/Config.in"
 	source "package/zeromq/Config.in"
 	source "package/zmqpp/Config.in"
 	source "package/zyre/Config.in"
@@ -1636,6 +1659,7 @@ menu "Other"
 	source "package/libcrossguid/Config.in"
 	source "package/libcsv/Config.in"
 	source "package/libdaemon/Config.in"
+	source "package/libeastl/Config.in"
 	source "package/libee/Config.in"
 	source "package/libev/Config.in"
 	source "package/libevdev/Config.in"
@@ -1797,6 +1821,7 @@ menu "Networking applications"
 	source "package/bmon/Config.in"
 	source "package/boa/Config.in"
 	source "package/boinc/Config.in"
+	source "package/brcm-patchram-plus/Config.in"
 	source "package/bridge-utils/Config.in"
 	source "package/bwm-ng/Config.in"
 	source "package/c-icap/Config.in"
@@ -1826,6 +1851,7 @@ menu "Networking applications"
 	source "package/ejabberd/Config.in"
 	source "package/ethtool/Config.in"
 	source "package/faifa/Config.in"
+	source "package/fail2ban/Config.in"
 	source "package/fastd/Config.in"
 	source "package/fcgiwrap/Config.in"
 	source "package/flannel/Config.in"
@@ -1833,6 +1859,7 @@ menu "Networking applications"
 	source "package/fping/Config.in"
 	source "package/freeswitch/Config.in"
 	source "package/freeswitch-mod-bcg729/Config.in"
+	source "package/gerbera/Config.in"
 	source "package/gesftpserver/Config.in"
 	source "package/glorytun/Config.in"
 	source "package/gupnp-tools/Config.in"
@@ -1866,6 +1893,7 @@ menu "Networking applications"
 	source "package/iputils/Config.in"
 	source "package/irssi/Config.in"
 	source "package/iw/Config.in"
+	source "package/iwd/Config.in"
 	source "package/janus-gateway/Config.in"
 	source "package/keepalived/Config.in"
 	source "package/kismet/Config.in"
@@ -1885,6 +1913,7 @@ menu "Networking applications"
 	source "package/macchanger/Config.in"
 	source "package/memcached/Config.in"
 	source "package/mii-diag/Config.in"
+	source "package/mini-snmpd/Config.in"
 	source "package/minidlna/Config.in"
 	source "package/minissdpd/Config.in"
 	source "package/mjpg-streamer/Config.in"
@@ -1990,7 +2019,6 @@ endif
 	source "package/thttpd/Config.in"
 	source "package/tinc/Config.in"
 	source "package/tinyhttpd/Config.in"
-	source "package/tn5250/Config.in"
 	source "package/tor/Config.in"
 	source "package/traceroute/Config.in"
 	source "package/transmission/Config.in"
@@ -2132,6 +2160,7 @@ menu "System tools"
 	source "package/numactl/Config.in"
 	source "package/nut/Config.in"
 	source "package/openvmtools/Config.in"
+	source "package/pamtester/Config.in"
 	source "package/polkit/Config.in"
 	source "package/powerpc-utils/Config.in"
 	source "package/procps-ng/Config.in"
diff --git a/buildroot/package/Config.in.host b/buildroot/package/Config.in.host
index 16b474fc9..b4c501a33 100644
--- a/buildroot/package/Config.in.host
+++ b/buildroot/package/Config.in.host
@@ -53,6 +53,7 @@ menu "Host utilities"
 	source "package/qemu/Config.in.host"
 	source "package/raspberrypi-usbboot/Config.in.host"
 	source "package/rauc/Config.in.host"
+	source "package/rcw/Config.in.host"
 	source "package/rustc/Config.in.host"
 	source "package/s6-rc/Config.in.host"
 	source "package/sam-ba/Config.in.host"
@@ -63,6 +64,7 @@ menu "Host utilities"
 	source "package/ti-cgt-pru/Config.in.host"
 	source "package/uboot-tools/Config.in.host"
 	source "package/util-linux/Config.in.host"
+	source "package/utp_com/Config.in.host"
 	source "package/vboot-utils/Config.in.host"
 	source "package/xorriso/Config.in.host"
 	source "package/zip/Config.in.host"
diff --git a/buildroot/package/Makefile.in b/buildroot/package/Makefile.in
index 44761b79c..dc818a2c1 100644
--- a/buildroot/package/Makefile.in
+++ b/buildroot/package/Makefile.in
@@ -163,6 +163,12 @@ TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
+ifeq ($(BR2_m68k_cf),y)
+TARGET_CFLAGS += -fno-dwarf2-cfi-asm
+TARGET_CXXFLAGS += -fno-dwarf2-cfi-asm
+endif
+
 ifeq ($(BR2_BINFMT_FLAT),y)
 TARGET_CFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
 	-Wl$(comma)-elf2flt)
diff --git a/buildroot/package/acpica/acpica.mk b/buildroot/package/acpica/acpica.mk
index 57cc37f85..c54006192 100644
--- a/buildroot/package/acpica/acpica.mk
+++ b/buildroot/package/acpica/acpica.mk
@@ -10,6 +10,7 @@ ACPICA_SITE = https://acpica.org/sites/acpica/files
 ACPICA_LICENSE = BSD-3-Clause or GPL-2.0
 ACPICA_LICENSE_FILES = source/include/acpi.h
 ACPICA_DEPENDENCIES = host-bison host-flex
+HOST_ACPICA_DEPENDENCIES = host-bison host-flex
 
 define ACPICA_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
diff --git a/buildroot/package/acpid/S02acpid b/buildroot/package/acpid/S02acpid
old mode 100755
new mode 100644
diff --git a/buildroot/package/acpid/acpid.mk b/buildroot/package/acpid/acpid.mk
index 48fe005e5..adcc1757a 100644
--- a/buildroot/package/acpid/acpid.mk
+++ b/buildroot/package/acpid/acpid.mk
@@ -10,6 +10,14 @@ ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
 ACPID_LICENSE = GPL-2.0+
 ACPID_LICENSE_FILES = COPYING
 
+define ACPID_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 package/acpid/acpid.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/acpid.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/acpid.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/acpid.service
+endef
+
 define ACPID_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/acpid/S02acpid \
 		$(TARGET_DIR)/etc/init.d/S02acpid
diff --git a/buildroot/package/acpid/acpid.service b/buildroot/package/acpid/acpid.service
new file mode 100644
index 000000000..5252b52f5
--- /dev/null
+++ b/buildroot/package/acpid/acpid.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=ACPI event daemon
+Documentation=man:acpid(8)
+
+[Service]
+ExecStart=/usr/sbin/acpid --foreground --netlink
+
+[Install]
+WantedBy=multi-user.target
diff --git a/buildroot/package/acsccid/acsccid.mk b/buildroot/package/acsccid/acsccid.mk
index 06a04185e..a59a16d76 100644
--- a/buildroot/package/acsccid/acsccid.mk
+++ b/buildroot/package/acsccid/acsccid.mk
@@ -11,5 +11,6 @@ ACSCCID_LICENSE = LGPL-2.1+
 ACSCCID_LICENSE_FILES = COPYING
 ACSCCID_INSTALL_STAGING = YES
 ACSCCID_DEPENDENCIES = pcsc-lite host-flex host-pkgconf libusb
+ACSCCID_CONF_OPTS = --enable-usbdropdir=/usr/lib/pcsc/drivers
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/aircrack-ng/aircrack-ng.hash b/buildroot/package/aircrack-ng/aircrack-ng.hash
index 031e803ee..d8a171dc0 100644
--- a/buildroot/package/aircrack-ng/aircrack-ng.hash
+++ b/buildroot/package/aircrack-ng/aircrack-ng.hash
@@ -1,6 +1,6 @@
 # From http://www.aircrack-ng.org/downloads.html
-sha1 22bae2c6f21e463df62b4c06c9c3c45c42a9b4ea aircrack-ng-1.4.tar.gz
-md5 24e22f6f6eca1e7dc0d203e5719d3e8d aircrack-ng-1.3.tar.gz
+sha1 7b63c7ce01cb65a4775833c6cadf7ddd82bf46d5 aircrack-ng-1.5.2.tar.gz
+md5 2648c192d206e953c67dca64967d2982 aircrack-ng-1.5.2.tar.gz
 
 # Hash for license file:
 sha256 fc51fd3a97223f2fd47b057202d4a6b0daaedf23b5a1f5ff8723c192fc1e021d LICENSE
diff --git a/buildroot/package/aircrack-ng/aircrack-ng.mk b/buildroot/package/aircrack-ng/aircrack-ng.mk
index 350e251bf..a6db384b8 100644
--- a/buildroot/package/aircrack-ng/aircrack-ng.mk
+++ b/buildroot/package/aircrack-ng/aircrack-ng.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-AIRCRACK_NG_VERSION = 1.4
+AIRCRACK_NG_VERSION = 1.5.2
 AIRCRACK_NG_SITE = http://download.aircrack-ng.org
 AIRCRACK_NG_LICENSE = GPL-2.0+
 AIRCRACK_NG_LICENSE_FILES = LICENSE
 AIRCRACK_NG_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_CMOCKA),cmocka) \
 	$(if $(BR2_PACKAGE_LIBNL),libnl) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_PCRE),pcre) \
@@ -31,6 +32,13 @@ else
 AIRCRACK_NG_CONF_OPTS += --without-duma
 endif
 
+ifeq ($(BR2_PACKAGE_HWLOC),y)
+AIRCRACK_NG_DEPENDENCIES += hwloc
+AIRCRACK_NG_CONF_OPTS += --enable-hwloc
+else
+AIRCRACK_NG_CONF_OPTS += --disable-hwloc
+endif
+
 ifeq ($(BR2_PACKAGE_JEMALLOC),y)
 AIRCRACK_NG_DEPENDENCIES += jemalloc
 AIRCRACK_NG_CONF_OPTS += --with-jemalloc
diff --git a/buildroot/package/alsa-lib/alsa-lib.hash b/buildroot/package/alsa-lib/alsa-lib.hash
index c4f16d6df..4373a2a59 100644
--- a/buildroot/package/alsa-lib/alsa-lib.hash
+++ b/buildroot/package/alsa-lib/alsa-lib.hash
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256 5f2cd274b272cae0d0d111e8a9e363f08783329157e8dd68b3de0c096de6d724  alsa-lib-1.1.6.tar.bz2
+sha256 9d6000b882a3b2df56300521225d69717be6741b71269e488bb20a20783bdc09  alsa-lib-1.1.7.tar.bz2
 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b  COPYING
 sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced  aserver/COPYING
diff --git a/buildroot/package/alsa-lib/alsa-lib.mk b/buildroot/package/alsa-lib/alsa-lib.mk
index 98fc486e2..9de45d208 100644
--- a/buildroot/package/alsa-lib/alsa-lib.mk
+++ b/buildroot/package/alsa-lib/alsa-lib.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ALSA_LIB_VERSION = 1.1.6
+ALSA_LIB_VERSION = 1.1.7
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
 ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)
diff --git a/buildroot/package/alsa-utils/alsa-utils.hash b/buildroot/package/alsa-utils/alsa-utils.hash
index ff8fd0801..f0468fb88 100644
--- a/buildroot/package/alsa-utils/alsa-utils.hash
+++ b/buildroot/package/alsa-utils/alsa-utils.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 155caecc40b2220f686f34ba3655a53e3bdbc0586adb1056733949feaaf7d36e  alsa-utils-1.1.6.tar.bz2
+sha256 1db27fb54ab7fdeb54b00d68b8a174808ffea198cfbd67e3c959482194e1540a  alsa-utils-1.1.7.tar.bz2
 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
diff --git a/buildroot/package/alsa-utils/alsa-utils.mk b/buildroot/package/alsa-utils/alsa-utils.mk
index 986a74539..b5c36e0a4 100644
--- a/buildroot/package/alsa-utils/alsa-utils.mk
+++ b/buildroot/package/alsa-utils/alsa-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ALSA_UTILS_VERSION = 1.1.6
+ALSA_UTILS_VERSION = 1.1.7
 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
 ALSA_UTILS_LICENSE = GPL-2.0
@@ -41,7 +41,7 @@ endif
 ifeq ($(BR2_PACKAGE_ALSA_UTILS_BAT),y)
 ALSA_UTILS_CONF_OPTS += --enable-bat
 # Analysis support requires fftw single precision
-ALSA_UTILS_DEPENDENCIES += $(if $(BR2_PACKAGE_FFTW_PRECISION_SINGLE),fftw)
+ALSA_UTILS_DEPENDENCIES += $(if $(BR2_PACKAGE_FFTW_SINGLE),fftw-single)
 else
 ALSA_UTILS_CONF_OPTS += --disable-bat
 endif
@@ -84,6 +84,7 @@ endef
 
 ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSACTL)$(BR2_INIT_SYSTEMD),yy)
 ALSA_UTILS_DEPENDENCIES += systemd
+ALSA_UTILS_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
 define ALSA_UTILS_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-restore.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service
diff --git a/buildroot/package/am33x-cm3/S93-am335x-pm-firmware-load b/buildroot/package/am33x-cm3/S93-am335x-pm-firmware-load
old mode 100755
new mode 100644
diff --git a/buildroot/package/amd-catalyst/Config.in b/buildroot/package/amd-catalyst/Config.in
index 85551ed80..1a5bf0295 100644
--- a/buildroot/package/amd-catalyst/Config.in
+++ b/buildroot/package/amd-catalyst/Config.in
@@ -45,22 +45,6 @@ config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS
 	help
 	  Build and install the AMD command line tools.
 
-comment "Catalyst Control Center needs Qt4 with X11 and PNG support"
-	depends on !BR2_PACKAGE_QT || !BR2_PACKAGE_QT_X11 \
-		|| BR2_PACKAGE_QT_NOPNG
-
-config BR2_PACKAGE_AMD_CATALYST_CCCLE
-	bool "Catalyst Control Center"
-	depends on BR2_PACKAGE_QT
-	depends on BR2_PACKAGE_QT_X11
-	depends on !BR2_PACKAGE_QT_NOPNG
-	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng
-	select BR2_PACKAGE_PROCPS_NG # runtime
-	select BR2_PACKAGE_QT_ACCESSIBILITY
-	help
-	  Installs the Catalyst Control Center, a Qt graphical tool to
-	  control AMD graphics accelerators.
-
 endif
 
 comment "amd-catalyst kernel module needs a kernel to be built"
diff --git a/buildroot/package/amd-catalyst/amd-catalyst.mk b/buildroot/package/amd-catalyst/amd-catalyst.mk
index d864095c3..fe8aa850f 100644
--- a/buildroot/package/amd-catalyst/amd-catalyst.mk
+++ b/buildroot/package/amd-catalyst/amd-catalyst.mk
@@ -149,15 +149,6 @@ define  AMD_CATALYST_INSTALL_CMDLINE_TOOLS
 endef
 endif
 
-ifeq ($(BR2_PACKAGE_AMD_CATALYST_CCCLE), y)
-define AMD_CATALYST_INSTALL_CCCLE
-	$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/amdcccle \
-		$(TARGET_DIR)/usr/bin/amdcccle
-	$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/amdnotifyui \
-		$(TARGET_DIR)/usr/sbin/amdnotifyui
-endef
-endif
-
 define AMD_CATALYST_INSTALL_STAGING_CMDS
 	$(call AMD_CATALYST_INSTALL_STAGING_XORG)
 endef
@@ -165,7 +156,6 @@ endef
 define AMD_CATALYST_INSTALL_TARGET_CMDS
 	$(call AMD_CATALYST_INSTALL_XORG)
 	$(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS)
-	$(call AMD_CATALYST_INSTALL_CCCLE)
 	$(call AMD_CATALYST_INSTALL_OPENCL)
 endef
 
diff --git a/buildroot/package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch b/buildroot/package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch
new file mode 100644
index 000000000..63ea1fb6a
--- /dev/null
+++ b/buildroot/package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch
@@ -0,0 +1,35 @@
+makefiles: use pkgconf to get libs deps
+
+LIBS lists library dependencies without taking into account static linking
+that need ordered listing and more libraries listed since differently from
+shared linking dependency is not transparent(i.e. -lcrypto could need
+-latomic etc.).
+
+Replace -lcrypto with `pkg-config --libs libcrypto` command to be sure all
+needed libraries are listed during linking.
+
+Signed-off-by: Giulio Benetti 
+---
+diff -urpN android-tools-4.2.2+git20130218.orig/debian/makefiles/adbd.mk android-tools-4.2.2+git20130218/debian/makefiles/adbd.mk
+--- android-tools-4.2.2+git20130218.orig/debian/makefiles/adbd.mk	2019-04-08 16:05:02.967710428 +0200
++++ android-tools-4.2.2+git20130218/debian/makefiles/adbd.mk	2019-04-08 16:30:42.463084426 +0200
+@@ -44,7 +44,7 @@ CPPFLAGS+= -DADBD_NON_ANDROID
+ CPPFLAGS+= -I$(SRCDIR)/core/adbd
+ CPPFLAGS+= -I$(SRCDIR)/core/include
+
+-LIBS+= -lc -lpthread -lz -lcrypto -lcrypt
++LIBS+= -lc -lpthread -lz `pkg-config --libs libcrypto` -lcrypt
+
+ OBJS= $(patsubst %, %.o, $(basename $(SRCS)))
+
+diff -urpN android-tools-4.2.2+git20130218.orig/debian/makefiles/adb.mk android-tools-4.2.2+git20130218/debian/makefiles/adb.mk
+--- android-tools-4.2.2+git20130218.orig/debian/makefiles/adb.mk	2019-04-08 16:05:02.959701400 +0200
++++ android-tools-4.2.2+git20130218/debian/makefiles/adb.mk	2019-04-08 16:31:06.529426250 +0200
+@@ -41,7 +41,7 @@ CPPFLAGS+= -DHAVE_TERMIO_H
+ CPPFLAGS+= -I$(SRCDIR)/core/adb
+ CPPFLAGS+= -I$(SRCDIR)/core/include
+
+-LIBS+= -lc -lpthread -lz -lcrypto
++LIBS+= -lc -lpthread -lz `pkg-config --libs libcrypto`
+
+ OBJS= $(SRCS:.c=.o)
diff --git a/buildroot/package/android-tools/0005-fix-static-link-zlib.patch b/buildroot/package/android-tools/0005-fix-static-link-zlib.patch
deleted file mode 100644
index dff4df6e7..000000000
--- a/buildroot/package/android-tools/0005-fix-static-link-zlib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix static linking of adb/adbd
-
-Both adb and adbd use OpenSSL, which indirectly uses zlib. Since
-adb/adbd also use zlib directly -lz is included in the linker flags,
-but not at the right position to ensure that static linking works: to
-make it possible for OpenSSL symbols to see zlib symbols, -lz must
-appear after -lcrypto.
-
-Signed-off-by: Thomas Petazzoni 
-
-Index: b/debian/makefiles/adb.mk
-===================================================================
---- a/debian/makefiles/adb.mk
-+++ b/debian/makefiles/adb.mk
-@@ -41,7 +41,7 @@
- CPPFLAGS+= -I$(SRCDIR)/core/adb
- CPPFLAGS+= -I$(SRCDIR)/core/include
- 
--LIBS+= -lc -lpthread -lz -lcrypto
-+LIBS+= -lc -lpthread -lcrypto -lz
- 
- OBJS= $(SRCS:.c=.o)
- 
-Index: b/debian/makefiles/adbd.mk
-===================================================================
---- a/debian/makefiles/adbd.mk
-+++ b/debian/makefiles/adbd.mk
-@@ -44,7 +44,7 @@
- CPPFLAGS+= -I$(SRCDIR)/core/adbd
- CPPFLAGS+= -I$(SRCDIR)/core/include
- 
--LIBS+= -lc -lpthread -lz -lcrypto -lcrypt
-+LIBS+= -lc -lpthread -lcrypto -lz -lcrypt
- 
- OBJS= $(patsubst %, %.o, $(basename $(SRCS)))
- 
diff --git a/buildroot/package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch b/buildroot/package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch
new file mode 100644
index 000000000..80ea1ec1f
--- /dev/null
+++ b/buildroot/package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch
@@ -0,0 +1,48 @@
+From d24abbec201975a5eb7f8589614cfb424b8c80b6 Mon Sep 17 00:00:00 2001
+From: Alex Kaplan 
+Date: Sat, 10 Nov 2018 19:50:51 -0800
+Subject: [PATCH] Fix makefiles for out-of-tree ext4_utils build
+
+Signed-off-by: Alex Kaplan 
+---
+ debian/makefiles/ext4_utils.mk | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/debian/makefiles/ext4_utils.mk b/debian/makefiles/ext4_utils.mk
+index cb64916..c5904bf 100644
+--- a/debian/makefiles/ext4_utils.mk
++++ b/debian/makefiles/ext4_utils.mk
+@@ -1,6 +1,7 @@
+ # Makefile for ext4_utils; based on https://heiher.info/2227.html
+ # Author: Dmitrijs Ledkovs 
+ 
++VPATH+=$(SRCDIR)/extras/ext4_utils
+ SRCS+=make_ext4fs.c
+ SRCS+=ext4fixup.c
+ SRCS+=ext4_utils.c
+@@ -13,7 +14,7 @@ SRCS+=sha1.c
+ SRCS+=wipe.c
+ SRCS+=crc16.c
+ 
+-VPATH+=../../core/libsparse
++VPATH+=$(SRCDIR)/core/libsparse
+ SRCS+= backed_block.c
+ SRCS+= sparse_crc32.c
+ SRCS+= sparse.c
+@@ -31,10 +32,9 @@ SRCS+=img2simg.c
+ SRCS+=simg2img.c
+ SRCS+=simg2simg.c
+ 
+-CPPFLAGS+= -I.
+-CPPFLAGS+= -I/usr/include
+-CPPFLAGS+= -I../../core/include
+-CPPFLAGS+= -I../../core/libsparse/include/
++CPPFLAGS+= -I$(SRCDIR)
++CPPFLAGS+= -I$(SRCDIR)/core/include
++CPPFLAGS+= -I$(SRCDIR)/core/libsparse/include/
+ 
+ LIBS+= -lz -lselinux
+ 
+-- 
+2.7.4
+
diff --git a/buildroot/package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch b/buildroot/package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch
new file mode 100644
index 000000000..2de338368
--- /dev/null
+++ b/buildroot/package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch
@@ -0,0 +1,47 @@
+From bb3da0e32be4f2260940edf3ee0f88103dfd0dcc Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz 
+Date: Tue, 5 Feb 2019 01:12:19 +0200
+Subject: [PATCH] adb: added patch for openssl 1.1.0 compatibility
+
+Signed-off-by: Eneas U de Queiroz 
+
+[Vadim: took only adb related part from
+https://github.com/lede-project/source/commit/f63f20fb93c7e67775cb01d97fc88b5b29452b81]
+Signed-off-by: Vadim Kochan 
+---
+ core/adb/adb_auth_host.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/core/adb/adb_auth_host.c b/core/adb/adb_auth_host.c
+index 9039d42..debd2ef 100644
+--- a/core/adb/adb_auth_host.c
++++ b/core/adb/adb_auth_host.c
+@@ -79,7 +79,13 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+     }
+ 
+     BN_set_bit(r32, 32);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    const BIGNUM *rsa_n, *rsa_e;
++    RSA_get0_key(rsa, &rsa_n, &rsa_e, NULL);
++    BN_copy(n, rsa_n);
++#else
+     BN_copy(n, rsa->n);
++#endif
+     BN_set_bit(r, RSANUMWORDS * 32);
+     BN_mod_sqr(rr, r, n, ctx);
+     BN_div(NULL, rem, n, r32, ctx);
+@@ -93,7 +99,11 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+         BN_div(n, rem, n, r32, ctx);
+         pkey->n[i] = BN_get_word(rem);
+     }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    pkey->exponent = BN_get_word(rsa_e);
++#else
+     pkey->exponent = BN_get_word(rsa->e);
++#endif
+ 
+ out:
+     BN_free(n0inv);
+-- 
+2.14.1
+
diff --git a/buildroot/package/android-tools/Config.in.host b/buildroot/package/android-tools/Config.in.host
index 993c4c9fd..433f4e384 100644
--- a/buildroot/package/android-tools/Config.in.host
+++ b/buildroot/package/android-tools/Config.in.host
@@ -23,4 +23,11 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB
 	  host, which can be used to interact with target devices
 	  implementing the ADB protocol.
 
+config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS
+	bool "ext4 utils"
+	help
+	  This option will build and install the ext4 utils for the
+	  host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg,
+	  simg2img and simg2simg.
+
 endif
diff --git a/buildroot/package/android-tools/android-tools.mk b/buildroot/package/android-tools/android-tools.mk
index 879d788e3..3d5c76a32 100644
--- a/buildroot/package/android-tools/android-tools.mk
+++ b/buildroot/package/android-tools/android-tools.mk
@@ -11,6 +11,8 @@ ANDROID_TOOLS_EXTRA_DOWNLOADS = android-tools_$(ANDROID_TOOLS_VERSION)-3ubuntu41
 HOST_ANDROID_TOOLS_EXTRA_DOWNLOADS = $(ANDROID_TOOLS_EXTRA_DOWNLOADS)
 ANDROID_TOOLS_LICENSE = Apache-2.0
 ANDROID_TOOLS_LICENSE_FILES = debian/copyright
+ANDROID_TOOLS_DEPENDENCIES = host-pkgconf
+HOST_ANDROID_TOOLS_DEPENDENCIES = host-pkgconf
 
 # Extract the Debian tarball inside the sources
 define ANDROID_TOOLS_DEBIAN_EXTRACT
@@ -31,15 +33,24 @@ HOST_ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH
 ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH
 
 ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT),y)
-HOST_ANDROID_TOOLS_TARGETS += fastboot
+HOST_ANDROID_TOOLS_BUILD_TARGETS += fastboot
+HOST_ANDROID_TOOLS_INSTALL_TARGETS += build-fastboot/fastboot
 HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-libselinux
 endif
 
 ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB),y)
-HOST_ANDROID_TOOLS_TARGETS += adb
+HOST_ANDROID_TOOLS_BUILD_TARGETS += adb
+HOST_ANDROID_TOOLS_INSTALL_TARGETS += build-adb/adb
 HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-openssl
 endif
 
+ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS),y)
+HOST_ANDROID_TOOLS_BUILD_TARGETS += ext4_utils
+HOST_ANDROID_TOOLS_INSTALL_TARGETS += \
+	$(addprefix build-ext4_utils/,make_ext4fs ext4fixup ext2simg img2simg simg2img simg2simg)
+HOST_ANDROID_TOOLS_DEPENDENCIES += host-libselinux
+endif
+
 ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT),y)
 ANDROID_TOOLS_TARGETS += fastboot
 ANDROID_TOOLS_DEPENDENCIES += zlib libselinux
@@ -58,7 +69,7 @@ endif
 # Build each tool in its own directory not to share object files
 
 define HOST_ANDROID_TOOLS_BUILD_CMDS
-	$(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\
+	$(foreach t,$(HOST_ANDROID_TOOLS_BUILD_TARGETS),\
 		mkdir -p $(@D)/build-$(t) && \
 		$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) SRCDIR=$(@D) \
 			-C $(@D)/build-$(t) -f $(@D)/debian/makefiles/$(t).mk$(sep))
@@ -72,8 +83,8 @@ define ANDROID_TOOLS_BUILD_CMDS
 endef
 
 define HOST_ANDROID_TOOLS_INSTALL_CMDS
-	$(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\
-		$(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(HOST_DIR)/bin/$(t)$(sep))
+	$(foreach t,$(HOST_ANDROID_TOOLS_INSTALL_TARGETS),\
+		$(INSTALL) -D -m 0755 $(@D)/$(t) $(HOST_DIR)/bin/$(notdir $(t))$(sep))
 endef
 
 define ANDROID_TOOLS_INSTALL_TARGET_CMDS
diff --git a/buildroot/package/apache/apache.hash b/buildroot/package/apache/apache.hash
index 6d21f0f61..0c3a1d530 100644
--- a/buildroot/package/apache/apache.hash
+++ b/buildroot/package/apache/apache.hash
@@ -1,4 +1,4 @@
-# From http://archive.apache.org/dist/httpd/httpd-2.4.35.tar.bz2.sha256
-sha256 3498dc5c6772fac2eb7307dc7963122ffe243b5e806e0be4fb51974ff759d726 httpd-2.4.37.tar.bz2
+# From http://archive.apache.org/dist/httpd/httpd-2.4.39.tar.bz2.sha256
+sha256 b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2 httpd-2.4.39.tar.bz2
 # Locally computed
 sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE
diff --git a/buildroot/package/apache/apache.mk b/buildroot/package/apache/apache.mk
index 283c3cbd5..ebb28b653 100644
--- a/buildroot/package/apache/apache.mk
+++ b/buildroot/package/apache/apache.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APACHE_VERSION = 2.4.37
+APACHE_VERSION = 2.4.39
 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
 APACHE_SITE = http://archive.apache.org/dist/httpd
 APACHE_LICENSE = Apache-2.0
@@ -63,6 +63,15 @@ else
 APACHE_CONF_OPTS += --disable-lua
 endif
 
+ifeq ($(BR2_PACKAGE_NGHTTP2),y)
+APACHE_CONF_OPTS += \
+	--enable-http2 \
+	--with-nghttp2=$(STAGING_DIR)/usr
+APACHE_DEPENDENCIES += nghttp2
+else
+APACHE_CONF_OPTS += --disable-http2
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 APACHE_DEPENDENCIES += openssl
 APACHE_CONF_OPTS += \
diff --git a/buildroot/package/apr/apr.mk b/buildroot/package/apr/apr.mk
index 58b1d86b2..8f29e57c5 100644
--- a/buildroot/package/apr/apr.mk
+++ b/buildroot/package/apr/apr.mk
@@ -26,7 +26,12 @@ APR_CONF_ENV = \
 	ac_cv_sizeof_pid_t=4 \
 	ac_cv_struct_rlimit=yes \
 	ac_cv_o_nonblock_inherited=no \
-	apr_cv_mutex_recursive=yes
+	apr_cv_mutex_recursive=yes \
+	apr_cv_epoll=yes \
+	apr_cv_epoll_create1=yes \
+	apr_cv_dup3=yes \
+	apr_cv_sock_cloexec=yes \
+	apr_cv_accept4=yes
 APR_CONFIG_SCRIPTS = apr-1-config
 
 # Doesn't even try to guess when cross compiling
diff --git a/buildroot/package/argparse/argparse.hash b/buildroot/package/argparse/argparse.hash
index a4746bc6a..fa99609cc 100644
--- a/buildroot/package/argparse/argparse.hash
+++ b/buildroot/package/argparse/argparse.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	e00e5637c937d7bfca96025f2c598ba4fffe9eb818d69952e77b4c08167a6be3  argparse-0.5.0-1.src.rock
+# computed by luarocks/buildroot
+sha256 e4029f42d61cbdde1540e0a098a24b1fed0bc8a2803efe2a0d0d3e7f2f2f2c82  argparse-0.6.0-1.src.rock
+sha256 c9b9a9667934d50f028a99b2617469db66663dc3b09d289b82e73e950b2b85eb  argparse/LICENSE
diff --git a/buildroot/package/argparse/argparse.mk b/buildroot/package/argparse/argparse.mk
index 095f0a315..04c46b527 100644
--- a/buildroot/package/argparse/argparse.mk
+++ b/buildroot/package/argparse/argparse.mk
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-ARGPARSE_VERSION_UPSTREAM = 0.5.0
-ARGPARSE_VERSION = $(ARGPARSE_VERSION_UPSTREAM)-1
+ARGPARSE_VERSION = 0.6.0-1
 ARGPARSE_SUBDIR = argparse
 ARGPARSE_LICENSE = MIT
 ARGPARSE_LICENSE_FILES = $(ARGPARSE_SUBDIR)/LICENSE
diff --git a/buildroot/package/armadillo/Config.in b/buildroot/package/armadillo/Config.in
index 47c7cd9ff..b2b61a323 100644
--- a/buildroot/package/armadillo/Config.in
+++ b/buildroot/package/armadillo/Config.in
@@ -1,6 +1,5 @@
 comment "armadillo needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
-	depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el)
 	depends on !BR2_powerpc
 	depends on !BR2_m68k_cf
 
@@ -11,7 +10,6 @@ comment "armadillo needs a glibc toolchain w/ C++"
 config BR2_PACKAGE_ARMADILLO
 	bool "armadillo"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) # clapack
 	depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC # clapack
 	depends on !BR2_m68k_cf # clapack
 	select BR2_PACKAGE_CLAPACK
diff --git a/buildroot/package/assimp/Config.in b/buildroot/package/assimp/Config.in
index 41c1bb348..630758f3e 100644
--- a/buildroot/package/assimp/Config.in
+++ b/buildroot/package/assimp/Config.in
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_ASSIMP
 	bool "assimp"
-	# All gcc versions affected by
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that
-	# cause an infinite loop in gcc when building this package.
-	depends on !BR2_microblaze
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_ZLIB
 	help
@@ -16,5 +12,4 @@ config BR2_PACKAGE_ASSIMP
 	  http://www.assimp.org
 
 comment "assimp needs a toolchain w/ C++"
-	depends on !BR2_microblaze
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/buildroot/package/assimp/assimp.mk b/buildroot/package/assimp/assimp.mk
index 4d447487b..5720f9793 100644
--- a/buildroot/package/assimp/assimp.mk
+++ b/buildroot/package/assimp/assimp.mk
@@ -19,11 +19,15 @@ endif
 # workaround SuperH compiler failure when static linking (i.e -fPIC is
 # not passed) in gcc versions 5.x or older. The -Os optimization level
 # causes a "unable to find a register to spill in class
-# ‘GENERAL_REGS’" error. -O2 works fine.
+# 'GENERAL_REGS'" error. -O2 works fine.
 ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
 ASSIMP_CXXFLAGS += -O2
 endif
 
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+ASSIMP_CXXFLAGS += -O0
+endif
+
 ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
 	-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"
 
diff --git a/buildroot/package/asterisk/0001-configure-do-not-configure-in-menuselect.patch b/buildroot/package/asterisk/0001-configure-do-not-configure-in-menuselect.patch
deleted file mode 100644
index d6d02d2c3..000000000
--- a/buildroot/package/asterisk/0001-configure-do-not-configure-in-menuselect.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cc5daff874779475742bdb89a9328bb4fc4c4e09 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" 
-Date: Tue, 27 Dec 2016 11:20:19 +0100
-Subject: [PATCH] configure: do not configure in menuselect
-
-When cross-compiling, the arguments and environment for ./configure are
-different for the host and the target, and we want menuselect to be
-compiled for the build machine, not the target.
-
-Although we do not pass any option to ./configure for menuselect, the
-environment may still reference variables for the target, like CC or
-CFLAGS and so on... We can not build menuselect with those variables.
-
-Instead, just assume that menuselect will be pre-compiled.
-
-Signed-off-by: "Yann E. MORIN" 
----
- configure    | 16 ----------------
- configure.ac | 16 ----------------
- 2 files changed, 32 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 66c8971..121dd93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2662,12 +2662,6 @@ fi
- 
- AC_SUBST([PBX_SYSLOG])
- 
--if test -f makeopts; then
--	${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak
--else
--	touch makeopts.acbak
--fi
--
- AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
- AST_CHECK_MANDATORY
- 
-@@ -2683,16 +2677,6 @@ fi
- 
- AC_OUTPUT
- 
--${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
--if test "x${ac_cv_path_CMP}" = "x:"; then
--	( cd `pwd`/menuselect && ./configure )
--else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
--	( cd `pwd`/menuselect && ./configure )
--fi ; fi
--
--rm makeopts.acbak makeopts.acbak2
--
--
- if test "x${silent}" != "xyes" ; then
- echo
- echo "               .\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$=..      "
--- 
-2.7.4
-
diff --git a/buildroot/package/asterisk/0002-sounds-do-not-download-and-check-sha1s.patch b/buildroot/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch
similarity index 100%
rename from buildroot/package/asterisk/0002-sounds-do-not-download-and-check-sha1s.patch
rename to buildroot/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch
diff --git a/buildroot/package/asterisk/0003-configure-fix-detection-of-libcrypt.patch b/buildroot/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch
similarity index 100%
rename from buildroot/package/asterisk/0003-configure-fix-detection-of-libcrypt.patch
rename to buildroot/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch
diff --git a/buildroot/package/asterisk/0004-build-ensure-target-directory-for-modules-exists.patch b/buildroot/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch
similarity index 100%
rename from buildroot/package/asterisk/0004-build-ensure-target-directory-for-modules-exists.patch
rename to buildroot/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch
diff --git a/buildroot/package/asterisk/0005-install-samples-need-the-data-files.patch b/buildroot/package/asterisk/0004-install-samples-need-the-data-files.patch
similarity index 100%
rename from buildroot/package/asterisk/0005-install-samples-need-the-data-files.patch
rename to buildroot/package/asterisk/0004-install-samples-need-the-data-files.patch
diff --git a/buildroot/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch b/buildroot/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch
new file mode 100644
index 000000000..bee8fdbb1
--- /dev/null
+++ b/buildroot/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch
@@ -0,0 +1,38 @@
+From 9b4070944578336506cd0a76de6f733c72d0ca74 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" 
+Date: Sat, 13 Oct 2018 11:11:15 +0200
+Subject: [PATCH] configure: fix detection of re-entrant resolver functions
+
+Fixes https://issues.asterisk.org/jira/browse/ASTERISK-21795
+
+uClibc does not provide res_nsearch:
+asterisk-16.0.0/main/dns.c:506: undefined reference to `res_nsearch'
+
+Patch coded by Yann E. MORIN:
+http://lists.busybox.net/pipermail/buildroot/2018-October/232630.html
+
+Signed-off-by: Bernd Kuhls 
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd0c8edd13..ee1ca9ceb6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1388,7 +1388,11 @@ AC_LINK_IFELSE(
+ 			#include 
+ 			#endif
+ 			#include ],
+-			[int foo = res_ninit(NULL);])],
++			[
++				int foo;
++				foo = res_ninit(NULL);
++				foo = res_nsearch(NULL, NULL, 0, 0, NULL, 0);
++			])],
+ 	AC_MSG_RESULT(yes)
+ 	AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.])
+ 	AC_SEARCH_LIBS(res_9_ndestroy, resolv)
+-- 
+2.19.1
+
diff --git a/buildroot/package/asterisk/0006-build-fix-issues-building-without-ssl.patch b/buildroot/package/asterisk/0006-build-fix-issues-building-without-ssl.patch
deleted file mode 100644
index b02031e5a..000000000
--- a/buildroot/package/asterisk/0006-build-fix-issues-building-without-ssl.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 999e0c17d7e4139d36730752a34fbfde18a4f9f1 Mon Sep 17 00:00:00 2001
-From: Corey Farrell 
-Date: Sun, 19 Nov 2017 14:52:59 -0500
-Subject: [PATCH] Build: Fix issues building without SSL.
-
-* Fix conditional in libasteriskssl.
-* Use variables produced by configure to link the SSL and uuid libraries
-  into libasteriskpj.so instead of hard-coding them.
-
-ASTERISK-27431
-
-Change-Id: I3977931fd3ef8c4e4376349ccddb354eb839b58d
-
-Downloaded from upstream master branch
-https://github.com/asterisk/asterisk/commit/999e0c17d7e4139d36730752a34fbfde18a4f9f1
-
-Signed-off-by: Bernd Kuhls 
----
- main/Makefile         | 4 ++--
- main/libasteriskssl.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/main/Makefile b/main/Makefile
-index 08d1f65580e..c724e2012b0 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -273,7 +273,7 @@ endif
- 
- $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(PJ_LDFLAGS)
- $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS)
--$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB)
-+$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
- ifeq ($(GNU_LD),1)
-     $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common
- endif
-@@ -298,7 +298,7 @@ ASTPJ_LIB:=libasteriskpj.dylib
- # /lib or /usr/lib
- $(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS)
- $(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -DAST_NOT_MODULE
--$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS)  -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB)
-+$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS)  $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
- $(ASTPJ_LIB): SOLINK=$(DYLINK)
- 
- # Special rules for building a shared library (not a dynamically loadable module)
-diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
-index 8b19e247da9..e2e256f8ffe 100644
---- a/main/libasteriskssl.c
-+++ b/main/libasteriskssl.c
-@@ -37,7 +37,7 @@
- #endif
- 
- #if defined(HAVE_OPENSSL) && \
--	!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+	(!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
- 
- #include 
- 
diff --git a/buildroot/package/asterisk/0007-res_srtp-Add-support-for-libsrtp2-with-AES-GCM.patch b/buildroot/package/asterisk/0007-res_srtp-Add-support-for-libsrtp2-with-AES-GCM.patch
deleted file mode 100644
index 65ebe0658..000000000
--- a/buildroot/package/asterisk/0007-res_srtp-Add-support-for-libsrtp2-with-AES-GCM.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 95b45d1c46b35232ee0b9bdb3135b080c164c7c6 Mon Sep 17 00:00:00 2001
-From: Alexander Traud 
-Date: Wed, 18 Oct 2017 10:30:25 +0200
-Subject: [PATCH] res_srtp: Add support for libsrtp2 with AES-GCM.
-
-Beside allowing AES-GCM again, this adds AES-192 again.
-
-ASTERISK-27356
-
-Change-Id: Ia97a435faf26300335d9552fa676b5d17e5f7233
-[yann.morin.1998@free.fr: backport from upstream]
-Signed-off-by: "Yann E. MORIN" 
----
- configure              | 104 +++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac           |   1 +
- res/srtp/srtp_compat.h |  12 ++++++
- 3 files changed, 117 insertions(+)
-
-diff --git a/configure b/configure
-index 59bc3b10b1..588fbfd0be 100755
---- a/configure
-+++ b/configure
-@@ -33793,6 +33793,110 @@ fi
- 
- 
- 
-+if test "x${PBX_SRTP_192}" != "x1" -a "${USE_SRTP_192}" != "no"; then
-+   pbxlibdir=""
-+   # if --with-SRTP_192=DIR has been specified, use it.
-+   if test "x${SRTP_192_DIR}" != "x"; then
-+      if test -d ${SRTP_192_DIR}/lib; then
-+         pbxlibdir="-L${SRTP_192_DIR}/lib"
-+      else
-+         pbxlibdir="-L${SRTP_192_DIR}"
-+      fi
-+   fi
-+   pbxfuncname="srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80"
-+   if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
-+      AST_SRTP_192_FOUND=yes
-+   else
-+      ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
-+      CFLAGS="${CFLAGS} "
-+      as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5
-+$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; }
-+if eval \${$as_ac_Lib+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsrtp2 ${pbxlibdir}  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char ${pbxfuncname} ();
-+int
-+main ()
-+{
-+return ${pbxfuncname} ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$as_ac_Lib=yes"
-+else
-+  eval "$as_ac_Lib=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+eval ac_res=\$$as_ac_Lib
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-+  AST_SRTP_192_FOUND=yes
-+else
-+  AST_SRTP_192_FOUND=no
-+fi
-+
-+      CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
-+   fi
-+
-+   # now check for the header.
-+   if test "${AST_SRTP_192_FOUND}" = "yes"; then
-+      SRTP_192_LIB="${pbxlibdir} -lsrtp2 "
-+      # if --with-SRTP_192=DIR has been specified, use it.
-+      if test "x${SRTP_192_DIR}" != "x"; then
-+         SRTP_192_INCLUDE="-I${SRTP_192_DIR}/include"
-+      fi
-+      SRTP_192_INCLUDE="${SRTP_192_INCLUDE} "
-+      if test "x" = "x" ; then	# no header, assume found
-+         SRTP_192_HEADER_FOUND="1"
-+      else				# check for the header
-+         ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
-+         CPPFLAGS="${CPPFLAGS} ${SRTP_192_INCLUDE}"
-+         ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default"
-+if test "x$ac_cv_header_" = xyes; then :
-+  SRTP_192_HEADER_FOUND=1
-+else
-+  SRTP_192_HEADER_FOUND=0
-+fi
-+
-+
-+         CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
-+      fi
-+      if test "x${SRTP_192_HEADER_FOUND}" = "x0" ; then
-+         SRTP_192_LIB=""
-+         SRTP_192_INCLUDE=""
-+      else
-+         if test "x${pbxfuncname}" = "x" ; then		# only checking headers -> no library
-+            SRTP_192_LIB=""
-+         fi
-+         PBX_SRTP_192=1
-+         cat >>confdefs.h <<_ACEOF
-+#define HAVE_SRTP_192 1
-+_ACEOF
-+
-+      fi
-+   fi
-+fi
-+
-+
-+
- if test "x${PBX_SRTP_GCM}" != "x1" -a "${USE_SRTP_GCM}" != "no"; then
-    pbxlibdir=""
-    # if --with-SRTP_GCM=DIR has been specified, use it.
-diff --git a/configure.ac b/configure.ac
-index 9f95786e11..c729b94aba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2520,6 +2520,7 @@ AST_EXT_LIB_CHECK_SHARED([SRTP], [srtp2], [srtp_init], [srtp2/srtp.h], [], [], [
- if test "x$PBX_SRTP" = x1;
- then
-     AST_EXT_LIB_CHECK([SRTP_256], [srtp2], [srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80])
-+    AST_EXT_LIB_CHECK([SRTP_192], [srtp2], [srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80])
-     AST_EXT_LIB_CHECK([SRTP_GCM], [srtp2], [srtp_crypto_policy_set_aes_gcm_128_8_auth])
-     AST_EXT_LIB_CHECK([SRTP_SHUTDOWN], [srtp2], [srtp_shutdown], [srtp2/srtp.h])
- 
-diff --git a/res/srtp/srtp_compat.h b/res/srtp/srtp_compat.h
-index 56ffca1cc2..dbd8ddee0f 100644
---- a/res/srtp/srtp_compat.h
-+++ b/res/srtp/srtp_compat.h
-@@ -16,6 +16,18 @@
- #define crypto_policy_set_aes_gcm_128_8_auth srtp_crypto_policy_set_aes_gcm_128_8_auth
- #define crypto_policy_set_aes_gcm_256_8_auth srtp_crypto_policy_set_aes_gcm_256_8_auth
- 
-+#if defined(SRTP_AES_GCM_128_KEY_LEN_WSALT)
-+#define AES_128_GCM_KEYSIZE_WSALT SRTP_AES_GCM_128_KEY_LEN_WSALT
-+#else
-+#define AES_128_GCM_KEYSIZE_WSALT SRTP_AES_128_GCM_KEYSIZE_WSALT
-+#endif
-+
-+#if defined(SRTP_AES_GCM_256_KEY_LEN_WSALT)
-+#define AES_256_GCM_KEYSIZE_WSALT SRTP_AES_GCM_256_KEY_LEN_WSALT
-+#else
-+#define AES_256_GCM_KEYSIZE_WSALT SRTP_AES_256_GCM_KEYSIZE_WSALT
-+#endif
-+
- #define err_status_t srtp_err_status_t
- #define err_status_ok srtp_err_status_ok
- #define err_status_fail srtp_err_status_fail
--- 
-2.14.1
-
diff --git a/buildroot/package/asterisk/Config.in b/buildroot/package/asterisk/Config.in
index 17ac22bfd..c52456f8f 100644
--- a/buildroot/package/asterisk/Config.in
+++ b/buildroot/package/asterisk/Config.in
@@ -1,13 +1,16 @@
 config BR2_PACKAGE_ASTERISK
 	bool "asterisk"
-	# Uses glibc resolver function res_nsearch()
-	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS # dlfcn.h
+	depends on !BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_USE_MMU # libedit
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_WCHAR # libedit
 	select BR2_PACKAGE_JANSSON
 	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBEDIT
 	select BR2_PACKAGE_LIBILBC
 	select BR2_PACKAGE_LIBXML2
-	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -22,5 +25,8 @@ config BR2_PACKAGE_ASTERISK
 
 	  http://www.asterisk.org/
 
-comment "asterisk needs a glibc toolchain w/ C++"
-	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP
+comment "asterisk needs a glibc or uClibc toolchain w/ C++, dynamic library, threads, wchar"
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_USES_MUSL || !BR2_INSTALL_LIBSTDCPP \
+		|| BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_USE_WCHAR
diff --git a/buildroot/package/asterisk/asterisk.hash b/buildroot/package/asterisk/asterisk.hash
index 2449aeb4d..d8cc56695 100644
--- a/buildroot/package/asterisk/asterisk.hash
+++ b/buildroot/package/asterisk/asterisk.hash
@@ -1,15 +1,15 @@
 # Locally computed
-sha256  41c99bd2236af95d056e15f9d044c28b69e00935e67791b18fa70b0614402012  asterisk-14.7.8.tar.gz
+sha256  c022e9d5410ed94ab1aa51ba1e2a8b196f0dfa15bcd0bd545d06efee4c786578  asterisk-16.2.1.tar.gz
 
 # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases
 # sha256 locally computed
-sha1    65ee068462c6645ed14a28d6b34eb0e9aa7a6c8d                          asterisk-core-sounds-en-gsm-1.5.tar.gz
-sha256  8d1118c6e0a0c614fafe297e3789f924ef5b04285cf6a8cffb8501dfcf5bbf07  asterisk-core-sounds-en-gsm-1.5.tar.gz
+sha1    721c512feaea102700d5bdce952fdc0bb29dc640                          asterisk-core-sounds-en-gsm-1.6.1.tar.gz
+sha256  d79c3d2044d41da8f363c447dfccc140be86b4fcc41b1ca5a60a80da52f24f2d  asterisk-core-sounds-en-gsm-1.6.1.tar.gz
 sha1    f40fd6ea03dfe8d72ada2540b2288bfdc006381d                          asterisk-moh-opsound-wav-2.03.tar.gz
 sha256  449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538  asterisk-moh-opsound-wav-2.03.tar.gz
 
 # License files, locally computed
 sha256  82af40ed7f49c08685360811993d9396320842f021df828801d733e8fdc0312f  COPYING
 sha256  ac5571f00e558e3b7c9b3f13f421b874cc12cf4250c4f70094c71544cf486312  main/sha1.c
-sha256  0fcdb946955d20c2819a51f3fe613d8f22da2ea793bd50acb30ce156499acc88  codecs/speex/speex_resampler.h
-sha256  e6e7b7204d34a3dcdf17389a9c8cf64721ec0d15a797fd51c8c1ed8517cc3038  utils/db1-ast/include/db.h
+sha256  309462c10e84f46bda22032ebe6359f3e9e3e23afcf1fc2aaed5b59daf800d84  codecs/speex/speex_resampler.h
+sha256  1ca2c7a7a1ae7ccd75212a8c1e85dd9ec92bdbc9170aafd97ea60459387755fd  utils/db1-ast/include/db.h
diff --git a/buildroot/package/asterisk/asterisk.mk b/buildroot/package/asterisk/asterisk.mk
index 6de498ed0..65f8d3fdf 100644
--- a/buildroot/package/asterisk/asterisk.mk
+++ b/buildroot/package/asterisk/asterisk.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-ASTERISK_VERSION = 14.7.8
+ASTERISK_VERSION = 16.2.1
 # Use the github mirror: it's an official mirror maintained by Digium, and
 # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not.
 ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION))
 
 ASTERISK_SOUNDS_BASE_URL = http://downloads.asterisk.org/pub/telephony/sounds/releases
 ASTERISK_EXTRA_DOWNLOADS = \
-	$(ASTERISK_SOUNDS_BASE_URL)/asterisk-core-sounds-en-gsm-1.5.tar.gz \
+	$(ASTERISK_SOUNDS_BASE_URL)/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \
 	$(ASTERISK_SOUNDS_BASE_URL)/asterisk-moh-opsound-wav-2.03.tar.gz
 
 ASTERISK_LICENSE = GPL-2.0, BSD-3c (SHA1, resample), BSD-4c (db1-ast)
@@ -21,16 +21,16 @@ ASTERISK_LICENSE_FILES = \
 	codecs/speex/speex_resampler.h \
 	utils/db1-ast/include/db.h
 
-# For patches 0001, 0003 and 0004
+# For patches 0002, 0003 and 0005
 ASTERISK_AUTORECONF = YES
-ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject
+ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson
 
 ASTERISK_DEPENDENCIES = \
 	host-asterisk \
 	jansson \
 	libcurl \
+	libedit \
 	libxml2 \
-	ncurses \
 	sqlite \
 	util-linux
 
@@ -54,7 +54,6 @@ ASTERISK_CONF_OPTS = \
 	--without-curses \
 	--without-gtk2 \
 	--without-gmime \
-	--without-h323 \
 	--without-hoard \
 	--without-iconv \
 	--without-iksemel \
@@ -67,7 +66,6 @@ ASTERISK_CONF_OPTS = \
 	--without-kqueue \
 	--without-libedit \
 	--without-libxslt \
-	--without-ltdl \
 	--without-lua \
 	--without-misdn \
 	--without-mysqlclient \
@@ -79,8 +77,8 @@ ASTERISK_CONF_OPTS = \
 	--without-oss \
 	--without-postgres \
 	--without-pjproject \
+	--without-pjproject-bundled \
 	--without-popt \
-	--without-pwlib \
 	--without-resample \
 	--without-sdl \
 	--without-SDL_image \
@@ -99,7 +97,7 @@ ASTERISK_CONF_OPTS = \
 	--with-libcurl \
 	--with-ilbc \
 	--with-libxml2 \
-	--with-ncurses="$(STAGING_DIR)/usr" \
+	--with-libedit="$(STAGING_DIR)/usr" \
 	--with-sqlite3="$(STAGING_DIR)/usr" \
 	--with-sounds-cache=$(ASTERISK_DL_DIR)
 
@@ -110,8 +108,14 @@ ASTERISK_CONF_OPTS = \
 ASTERISK_CONF_OPTS += --without-avcodec
 
 ASTERISK_CONF_ENV = \
+	ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true \
 	ac_cv_path_CONFIG_LIBXML2=$(STAGING_DIR)/usr/bin/xml2-config
 
+# Uses __atomic_fetch_add_4
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+ASTERISK_CONF_ENV += LIBS="-latomic"
+endif
+
 ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
 ASTERISK_CONF_OPTS += --with-execinfo
 else
@@ -272,6 +276,11 @@ ASTERISK_DIRS = \
 
 ASTERISK_MAKE_OPTS = $(ASTERISK_DIRS)
 
+# Uses __atomic_fetch_add_4
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+ASTERISK_MAKE_OPTS += ASTLDFLAGS="-latomic"
+endif
+
 # We want to install sample configuration files, too.
 ASTERISK_INSTALL_TARGET_OPTS = \
 	$(ASTERISK_DIRS) \
diff --git a/buildroot/package/at/S99at b/buildroot/package/at/S99at
old mode 100755
new mode 100644
diff --git a/buildroot/package/atftp/atftp.hash b/buildroot/package/atftp/atftp.hash
index b7860c768..3e5e783cf 100644
--- a/buildroot/package/atftp/atftp.hash
+++ b/buildroot/package/atftp/atftp.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha1 fc9e9f821dfd2f257b4a5c32b948ed60b4e31fd1 atftp-0.7.1.tar.gz
+sha256 1ad080674e9f974217b3a703e7356c6c8446dc5e7b2014d0d06e1bfaa11b5041  atftp-0.7.2.tar.gz
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  LICENSE
diff --git a/buildroot/package/atftp/atftp.mk b/buildroot/package/atftp/atftp.mk
index e1c257cb8..cbe05ba7e 100644
--- a/buildroot/package/atftp/atftp.mk
+++ b/buildroot/package/atftp/atftp.mk
@@ -4,19 +4,19 @@
 #
 ################################################################################
 
-ATFTP_VERSION = 0.7.1
+ATFTP_VERSION = 0.7.2
 ATFTP_SITE = http://sourceforge.net/projects/atftp/files
 ATFTP_LICENSE = GPL-2.0+
 ATFTP_LICENSE_FILES = LICENSE
+# 0001-Makefile.am-link-against-libpthread-for-atftp.patch patches Makefile.am
+ATFTP_AUTORECONF = YES
 ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp
 # For static we need to explicitly link against libpthread
 ATFTP_LIBS = -lpthread
-# We use CPPFLAGS for -fgnu89-inline even though it's a compiler flag
-# because atftp discards configure environment CFLAGS. -fgnu89-inline
-# is needed to avoid multiple definition error with gcc 5. See
+# -fgnu89-inline is needed to avoid multiple definition error with gcc 5. See
 # https://gcc.gnu.org/gcc-5/porting_to.html.
 ATFTP_CONF_ENV = LIBS="$(ATFTP_LIBS)" \
-	CPPFLAGS="$(TARGET_CPPFLAGS) -fgnu89-inline"
+	CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline"
 
 ifeq ($(BR2_PACKAGE_READLINE),y)
 ATFTP_DEPENDENCIES += readline
diff --git a/buildroot/package/atk/0001-atk-meson.build-replace-shared_library-by-library.patch b/buildroot/package/atk/0001-atk-meson.build-replace-shared_library-by-library.patch
new file mode 100644
index 000000000..6260cca89
--- /dev/null
+++ b/buildroot/package/atk/0001-atk-meson.build-replace-shared_library-by-library.patch
@@ -0,0 +1,33 @@
+From da08587d9a57b45cc8a76cb31390c79c1199959b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Thu, 10 Jan 2019 10:13:03 +0100
+Subject: [PATCH] atk/meson.build: replace shared_library by library
+
+Use library instead of shared_library to allow the user to build a
+static libatk library
+
+Fixes:
+ - http://autobuild.buildroot.org/results/347a37dd2585974bdbf3bf99158e8ee9127d1202
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://gitlab.gnome.org/GNOME/atk/merge_requests/11]
+---
+ atk/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atk/meson.build b/atk/meson.build
+index 69ba6c5..0ad67e5 100644
+--- a/atk/meson.build
++++ b/atk/meson.build
+@@ -122,7 +122,7 @@ endif
+ 
+ atk_inc = include_directories('.')
+ 
+-libatk = shared_library('atk-@0@'.format(atk_api_version),
++libatk = library('atk-@0@'.format(atk_api_version),
+                         sources: atk_sources + atk_enums + atk_marshals,
+                         soversion: atk_soversion,
+                         version: atk_libversion,
+-- 
+2.14.1
+
diff --git a/buildroot/package/atk/atk.hash b/buildroot/package/atk/atk.hash
index 80aeecaee..911e65fcc 100644
--- a/buildroot/package/atk/atk.hash
+++ b/buildroot/package/atk/atk.hash
@@ -1,2 +1,5 @@
-# From http://ftp.gnome.org/pub/gnome/sources/atk/2.28/atk-2.28.1.sha256sum
-sha256 cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc atk-2.28.1.tar.xz
+# From http://ftp.gnome.org/pub/gnome/sources/atk/2.30/atk-2.30.0.sha256sum
+sha256 dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b atk-2.30.0.tar.xz
+
+# Hash for license file
+sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING
diff --git a/buildroot/package/atk/atk.mk b/buildroot/package/atk/atk.mk
index 64950bfd0..228b24a7d 100644
--- a/buildroot/package/atk/atk.mk
+++ b/buildroot/package/atk/atk.mk
@@ -4,15 +4,13 @@
 #
 ################################################################################
 
-ATK_VERSION_MAJOR = 2.28
-ATK_VERSION = $(ATK_VERSION_MAJOR).1
+ATK_VERSION_MAJOR = 2.30
+ATK_VERSION = $(ATK_VERSION_MAJOR).0
 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz
 ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)
 ATK_LICENSE = LGPL-2.0+
 ATK_LICENSE_FILES = COPYING
 ATK_INSTALL_STAGING = YES
-ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
-ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
-ATK_DEPENDENCIES = libglib2 host-pkgconf
+ATK_DEPENDENCIES = libglib2
 
-$(eval $(autotools-package))
+$(eval $(meson-package))
diff --git a/buildroot/package/atop/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch b/buildroot/package/atop/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch
deleted file mode 100644
index a80be7b73..000000000
--- a/buildroot/package/atop/0001-Include-sysmacros.h-to-compile-with-newer-gcc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 414127c03669b4eedc85778a7bff80cf601311d8 Mon Sep 17 00:00:00 2001
-From: SjonHortensius 
-Date: Fri, 24 Aug 2018 18:26:58 +0200
-Subject: [PATCH] Include sysmacros.h to compile with newer gcc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Older gcc throws a warning
-```
-photosyst.c: In function 'lvmmapname':
-photosyst.c:1465:13: warning: In the GNU C Library, "major" is defined
- by . For historical compatibility, it is
- currently defined by  as well, but we plan to
- remove this soon. To use "major", include 
- directly. If you did not intend to use a system-defined macro
- "major", you should undefine it after including .
-     dmp->major  = major(statbuf.st_rdev);
-```
-
-Newer gcc throws an error:
-
-```
-photosyst.c: In function ‘lvmmapname’:
-photosyst.c:1482:19: error: called object ‘major’ is not a function or function pointer
-     dmp->major  = major(statbuf.st_rdev);
-                   ^~~~~
-photosyst.c:1437:25: note: declared here
- lvmmapname(unsigned int major, unsigned int minor,
-            ~~~~~~~~~~~~~^~~~~
-```
-
-Signed-off-by: Giulio Benetti 
----
- photosyst.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/photosyst.c b/photosyst.c
-index 19cbbe1..50841a1 100644
---- a/photosyst.c
-+++ b/photosyst.c
-@@ -152,6 +152,7 @@
- static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof Exp $";
- 
- #include 
-+#include 
- #include 
- #include 
- #include 
--- 
-2.17.1
-
diff --git a/buildroot/package/atop/Config.in b/buildroot/package/atop/Config.in
index d42a201bd..9e42eddb5 100644
--- a/buildroot/package/atop/Config.in
+++ b/buildroot/package/atop/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_ATOP
 	bool "atop"
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # PERF_FLAG_FD_CLOEXEC
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_ZLIB
 	help
@@ -16,3 +17,7 @@ config BR2_PACKAGE_ATOP
 	  username, state, and exit code.
 
 	  http://www.atoptool.nl
+
+comment "atop needs a toolchain w/ headers >= 3.14"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
diff --git a/buildroot/package/atop/atop.hash b/buildroot/package/atop/atop.hash
index 9ee0d62bc..80082d022 100644
--- a/buildroot/package/atop/atop.hash
+++ b/buildroot/package/atop/atop.hash
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  73e4725de0bafac8c63b032e8479e2305e3962afbe977ec1abd45f9e104eb264  atop-2.3.0.tar.gz
+sha256  be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69  atop-2.4.0.tar.gz
 
 # Hash for license file:
 sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  COPYING
diff --git a/buildroot/package/atop/atop.mk b/buildroot/package/atop/atop.mk
index 2cc0da6af..4ea1ccf26 100644
--- a/buildroot/package/atop/atop.mk
+++ b/buildroot/package/atop/atop.mk
@@ -4,14 +4,21 @@
 #
 ################################################################################
 
-ATOP_VERSION = 2.3.0
+ATOP_VERSION = 2.4.0
 ATOP_SITE = http://www.atoptool.nl/download
 ATOP_LICENSE = GPL-2.0+
 ATOP_LICENSE_FILES = COPYING
 ATOP_DEPENDENCIES = ncurses zlib
 
+ATOP_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+ATOP_CFLAGS += -O0
+endif
+
 define ATOP_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" \
+		-C $(@D)
 endef
 
 define ATOP_INSTALL_TARGET_CMDS
diff --git a/buildroot/package/aubio/aubio.mk b/buildroot/package/aubio/aubio.mk
index b0cc8b899..ba182d9bd 100644
--- a/buildroot/package/aubio/aubio.mk
+++ b/buildroot/package/aubio/aubio.mk
@@ -27,7 +27,7 @@ AUBIO_CONF_OPTS += --disable-sndfile
 endif
 
 # Could not compile aubio in double precision mode with libsamplerate
-ifeq ($(BR2_PACKAGE_LIBSAMPLERATE)$(BR2_PACKAGE_FFTW_PRECISION_SINGLE),yy)
+ifeq ($(BR2_PACKAGE_LIBSAMPLERATE):$(BR2_PACKAGE_FFTW_DOUBLE),y:)
 AUBIO_DEPENDENCIES += libsamplerate
 AUBIO_CONF_OPTS += --enable-samplerate
 else
@@ -41,15 +41,14 @@ else
 AUBIO_CONF_OPTS += --disable-jack
 endif
 
-ifeq ($(BR2_PACKAGE_FFTW),y)
-AUBIO_DEPENDENCIES += fftw
 # fftw3 require double otherwise it will look for fftw3f
-ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y)
+ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y)
 AUBIO_CONF_OPTS += --enable-fftw3 --enable-double
-else ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y)
+AUBIO_DEPENDENCIES += fftw-double
+else ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y)
 AUBIO_CONF_OPTS += --enable-fftw3f --disable-double
-endif
-else  # !BR2_PACKAGE_FFTW
+AUBIO_DEPENDENCIES += fftw-single
+else
 AUBIO_CONF_OPTS += --disable-fftw3
 endif
 
diff --git a/buildroot/package/augeas/augeas.hash b/buildroot/package/augeas/augeas.hash
index 46b99dd8f..d69ef8577 100644
--- a/buildroot/package/augeas/augeas.hash
+++ b/buildroot/package/augeas/augeas.hash
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature from
-# http://download.augeas.net/augeas-1.10.1.tar.gz.sig
-sha256  52db256afab261d31cc147eaa1a71795a5fec59e888dfd0b65a84c7aacd6364d  augeas-1.10.1.tar.gz
+# http://download.augeas.net/augeas-1.11.0.tar.gz.sig
+sha256  393ce8f4055af89cd4c20bf903eacbbd909cf427891f41b56dc2ba66243ea0b0  augeas-1.11.0.tar.gz
 sha256  ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532  COPYING
diff --git a/buildroot/package/augeas/augeas.mk b/buildroot/package/augeas/augeas.mk
index c4b8b7e6c..8cb4f74e4 100644
--- a/buildroot/package/augeas/augeas.mk
+++ b/buildroot/package/augeas/augeas.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AUGEAS_VERSION = 1.10.1
+AUGEAS_VERSION = 1.11.0
 AUGEAS_SITE = http://download.augeas.net
 AUGEAS_INSTALL_STAGING = YES
 AUGEAS_LICENSE = LGPL-2.1+
diff --git a/buildroot/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch b/buildroot/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch
new file mode 100644
index 000000000..0e8408c83
--- /dev/null
+++ b/buildroot/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch
@@ -0,0 +1,48 @@
+From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001
+From: Trent Lloyd 
+Date: Sat, 22 Dec 2018 09:06:07 +0800
+Subject: [PATCH] Drop legacy unicast queries from address not on local link
+
+When handling legacy unicast queries, ensure that the source IP is
+inside a subnet on the local link, otherwise drop the packet.
+
+Fixes #145
+Fixes #203
+CVE-2017-6519
+CVE-2018-100084
+
+Backported from: e111def44a7df4624a4aa3f85fe98054bffb6b4f
+Signed-off-by: Artem Panfilov 
+---
+ avahi-core/server.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/avahi-core/server.c b/avahi-core/server.c
+index a2cb19a8..a2580e38 100644
+--- a/avahi-core/server.c
++++ b/avahi-core/server.c
+@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
+ 
+     if (avahi_dns_packet_is_query(p)) {
+         int legacy_unicast = 0;
++        char t[AVAHI_ADDRESS_STR_MAX];
+ 
+         /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the
+          * AR section completely here, so far. Until the day we add
+@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
+             legacy_unicast = 1;
+         }
+ 
++        if (!is_mdns_mcast_address(dst_address) &&
++            !avahi_interface_address_on_link(i, src_address)) {
++
++            avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol);
++            return;
++        }
++
+         if (legacy_unicast)
+             reflect_legacy_unicast_query_packet(s, p, i, src_address, port);
+ 
+-- 
+2.19.1
+
diff --git a/buildroot/package/avahi/S05avahi-setup.sh b/buildroot/package/avahi/S05avahi-setup.sh
old mode 100755
new mode 100644
diff --git a/buildroot/package/avahi/S50avahi-daemon b/buildroot/package/avahi/S50avahi-daemon
old mode 100755
new mode 100644
diff --git a/buildroot/package/avrdude/avrdude.mk b/buildroot/package/avrdude/avrdude.mk
index 0e34076e3..ae378dfba 100644
--- a/buildroot/package/avrdude/avrdude.mk
+++ b/buildroot/package/avrdude/avrdude.mk
@@ -15,8 +15,6 @@ AVRDUDE_AUTORECONF = YES
 AVRDUDE_CONF_OPTS = --enable-linuxgpio
 AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \
 	host-flex host-bison
-AVRDUDE_LICENSE = GPL-2.0+
-AVRDUDE_LICENSE_FILES = avrdude/COPYING
 
 ifeq ($(BR2_PACKAGE_LIBFTDI1),y)
 AVRDUDE_DEPENDENCIES += libftdi1
diff --git a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk
index 504929aee..8b3f67039 100644
--- a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk
+++ b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AZURE_IOT_SDK_C_VERSION = 2018-03-16
+AZURE_IOT_SDK_C_VERSION = 2018-12-13
 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c
 AZURE_IOT_SDK_C_SITE_METHOD = git
 AZURE_IOT_SDK_C_GIT_SUBMODULES = YES
diff --git a/buildroot/package/bash/0001-bash44-019.patch b/buildroot/package/bash/0001-bash44-019.patch
new file mode 100644
index 000000000..b3d2f331b
--- /dev/null
+++ b/buildroot/package/bash/0001-bash44-019.patch
@@ -0,0 +1,54 @@
+From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-019
+
+Signed-off-by: Peter Korsgaard 
+
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.4
+Patch-ID:	bash44-019
+
+Bug-Reported-by:	Kieran Grant 
+Bug-Reference-ID:	
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2018-02/msg00002.html
+
+Bug-Description:
+
+With certain values for PS1, especially those that wrap onto three or more
+lines, readline will miscalculate the number of invisible characters,
+leading to crashes and core dumps.
+
+Patch (apply with `patch -p0'):
+
+*** bash-4.4.18/lib/readline/display.c	2016-07-28 14:49:33.000000000 -0400
+--- b/lib/readline/display.c	2018-02-03 19:19:35.000000000 -0500
+***************
+*** 772,776 ****
+        wadjust = (newlines == 0)
+  		  ? prompt_invis_chars_first_line
+! 		  : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line);
+  
+        /* fix from Darin Johnson  for prompt string with
+--- b/788,794 ----
+        wadjust = (newlines == 0)
+  		  ? prompt_invis_chars_first_line
+! 		  : ((newlines == prompt_lines_estimate)
+! 		  	? (wrap_offset - prompt_invis_chars_first_line)
+! 		  	: 0);
+  
+        /* fix from Darin Johnson  for prompt string with
+*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 18
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- b/26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 19
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/buildroot/package/bash/0002-bash44-020.patch b/buildroot/package/bash/0002-bash44-020.patch
new file mode 100644
index 000000000..20f3abb58
--- /dev/null
+++ b/buildroot/package/bash/0002-bash44-020.patch
@@ -0,0 +1,181 @@
+From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-020
+
+Signed-off-by: Peter Korsgaard 
+
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.4
+Patch-ID:	bash44-020
+
+Bug-Reported-by:	Graham Northup 
+Bug-Reference-ID:	<537530c3-61f0-349b-9de6-fa4e2487f428@clarkson.edu>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00025.html
+
+Bug-Description:
+
+In circumstances involving long-running scripts that create and reap many
+processes, it is possible for the hash table bash uses to store exit
+statuses from asynchronous processes to develop loops. This patch fixes
+the loop causes and adds code to detect any future loops.
+
+Patch (apply with `patch -p0'):
+
+*** bash-4.4-patched/jobs.c	2016-11-11 13:42:55.000000000 -0500
+--- b/jobs.c	2017-02-22 15:16:28.000000000 -0500
+***************
+*** 813,818 ****
+    struct pidstat *ps;
+  
+!   bucket = pshash_getbucket (pid);
+!   psi = bgp_getindex ();
+    ps = &bgpids.storage[psi];
+  
+--- b/796,815 ----
+    struct pidstat *ps;
+  
+!   /* bucket == existing chain of pids hashing to same value
+!      psi = where were going to put this pid/status */
+! 
+!   bucket = pshash_getbucket (pid);	/* index into pidstat_table */
+!   psi = bgp_getindex ();		/* bgpids.head, index into storage */
+! 
+!   /* XXX - what if psi == *bucket? */
+!   if (psi == *bucket)
+!     {
+! #ifdef DEBUG
+!       internal_warning ("hashed pid %d (pid %d) collides with bgpids.head, skipping", psi, pid);
+! #endif
+!       bgpids.storage[psi].pid = NO_PID;		/* make sure */
+!       psi = bgp_getindex ();			/* skip to next one */
+!     }
+! 
+    ps = &bgpids.storage[psi];
+  
+***************
+*** 842,845 ****
+--- b/839,843 ----
+  {
+    struct pidstat *ps;
++   ps_index_t *bucket;
+  
+    ps = &bgpids.storage[psi];
+***************
+*** 847,856 ****
+      return;
+  
+!   if (ps->bucket_next != NO_PID)
+      bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev;
+!   if (ps->bucket_prev != NO_PID)
+      bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next;
+    else
+!     *(pshash_getbucket (ps->pid)) = ps->bucket_next;
+  }
+  
+--- b/845,861 ----
+      return;
+  
+!   if (ps->bucket_next != NO_PIDSTAT)
+      bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev;
+!   if (ps->bucket_prev != NO_PIDSTAT)
+      bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next;
+    else
+!     {
+!       bucket = pshash_getbucket (ps->pid);
+!       *bucket = ps->bucket_next;	/* deleting chain head in hash table */
+!     }
+! 
+!   /* clear out this cell, just in case */
+!   ps->pid = NO_PID;
+!   ps->bucket_next = ps->bucket_prev = NO_PIDSTAT;
+  }
+  
+***************
+*** 859,863 ****
+       pid_t pid;
+  {
+!   ps_index_t psi;
+  
+    if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0)
+--- b/864,868 ----
+       pid_t pid;
+  {
+!   ps_index_t psi, orig_psi;
+  
+    if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0)
+***************
+*** 865,871 ****
+  
+    /* Search chain using hash to find bucket in pidstat_table */
+!   for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next)
+!     if (bgpids.storage[psi].pid == pid)
+!       break;
+  
+    if (psi == NO_PIDSTAT)
+--- b/870,883 ----
+  
+    /* Search chain using hash to find bucket in pidstat_table */
+!   for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next)
+!     {
+!       if (bgpids.storage[psi].pid == pid)
+! 	break;
+!       if (orig_psi == bgpids.storage[psi].bucket_next)	/* catch reported bug */
+! 	{
+! 	  internal_warning ("bgp_delete: LOOP: psi (%d) == storage[psi].bucket_next", psi);
+! 	  return 0;
+! 	}
+!     }
+  
+    if (psi == NO_PIDSTAT)
+***************
+*** 905,909 ****
+       pid_t pid;
+  {
+!   ps_index_t psi;
+  
+    if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0)
+--- b/917,921 ----
+       pid_t pid;
+  {
+!   ps_index_t psi, orig_psi;
+  
+    if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0)
+***************
+*** 911,917 ****
+  
+    /* Search chain using hash to find bucket in pidstat_table */
+!   for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next)
+!     if (bgpids.storage[psi].pid == pid)
+!       return (bgpids.storage[psi].status);
+  
+    return -1;
+--- b/923,936 ----
+  
+    /* Search chain using hash to find bucket in pidstat_table */
+!   for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next)
+!     {
+!       if (bgpids.storage[psi].pid == pid)
+! 	return (bgpids.storage[psi].status);
+!       if (orig_psi == bgpids.storage[psi].bucket_next)	/* catch reported bug */
+! 	{
+! 	  internal_warning ("bgp_search: LOOP: psi (%d) == storage[psi].bucket_next", psi);
+! 	  return -1;
+! 	}
+!     }
+  
+    return -1;
+*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 19
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- b/26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 20
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/buildroot/package/bash/0003-bash44-021.patch b/buildroot/package/bash/0003-bash44-021.patch
new file mode 100644
index 000000000..52f3b75ea
--- /dev/null
+++ b/buildroot/package/bash/0003-bash44-021.patch
@@ -0,0 +1,61 @@
+From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-021
+
+Signed-off-by: Peter Korsgaard 
+
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.4
+Patch-ID:	bash44-021
+
+Bug-Reported-by:	werner@suse.de
+Bug-Reference-ID:	<201803281402.w2SE2VOa000476@noether.suse.de>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2018-03/msg00196.html
+
+Bug-Description:
+
+A SIGINT received inside a SIGINT trap handler can possibly cause the
+shell to loop.
+
+Patch (apply with `patch -p0'):
+
+*** bash-20180329/jobs.c	2018-02-11 18:07:22.000000000 -0500
+--- b/jobs.c	2018-04-02 14:24:21.000000000 -0400
+***************
+*** 2690,2694 ****
+    if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB))
+      {
+!       old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler);
+        waiting_for_child = 0;
+        if (old_sigint_handler == SIG_IGN)
+--- b/2690,2704 ----
+    if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB))
+      {
+!       SigHandler *temp_sigint_handler;
+! 
+!       temp_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler);
+!       if (temp_sigint_handler == wait_sigint_handler)
+!         {
+! #if defined (DEBUG)
+! 	  internal_warning ("wait_for: recursively setting old_sigint_handler to wait_sigint_handler: running_trap = %d", running_trap);
+! #endif
+!         }
+!       else
+! 	old_sigint_handler = temp_sigint_handler;
+        waiting_for_child = 0;
+        if (old_sigint_handler == SIG_IGN)
+*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 20
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- b/26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 21
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/buildroot/package/bash/0004-bash44-022.patch b/buildroot/package/bash/0004-bash44-022.patch
new file mode 100644
index 000000000..0db270a17
--- /dev/null
+++ b/buildroot/package/bash/0004-bash44-022.patch
@@ -0,0 +1,65 @@
+From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-022
+
+Signed-off-by: Peter Korsgaard 
+
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.4
+Patch-ID:	bash44-022
+
+Bug-Reported-by:	Nuzhna Pomoshch 
+Bug-Reference-ID:	<1317167476.1492079.1495999776464@mail.yahoo.com>
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-readline/2017-05/msg00005.html
+
+Bug-Description:
+
+There are cases where a failing readline command (e.g., delete-char at the end
+of a line) can cause a multi-character key sequence to `back up' and attempt
+to re-read some of the characters in the sequence.
+
+Patch (apply with `patch -p0'):
+
+*** bash-4.4-patched/lib/readline/readline.c	2016-04-20 15:53:52.000000000 -0400
+--- b/lib/readline/readline.c	2018-05-26 17:19:00.000000000 -0400
+***************
+*** 1058,1062 ****
+  	r = _rl_dispatch (ANYOTHERKEY, m);
+      }
+!   else if (r && map[ANYOTHERKEY].function)
+      {
+        /* We didn't match (r is probably -1), so return something to
+--- b/1056,1060 ----
+  	r = _rl_dispatch (ANYOTHERKEY, m);
+      }
+!   else if (r < 0 && map[ANYOTHERKEY].function)
+      {
+        /* We didn't match (r is probably -1), so return something to
+***************
+*** 1070,1074 ****
+        return -2;
+      }
+!   else if (r && got_subseq)
+      {
+        /* OK, back up the chain. */
+--- b/1068,1072 ----
+        return -2;
+      }
+!   else if (r < 0 && got_subseq)		/* XXX */
+      {
+        /* OK, back up the chain. */
+*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 21
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- b/26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 22
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/buildroot/package/bash/0005-bash44-023.patch b/buildroot/package/bash/0005-bash44-023.patch
new file mode 100644
index 000000000..05b18902a
--- /dev/null
+++ b/buildroot/package/bash/0005-bash44-023.patch
@@ -0,0 +1,56 @@
+From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-023
+
+Signed-off-by: Peter Korsgaard 
+
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.4
+Patch-ID:	bash44-023
+
+Bug-Reported-by:	Martijn Dekker 
+Bug-Reference-ID:	<5326d6b9-2625-1d32-3e6e-ad1d15462c09@inlv.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00041.html
+
+Bug-Description:
+
+When sourcing a file from an interactive shell, setting the SIGINT handler
+to the default and typing ^C will cause the shell to exit.
+
+Patch (apply with `patch -p0'):
+
+*** bash-4.4-patched/builtins/trap.def	2016-01-25 13:32:38.000000000 -0500
+--- b/builtins/trap.def	2016-11-06 12:04:35.000000000 -0500
+***************
+*** 99,102 ****
+--- b/99,103 ----
+  
+  extern int posixly_correct, subshell_environment;
++ extern int sourcelevel, running_trap;
+  
+  int
+***************
+*** 213,216 ****
+--- b/214,220 ----
+  			if (interactive)
+  			  set_signal_handler (SIGINT, sigint_sighandler);
++ 			/* special cases for interactive == 0 */
++ 			else if (interactive_shell && (sourcelevel||running_trap))
++ 			  set_signal_handler (SIGINT, sigint_sighandler);
+  			else
+  			  set_signal_handler (SIGINT, termsig_sighandler);
+*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 22
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- b/26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 23
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/buildroot/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch b/buildroot/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch
new file mode 100644
index 000000000..32f167996
--- /dev/null
+++ b/buildroot/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch
@@ -0,0 +1,27 @@
+configure.ac: don't check for C++ compiler
+
+Signed-off-by: Fabrice Fontaine 
+
+diff -durN beecrypt-4.2.1-orig/configure.ac beecrypt-4.2.1/configure.ac
+--- beecrypt-4.2.1-orig/configure.ac	2019-03-01 19:58:16.516117640 +0100
++++ beecrypt-4.2.1/configure.ac	2019-03-01 21:10:17.707391803 +0100
+@@ -119,9 +119,6 @@
+ 
+ # Checks for C compiler and preprocessor
+ AC_PROG_CC
+-AC_PROG_CPP
+-AC_PROG_CXX
+-AC_PROG_CXXCPP
+ AM_PROG_AS
+ AC_PROG_LD
+ AC_PROG_LN_S
+@@ -133,9 +130,6 @@
+ AC_LANG_PUSH(C)
+ AC_OPENMP
+ AC_LANG_POP(C)
+-AC_LANG_PUSH(C++)
+-AC_OPENMP
+-AC_LANG_POP(C++)
+ 
+ # Checks for compiler characteristics and flags
+ if test "$ac_enable_expert_mode" = no; then
diff --git a/buildroot/package/berkeleydb/berkeleydb.mk b/buildroot/package/berkeleydb/berkeleydb.mk
index a315943ee..e5c11bddc 100644
--- a/buildroot/package/berkeleydb/berkeleydb.mk
+++ b/buildroot/package/berkeleydb/berkeleydb.mk
@@ -20,18 +20,11 @@ BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \
 	db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \
 	db_stat db_tuner db_upgrade db_verify
 
-# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
-ifeq ($(BR2_m68k_cf),y)
-BERKELEYDB_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
-endif
-
 # build directory can't be the directory where configure are there, so..
 define BERKELEYDB_CONFIGURE_CMDS
 	(cd $(@D)/build_unix; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		$(BERKELEYDB_CONF_ENV) \
 		../dist/configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
diff --git a/buildroot/package/bind/0002-Replace-atomic-operations-in-bin-named-client.c-with.patch b/buildroot/package/bind/0002-Replace-atomic-operations-in-bin-named-client.c-with.patch
new file mode 100644
index 000000000..2701de766
--- /dev/null
+++ b/buildroot/package/bind/0002-Replace-atomic-operations-in-bin-named-client.c-with.patch
@@ -0,0 +1,133 @@
+From ef49780d30d3ddc5735cfc32561b678a634fa72f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= 
+Date: Wed, 17 Apr 2019 15:22:27 +0200
+Subject: [PATCH] Replace atomic operations in bin/named/client.c with
+ isc_refcount reference counting
+
+Signed-off-by: Peter Korsgaard 
+---
+ bin/named/client.c                     | 18 +++++++-----------
+ bin/named/include/named/interfacemgr.h |  5 +++--
+ bin/named/interfacemgr.c               |  7 +++++--
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/bin/named/client.c b/bin/named/client.c
+index 845326abc0..29fecadca8 100644
+--- a/bin/named/client.c
++++ b/bin/named/client.c
+@@ -402,12 +402,10 @@ tcpconn_detach(ns_client_t *client) {
+ static void
+ mark_tcp_active(ns_client_t *client, bool active) {
+ 	if (active && !client->tcpactive) {
+-		isc_atomic_xadd(&client->interface->ntcpactive, 1);
++		isc_refcount_increment0(&client->interface->ntcpactive, NULL);
+ 		client->tcpactive = active;
+ 	} else if (!active && client->tcpactive) {
+-		uint32_t old =
+-			isc_atomic_xadd(&client->interface->ntcpactive, -1);
+-		INSIST(old > 0);
++		isc_refcount_decrement(&client->interface->ntcpactive, NULL);
+ 		client->tcpactive = active;
+ 	}
+ }
+@@ -554,7 +552,7 @@ exit_check(ns_client_t *client) {
+ 		if (client->mortal && TCP_CLIENT(client) &&
+ 		    client->newstate != NS_CLIENTSTATE_FREED &&
+ 		    !ns_g_clienttest &&
+-		    isc_atomic_xadd(&client->interface->ntcpaccepting, 0) == 0)
++		    isc_refcount_current(&client->interface->ntcpaccepting) == 0)
+ 		{
+ 			/* Nobody else is accepting */
+ 			client->mortal = false;
+@@ -3328,7 +3326,6 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
+ 	isc_result_t result;
+ 	ns_client_t *client = event->ev_arg;
+ 	isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event;
+-	uint32_t old;
+ 
+ 	REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN);
+ 	REQUIRE(NS_CLIENT_VALID(client));
+@@ -3348,8 +3345,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
+ 	INSIST(client->naccepts == 1);
+ 	client->naccepts--;
+ 
+-	old = isc_atomic_xadd(&client->interface->ntcpaccepting, -1);
+-	INSIST(old > 0);
++	isc_refcount_decrement(&client->interface->ntcpaccepting, NULL);
+ 
+ 	/*
+ 	 * We must take ownership of the new socket before the exit
+@@ -3480,8 +3476,8 @@ client_accept(ns_client_t *client) {
+ 		 * quota is tcp-clients plus the number of listening
+ 		 * interfaces plus 1.)
+ 		 */
+-		exit = (isc_atomic_xadd(&client->interface->ntcpactive, 0) >
+-			(client->tcpactive ? 1 : 0));
++		exit = (isc_refcount_current(&client->interface->ntcpactive) >
++			(client->tcpactive ? 1U : 0U));
+ 		if (exit) {
+ 			client->newstate = NS_CLIENTSTATE_INACTIVE;
+ 			(void)exit_check(client);
+@@ -3539,7 +3535,7 @@ client_accept(ns_client_t *client) {
+ 	 * listening for connections itself to prevent the interface
+ 	 * going dead.
+ 	 */
+-	isc_atomic_xadd(&client->interface->ntcpaccepting, 1);
++	isc_refcount_increment0(&client->interface->ntcpaccepting, NULL);
+ }
+ 
+ static void
+diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h
+index 3535ef22a8..6e10f210fd 100644
+--- a/bin/named/include/named/interfacemgr.h
++++ b/bin/named/include/named/interfacemgr.h
+@@ -45,6 +45,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ 
+@@ -75,11 +76,11 @@ struct ns_interface {
+ 						/*%< UDP dispatchers. */
+ 	isc_socket_t *		tcpsocket;	/*%< TCP socket. */
+ 	isc_dscp_t		dscp;		/*%< "listen-on" DSCP value */
+-	int32_t			ntcpaccepting;	/*%< Number of clients
++	isc_refcount_t		ntcpaccepting;	/*%< Number of clients
+ 						     ready to accept new
+ 						     TCP connections on this
+ 						     interface */
+-	int32_t			ntcpactive;	/*%< Number of clients
++	isc_refcount_t		ntcpactive;	/*%< Number of clients
+ 						     servicing TCP queries
+ 						     (whether accepting or
+ 						     connected) */
+diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
+index d9f6df5802..135533be6b 100644
+--- a/bin/named/interfacemgr.c
++++ b/bin/named/interfacemgr.c
+@@ -386,8 +386,8 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
+ 	 * connections will be handled in parallel even though there is
+ 	 * only one client initially.
+ 	 */
+-	ifp->ntcpaccepting = 0;
+-	ifp->ntcpactive = 0;
++	isc_refcount_init(&ifp->ntcpaccepting, 0);
++	isc_refcount_init(&ifp->ntcpactive, 0);
+ 
+ 	ifp->nudpdispatch = 0;
+ 
+@@ -618,6 +618,9 @@ ns_interface_destroy(ns_interface_t *ifp) {
+ 
+ 	ns_interfacemgr_detach(&ifp->mgr);
+ 
++	isc_refcount_destroy(&ifp->ntcpactive);
++	isc_refcount_destroy(&ifp->ntcpaccepting);
++
+ 	ifp->magic = 0;
+ 	isc_mem_put(mctx, ifp, sizeof(*ifp));
+ }
+-- 
+2.11.0
+
diff --git a/buildroot/package/bind/bind.hash b/buildroot/package/bind/bind.hash
index ea76108cc..cdd4bdd31 100644
--- a/buildroot/package/bind/bind.hash
+++ b/buildroot/package/bind/bind.hash
@@ -1,4 +1,4 @@
-# Verified from https://ftp.isc.org/isc/bind9/9.11.5/bind-9.11.5.tar.gz.asc
-# with key BE0E9748B718253A28BB89FFF1B11BF05CF02E57
-sha256 a4cae11dad954bdd4eb592178f875bfec09fcc7e29fe0f6b7a4e5b5c6bc61322 bind-9.11.5.tar.gz
-sha256 336f3c40e37a1a13690efb4c63e20908faa4c40498cc02f3579fb67d3a1933a5 COPYRIGHT
+# Verified from https://ftp.isc.org/isc/bind9/9.11.6-P1/bind-9.11.6-P1.tar.gz.asc
+# with key 156890685EA0DF6A1371EF2017CC5DB1F0088407
+sha256 58ace2abb4d048b67abcdef0649ecd6cbd3b0652734a41a1d34f942d5500f8ef bind-9.11.6-P1.tar.gz
+sha256 cd02c93b8dcda794f55dfd1231828d69633072a98eee4874f9cf732d22d9dcde COPYRIGHT
diff --git a/buildroot/package/bind/bind.mk b/buildroot/package/bind/bind.mk
index 19d9d1cf5..42c240a74 100644
--- a/buildroot/package/bind/bind.mk
+++ b/buildroot/package/bind/bind.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-BIND_VERSION = 9.11.5
-BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION)
+BIND_VERSION = 9.11.6-P1
+BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 # bind does not support parallel builds.
 BIND_MAKE = $(MAKE1)
 BIND_INSTALL_STAGING = YES
@@ -74,8 +74,11 @@ else
 BIND_CONF_OPTS += --with-openssl=no
 endif
 
-# Used by dnssec-checkds and dnssec-coverage
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),)
+# Used by dnssec-keymgr
+ifeq ($(BR2_PACKAGE_PYTHON_PLY),y)
+BIND_DEPENDENCIES += host-python-ply
+BIND_CONF_OPTS += --with-python=$(HOST_DIR)/usr/bin/python
+else
 BIND_CONF_OPTS += --with-python=no
 endif
 
diff --git a/buildroot/package/binutils/2.30/0010-gas-use-literals-const16-for-xtensa-loop-relaxation.patch b/buildroot/package/binutils/2.30/0010-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
new file mode 100644
index 000000000..ed617bcaf
--- /dev/null
+++ b/buildroot/package/binutils/2.30/0010-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
@@ -0,0 +1,294 @@
+From 0dbdfb7918d0b0cfcb8883b24c1291574bf5bb7c Mon Sep 17 00:00:00 2001
+From: Max Filippov 
+Date: Tue, 2 Apr 2019 14:32:42 -0700
+Subject: [PATCH] gas: use literals/const16 for xtensa loop relaxation
+
+Loop opcode relaxation that uses addi/addmi doesn't work well with other
+relaxations that may cause code movement. Instead of encoding fixed loop
+end offset in the relaxed sequence use l32r or a pair of const16 to load
+loop end address. This way the address of the loop end gets a relocation
+record and it gets updated appropriately.
+
+gas/
+2019-04-02  Max Filippov  
+
+	* config/tc-xtensa.c (convert_frag_immed): Drop
+	convert_frag_immed_finish_loop invocation.
+	(convert_frag_immed_finish_loop): Drop declaration and
+	definition.
+	* config/xtensa-relax.c (widen_spec_list): Replace loop
+	widening that uses addi/addmi with widening that uses l32r
+	and const16.
+
+Signed-off-by: Max Filippov 
+---
+ gas/config/tc-xtensa.c    | 120 ----------------------------------------------
+ gas/config/xtensa-relax.c |  77 ++++++++++++++++++++---------
+ 2 files changed, 55 insertions(+), 142 deletions(-)
+
+diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
+index 3bdbbc931cfc..0cc06361cf6f 100644
+--- a/gas/config/tc-xtensa.c
++++ b/gas/config/tc-xtensa.c
+@@ -10668,7 +10668,6 @@ convert_frag_fill_nop (fragS *fragP)
+ static fixS *fix_new_exp_in_seg
+   (segT, subsegT, fragS *, int, int, expressionS *, int,
+    bfd_reloc_code_real_type);
+-static void convert_frag_immed_finish_loop (segT, fragS *, TInsn *);
+ 
+ static void
+ convert_frag_immed (segT segP,
+@@ -10910,9 +10909,6 @@ convert_frag_immed (segT segP,
+ 	}
+     }
+ 
+-  if (expanded && xtensa_opcode_is_loop (isa, orig_tinsn.opcode) == 1)
+-    convert_frag_immed_finish_loop (segP, fragP, &orig_tinsn);
+-
+   if (expanded && is_direct_call_opcode (orig_tinsn.opcode))
+     {
+       /* Add an expansion note on the expanded instruction.  */
+@@ -10949,122 +10945,6 @@ fix_new_exp_in_seg (segT new_seg,
+ }
+ 
+ 
+-/* Relax a loop instruction so that it can span loop >256 bytes.
+-
+-                  loop    as, .L1
+-          .L0:
+-                  rsr     as, LEND
+-                  wsr     as, LBEG
+-                  addi    as, as, lo8 (label-.L1)
+-                  addmi   as, as, mid8 (label-.L1)
+-                  wsr     as, LEND
+-                  isync
+-                  rsr     as, LCOUNT
+-                  addi    as, as, 1
+-          .L1:
+-                  <>
+-          label:
+-*/
+-
+-static void
+-convert_frag_immed_finish_loop (segT segP, fragS *fragP, TInsn *tinsn)
+-{
+-  TInsn loop_insn;
+-  TInsn addi_insn;
+-  TInsn addmi_insn;
+-  unsigned long target;
+-  static xtensa_insnbuf insnbuf = NULL;
+-  unsigned int loop_length, loop_length_hi, loop_length_lo;
+-  xtensa_isa isa = xtensa_default_isa;
+-  addressT loop_offset;
+-  addressT addi_offset = 9;
+-  addressT addmi_offset = 12;
+-  fragS *next_fragP;
+-  int target_count;
+-
+-  if (!insnbuf)
+-    insnbuf = xtensa_insnbuf_alloc (isa);
+-
+-  /* Get the loop offset.  */
+-  loop_offset = get_expanded_loop_offset (tinsn->opcode);
+-
+-  /* Validate that there really is a LOOP at the loop_offset.  Because
+-     loops are not bundleable, we can assume that the instruction will be
+-     in slot 0.  */
+-  tinsn_from_chars (&loop_insn, fragP->fr_opcode + loop_offset, 0);
+-  tinsn_immed_from_frag (&loop_insn, fragP, 0);
+-
+-  gas_assert (xtensa_opcode_is_loop (isa, loop_insn.opcode) == 1);
+-  addi_offset += loop_offset;
+-  addmi_offset += loop_offset;
+-
+-  gas_assert (tinsn->ntok == 2);
+-  if (tinsn->tok[1].X_op == O_constant)
+-    target = tinsn->tok[1].X_add_number;
+-  else if (tinsn->tok[1].X_op == O_symbol)
+-    {
+-      /* Find the fragment.  */
+-      symbolS *sym = tinsn->tok[1].X_add_symbol;
+-      gas_assert (S_GET_SEGMENT (sym) == segP
+-	      || S_GET_SEGMENT (sym) == absolute_section);
+-      target = (S_GET_VALUE (sym) + tinsn->tok[1].X_add_number);
+-    }
+-  else
+-    {
+-      as_bad (_("invalid expression evaluation type %d"), tinsn->tok[1].X_op);
+-      target = 0;
+-    }
+-
+-  loop_length = target - (fragP->fr_address + fragP->fr_fix);
+-  loop_length_hi = loop_length & ~0x0ff;
+-  loop_length_lo = loop_length & 0x0ff;
+-  if (loop_length_lo >= 128)
+-    {
+-      loop_length_lo -= 256;
+-      loop_length_hi += 256;
+-    }
+-
+-  /* Because addmi sign-extends the immediate, 'loop_length_hi' can be at most
+-     32512.  If the loop is larger than that, then we just fail.  */
+-  if (loop_length_hi > 32512)
+-    as_bad_where (fragP->fr_file, fragP->fr_line,
+-		  _("loop too long for LOOP instruction"));
+-
+-  tinsn_from_chars (&addi_insn, fragP->fr_opcode + addi_offset, 0);
+-  gas_assert (addi_insn.opcode == xtensa_addi_opcode);
+-
+-  tinsn_from_chars (&addmi_insn, fragP->fr_opcode + addmi_offset, 0);
+-  gas_assert (addmi_insn.opcode == xtensa_addmi_opcode);
+-
+-  set_expr_const (&addi_insn.tok[2], loop_length_lo);
+-  tinsn_to_insnbuf (&addi_insn, insnbuf);
+-
+-  fragP->tc_frag_data.is_insn = TRUE;
+-  xtensa_insnbuf_to_chars
+-    (isa, insnbuf, (unsigned char *) fragP->fr_opcode + addi_offset, 0);
+-
+-  set_expr_const (&addmi_insn.tok[2], loop_length_hi);
+-  tinsn_to_insnbuf (&addmi_insn, insnbuf);
+-  xtensa_insnbuf_to_chars
+-    (isa, insnbuf, (unsigned char *) fragP->fr_opcode + addmi_offset, 0);
+-
+-  /* Walk through all of the frags from here to the loop end
+-     and mark them as no_transform to keep them from being modified
+-     by the linker.  If we ever have a relocation for the
+-     addi/addmi of the difference of two symbols we can remove this.  */
+-
+-  target_count = 0;
+-  for (next_fragP = fragP; next_fragP != NULL;
+-       next_fragP = next_fragP->fr_next)
+-    {
+-      next_fragP->tc_frag_data.is_no_transform = TRUE;
+-      if (next_fragP->tc_frag_data.is_loop_target)
+-	target_count++;
+-      if (target_count == 2)
+-	break;
+-    }
+-}
+-
+ 
+ /* A map that keeps information on a per-subsegment basis.  This is
+    maintained during initial assembly, but is invalid once the
+diff --git a/gas/config/xtensa-relax.c b/gas/config/xtensa-relax.c
+index cb296ed85ed2..daf15d52c259 100644
+--- a/gas/config/xtensa-relax.c
++++ b/gas/config/xtensa-relax.c
+@@ -87,13 +87,7 @@
+    when the first and second operands are not the same as specified
+    by the "| %at!=%as" precondition clause.
+    {"l32i %at,%as,%imm | %at!=%as",
+-   "LITERAL %imm; l32r %at,%LITERAL; add %at,%at,%as; l32i %at,%at,0"}
+-
+-   There is special case for loop instructions here, but because we do
+-   not currently have the ability to represent the difference of two
+-   symbols, the conversion requires special code in the assembler to
+-   write the operands of the addi/addmi pair representing the
+-   difference of the old and new loop end label.  */
++   "LITERAL %imm; l32r %at,%LITERAL; add %at,%at,%as; l32i %at,%at,0"}  */
+ 
+ #include "as.h"
+ #include "xtensa-isa.h"
+@@ -306,44 +300,83 @@ static string_pattern_pair widen_spec_list[] =
+   {"l32i %at,%as,%imm | %at!=%as ? IsaUseConst16",
+    "const16 %at,HI16U(%imm); const16 %at,LOW16U(%imm); add %at,%at,%as; l32i %at,%at,0"},
+ 
+-  /* This is only PART of the loop instruction.  In addition,
+-     hardcoded into its use is a modification of the final operand in
+-     the instruction in bytes 9 and 12.  */
+-  {"loop %as,%label | %as!=1 ? IsaUseLoops",
++  /* Widening loops with literals.  */
++  {"loop %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R",
++   "loop %as,%LABEL;"
++   "rsr.lend    %as;"		/* LEND */
++   "wsr.lbeg    %as;"		/* LBEG */
++   "LITERAL     %label;"
++   "l32r        %as, %LITERAL;"
++   "nop;"
++   "wsr.lend    %as;"
++   "isync;"
++   "rsr.lcount    %as;"		/* LCOUNT */
++   "addi    %as, %as, 1;"
++   "LABEL"},
++  {"loopgtz %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R",
++   "beqz    %as,%label;"
++   "bltz    %as,%label;"
++   "loopgtz %as,%LABEL;"
++   "rsr.lend    %as;"		/* LEND */
++   "wsr.lbeg    %as;"		/* LBEG */
++   "LITERAL     %label;"
++   "l32r        %as, %LITERAL;"
++   "nop;"
++   "wsr.lend    %as;"
++   "isync;"
++   "rsr.lcount    %as;"		/* LCOUNT */
++   "addi    %as, %as, 1;"
++   "LABEL"},
++  {"loopnez %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R",
++   "beqz     %as,%label;"
++   "loopnez %as,%LABEL;"
++   "rsr.lend    %as;"		/* LEND */
++   "wsr.lbeg    %as;"		/* LBEG */
++   "LITERAL     %label;"
++   "l32r        %as, %LITERAL;"
++   "nop;"
++   "wsr.lend    %as;"
++   "isync;"
++   "rsr.lcount    %as;"		/* LCOUNT */
++   "addi    %as, %as, 1;"
++   "LABEL"},
++
++  /* Widening loops with const16.  */
++  {"loop %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16",
+    "loop %as,%LABEL;"
+    "rsr.lend    %as;"		/* LEND */
+    "wsr.lbeg    %as;"		/* LBEG */
+-   "addi    %as, %as, 0;"	/* lo8(%label-%LABEL1) */
+-   "addmi   %as, %as, 0;"	/* mid8(%label-%LABEL1) */
++   "const16     %as,HI16U(%label);"
++   "const16     %as,LOW16U(%label);"
+    "wsr.lend    %as;"
+    "isync;"
+    "rsr.lcount    %as;"		/* LCOUNT */
+-   "addi    %as, %as, 1;"	/* density -> addi.n %as, %as, 1 */
++   "addi    %as, %as, 1;"
+    "LABEL"},
+-  {"loopgtz %as,%label | %as!=1 ? IsaUseLoops",
++  {"loopgtz %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16",
+    "beqz    %as,%label;"
+    "bltz    %as,%label;"
+    "loopgtz %as,%LABEL;"
+    "rsr.lend    %as;"		/* LEND */
+    "wsr.lbeg    %as;"		/* LBEG */
+-   "addi    %as, %as, 0;"	/* lo8(%label-%LABEL1) */
+-   "addmi   %as, %as, 0;"	/* mid8(%label-%LABEL1) */
++   "const16     %as,HI16U(%label);"
++   "const16     %as,LOW16U(%label);"
+    "wsr.lend    %as;"
+    "isync;"
+    "rsr.lcount    %as;"		/* LCOUNT */
+-   "addi    %as, %as, 1;"	/* density -> addi.n %as, %as, 1 */
++   "addi    %as, %as, 1;"
+    "LABEL"},
+-  {"loopnez %as,%label | %as!=1 ? IsaUseLoops",
++  {"loopnez %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16",
+    "beqz     %as,%label;"
+    "loopnez %as,%LABEL;"
+    "rsr.lend    %as;"		/* LEND */
+    "wsr.lbeg    %as;"		/* LBEG */
+-   "addi    %as, %as, 0;"	/* lo8(%label-%LABEL1) */
+-   "addmi   %as, %as, 0;"	/* mid8(%label-%LABEL1) */
++   "const16     %as,HI16U(%label);"
++   "const16     %as,LOW16U(%label);"
+    "wsr.lend    %as;"
+    "isync;"
+    "rsr.lcount    %as;"		/* LCOUNT */
+-   "addi    %as, %as, 1;"	/* density -> addi.n %as, %as, 1 */
++   "addi    %as, %as, 1;"
+    "LABEL"},
+ 
+   /* Relaxing to wide branches.  Order is important here.  With wide
+-- 
+2.11.0
+
diff --git a/buildroot/package/binutils/2.31.1/0002-ld-makefile.patch b/buildroot/package/binutils/2.31.1/0002-ld-makefile.patch
deleted file mode 100644
index 6893d65aa..000000000
--- a/buildroot/package/binutils/2.31.1/0002-ld-makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ae435bc27e1eb59e4ad571a37a144bf99dc68f55 Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Fri, 25 Dec 2015 11:40:53 +0100
-Subject: [PATCH] ld-makefile
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour 
----
- ld/Makefile.am | 2 +-
- ld/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index d86ad0940c9..c95b0ef0252 100644
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -57,7 +57,7 @@ endif
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 4792b2b013c..789df2d01b9 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
--- 
-2.14.4
-
diff --git a/buildroot/package/binutils/2.31.1/0003-check-ldrunpath-length.patch b/buildroot/package/binutils/2.31.1/0003-check-ldrunpath-length.patch
deleted file mode 100644
index 6cdf08542..000000000
--- a/buildroot/package/binutils/2.31.1/0003-check-ldrunpath-length.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a216bfcd91363a8e8c14db320a2870fff2985d78 Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Fri, 25 Dec 2015 11:41:47 +0100
-Subject: [PATCH] check-ldrunpath-length
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour 
----
- ld/emultempl/elf32.em | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 1ad9d6b6fa8..637a5d5d585 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -1471,6 +1471,8 @@ fragment <link.next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
--- 
-2.14.4
-
diff --git a/buildroot/package/binutils/2.31.1/0004-add-sysroot-fix-from-bug-3049.patch b/buildroot/package/binutils/2.31.1/0004-add-sysroot-fix-from-bug-3049.patch
deleted file mode 100644
index 1ef138506..000000000
--- a/buildroot/package/binutils/2.31.1/0004-add-sysroot-fix-from-bug-3049.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 73ecf6f6a1f327c9fa3af1fc924d152321aac801 Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Fri, 25 Dec 2015 11:42:48 +0100
-Subject: [PATCH] add sysroot fix from bug #3049
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
-Signed-off-by: Sven Rebhan 
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour 
----
- ld/ldfile.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index a72ff135264..b3d166cbd60 100644
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch,
-      directory first.  */
-   if (!entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+     /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+     entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+     if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+     && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
--- 
-2.14.4
-
diff --git a/buildroot/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/buildroot/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
new file mode 100644
index 000000000..8a05af4bb
--- /dev/null
+++ b/buildroot/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
@@ -0,0 +1,568 @@
+From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" 
+Date: Fri, 20 Jul 2018 09:18:47 -0700
+Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed
+
+When -z separate-code, which is enabled by default for Linux/x86, is
+used to create executable, ld won't place any data in the code-only
+PT_LOAD segment.  If there are no data sections placed before the
+code-only PT_LOAD segment, the program headers won't be mapped into
+any PT_LOAD segment.  When the executable tries to access it (based
+on the program header address passed in AT_PHDR), it will lead to
+segfault.  This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if
+there may be no data sections before the text section so that the
+first PT_LOAD segment won't be code-only and will contain the program
+header.
+
+Testcases are adjusted to either pass "-z noseparate-code" to ld or
+discard the .note.gnu.property section.  A Linux/x86 run-time test is
+added.
+
+bfd/
+
+	PR ld/23428
+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
+	separate code program header is needed, make sure that the first
+	read-only PT_LOAD segment has no code by adding a
+	GNU_PROPERTY_X86_ISA_1_USED note.
+
+ld/
+
+	PR ld/23428
+	* testsuite/ld-elf/linux-x86.S: New file.
+	* testsuite/ld-elf/linux-x86.exp: Likewise.
+	* testsuite/ld-elf/pr23428.c: Likewise.
+	* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
+	for Linux/x86 targets.
+	* testsuite/ld-i386/abs-iamcu.d: Likewise.
+	* testsuite/ld-i386/abs.d: Likewise.
+	* testsuite/ld-i386/pr12718.d: Likewise.
+	* testsuite/ld-i386/pr12921.d: Likewise.
+	* testsuite/ld-x86-64/abs-k1om.d: Likewise.
+	* testsuite/ld-x86-64/abs-l1om.d: Likewise.
+	* testsuite/ld-x86-64/abs.d: Likewise.
+	* testsuite/ld-x86-64/pr12718.d: Likewise.
+	* testsuite/ld-x86-64/pr12921.d: Likewise.
+	* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
+	section.
+	* testsuite/ld-scripts/print-memory-usage.t: Likewise.
+	* testsuite/ld-scripts/size-2.t: Likewise.
+	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld
+	to create executable if language is "asm".
+
+(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5)
+Signed-off-by: Norbert Lange 
+---
+ bfd/ChangeLog                                |  8 ++++
+ bfd/elfxx-x86.c                              | 60 +++++++++++++++++++-------
+ ld/ChangeLog                                 | 24 +++++++++++
+ ld/testsuite/ld-elf/linux-x86.S              | 63 ++++++++++++++++++++++++++++
+ ld/testsuite/ld-elf/linux-x86.exp            | 46 ++++++++++++++++++++
+ ld/testsuite/ld-elf/pr23428.c                | 43 +++++++++++++++++++
+ ld/testsuite/ld-elf/sec64k.exp               |  2 +
+ ld/testsuite/ld-i386/abs-iamcu.d             |  2 +-
+ ld/testsuite/ld-i386/abs.d                   |  2 +-
+ ld/testsuite/ld-i386/pr12718.d               |  2 +-
+ ld/testsuite/ld-i386/pr12921.d               |  2 +-
+ ld/testsuite/ld-linkonce/zeroeh.ld           |  1 +
+ ld/testsuite/ld-scripts/print-memory-usage.t |  2 +
+ ld/testsuite/ld-scripts/size-2.t             |  1 +
+ ld/testsuite/ld-x86-64/abs-k1om.d            |  2 +-
+ ld/testsuite/ld-x86-64/abs-l1om.d            |  2 +-
+ ld/testsuite/ld-x86-64/abs.d                 |  2 +-
+ ld/testsuite/ld-x86-64/pr12718.d             |  2 +-
+ ld/testsuite/ld-x86-64/pr12921.d             |  2 +-
+ ld/testsuite/lib/ld-lib.exp                  |  5 ++-
+ 20 files changed, 248 insertions(+), 25 deletions(-)
+ create mode 100644 ld/testsuite/ld-elf/linux-x86.S
+ create mode 100644 ld/testsuite/ld-elf/linux-x86.exp
+ create mode 100644 ld/testsuite/ld-elf/pr23428.c
+
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 1c1174a..d3831b7 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1,3 +1,11 @@
++2018-07-23  H.J. Lu  
++
++	PR ld/23428
++	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
++	separate code program header is needed, make sure that the first
++	read-only PT_LOAD segment has no code by adding a
++	GNU_PROPERTY_X86_ISA_1_USED note.
++
+ 2018-07-18  Nick Clifton  
+
+ 	* development.sh: Set to true.
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index a2497aa..2e4ff88 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+   const struct elf_backend_data *bed;
+   unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2;
+   unsigned int got_align;
++  bfd_boolean has_text = FALSE;
+
+   features = 0;
+   if (info->ibt)
+@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties
+     if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour
+ 	&& bfd_count_sections (pbfd) != 0)
+       {
++	if (!has_text)
++	  {
++	    /* Check if there is no non-empty text section.  */
++	    sec = bfd_get_section_by_name (pbfd, ".text");
++	    if (sec != NULL && sec->size != 0)
++	      has_text = TRUE;
++	  }
++
+ 	ebfd = pbfd;
+
+ 	if (elf_properties (pbfd) != NULL)
+ 	  break;
+       }
+
+-  if (ebfd != NULL && features)
++  bed = get_elf_backend_data (info->output_bfd);
++
++  htab = elf_x86_hash_table (info, bed->target_id);
++  if (htab == NULL)
++    return pbfd;
++
++  if (ebfd != NULL)
+     {
+-      /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
+-	 GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
+-      prop = _bfd_elf_get_property (ebfd,
+-				    GNU_PROPERTY_X86_FEATURE_1_AND,
+-				    4);
+-      prop->u.number |= features;
+-      prop->pr_kind = property_number;
++      prop = NULL;
++      if (features)
++	{
++	  /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
++	     GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
++	  prop = _bfd_elf_get_property (ebfd,
++					GNU_PROPERTY_X86_FEATURE_1_AND,
++					4);
++	  prop->u.number |= features;
++	  prop->pr_kind = property_number;
++	}
++      else if (has_text
++	       && elf_properties (ebfd) == NULL
++	       && elf_tdata (info->output_bfd)->o->build_id.sec == NULL
++	       && !htab->elf.dynamic_sections_created
++	       && !info->traditional_format
++	       && (info->output_bfd->flags & D_PAGED) != 0
++	       && info->separate_code)
++	{
++	  /* If the separate code program header is needed, make sure
++	     that the first read-only PT_LOAD segment has no code by
++	     adding a GNU_PROPERTY_X86_ISA_1_USED note.  */
++	  prop = _bfd_elf_get_property (ebfd,
++					GNU_PROPERTY_X86_ISA_1_USED,
++					4);
++	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
++	  prop->pr_kind = property_number;
++	}
+
+       /* Create the GNU property note section if needed.  */
+-      if (pbfd == NULL)
++      if (prop != NULL && pbfd == NULL)
+ 	{
+ 	  sec = bfd_make_section_with_flags (ebfd,
+ 					     NOTE_GNU_PROPERTY_SECTION_NAME,
+@@ -2581,12 +2617,6 @@ error_alignment:
+
+   pbfd = _bfd_elf_link_setup_gnu_properties (info);
+
+-  bed = get_elf_backend_data (info->output_bfd);
+-
+-  htab = elf_x86_hash_table (info, bed->target_id);
+-  if (htab == NULL)
+-    return pbfd;
+-
+   htab->r_info = init_table->r_info;
+   htab->r_sym = init_table->r_sym;
+
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index c07e442..cfadbd4 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1,3 +1,27 @@
++2018-07-23  H.J. Lu  
++
++	PR ld/23428
++	* testsuite/ld-elf/linux-x86.S: New file.
++	* testsuite/ld-elf/linux-x86.exp: Likewise.
++	* testsuite/ld-elf/pr23428.c: Likewise.
++	* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
++	for Linux/x86 targets.
++	* testsuite/ld-i386/abs-iamcu.d: Likewise.
++	* testsuite/ld-i386/abs.d: Likewise.
++	* testsuite/ld-i386/pr12718.d: Likewise.
++	* testsuite/ld-i386/pr12921.d: Likewise.
++	* testsuite/ld-x86-64/abs-k1om.d: Likewise.
++	* testsuite/ld-x86-64/abs-l1om.d: Likewise.
++	* testsuite/ld-x86-64/abs.d: Likewise.
++	* testsuite/ld-x86-64/pr12718.d: Likewise.
++	* testsuite/ld-x86-64/pr12921.d: Likewise.
++	* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
++	section.
++	* testsuite/ld-scripts/print-memory-usage.t: Likewise.
++	* testsuite/ld-scripts/size-2.t: Likewise.
++	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld to
++	create executable if language is "asm".
++
+ 2018-07-18  Nick Clifton  
+
+ 	2.31.1 Release point.
+diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
+new file mode 100644
+index 0000000..bdf40c6
+--- /dev/null
++++ b/ld/testsuite/ld-elf/linux-x86.S
+@@ -0,0 +1,63 @@
++	.text
++	.globl _start
++	.type _start,@function
++	.p2align 4
++_start:
++	xorl %ebp, %ebp
++#ifdef __LP64__
++	popq %rdi
++	movq %rsp, %rsi
++	andq  $~15, %rsp
++#elif defined __x86_64__
++	mov (%rsp),%edi
++	addl $4,%esp
++	movl %esp, %esi
++	andl  $~15, %esp
++#else
++	popl %esi
++	movl %esp, %ecx
++	andl  $~15, %esp
++
++	subl $8,%esp
++	pushl %ecx
++	pushl %esi
++#endif
++
++	call main
++
++	hlt
++
++	.type syscall,  @function
++	.globl syscall
++	.p2align 4
++syscall:
++#ifdef __x86_64__
++	movq %rdi, %rax		/* Syscall number -> rax.  */
++	movq %rsi, %rdi		/* shift arg1 - arg5.  */
++	movq %rdx, %rsi
++	movq %rcx, %rdx
++	movq %r8, %r10
++	movq %r9, %r8
++	movq 8(%rsp),%r9	/* arg6 is on the stack.  */
++	syscall			/* Do the system call.  */
++#else
++	push %ebp
++	push %edi
++	push %esi
++	push %ebx
++	mov 0x2c(%esp),%ebp
++	mov 0x28(%esp),%edi
++	mov 0x24(%esp),%esi
++	mov 0x20(%esp),%edx
++	mov 0x1c(%esp),%ecx
++	mov 0x18(%esp),%ebx
++	mov 0x14(%esp),%eax
++	int $0x80
++	pop %ebx
++	pop %esi
++	pop %edi
++	pop %ebp
++#endif
++	ret			/* Return to caller.  */
++	.size syscall, .-syscall
++	.section .note.GNU-stack,"",@progbits
+diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
+new file mode 100644
+index 0000000..36217c6
+--- /dev/null
++++ b/ld/testsuite/ld-elf/linux-x86.exp
+@@ -0,0 +1,46 @@
++# Expect script for simple native Linux/x86 tests.
++#   Copyright (C) 2018 Free Software Foundation, Inc.
++#
++# This file is part of the GNU Binutils.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
++# MA 02110-1301, USA.
++#
++
++# Test very simple native Linux/x86 programs with linux-x86.S.
++if { ![isnative] || [which $CC] == 0 \
++     || (![istarget "i?86-*-linux*"] \
++         && ![istarget "x86_64-*-linux*"] \
++         && ![istarget "amd64-*-linux*"]) } {
++    return
++}
++
++# Add $PLT_CFLAGS if PLT is expected.
++global PLT_CFLAGS
++# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required.
++global NOPIE_CFLAGS NOPIE_LDFLAGS
++
++run_ld_link_exec_tests [list \
++    [list \
++	"Run PR ld/23428 test" \
++	"--no-dynamic-linker -z separate-code" \
++	"" \
++	{ linux-x86.S pr23428.c } \
++	"pr23428" \
++	"pass.out" \
++	"$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
++	"asm" \
++    ] \
++]
+diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c
+new file mode 100644
+index 0000000..3631ed7
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr23428.c
+@@ -0,0 +1,43 @@
++#include 
++#include 
++#include 
++
++#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1)
++
++int
++main (int argc, char **argv)
++{
++  char **ev = &argv[argc + 1];
++  char **evp = ev;
++  ElfW(auxv_t) *av;
++  const ElfW(Phdr) *phdr = NULL;
++  size_t phnum = 0;
++  size_t loadnum = 0;
++  int fd = STDOUT_FILENO;
++  size_t i;
++
++  while (*evp++ != NULL)
++    ;
++
++  av = (ElfW(auxv_t) *) evp;
++
++  for (; av->a_type != AT_NULL; ++av)
++    switch (av->a_type)
++      {
++      case AT_PHDR:
++	phdr = (const void *) av->a_un.a_val;
++	break;
++      case AT_PHNUM:
++	phnum = av->a_un.a_val;
++	break;
++      }
++
++  for (i = 0; i < phnum; i++, phdr++)
++    if (phdr->p_type == PT_LOAD)
++      loadnum++;
++
++  syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n"));
++
++  syscall (SYS_exit, !loadnum);
++  return 0;
++}
+diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp
+index b58139e..3909c0e 100644
+--- a/ld/testsuite/ld-elf/sec64k.exp
++++ b/ld/testsuite/ld-elf/sec64k.exp
+@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"]
+     foreach sfile $sfiles { puts $ofd "#source: $sfile" }
+     if { [istarget spu*-*-*] } {
+ 	puts $ofd "#ld: --local-store 0:0"
++    } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
++	puts $ofd "#ld: -z noseparate-code"
+     } else {
+ 	puts $ofd "#ld:"
+     }
+diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d
+index ac9beff..aba7d6b 100644
+--- a/ld/testsuite/ld-i386/abs-iamcu.d
++++ b/ld/testsuite/ld-i386/abs-iamcu.d
+@@ -2,7 +2,7 @@
+ #source: abs.s
+ #source: zero.s
+ #as: --32 -march=iamcu
+-#ld: -m elf_iamcu
++#ld: -m elf_iamcu -z noseparate-code
+ #objdump: -rs -j .text
+
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d
+index e660aca..191ee44 100644
+--- a/ld/testsuite/ld-i386/abs.d
++++ b/ld/testsuite/ld-i386/abs.d
+@@ -2,7 +2,7 @@
+ #as: --32
+ #source: abs.s
+ #source: zero.s
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #objdump: -rs
+
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d
+index ec51540..7eba52d 100644
+--- a/ld/testsuite/ld-i386/pr12718.d
++++ b/ld/testsuite/ld-i386/pr12718.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12718
+ #as: --32
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #readelf: -S
+
+ There are 5 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d
+index e49079b..ea2da3e 100644
+--- a/ld/testsuite/ld-i386/pr12921.d
++++ b/ld/testsuite/ld-i386/pr12921.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12921
+ #as: --32
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #readelf: -S --wide
+
+ There are 7 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld
+index b22eaa1..f89855a 100644
+--- a/ld/testsuite/ld-linkonce/zeroeh.ld
++++ b/ld/testsuite/ld-linkonce/zeroeh.ld
+@@ -2,4 +2,5 @@ SECTIONS {
+  .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) }
+  .gcc_except_table 0x2000 : { *(.gcc_except_table) }
+  .eh_frame 0x4000 : { *(.eh_frame) }
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t
+index 5ff057a..6eda1d2 100644
+--- a/ld/testsuite/ld-scripts/print-memory-usage.t
++++ b/ld/testsuite/ld-scripts/print-memory-usage.t
+@@ -11,4 +11,6 @@ SECTIONS
+     *(.data)
+     *(.rw)
+   }
++
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t
+index 7238639..c3c4edd 100644
+--- a/ld/testsuite/ld-scripts/size-2.t
++++ b/ld/testsuite/ld-scripts/size-2.t
+@@ -18,4 +18,5 @@ SECTIONS
+     LONG (SIZEOF (.tdata))
+     LONG (SIZEOF (.tbss))
+   } :image
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d
+index 2c26639..6b0fde0 100644
+--- a/ld/testsuite/ld-x86-64/abs-k1om.d
++++ b/ld/testsuite/ld-x86-64/abs-k1om.d
+@@ -2,7 +2,7 @@
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+ #as: --64 -march=k1om
+-#ld: -m elf_k1om
++#ld: -m elf_k1om -z noseparate-code
+ #objdump: -rs -j .text
+
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d
+index 1fb96d4..f87869f 100644
+--- a/ld/testsuite/ld-x86-64/abs-l1om.d
++++ b/ld/testsuite/ld-x86-64/abs-l1om.d
+@@ -2,7 +2,7 @@
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+ #as: --64 -march=l1om
+-#ld: -m elf_l1om
++#ld: -m elf_l1om -z noseparate-code
+ #objdump: -rs -j .text
+ #target: x86_64-*-linux*
+
+diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d
+index b24b018..d99ab46 100644
+--- a/ld/testsuite/ld-x86-64/abs.d
++++ b/ld/testsuite/ld-x86-64/abs.d
+@@ -1,7 +1,7 @@
+ #name: Absolute non-overflowing relocs
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+-#ld:
++#ld: -z noseparate-code
+ #objdump: -rs
+
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d
+index 07d1732..2c503ff 100644
+--- a/ld/testsuite/ld-x86-64/pr12718.d
++++ b/ld/testsuite/ld-x86-64/pr12718.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12718
+ #as: --64
+-#ld: -melf_x86_64
++#ld: -melf_x86_64 -z noseparate-code
+ #readelf: -S --wide
+
+ There are 5 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d
+index 6fe6abe..1162d55 100644
+--- a/ld/testsuite/ld-x86-64/pr12921.d
++++ b/ld/testsuite/ld-x86-64/pr12921.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12921
+ #as: --64
+-#ld: -melf_x86_64
++#ld: -melf_x86_64 -z noseparate-code
+ #readelf: -S --wide
+
+ There are 7 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
+index cfbefe9..1095091 100644
+--- a/ld/testsuite/lib/ld-lib.exp
++++ b/ld/testsuite/lib/ld-lib.exp
+@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } {
+ 	    continue
+ 	}
+
+-	if { [ string match "c++" $lang ] } {
++	if { [ string match "asm" $lang ] } {
++	    set link_proc ld_link
++	    set link_cmd $ld
++	} elseif { [ string match "c++" $lang ] } {
+ 	    set link_proc ld_link
+ 	    set link_cmd $CXX
+ 	} else {
+--
+2.9.3
+
diff --git a/buildroot/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/buildroot/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
new file mode 100644
index 000000000..a4c48985d
--- /dev/null
+++ b/buildroot/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
@@ -0,0 +1,588 @@
+From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" 
+Date: Wed, 8 Aug 2018 06:09:15 -0700
+Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used.
+If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the
+corresponding x86 instruction set isn’t used.  When merging properties
+from 2 input files and one input file doesn't have the
+GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have
+it neither.  This patch removes the GNU_PROPERTY_X86_ISA_1_USED
+property if an input file doesn't have it.
+
+This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the
+GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA
+requirement.
+
+bfd/
+
+	PR ld/23486
+	* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove
+	GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it.
+	(_bfd_x86_elf_link_setup_gnu_properties): Adding the
+	GNU_PROPERTY_X86_ISA_1_NEEDED, instead of
+	GNU_PROPERTY_X86_ISA_1_USED, property.
+
+ld/
+
+	PR ld/23486
+	* testsuite/ld-i386/i386.exp: Run PR ld/23486 tests.
+	* testsuite/ld-x86-64/x86-64.exp: Likewise.
+	* testsuite/ld-i386/pr23486a.d: New file.
+	* testsuite/ld-i386/pr23486b.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a-x32.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a.s: Likewise.
+	* testsuite/ld-x86-64/pr23486b-x32.d: Likewise.
+	* testsuite/ld-x86-64/pr23486b.d: Likewise.
+	* testsuite/ld-x86-64/pr23486b.s: Likewise.
+	* testsuite/ld-i386/property-3.r: Remove "x86 ISA used".
+	* testsuite/ld-i386/property-4.r: Likewise.
+	* testsuite/ld-i386/property-5.r: Likewise.
+	* testsuite/ld-i386/property-x86-ibt3a.d: Likewise.
+	* testsuite/ld-i386/property-x86-ibt3b.d: Likewise.
+	* testsuite/ld-i386/property-x86-shstk3a.d: Likewise.
+	* testsuite/ld-i386/property-x86-shstk3b.d: Likewise.
+	* testsuite/ld-x86-64/property-3.r: Likewise.
+	* testsuite/ld-x86-64/property-4.r: Likewise.
+	* testsuite/ld-x86-64/property-5.r: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise.
+
+(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54)
+Signed-off-by: Norbert Lange 
+---
+ bfd/ChangeLog                                     |  9 +++++++
+ bfd/elfxx-x86.c                                   | 25 ++++++++++++++----
+ ld/ChangeLog                                      | 32 +++++++++++++++++++++++
+ ld/testsuite/ld-i386/i386.exp                     |  2 ++
+ ld/testsuite/ld-i386/pr23486a.d                   | 10 +++++++
+ ld/testsuite/ld-i386/pr23486b.d                   | 10 +++++++
+ ld/testsuite/ld-i386/property-3.r                 |  1 -
+ ld/testsuite/ld-i386/property-4.r                 |  1 -
+ ld/testsuite/ld-i386/property-5.r                 |  1 -
+ ld/testsuite/ld-i386/property-x86-ibt3a.d         |  5 ++--
+ ld/testsuite/ld-i386/property-x86-ibt3b.d         |  5 ++--
+ ld/testsuite/ld-i386/property-x86-shstk3a.d       |  5 ++--
+ ld/testsuite/ld-i386/property-x86-shstk3b.d       |  5 ++--
+ ld/testsuite/ld-x86-64/pr23486a-x32.d             | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486a.d                 | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486a.s                 | 30 +++++++++++++++++++++
+ ld/testsuite/ld-x86-64/pr23486b-x32.d             | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486b.d                 | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486b.s                 | 30 +++++++++++++++++++++
+ ld/testsuite/ld-x86-64/property-3.r               |  1 -
+ ld/testsuite/ld-x86-64/property-4.r               |  1 -
+ ld/testsuite/ld-x86-64/property-5.r               |  1 -
+ ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d   |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3a.d       |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d   |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3b.d       |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3a.d     |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3b.d     |  5 ++--
+ ld/testsuite/ld-x86-64/x86-64.exp                 |  4 +++
+ 31 files changed, 211 insertions(+), 47 deletions(-)
+ create mode 100644 ld/testsuite/ld-i386/pr23486a.d
+ create mode 100644 ld/testsuite/ld-i386/pr23486b.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s
+
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 2e4ff88..7ccfd25 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
+   switch (pr_type)
+     {
+     case GNU_PROPERTY_X86_ISA_1_USED:
++      if (aprop == NULL || bprop == NULL)
++	{
++	  /* Only one of APROP and BPROP can be NULL.  */
++	  if (aprop != NULL)
++	    {
++	      /* Remove this property since the other input file doesn't
++		 have it.  */
++	      aprop->pr_kind = property_remove;
++	      updated = TRUE;
++	    }
++	  break;
++	}
++      goto or_property;
++
+     case GNU_PROPERTY_X86_ISA_1_NEEDED:
+       if (aprop != NULL && bprop != NULL)
+ 	{
++or_property:
+ 	  number = aprop->u.number;
+ 	  aprop->u.number = number | bprop->u.number;
+-	  /* Remove the property if ISA bits are empty.  */
++	  /* Remove the property if all bits are empty.  */
+ 	  if (aprop->u.number == 0)
+ 	    {
+ 	      aprop->pr_kind = property_remove;
+@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
+ 	    {
+ 	      if (aprop->u.number == 0)
+ 		{
+-		  /* Remove APROP if ISA bits are empty.  */
++		  /* Remove APROP if all bits are empty.  */
+ 		  aprop->pr_kind = property_remove;
+ 		  updated = TRUE;
+ 		}
+ 	    }
+ 	  else
+ 	    {
+-	      /* Return TRUE if APROP is NULL and ISA bits of BPROP
++	      /* Return TRUE if APROP is NULL and all bits of BPROP
+ 		 aren't empty to indicate that BPROP should be added
+ 		 to ABFD.  */
+ 	      updated = bprop->u.number != 0;
+@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	{
+ 	  /* If the separate code program header is needed, make sure
+ 	     that the first read-only PT_LOAD segment has no code by
+-	     adding a GNU_PROPERTY_X86_ISA_1_USED note.  */
++	     adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */
+ 	  prop = _bfd_elf_get_property (ebfd,
+-					GNU_PROPERTY_X86_ISA_1_USED,
++					GNU_PROPERTY_X86_ISA_1_NEEDED,
+ 					4);
+ 	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
+ 	  prop->pr_kind = property_number;
+diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
+index 6d794fe..78dad02 100644
+--- a/ld/testsuite/ld-i386/i386.exp
++++ b/ld/testsuite/ld-i386/i386.exp
+@@ -462,6 +462,8 @@ run_dump_test "pr23189"
+ run_dump_test "pr23194"
+ run_dump_test "pr23372a"
+ run_dump_test "pr23372b"
++run_dump_test "pr23486a"
++run_dump_test "pr23486b"
+
+ if { !([istarget "i?86-*-linux*"]
+        || [istarget "i?86-*-gnu*"]
+diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d
+new file mode 100644
+index 0000000..41a6dcf
+--- /dev/null
++++ b/ld/testsuite/ld-i386/pr23486a.d
+@@ -0,0 +1,10 @@
++#source: ../ld-x86-64/pr23486a.s
++#source: ../ld-x86-64/pr23486b.s
++#as: --32
++#ld: -r -m elf_i386
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d
+new file mode 100644
+index 0000000..08019b7
+--- /dev/null
++++ b/ld/testsuite/ld-i386/pr23486b.d
+@@ -0,0 +1,10 @@
++#source: ../ld-x86-64/pr23486b.s
++#source: ../ld-x86-64/pr23486a.s
++#as: --32
++#ld: -r -m elf_i386
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r
+index 0ed91f5..d03203c 100644
+--- a/ld/testsuite/ld-i386/property-3.r
++++ b/ld/testsuite/ld-i386/property-3.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: 586, SSE
+ 	x86 ISA needed: i486, 586
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r
+index cb2bc15..da295eb 100644
+--- a/ld/testsuite/ld-i386/property-4.r
++++ b/ld/testsuite/ld-i386/property-4.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r
+index 5529650..e414159 100644
+--- a/ld/testsuite/ld-i386/property-5.r
++++ b/ld/testsuite/ld-i386/property-5.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x900000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d
+index 4bb35b0..0aedea1 100644
+--- a/ld/testsuite/ld-i386/property-x86-ibt3a.d
++++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d
+index 418d58a..bd69ac6 100644
+--- a/ld/testsuite/ld-i386/property-x86-ibt3b.d
++++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d
+index e261038..76d2a39 100644
+--- a/ld/testsuite/ld-i386/property-x86-shstk3a.d
++++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d
+index 25f3d23..e770ecf 100644
+--- a/ld/testsuite/ld-i386/property-x86-shstk3b.d
++++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d
+new file mode 100644
+index 0000000..6d9fa68
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --x32
++#ld: -r -m elf32_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d
+new file mode 100644
+index 0000000..dc2b7bf
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --64 -defsym __64_bit__=1
++#ld: -r -m elf_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s
+new file mode 100644
+index 0000000..a07d0c7
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a.s
+@@ -0,0 +1,30 @@
++	.section ".note.gnu.property", "a"
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	.long 1f - 0f		/* name length.  */
++	.long 4f - 1f		/* data length.  */
++	/* NT_GNU_PROPERTY_TYPE_0 */
++	.long 5			/* note type.  */
++0:
++	.asciz "GNU"		/* vendor name.  */
++1:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	/* GNU_PROPERTY_X86_ISA_1_USED */
++	.long 0xc0000000	/* pr_type.  */
++	.long 3f - 2f		/* pr_datasz.  */
++2:
++	.long 0xa
++3:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++4:
+diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d
+new file mode 100644
+index 0000000..0445e69
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d
+@@ -0,0 +1,10 @@
++#source: pr23486b.s
++#source: pr23486a.s
++#as: --x32
++#ld: -r -m elf32_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d
+new file mode 100644
+index 0000000..dc2b7bf
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --64 -defsym __64_bit__=1
++#ld: -r -m elf_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s
+new file mode 100644
+index 0000000..c5167ee
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b.s
+@@ -0,0 +1,30 @@
++	.section ".note.gnu.property", "a"
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	.long 1f - 0f		/* name length.  */
++	.long 4f - 1f		/* data length.  */
++	/* NT_GNU_PROPERTY_TYPE_0 */
++	.long 5			/* note type.  */
++0:
++	.asciz "GNU"		/* vendor name.  */
++1:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	/* GNU_PROPERTY_X86_ISA_1_NEEDED */
++	.long 0xc0000001	/* pr_type.  */
++	.long 3f - 2f		/* pr_datasz.  */
++2:
++	.long 0x3
++3:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++4:
+diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r
+index 0ed91f5..d03203c 100644
+--- a/ld/testsuite/ld-x86-64/property-3.r
++++ b/ld/testsuite/ld-x86-64/property-3.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: 586, SSE
+ 	x86 ISA needed: i486, 586
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r
+index cb2bc15..da295eb 100644
+--- a/ld/testsuite/ld-x86-64/property-4.r
++++ b/ld/testsuite/ld-x86-64/property-4.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r
+index 5529650..e414159 100644
+--- a/ld/testsuite/ld-x86-64/property-5.r
++++ b/ld/testsuite/ld-x86-64/property-5.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x900000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
+index 011426f..4cec728 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
+index 1b4229a..a8df49a 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
+index 290ed6a..c112626 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
+index 1142e03..f10dffd 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
+index 819542d..0147a3c 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
+index 4c5d0e0..1f8c2dc 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
+index ba181e0..7ca2539 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
+index 5216f38..f66a40e 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
+@@ -6,6 +6,5 @@
+
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
+index 6edb9e8..ae21e55 100644
+--- a/ld/testsuite/ld-x86-64/x86-64.exp
++++ b/ld/testsuite/ld-x86-64/x86-64.exp
+@@ -403,6 +403,10 @@ run_dump_test "pr23372a"
+ run_dump_test "pr23372a-x32"
+ run_dump_test "pr23372b"
+ run_dump_test "pr23372b-x32"
++run_dump_test "pr23486a"
++run_dump_test "pr23486a-x32"
++run_dump_test "pr23486b"
++run_dump_test "pr23486b-x32"
+
+ if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
+     return
+--
+2.9.3
+
diff --git a/buildroot/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/buildroot/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
new file mode 100644
index 000000000..356914c99
--- /dev/null
+++ b/buildroot/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
@@ -0,0 +1,140 @@
+From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" 
+Date: Sat, 11 Aug 2018 06:41:33 -0700
+Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property
+
+Existing properties may be removed during property merging.  We avoid
+adding X86_ISA_1_NEEDED property only if existing properties won't be
+removed.
+
+bfd/
+
+	PR ld/23428
+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't
+	add X86_ISA_1_NEEDED property only if existing properties won't
+	be removed.
+
+ld/
+
+	PR ld/23428
+	* testsuite/ld-elf/dummy.s: New file.
+	* testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property.
+	* testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428.
+
+(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da)
+Signed-off-by: Norbert Lange 
+---
+ bfd/ChangeLog                     |  7 +++++++
+ bfd/elfxx-x86.c                   | 28 ++++++++++++++++++++++------
+ ld/ChangeLog                      |  7 +++++++
+ ld/testsuite/ld-elf/dummy.s       |  1 +
+ ld/testsuite/ld-elf/linux-x86.S   | 28 ++++++++++++++++++++++++++++
+ ld/testsuite/ld-elf/linux-x86.exp |  2 +-
+ 6 files changed, 66 insertions(+), 7 deletions(-)
+ create mode 100644 ld/testsuite/ld-elf/dummy.s
+
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 7ccfd25..2d8f7b6 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	  prop->pr_kind = property_number;
+ 	}
+       else if (has_text
+-	       && elf_properties (ebfd) == NULL
+ 	       && elf_tdata (info->output_bfd)->o->build_id.sec == NULL
+ 	       && !htab->elf.dynamic_sections_created
+ 	       && !info->traditional_format
+@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	  /* If the separate code program header is needed, make sure
+ 	     that the first read-only PT_LOAD segment has no code by
+ 	     adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */
+-	  prop = _bfd_elf_get_property (ebfd,
+-					GNU_PROPERTY_X86_ISA_1_NEEDED,
+-					4);
+-	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
+-	  prop->pr_kind = property_number;
++	  elf_property_list *list;
++	  bfd_boolean need_property = TRUE;
++
++	  for (list = elf_properties (ebfd); list; list = list->next)
++	    switch (list->property.pr_type)
++	      {
++	      case GNU_PROPERTY_STACK_SIZE:
++	      case GNU_PROPERTY_NO_COPY_ON_PROTECTED:
++	      case GNU_PROPERTY_X86_ISA_1_NEEDED:
++		/* These properties won't be removed during merging.  */
++		need_property = FALSE;
++		break;
++	      }
++
++	  if (need_property)
++	    {
++	      prop = _bfd_elf_get_property (ebfd,
++					    GNU_PROPERTY_X86_ISA_1_NEEDED,
++					    4);
++	      prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
++	      prop->pr_kind = property_number;
++	    }
+ 	}
+
+       /* Create the GNU property note section if needed.  */
+diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s
+new file mode 100644
+index 0000000..403f980
+--- /dev/null
++++ b/ld/testsuite/ld-elf/dummy.s
+@@ -0,0 +1 @@
++# Dummy
+diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
+index bdf40c6..d94abc1 100644
+--- a/ld/testsuite/ld-elf/linux-x86.S
++++ b/ld/testsuite/ld-elf/linux-x86.S
+@@ -61,3 +61,31 @@ syscall:
+ 	ret			/* Return to caller.  */
+ 	.size syscall, .-syscall
+ 	.section .note.GNU-stack,"",@progbits
++
++	.section ".note.gnu.property", "a"
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++	.long 1f - 0f		/* name length */
++	.long 5f - 2f		/* data length */
++	.long 5			/* note type */
++0:	.asciz "GNU"		/* vendor name */
++1:
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++2:	.long 0xc0000002	/* pr_type.  */
++	.long 4f - 3f		/* pr_datasz.  */
++3:
++	.long 0x2
++4:
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++5:
+diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
+index 36217c6..f6f5a80 100644
+--- a/ld/testsuite/ld-elf/linux-x86.exp
++++ b/ld/testsuite/ld-elf/linux-x86.exp
+@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \
+ 	"Run PR ld/23428 test" \
+ 	"--no-dynamic-linker -z separate-code" \
+ 	"" \
+-	{ linux-x86.S pr23428.c } \
++	{ linux-x86.S pr23428.c dummy.s } \
+ 	"pr23428" \
+ 	"pass.out" \
+ 	"$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
+--
+2.9.3
+
diff --git a/buildroot/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch b/buildroot/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch
new file mode 100644
index 000000000..b80e1fa7c
--- /dev/null
+++ b/buildroot/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch
@@ -0,0 +1,41 @@
+From 278989f23735aa501be1052e085540c75c126dbb Mon Sep 17 00:00:00 2001
+From: Max Filippov 
+Date: Thu, 28 Mar 2019 17:03:57 -0700
+Subject: [PATCH] bfd: xtensa: fix shrink_dynamic_reloc_sections for
+ export-dynamic
+
+shrink_dynamic_reloc_sections must remove PLT entry that was created for
+an undefined weak symbol in the presence of --export-dynamic option when
+relaxation coalesces literals pointing to that symbol. This fixes the
+following assertion:
+
+  ld: BFD (GNU Binutils) 2.31.1 internal error, aborting at
+  elf32-xtensa.c:3292 in elf_xtensa_finish_dynamic_sections
+
+2019-03-28  Max Filippov  
+bfd/
+	* elf32-xtensa.c (shrink_dynamic_reloc_sections): Add
+	info->export_dynamic to the conditional.
+
+Signed-off-by: Max Filippov 
+---
+ bfd/elf32-xtensa.c                                         |  3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index c3df3d6db756..37ea200eea74 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -10083,7 +10083,8 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info,
+       && (input_section->flags & SEC_ALLOC) != 0
+       && (dynamic_symbol || bfd_link_pic (info))
+       && (!h || h->root.type != bfd_link_hash_undefweak
+-	  || (dynamic_symbol && bfd_link_dll (info))))
++	  || (dynamic_symbol
++	      && (bfd_link_dll (info) || info->export_dynamic))))
+     {
+       asection *srel;
+       bfd_boolean is_plt = FALSE;
+-- 
+2.11.0
+
diff --git a/buildroot/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch b/buildroot/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
new file mode 100644
index 000000000..ed617bcaf
--- /dev/null
+++ b/buildroot/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
@@ -0,0 +1,294 @@
+From 0dbdfb7918d0b0cfcb8883b24c1291574bf5bb7c Mon Sep 17 00:00:00 2001
+From: Max Filippov 
+Date: Tue, 2 Apr 2019 14:32:42 -0700
+Subject: [PATCH] gas: use literals/const16 for xtensa loop relaxation
+
+Loop opcode relaxation that uses addi/addmi doesn't work well with other
+relaxations that may cause code movement. Instead of encoding fixed loop
+end offset in the relaxed sequence use l32r or a pair of const16 to load
+loop end address. This way the address of the loop end gets a relocation
+record and it gets updated appropriately.
+
+gas/
+2019-04-02  Max Filippov  
+
+	* config/tc-xtensa.c (convert_frag_immed): Drop
+	convert_frag_immed_finish_loop invocation.
+	(convert_frag_immed_finish_loop): Drop declaration and
+	definition.
+	* config/xtensa-relax.c (widen_spec_list): Replace loop
+	widening that uses addi/addmi with widening that uses l32r
+	and const16.
+
+Signed-off-by: Max Filippov 
+---
+ gas/config/tc-xtensa.c    | 120 ----------------------------------------------
+ gas/config/xtensa-relax.c |  77 ++++++++++++++++++++---------
+ 2 files changed, 55 insertions(+), 142 deletions(-)
+
+diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
+index 3bdbbc931cfc..0cc06361cf6f 100644
+--- a/gas/config/tc-xtensa.c
++++ b/gas/config/tc-xtensa.c
+@@ -10668,7 +10668,6 @@ convert_frag_fill_nop (fragS *fragP)
+ static fixS *fix_new_exp_in_seg
+   (segT, subsegT, fragS *, int, int, expressionS *, int,
+    bfd_reloc_code_real_type);
+-static void convert_frag_immed_finish_loop (segT, fragS *, TInsn *);
+ 
+ static void
+ convert_frag_immed (segT segP,
+@@ -10910,9 +10909,6 @@ convert_frag_immed (segT segP,
+ 	}
+     }
+ 
+-  if (expanded && xtensa_opcode_is_loop (isa, orig_tinsn.opcode) == 1)
+-    convert_frag_immed_finish_loop (segP, fragP, &orig_tinsn);
+-
+   if (expanded && is_direct_call_opcode (orig_tinsn.opcode))
+     {
+       /* Add an expansion note on the expanded instruction.  */
+@@ -10949,122 +10945,6 @@ fix_new_exp_in_seg (segT new_seg,
+ }
+ 
+ 
+-/* Relax a loop instruction so that it can span loop >256 bytes.
+-
+-                  loop    as, .L1
+-          .L0:
+-                  rsr     as, LEND
+-                  wsr     as, LBEG
+-                  addi    as, as, lo8 (label-.L1)
+-                  addmi   as, as, mid8 (label-.L1)
+-                  wsr     as, LEND
+-                  isync
+-                  rsr     as, LCOUNT
+-                  addi    as, as, 1
+-          .L1:
+-                  <>
+-          label:
+-*/
+-
+-static void
+-convert_frag_immed_finish_loop (segT segP, fragS *fragP, TInsn *tinsn)
+-{
+-  TInsn loop_insn;
+-  TInsn addi_insn;
+-  TInsn addmi_insn;
+-  unsigned long target;
+-  static xtensa_insnbuf insnbuf = NULL;
+-  unsigned int loop_length, loop_length_hi, loop_length_lo;
+-  xtensa_isa isa = xtensa_default_isa;
+-  addressT loop_offset;
+-  addressT addi_offset = 9;
+-  addressT addmi_offset = 12;
+-  fragS *next_fragP;
+-  int target_count;
+-
+-  if (!insnbuf)
+-    insnbuf = xtensa_insnbuf_alloc (isa);
+-
+-  /* Get the loop offset.  */
+-  loop_offset = get_expanded_loop_offset (tinsn->opcode);
+-
+-  /* Validate that there really is a LOOP at the loop_offset.  Because
+-     loops are not bundleable, we can assume that the instruction will be
+-     in slot 0.  */
+-  tinsn_from_chars (&loop_insn, fragP->fr_opcode + loop_offset, 0);
+-  tinsn_immed_from_frag (&loop_insn, fragP, 0);
+-
+-  gas_assert (xtensa_opcode_is_loop (isa, loop_insn.opcode) == 1);
+-  addi_offset += loop_offset;
+-  addmi_offset += loop_offset;
+-
+-  gas_assert (tinsn->ntok == 2);
+-  if (tinsn->tok[1].X_op == O_constant)
+-    target = tinsn->tok[1].X_add_number;
+-  else if (tinsn->tok[1].X_op == O_symbol)
+-    {
+-      /* Find the fragment.  */
+-      symbolS *sym = tinsn->tok[1].X_add_symbol;
+-      gas_assert (S_GET_SEGMENT (sym) == segP
+-	      || S_GET_SEGMENT (sym) == absolute_section);
+-      target = (S_GET_VALUE (sym) + tinsn->tok[1].X_add_number);
+-    }
+-  else
+-    {
+-      as_bad (_("invalid expression evaluation type %d"), tinsn->tok[1].X_op);
+-      target = 0;
+-    }
+-
+-  loop_length = target - (fragP->fr_address + fragP->fr_fix);
+-  loop_length_hi = loop_length & ~0x0ff;
+-  loop_length_lo = loop_length & 0x0ff;
+-  if (loop_length_lo >= 128)
+-    {
+-      loop_length_lo -= 256;
+-      loop_length_hi += 256;
+-    }
+-
+-  /* Because addmi sign-extends the immediate, 'loop_length_hi' can be at most
+-     32512.  If the loop is larger than that, then we just fail.  */
+-  if (loop_length_hi > 32512)
+-    as_bad_where (fragP->fr_file, fragP->fr_line,
+-		  _("loop too long for LOOP instruction"));
+-
+-  tinsn_from_chars (&addi_insn, fragP->fr_opcode + addi_offset, 0);
+-  gas_assert (addi_insn.opcode == xtensa_addi_opcode);
+-
+-  tinsn_from_chars (&addmi_insn, fragP->fr_opcode + addmi_offset, 0);
+-  gas_assert (addmi_insn.opcode == xtensa_addmi_opcode);
+-
+-  set_expr_const (&addi_insn.tok[2], loop_length_lo);
+-  tinsn_to_insnbuf (&addi_insn, insnbuf);
+-
+-  fragP->tc_frag_data.is_insn = TRUE;
+-  xtensa_insnbuf_to_chars
+-    (isa, insnbuf, (unsigned char *) fragP->fr_opcode + addi_offset, 0);
+-
+-  set_expr_const (&addmi_insn.tok[2], loop_length_hi);
+-  tinsn_to_insnbuf (&addmi_insn, insnbuf);
+-  xtensa_insnbuf_to_chars
+-    (isa, insnbuf, (unsigned char *) fragP->fr_opcode + addmi_offset, 0);
+-
+-  /* Walk through all of the frags from here to the loop end
+-     and mark them as no_transform to keep them from being modified
+-     by the linker.  If we ever have a relocation for the
+-     addi/addmi of the difference of two symbols we can remove this.  */
+-
+-  target_count = 0;
+-  for (next_fragP = fragP; next_fragP != NULL;
+-       next_fragP = next_fragP->fr_next)
+-    {
+-      next_fragP->tc_frag_data.is_no_transform = TRUE;
+-      if (next_fragP->tc_frag_data.is_loop_target)
+-	target_count++;
+-      if (target_count == 2)
+-	break;
+-    }
+-}
+-
+ 
+ /* A map that keeps information on a per-subsegment basis.  This is
+    maintained during initial assembly, but is invalid once the
+diff --git a/gas/config/xtensa-relax.c b/gas/config/xtensa-relax.c
+index cb296ed85ed2..daf15d52c259 100644
+--- a/gas/config/xtensa-relax.c
++++ b/gas/config/xtensa-relax.c
+@@ -87,13 +87,7 @@
+    when the first and second operands are not the same as specified
+    by the "| %at!=%as" precondition clause.
+    {"l32i %at,%as,%imm | %at!=%as",
+-   "LITERAL %imm; l32r %at,%LITERAL; add %at,%at,%as; l32i %at,%at,0"}
+-
+-   There is special case for loop instructions here, but because we do
+-   not currently have the ability to represent the difference of two
+-   symbols, the conversion requires special code in the assembler to
+-   write the operands of the addi/addmi pair representing the
+-   difference of the old and new loop end label.  */
++   "LITERAL %imm; l32r %at,%LITERAL; add %at,%at,%as; l32i %at,%at,0"}  */
+ 
+ #include "as.h"
+ #include "xtensa-isa.h"
+@@ -306,44 +300,83 @@ static string_pattern_pair widen_spec_list[] =
+   {"l32i %at,%as,%imm | %at!=%as ? IsaUseConst16",
+    "const16 %at,HI16U(%imm); const16 %at,LOW16U(%imm); add %at,%at,%as; l32i %at,%at,0"},
+ 
+-  /* This is only PART of the loop instruction.  In addition,
+-     hardcoded into its use is a modification of the final operand in
+-     the instruction in bytes 9 and 12.  */
+-  {"loop %as,%label | %as!=1 ? IsaUseLoops",
++  /* Widening loops with literals.  */
++  {"loop %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R",
++   "loop %as,%LABEL;"
++   "rsr.lend    %as;"		/* LEND */
++   "wsr.lbeg    %as;"		/* LBEG */
++   "LITERAL     %label;"
++   "l32r        %as, %LITERAL;"
++   "nop;"
++   "wsr.lend    %as;"
++   "isync;"
++   "rsr.lcount    %as;"		/* LCOUNT */
++   "addi    %as, %as, 1;"
++   "LABEL"},
++  {"loopgtz %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R",
++   "beqz    %as,%label;"
++   "bltz    %as,%label;"
++   "loopgtz %as,%LABEL;"
++   "rsr.lend    %as;"		/* LEND */
++   "wsr.lbeg    %as;"		/* LBEG */
++   "LITERAL     %label;"
++   "l32r        %as, %LITERAL;"
++   "nop;"
++   "wsr.lend    %as;"
++   "isync;"
++   "rsr.lcount    %as;"		/* LCOUNT */
++   "addi    %as, %as, 1;"
++   "LABEL"},
++  {"loopnez %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R",
++   "beqz     %as,%label;"
++   "loopnez %as,%LABEL;"
++   "rsr.lend    %as;"		/* LEND */
++   "wsr.lbeg    %as;"		/* LBEG */
++   "LITERAL     %label;"
++   "l32r        %as, %LITERAL;"
++   "nop;"
++   "wsr.lend    %as;"
++   "isync;"
++   "rsr.lcount    %as;"		/* LCOUNT */
++   "addi    %as, %as, 1;"
++   "LABEL"},
++
++  /* Widening loops with const16.  */
++  {"loop %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16",
+    "loop %as,%LABEL;"
+    "rsr.lend    %as;"		/* LEND */
+    "wsr.lbeg    %as;"		/* LBEG */
+-   "addi    %as, %as, 0;"	/* lo8(%label-%LABEL1) */
+-   "addmi   %as, %as, 0;"	/* mid8(%label-%LABEL1) */
++   "const16     %as,HI16U(%label);"
++   "const16     %as,LOW16U(%label);"
+    "wsr.lend    %as;"
+    "isync;"
+    "rsr.lcount    %as;"		/* LCOUNT */
+-   "addi    %as, %as, 1;"	/* density -> addi.n %as, %as, 1 */
++   "addi    %as, %as, 1;"
+    "LABEL"},
+-  {"loopgtz %as,%label | %as!=1 ? IsaUseLoops",
++  {"loopgtz %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16",
+    "beqz    %as,%label;"
+    "bltz    %as,%label;"
+    "loopgtz %as,%LABEL;"
+    "rsr.lend    %as;"		/* LEND */
+    "wsr.lbeg    %as;"		/* LBEG */
+-   "addi    %as, %as, 0;"	/* lo8(%label-%LABEL1) */
+-   "addmi   %as, %as, 0;"	/* mid8(%label-%LABEL1) */
++   "const16     %as,HI16U(%label);"
++   "const16     %as,LOW16U(%label);"
+    "wsr.lend    %as;"
+    "isync;"
+    "rsr.lcount    %as;"		/* LCOUNT */
+-   "addi    %as, %as, 1;"	/* density -> addi.n %as, %as, 1 */
++   "addi    %as, %as, 1;"
+    "LABEL"},
+-  {"loopnez %as,%label | %as!=1 ? IsaUseLoops",
++  {"loopnez %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16",
+    "beqz     %as,%label;"
+    "loopnez %as,%LABEL;"
+    "rsr.lend    %as;"		/* LEND */
+    "wsr.lbeg    %as;"		/* LBEG */
+-   "addi    %as, %as, 0;"	/* lo8(%label-%LABEL1) */
+-   "addmi   %as, %as, 0;"	/* mid8(%label-%LABEL1) */
++   "const16     %as,HI16U(%label);"
++   "const16     %as,LOW16U(%label);"
+    "wsr.lend    %as;"
+    "isync;"
+    "rsr.lcount    %as;"		/* LCOUNT */
+-   "addi    %as, %as, 1;"	/* density -> addi.n %as, %as, 1 */
++   "addi    %as, %as, 1;"
+    "LABEL"},
+ 
+   /* Relaxing to wide branches.  Order is important here.  With wide
+-- 
+2.11.0
+
diff --git a/buildroot/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch b/buildroot/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch
new file mode 100644
index 000000000..b4bbc27b3
--- /dev/null
+++ b/buildroot/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch
@@ -0,0 +1,96 @@
+From 471702ac4a57878a06e8167f063274cf413e548d Mon Sep 17 00:00:00 2001
+From: Max Filippov 
+Date: Mon, 8 Apr 2019 13:47:18 -0700
+Subject: [PATCH] xtensa: gas: put .literal_position at section start
+
+Provide literal position at the beginning of each section for literal
+space reserved by relaxations when text-section-literals or
+auto-litpools options are used. Remove code that adds fill frag to the
+literal section for every .literal_position directive to avoid creation
+of empty literal sections.
+
+Fix auto-litpools tests that got literal pool address changes.
+
+gas/
+2019-04-11  Max Filippov  
+
+	* config/tc-xtensa.c (xtensa_is_init_fini): Add declaration.
+	(xtensa_mark_literal_pool_location): Don't add fill frag to literal
+	section that records literal pool location.
+	(md_begin): Call xtensa_mark_literal_pool_location when text
+	section literals or auto litpools are used.
+	(xtensa_elf_section_change_hook): Call
+	xtensa_mark_literal_pool_location when text section literals or
+	auto litpools are used, there's no literal pool location defined
+	for the current section and it's not .init or .fini.
+
+Signed-off-by: Max Filippov 
+---
+ gas/config/tc-xtensa.c                          | 22 +++++++++-------------
+ 1 file changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
+index 0cc06361cf6f..6a80e76fed8c 100644
+--- a/gas/config/tc-xtensa.c
++++ b/gas/config/tc-xtensa.c
+@@ -497,6 +497,7 @@ static fixS *xg_append_jump (fragS *fragP, symbolS *sym, offsetT offset);
+ static void xtensa_maybe_create_literal_pool_frag (bfd_boolean, bfd_boolean);
+ static bfd_boolean auto_litpools = FALSE;
+ static int auto_litpool_limit = 0;
++static bfd_boolean xtensa_is_init_fini (segT seg);
+ 
+ /* Alignment Functions.  */
+ 
+@@ -4797,7 +4798,6 @@ xtensa_mark_literal_pool_location (void)
+ {
+   /* Any labels pointing to the current location need
+      to be adjusted to after the literal pool.  */
+-  emit_state s;
+   fragS *pool_location;
+ 
+   if (use_literal_section)
+@@ -4818,19 +4818,7 @@ xtensa_mark_literal_pool_location (void)
+ 		RELAX_LITERAL_POOL_END, NULL, 0, NULL);
+   xtensa_set_frag_assembly_state (frag_now);
+ 
+-  /* Now put a frag into the literal pool that points to this location.  */
+   set_literal_pool_location (now_seg, pool_location);
+-  xtensa_switch_to_non_abs_literal_fragment (&s);
+-  frag_align (2, 0, 0);
+-  record_alignment (now_seg, 2);
+-
+-  /* Close whatever frag is there.  */
+-  frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL);
+-  xtensa_set_frag_assembly_state (frag_now);
+-  frag_now->tc_frag_data.literal_frag = pool_location;
+-  frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL);
+-  xtensa_restore_emit_state (&s);
+-  xtensa_set_frag_assembly_state (frag_now);
+ }
+ 
+ 
+@@ -5334,6 +5322,9 @@ md_begin (void)
+   /* Set up the assembly state.  */
+   if (!frag_now->tc_frag_data.is_assembly_state_set)
+     xtensa_set_frag_assembly_state (frag_now);
++
++  if (!use_literal_section)
++    xtensa_mark_literal_pool_location ();
+ }
+ 
+ 
+@@ -5933,6 +5924,11 @@ xtensa_elf_section_change_hook (void)
+   /* Set up the assembly state.  */
+   if (!frag_now->tc_frag_data.is_assembly_state_set)
+     xtensa_set_frag_assembly_state (frag_now);
++
++  if (!use_literal_section
++      && seg_info (now_seg)->tc_segment_info_data.literal_pool_loc == NULL
++      && !xtensa_is_init_fini (now_seg))
++    xtensa_mark_literal_pool_location ();
+ }
+ 
+ 
+-- 
+2.11.0
+
diff --git a/buildroot/package/binutils/Config.in.host b/buildroot/package/binutils/Config.in.host
index 59120f313..924d1749c 100644
--- a/buildroot/package/binutils/Config.in.host
+++ b/buildroot/package/binutils/Config.in.host
@@ -31,13 +31,13 @@ config BR2_BINUTILS_VERSION_2_31_X
 	bool "binutils 2.31.1"
 
 config BR2_BINUTILS_VERSION_ARC
-	bool "binutils arc (2.29)"
+	bool "binutils arc (2.31)"
 	depends on BR2_arc
 endchoice
 
 config BR2_BINUTILS_VERSION
 	string
-	default "arc-2018.03"	if BR2_BINUTILS_VERSION_ARC
+	default "arc-2018.09-release"	if BR2_BINUTILS_VERSION_ARC
 	default "2.28.1"	if BR2_BINUTILS_VERSION_2_28_X
 	default "2.29.1"	if BR2_BINUTILS_VERSION_2_29_X
 	default "2.30"		if BR2_BINUTILS_VERSION_2_30_X
diff --git a/buildroot/package/binutils/arc-2018.03/0002-ld-makefile.patch b/buildroot/package/binutils/arc-2018.03/0002-ld-makefile.patch
deleted file mode 100644
index a7cd71e63..000000000
--- a/buildroot/package/binutils/arc-2018.03/0002-ld-makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d4e18ebc6ad810167a2de84b185a5f0d65b9ec2d Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Fri, 25 Dec 2015 11:40:53 +0100
-Subject: [PATCH] ld-makefile
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour 
----
- ld/Makefile.am | 2 +-
- ld/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 625347f..d5334d2 100644
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -57,7 +57,7 @@ endif
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index ba25177..a2cf228 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
--- 
-2.9.4
-
diff --git a/buildroot/package/binutils/arc-2018.03/0003-check-ldrunpath-length.patch b/buildroot/package/binutils/arc-2018.03/0003-check-ldrunpath-length.patch
deleted file mode 100644
index 3fbc5031d..000000000
--- a/buildroot/package/binutils/arc-2018.03/0003-check-ldrunpath-length.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3bd211025c890ef2971958915d500a9bb2913a2a Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Fri, 25 Dec 2015 11:41:47 +0100
-Subject: [PATCH] check-ldrunpath-length
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour 
----
- ld/emultempl/elf32.em | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index d2551b6..70fcb56 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -1463,6 +1463,8 @@ fragment <link.next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
--- 
-2.9.4
-
diff --git a/buildroot/package/binutils/arc-2018.03/0004-add-sysroot-fix-from-bug-3049.patch b/buildroot/package/binutils/arc-2018.03/0004-add-sysroot-fix-from-bug-3049.patch
deleted file mode 100644
index 9e11840ce..000000000
--- a/buildroot/package/binutils/arc-2018.03/0004-add-sysroot-fix-from-bug-3049.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 378bda0e19d279535b3f4a0e448a658a534a5d67 Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Fri, 25 Dec 2015 11:42:48 +0100
-Subject: [PATCH] add sysroot fix from bug #3049
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
-Signed-off-by: Sven Rebhan 
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour 
----
- ld/ldfile.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 3b37a0a..f7e5473 100644
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch,
-      directory first.  */
-   if (!entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+     /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+     entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+     if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+     && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
--- 
-2.9.4
-
diff --git a/buildroot/package/binutils/arc-2018.03/0005-poison-system-directories.patch b/buildroot/package/binutils/arc-2018.09-release/0005-poison-system-directories.patch
similarity index 89%
rename from buildroot/package/binutils/arc-2018.03/0005-poison-system-directories.patch
rename to buildroot/package/binutils/arc-2018.09-release/0005-poison-system-directories.patch
index a7c2761a9..90c7ac760 100644
--- a/buildroot/package/binutils/arc-2018.03/0005-poison-system-directories.patch
+++ b/buildroot/package/binutils/arc-2018.09-release/0005-poison-system-directories.patch
@@ -1,4 +1,4 @@
-From b100e9d16bfe6725b2624902af457ecfa490b150 Mon Sep 17 00:00:00 2001
+From 7d1e6ed1d57e839207e0ece7561bd4709032de9f Mon Sep 17 00:00:00 2001
 From: Romain Naour 
 Date: Fri, 25 Dec 2015 11:45:38 +0100
 Subject: [PATCH] poison-system-directories
@@ -70,7 +70,7 @@ Signed-off-by: Scott Garman 
  ld/configure    | 14 ++++++++++++++
  ld/configure.ac | 10 ++++++++++
  ld/ld.h         |  8 ++++++++
- ld/ld.texinfo   | 12 ++++++++++++
+ ld/ld.texi      | 12 ++++++++++++
  ld/ldfile.c     | 17 +++++++++++++++++
  ld/ldlex.h      |  2 ++
  ld/ldmain.c     |  2 ++
@@ -78,10 +78,10 @@ Signed-off-by: Scott Garman 
  9 files changed, 89 insertions(+)
 
 diff --git a/ld/config.in b/ld/config.in
-index 5d91380..ffe84a7 100644
+index d93c9b0..5da2742 100644
 --- a/ld/config.in
 +++ b/ld/config.in
-@@ -21,6 +21,9 @@
+@@ -31,6 +31,9 @@
     language is requested. */
  #undef ENABLE_NLS
  
@@ -92,10 +92,10 @@ index 5d91380..ffe84a7 100644
  #undef EXTRA_SHLIB_EXTENSION
  
 diff --git a/ld/configure b/ld/configure
-index da20ab5..63e3da7 100755
+index 300a272..d68890f 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -785,6 +785,7 @@ with_lib_path
+@@ -822,6 +822,7 @@ with_lib_path
  enable_targets
  enable_64_bit_bfd
  with_sysroot
@@ -103,7 +103,7 @@ index da20ab5..63e3da7 100755
  enable_gold
  enable_got
  enable_compressed_debug_sections
-@@ -1443,6 +1444,8 @@ Optional Features:
+@@ -1486,6 +1487,8 @@ Optional Features:
    --disable-largefile     omit support for large files
    --enable-targets        alternative target configurations
    --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
@@ -112,7 +112,7 @@ index da20ab5..63e3da7 100755
    --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
    --enable-got=     GOT handling scheme (target, single, negative,
                            multigot)
-@@ -15497,7 +15500,18 @@ else
+@@ -15803,7 +15806,18 @@ else
  fi
  
  
@@ -132,10 +132,10 @@ index da20ab5..63e3da7 100755
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
 diff --git a/ld/configure.ac b/ld/configure.ac
-index 34315e6..5ade9a0 100644
+index d10c553..9f1b57b 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
  
@@ -153,10 +153,10 @@ index 34315e6..5ade9a0 100644
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
 diff --git a/ld/ld.h b/ld/ld.h
-index 162e156..7d6d7ef 100644
+index ba914b9..9df17da 100644
 --- a/ld/ld.h
 +++ b/ld/ld.h
-@@ -177,6 +177,14 @@ typedef struct
+@@ -180,6 +180,14 @@ typedef struct
       in the linker script.  */
    bfd_boolean force_group_allocation;
  
@@ -171,11 +171,11 @@ index 162e156..7d6d7ef 100644
    /* Big or little endian as set on command line.  */
    enum endian_enum endian;
  
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index bb5f719..78501e4 100644
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -2480,6 +2480,18 @@ string identifying the original linked file does not change.
+diff --git a/ld/ld.texi b/ld/ld.texi
+index 40d79dd..137d46c 100644
+--- a/ld/ld.texi
++++ b/ld/ld.texi
+@@ -2479,6 +2479,18 @@ string identifying the original linked file does not change.
  
  Passing @code{none} for @var{style} disables the setting from any
  @code{--build-id} options earlier on the command line.
@@ -195,7 +195,7 @@ index bb5f719..78501e4 100644
  
  @c man end
 diff --git a/ld/ldfile.c b/ld/ldfile.c
-index f7e5473..2cd84d3 100644
+index b3d166c..3dcbf66 100644
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
 @@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
@@ -223,10 +223,10 @@ index f7e5473..2cd84d3 100644
  
  /* Try to open a BFD for a lang_input_statement.  */
 diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 5aa7f6b..cb655e0 100644
+index 04d6fd5..d7df005 100644
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
-@@ -147,6 +147,8 @@ enum option_values
+@@ -148,6 +148,8 @@ enum option_values
    OPTION_REQUIRE_DEFINED_SYMBOL,
    OPTION_ORPHAN_HANDLING,
    OPTION_FORCE_GROUP_ALLOCATION,
@@ -236,10 +236,10 @@ index 5aa7f6b..cb655e0 100644
  
  /* The initial parser states.  */
 diff --git a/ld/ldmain.c b/ld/ldmain.c
-index ee5ab11..5f6effd 100644
+index f31eeb2..25f8497 100644
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -270,6 +270,8 @@ main (int argc, char **argv)
+@@ -268,6 +268,8 @@ main (int argc, char **argv)
    command_line.warn_mismatch = TRUE;
    command_line.warn_search_mismatch = TRUE;
    command_line.check_section_addresses = -1;
@@ -249,10 +249,10 @@ index ee5ab11..5f6effd 100644
    /* We initialize DEMANGLING based on the environment variable
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
 diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 08106bc..d619d50 100644
+index 86a033a..f07f095 100644
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
-@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] =
+@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] =
    { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
      '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
      TWO_DASHES },
@@ -267,7 +267,7 @@ index 08106bc..d619d50 100644
  };
  
  #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -550,6 +558,7 @@ parse_args (unsigned argc, char **argv)
+@@ -555,6 +563,7 @@ parse_args (unsigned argc, char **argv)
    int ingroup = 0;
    char *default_dirlist = NULL;
    char *shortopts;
@@ -275,9 +275,9 @@ index 08106bc..d619d50 100644
    struct option *longopts;
    struct option *really_longopts;
    int last_optind;
-@@ -1534,6 +1543,14 @@ parse_args (unsigned argc, char **argv)
-           }
-           break;
+@@ -1543,6 +1552,14 @@ parse_args (unsigned argc, char **argv)
+ 	  }
+ 	  break;
  
 +	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
 +	  command_line.poison_system_directories = FALSE;
@@ -290,7 +290,7 @@ index 08106bc..d619d50 100644
  	case OPTION_PUSH_STATE:
  	  input_flags.pushed = xmemdup (&input_flags,
  					sizeof (input_flags),
-@@ -1577,6 +1594,10 @@ parse_args (unsigned argc, char **argv)
+@@ -1586,6 +1603,10 @@ parse_args (unsigned argc, char **argv)
        command_line.soname = NULL;
      }
  
@@ -302,5 +302,5 @@ index 08106bc..d619d50 100644
      {
        lang_leave_group ();
 -- 
-2.9.4
+2.7.4
 
diff --git a/buildroot/package/binutils/binutils.hash b/buildroot/package/binutils/binutils.hash
index d97f55da8..ac0831ca2 100644
--- a/buildroot/package/binutils/binutils.hash
+++ b/buildroot/package/binutils/binutils.hash
@@ -5,4 +5,4 @@ sha512  e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b19
 sha512  0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30  binutils-2.31.1.tar.xz
 
 # Locally calculated (fetched from Github)
-sha512  bea88164ed48733bad63393fe702e12e651efd113aa4f3fe2e253e05c4c1e5da20b5a99333f0b5528df6d32ce806f799211c568e1916845a87999901dde28817  binutils-arc-2018.03.tar.gz
+sha512  a96dfcea6064fcd1aac1333ac0d631491bed8b0be9bdcf62f1447909c8f30d2cb8d9323ffeb7c9ad6b326ecddb72e3d28281684e73343189d0a4a37a11aef62f  binutils-gdb-arc-2018.09-release.tar.gz
diff --git a/buildroot/package/binutils/binutils.mk b/buildroot/package/binutils/binutils.mk
index 090065a3e..4531b8d9c 100644
--- a/buildroot/package/binutils/binutils.mk
+++ b/buildroot/package/binutils/binutils.mk
@@ -9,15 +9,15 @@
 BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
 ifeq ($(BINUTILS_VERSION),)
 ifeq ($(BR2_arc),y)
-BINUTILS_VERSION = arc-2018.03
+BINUTILS_VERSION = arc-2018.09-release
 else
 BINUTILS_VERSION = 2.29.1
 endif
 endif # BINUTILS_VERSION
 
-ifeq ($(BINUTILS_VERSION),arc-2018.03)
+ifeq ($(BINUTILS_VERSION),arc-2018.09-release)
 BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION))
-BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
+BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz
 BINUTILS_FROM_GIT = y
 endif
 BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils
diff --git a/buildroot/package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch b/buildroot/package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch
deleted file mode 100644
index c0faec21b..000000000
--- a/buildroot/package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6cb15abfc00cb5e492175a9efc71bfdfd1aa457c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Tue, 9 Oct 2018 12:51:08 +0200
-Subject: [PATCH] Makefile.in: fix installation with --disable-client
-
-The configure.ac script initializes the CLIENT variable this way:
-
-CLIENT=birdcl
-if client enabled
- CLIENT=$CLIENT birdc
-fi
-
-This means that checking if @CLIENT@ is empty to decide whether birdc
-should be installed or not doesn't work, and causes a failure at
-installation time when --disable-client is passed.
-
-Instead, check if the birdc binary has been produced or not to decide
-whether it should be installed.
-
-Signed-off-by: Thomas Petazzoni 
-Upstream-status: http://trubka.network.cz/pipermail/bird-users/2018-October/012763.html
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index c8168bbe..fea3683e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -171,7 +171,7 @@ install: all
- 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
- 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
- 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
--	if test -n "@CLIENT@" ; then								\
-+	if test -f $(exedir)/birdc ; then							\
- 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
- 	fi
- 	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
--- 
-2.14.4
-
diff --git a/buildroot/package/bird/bird.hash b/buildroot/package/bird/bird.hash
index 449e8afd8..3f3a93b96 100644
--- a/buildroot/package/bird/bird.hash
+++ b/buildroot/package/bird/bird.hash
@@ -1,2 +1,2 @@
-sha256 bd42d48fbcc2c0046d544f1183cd98193ff15b792d332ff45f386b0180b09335  bird-v2.0.2.tar.gz
-sha256 f018596a97af0108efc446320631e2fddc0c1d1f3ffab3129327ccdb4f0c29ed  README
+sha256 0f49b38327d3109553acfa662ac0cf0377719226a03c124cd2e0ea2265ecb1de  bird-2.0.3.tar.gz
+sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2  README
diff --git a/buildroot/package/bird/bird.mk b/buildroot/package/bird/bird.mk
index 297e21dd9..da2f86807 100644
--- a/buildroot/package/bird/bird.mk
+++ b/buildroot/package/bird/bird.mk
@@ -4,12 +4,10 @@
 #
 ################################################################################
 
-BIRD_VERSION = v2.0.2
-BIRD_SITE = $(call github,BIRD,bird,$(BIRD_VERSION))
+BIRD_VERSION = 2.0.3
+BIRD_SITE = ftp://bird.network.cz/pub/bird
 BIRD_LICENSE = GPL-2.0+
 BIRD_LICENSE_FILES = README
-# autoreconf is needed since the package is fetched from github
-BIRD_AUTORECONF = YES
 BIRD_DEPENDENCIES = host-flex host-bison
 
 ifeq ($(BR2_PACKAGE_BIRD_CLIENT),y)
diff --git a/buildroot/package/bluez5_utils/bluez5_utils.mk b/buildroot/package/bluez5_utils/bluez5_utils.mk
index f5b827cc3..15c9b670a 100644
--- a/buildroot/package/bluez5_utils/bluez5_utils.mk
+++ b/buildroot/package/bluez5_utils/bluez5_utils.mk
@@ -20,7 +20,8 @@ BLUEZ5_UTILS_DEPENDENCIES = \
 BLUEZ5_UTILS_CONF_OPTS = \
 	--enable-tools \
 	--enable-library \
-	--disable-cups
+	--disable-cups \
+	--with-dbusconfdir=/etc
 
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-obex
diff --git a/buildroot/package/boinc/boinc.hash b/buildroot/package/boinc/boinc.hash
index 289a3abf2..eeaaf68ed 100644
--- a/buildroot/package/boinc/boinc.hash
+++ b/buildroot/package/boinc/boinc.hash
@@ -1,4 +1,4 @@
 # Locally computed:
-sha256 8fcfa84d2c1c90f65b0f1a5b0edf8353341f0211acfaa7538428845d9817e2d7  boinc-7.12.1.tar.gz
+sha256 970aedb9e25afa20be67f125ab05435df8eb2e66a3ac30ad316c54085e397c88  boinc-7.14.2.tar.gz
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
 sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c  COPYING.LESSER
diff --git a/buildroot/package/boinc/boinc.mk b/buildroot/package/boinc/boinc.mk
index 1a34c7186..dd468c767 100644
--- a/buildroot/package/boinc/boinc.mk
+++ b/buildroot/package/boinc/boinc.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-BOINC_VERSION_MAJOR = 7.12
-BOINC_VERSION = $(BOINC_VERSION_MAJOR).1
+BOINC_VERSION_MAJOR = 7.14
+BOINC_VERSION = $(BOINC_VERSION_MAJOR).2
 # client_release can be used to build the Client and Manager but not the Server
 # part. The Server currently has no versioning (see
 # https://github.com/BOINC/boinc/pull/1798).
diff --git a/buildroot/package/boost/0005-fix-static-detection-of-lock-free-atomic-ints.patch b/buildroot/package/boost/0005-fix-static-detection-of-lock-free-atomic-ints.patch
deleted file mode 100644
index 9e87aaedf..000000000
--- a/buildroot/package/boost/0005-fix-static-detection-of-lock-free-atomic-ints.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 48be99d20753ecab8817b030b95a7f1260aa777f Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Wed, 5 Sep 2018 12:04:15 +0200
-Subject: [PATCH 17/17] fix static detection of lock-free atomic ints
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When build statically, boost is unable to detect lock-free atomics ints
-because it tries to link dynamically with boost_system, see
-output/build/boost-1.67.0/bin.v2/config.log (with -d5 option):
-
-Using shell: /bin/sh -c
-    argv[0] = '/bin/sh'
-    argv[1] = '-c'
-    argv[2] = '
-    "/home/fabrice/buildroot/output/host/bin/arm-linux-g++"   -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os   -Wl,-elf2flt -static  -Wl,-elf2flt -static -fPIC -pthread -O0 -fno-inline -Wall -pedantic -g -Wextra -Wno-long-long -Wno-unused-parameter -Wunused-function -pedantic -DBOOST_ALL_NO_LIB=1 -DBOOST_SYSTEM_DYN_LINK=1 -DBOOST_THREAD_BUILD_DLL=1  -I"." -c -o "bin.v2/libs/thread/build/gcc-6.4.0/debug/threading-multi/has_atomic_flag_lockfree_test.o" "libs/thread/src/../build/has_atomic_flag_lockfree_test.cpp"
-'
-gcc.compile.c++ bin.v2/libs/thread/build/gcc-6.4.0/debug/threading-multi/has_atomic_flag_lockfree_test.o
-
-    "/home/fabrice/buildroot/output/host/bin/arm-linux-g++"   -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os   -Wl,-elf2flt -static  -Wl,-elf2flt -static -fPIC -pthread -O0 -fno-inline -Wall -pedantic -g -Wextra -Wno-long-long -Wno-unused-parameter -Wunused-function -pedantic -DBOOST_ALL_NO_LIB=1 -DBOOST_SYSTEM_DYN_LINK=1 -DBOOST_THREAD_BUILD_DLL=1  -I"." -c -o "bin.v2/libs/thread/build/gcc-6.4.0/debug/threading-multi/has_atomic_flag_lockfree_test.o" "libs/thread/src/../build/has_atomic_flag_lockfree_test.cpp"
-
-0.033561 sec system; 0.126314 sec user; 288.682473 sec clock
-gcc.compile.c++ bin.v2/libs/system/build/gcc-6.4.0/debug/threading-multi/error_code.o
-
-    "/home/fabrice/buildroot/output/host/bin/arm-linux-g++"   -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os   -Wl,-elf2flt -static  -Wl,-elf2flt -static -fPIC -pthread -O0 -fno-inline -Wall -pedantic -g  -DBOOST_ALL_NO_LIB=1 -DBOOST_SYSTEM_DYN_LINK=1  -I"." -c -o "bin.v2/libs/system/build/gcc-6.4.0/debug/threading-multi/error_code.o" "libs/system/src/error_code.cpp"
-
-0.084060 sec system; 0.644133 sec user; 8.858824 sec clock
-SEM: gcc-link-semaphore now used by libboost_system.so.1.67.0
-Using shell: /bin/sh -c
-    argv[0] = '/bin/sh'
-    argv[1] = '-c'
-    argv[2] = '
-    "/home/fabrice/buildroot/output/host/bin/arm-linux-g++"    -o "bin.v2/libs/system/build/gcc-6.4.0/debug/threading-multi/libboost_system.so.1.67.0" -Wl,-h -Wl,libboost_system.so.1.67.0 -shared -Wl,--start-group "bin.v2/libs/system/build/gcc-6.4.0/debug/threading-multi/error_code.o"  -Wl,-Bstatic  -Wl,-Bdynamic -lrt -Wl,--end-group -fPIC -pthread -g  -Wl,-elf2flt -static
-'
-gcc.link.dll bin.v2/libs/system/build/gcc-6.4.0/debug/threading-multi/libboost_system.so.1.67.0
-
-    "/home/fabrice/buildroot/output/host/bin/arm-linux-g++"    -o "bin.v2/libs/system/build/gcc-6.4.0/debug/threading-multi/libboost_system.so.1.67.0" -Wl,-h -Wl,libboost_system.so.1.67.0 -shared -Wl,--start-group "bin.v2/libs/system/build/gcc-6.4.0/debug/threading-multi/error_code.o"  -Wl,-Bstatic  -Wl,-Bdynamic -lrt -Wl,--end-group -fPIC -pthread -g  -Wl,-elf2flt -static
-
-ld (ld-elf2flt): -shared used without passing a shared library ID
-collect2: error: ld a retourné le statut de sortie 1
-0.003123 sec system; 0.004732 sec user; 15.646509 sec clock
-...failed gcc.link.dll bin.v2/libs/system/build/gcc-6.4.0/debug/threading-multi/libboost_system.so.1.67.0...
-
-To fix this, move the exe statement before the boost/thread project
-
-Fixes:
- - http://autobuild.buildroot.org/results/f46d38991385cbc2a4fa14eb31074e770cd79803
-
-Signed-off-by: Fabrice Fontaine 
-[Upstream status: https://github.com/boostorg/thread/commit/f7581a366294c6f5381e0371c242af327c6da655]
----
- build/Jamfile.v2 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libs/thread/build/Jamfile.v2 b/build/Jamfile.v2
-index ce8c7f47..26d8b9c3 100644
---- a/libs/thread/build/Jamfile.v2
-+++ b/libs/thread/build/Jamfile.v2
-@@ -38,6 +38,8 @@ import path ;
- import configure ; 
- import threadapi-feature ;
- 
-+exe has_atomic_flag_lockfree : ../build/has_atomic_flag_lockfree_test.cpp ;
-+
- project boost/thread
-     : source-location ../src
-     : requirements multi
-@@ -141,8 +143,6 @@ project boost/thread
-       /boost/system//boost_system
-     ;
- 
--exe has_atomic_flag_lockfree : ../build/has_atomic_flag_lockfree_test.cpp ; 
--
- rule tag ( name : type ? : property-set )
- {
-     local result = $(name) ;
--- 
-2.17.1
-
diff --git a/buildroot/package/boost/Config.in b/buildroot/package/boost/Config.in
index 0fe2422e5..4e6bbff6d 100644
--- a/buildroot/package/boost/Config.in
+++ b/buildroot/package/boost/Config.in
@@ -279,11 +279,6 @@ config BR2_PACKAGE_BOOST_SERIALIZATION
 	help
 	  Serialization for persistence and marshalling.
 
-config BR2_PACKAGE_BOOST_SIGNALS
-	bool "boost-signals"
-	help
-	  Managed signals & slots callback implementation.
-
 config BR2_PACKAGE_BOOST_STACKTRACE
 	bool "boost-stacktrace"
 	depends on !BR2_STATIC_LIBS
diff --git a/buildroot/package/boost/boost.hash b/buildroot/package/boost/boost.hash
index f3322aed9..c67c3f4a5 100644
--- a/buildroot/package/boost/boost.hash
+++ b/buildroot/package/boost/boost.hash
@@ -1,5 +1,5 @@
-# From http://www.boost.org/users/history/version_1_68_0.html
-sha256 7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7  boost_1_68_0.tar.bz2
+# From http://www.boost.org/users/history/version_1_69_0.html
+sha256 8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406  boost_1_69_0.tar.bz2
 
 # Locally computed
 sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566  LICENSE_1_0.txt
diff --git a/buildroot/package/boost/boost.mk b/buildroot/package/boost/boost.mk
index 0adad8929..432730901 100644
--- a/buildroot/package/boost/boost.mk
+++ b/buildroot/package/boost/boost.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BOOST_VERSION = 1.68.0
+BOOST_VERSION = 1.69.0
 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
 BOOST_INSTALL_STAGING = YES
@@ -16,8 +16,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \
 	--without-libraries=$(subst $(space),$(comma),atomic chrono context \
 	contract coroutine date_time exception filesystem graph graph_parallel \
 	iostreams locale log math mpi program_options python random regex \
-	serialization signals system test thread timer type_erasure \
-	wave)
+	serialization system test thread timer type_erasure wave)
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
@@ -41,7 +40,6 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_REGEX),,regex)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SERIALIZATION),,serialization)
-BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SIGNALS),,signals)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_STACKTRACE),,stacktrace)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SYSTEM),,system)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test)
diff --git a/buildroot/package/botan/0003-makefile.in-move-LDFLAGS-after-EXE_LINKS_TO.patch b/buildroot/package/botan/0003-makefile.in-move-LDFLAGS-after-EXE_LINKS_TO.patch
new file mode 100644
index 000000000..82186419d
--- /dev/null
+++ b/buildroot/package/botan/0003-makefile.in-move-LDFLAGS-after-EXE_LINKS_TO.patch
@@ -0,0 +1,38 @@
+From a837dd63f3ac5a9c206863c82b57c679cb72b8b7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 28 Apr 2019 10:21:06 +0200
+Subject: [PATCH] makefile.in: move LDFLAGS after EXE_LINKS_TO
+
+Move LDFLAGS after EXE_LINKS_TO to allow the user to give additional
+libraries such as -latomic otherwise static build will fail:
+
+cli/tls_server.o build/obj/cli/tls_utils.o build/obj/cli/utils.o build/obj/cli/x509.o -L. -lbotan-2 -lboost_filesystem -lboost_system -lbz2 -lcrypto -llzma -lsqlite3 -lz -o botan
+/home/buildroot/autobuild/instance-1/output/host/bin/sparc-linux-g++ -Wl,-rpath=\$ORIGIN -pthread -static -latomic build/obj/test/main.o build/obj/test/test_aead.o build/obj/test/test_asn1.o build/obj/test/test_bigint.o build/obj/test/test_block.o build/obj/test/test_blowfish.o build/obj/test/test_c25519.o build/obj/test/test_certstor.o build/obj/test/test_compression.o build/obj/test/test_cryptobox.o build/obj/test/test_datastore.o build/obj/test/test_dh.o build/obj/test/test_dl_group.o build/obj/test/test_dlies.o build/obj/test/test_dsa.o build/obj/test/test_ecc_pointmul.o build/obj/test/test_ecdh.o build/obj/test/test_ecdsa.o build/obj/test/test_ecgdsa.o build/obj/test/test_ecies.o build/obj/test/test_eckcdsa.o build/obj/test/test_ed25519.o build/obj/test/test_elg.o build/obj/test/test_entropy.o build/obj/test/test_ffi.o build/obj/test/test_filters.o build/obj/test/test_fpe.o build/obj/test/test_gf2m.o build/obj/test/test_gost_3410.o build/obj/test/test_hash.o build/obj/test/test_hash_id.o build/obj/test/test_kdf.o build/obj/test/test_keywrap.o build/obj/test/test_mac.o build/obj/test/test_mceliece.o build/obj/test/test_modes.o build/obj/test/test_mp.o build/obj/test/test_name_constraint.o build/obj/test/test_newhope.o build/obj/test/test_ocb.o build/obj/test/test_ocsp.o build/obj/test/test_octetstring.o build/obj/test/test_oid.o build/obj/test/test_os_utils.o build/obj/test/test_otp.o build/obj/test/test_package_transform.o build/obj/test/test_pad.o build/obj/test/test_passhash.o build/obj/test/test_pbkdf.o build/obj/test/test_pem.o build/obj/test/test_pk_pad.o build/obj/test/test_pkcs11.o build/obj/test/test_pkcs11_high_level.o build/obj/test/test_pkcs11_low_level.o build/obj/test/test_psk_db.o build/obj/test/test_pubkey.o build/obj/test/test_rfc6979.o build/obj/test/test_rng.o build/obj/test/test_rng_kat.o build/obj/test/test_rsa.o build/obj/test/test_runner.o build/obj/test/test_simd.o build/obj/test/test_siv.o build/obj/test/test_sm2.o build/obj/test/test_srp6.o build/obj/test/test_stream.o build/obj/test/test_tests.o build/obj/test/test_tls.o build/obj/test/test_tls_messages.o build/obj/test/test_tpm.o build/obj/test/test_tss.o build/obj/test/test_utils.o build/obj/test/test_workfactor.o build/obj/test/test_x509_dn.o build/obj/test/test_x509_path.o build/obj/test/test_xmss.o build/obj/test/tests.o build/obj/test/unit_ecc.o build/obj/test/unit_ecdh.o build/obj/test/unit_ecdsa.o build/obj/test/unit_tls.o build/obj/test/unit_tls_policy.o build/obj/test/unit_x509.o -L. -lbotan-2 -lboost_filesystem -lboost_system -lbz2 -lcrypto -llzma -lsqlite3 -lz -o botan-test
+./libbotan-2.a(utils_filesystem.o): In function `Botan::get_files_recursive(std::__cxx11::basic_string, std::allocator > const&)':
+filesystem.cpp:(.text+0x758): undefined reference to `__atomic_fetch_sub_4'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/9db39b209a0f4be1e09b7e4ddb5e9a63da4fbbfa
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/randombit/botan/pull/1916]
+---
+ src/build-data/makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
+index 08c9c5421..7111c7b19 100644
+--- a/src/build-data/makefile.in
++++ b/src/build-data/makefile.in
+@@ -71,7 +71,7 @@ $(CLI): $(LIBRARIES) $(CLIOBJS)
+ 	$(POST_LINK_CMD)
+ 
+ $(TEST): $(LIBRARIES) $(TESTOBJS)
+-	$(EXE_LINK_CMD) $(ABI_FLAGS) $(LDFLAGS) $(TESTOBJS) $(EXE_LINKS_TO) %{output_to_exe}$@
++	$(EXE_LINK_CMD) $(ABI_FLAGS) $(TESTOBJS) $(EXE_LINKS_TO) $(LDFLAGS) %{output_to_exe}$@
+ 	$(POST_LINK_CMD)
+ 
+ %{if build_fuzzers}
+-- 
+2.20.1
+
diff --git a/buildroot/package/botan/botan.mk b/buildroot/package/botan/botan.mk
index e07b786c8..a96a12178 100644
--- a/buildroot/package/botan/botan.mk
+++ b/buildroot/package/botan/botan.mk
@@ -17,9 +17,16 @@ BOTAN_CONF_OPTS = \
 	--os=linux \
 	--cc=gcc \
 	--cc-bin="$(TARGET_CXX)" \
+	--ldflags="$(BOTAN_LDFLAGS)" \
 	--prefix=/usr \
 	--without-documentation
 
+BOTAN_LDFLAGS = $(TARGET_LDFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+BOTAN_LDFLAGS += -latomic
+endif
+
 ifeq ($(BR2_SHARED_LIBS),y)
 BOTAN_CONF_OPTS += \
 	--disable-static-library \
diff --git a/buildroot/package/brcm-patchram-plus/Config.in b/buildroot/package/brcm-patchram-plus/Config.in
new file mode 100644
index 000000000..2742016eb
--- /dev/null
+++ b/buildroot/package/brcm-patchram-plus/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_BRCM_PATCHRAM_PLUS
+	bool "brcm-patchram-plus"
+	help
+	  Broadcom utility to flash Bluetooth firmwares, extended with
+	  per-device Low Power Mode configuration.
+
+	  https://github.com/AsteroidOS/brcm-patchram-plus
diff --git a/buildroot/package/brcm-patchram-plus/brcm-patchram-plus.hash b/buildroot/package/brcm-patchram-plus/brcm-patchram-plus.hash
new file mode 100644
index 000000000..f6910e714
--- /dev/null
+++ b/buildroot/package/brcm-patchram-plus/brcm-patchram-plus.hash
@@ -0,0 +1,3 @@
+# locally computed
+sha256  febad69fbc9185b4c6a31188cf381fd280b88d93cb7f5a40dfdbab9c599c29a7  brcm-patchram-plus-95b7b6916d661a4da3f9c0adf52d5e1f4f8ab042.tar.gz
+sha256  26324f5c563b7e338c2876c8abe90c3681c1e9a6163fc59b494c94ad6493eda4  COPYING
diff --git a/buildroot/package/brcm-patchram-plus/brcm-patchram-plus.mk b/buildroot/package/brcm-patchram-plus/brcm-patchram-plus.mk
new file mode 100644
index 000000000..329571d9a
--- /dev/null
+++ b/buildroot/package/brcm-patchram-plus/brcm-patchram-plus.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# brcm-patchram-plus
+#
+################################################################################
+
+BRCM_PATCHRAM_PLUS_VERSION = 95b7b6916d661a4da3f9c0adf52d5e1f4f8ab042
+BRCM_PATCHRAM_PLUS_SITE = $(call github,AsteroidOS,brcm-patchram-plus,$(BRCM_PATCHRAM_PLUS_VERSION))
+BRCM_PATCHRAM_PLUS_LICENSE = Apache-2.0
+BRCM_PATCHRAM_PLUS_LICENSE_FILES = COPYING
+BRCM_PATCHRAM_PLUS_AUTORECONF = YES
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch b/buildroot/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch
new file mode 100644
index 000000000..b40979e35
--- /dev/null
+++ b/buildroot/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch
@@ -0,0 +1,137 @@
+From 6d3b4bb24da9a07c263f3c1acf8df85382ff562c Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko 
+Date: Mon, 17 Dec 2018 18:07:18 +0100
+Subject: udhcpc: check that 4-byte options are indeed 4-byte, closes 11506
+
+function                                             old     new   delta
+udhcp_get_option32                                     -      27     +27
+udhcp_get_option                                     231     248     +17
+------------------------------------------------------------------------------
+(add/remove: 1/0 grow/shrink: 1/0 up/down: 44/0)               Total: 44 bytes
+
+Signed-off-by: Denys Vlasenko 
+Signed-off-by: Jared Bents 
+---
+ networking/udhcp/common.c | 19 +++++++++++++++++++
+ networking/udhcp/common.h |  4 ++++
+ networking/udhcp/dhcpc.c  |  6 +++---
+ networking/udhcp/dhcpd.c  |  6 +++---
+ 4 files changed, 29 insertions(+), 6 deletions(-)
+
+diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
+index e5fd74f91..41b05b855 100644
+--- a/networking/udhcp/common.c
++++ b/networking/udhcp/common.c
+@@ -272,6 +272,15 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code)
+ 			goto complain; /* complain and return NULL */
+ 
+ 		if (optionptr[OPT_CODE] == code) {
++			if (optionptr[OPT_LEN] == 0) {
++				/* So far no valid option with length 0 known.
++				 * Having this check means that searching
++				 * for DHCP_MESSAGE_TYPE need not worry
++				 * that returned pointer might be unsafe
++				 * to dereference.
++				 */
++				goto complain; /* complain and return NULL */
++			}
+ 			log_option("option found", optionptr);
+ 			return optionptr + OPT_DATA;
+ 		}
+@@ -289,6 +298,16 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code)
+ 	return NULL;
+ }
+ 
++uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code)
++{
++	uint8_t *r = udhcp_get_option(packet, code);
++	if (r) {
++		if (r[-1] != 4)
++			r = NULL;
++	}
++	return r;
++}
++
+ /* Return the position of the 'end' option (no bounds checking) */
+ int FAST_FUNC udhcp_end_option(uint8_t *optionptr)
+ {
+diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
+index 7ad603d33..9511152ff 100644
+--- a/networking/udhcp/common.h
++++ b/networking/udhcp/common.h
+@@ -205,6 +205,10 @@ extern const uint8_t dhcp_option_lengths[] ALIGN1;
+ unsigned FAST_FUNC udhcp_option_idx(const char *name, const char *option_strings);
+ 
+ uint8_t *udhcp_get_option(struct dhcp_packet *packet, int code) FAST_FUNC;
++/* Same as above + ensures that option length is 4 bytes
++ * (returns NULL if size is different)
++ */
++uint8_t *udhcp_get_option32(struct dhcp_packet *packet, int code) FAST_FUNC;
+ int udhcp_end_option(uint8_t *optionptr) FAST_FUNC;
+ void udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addopt) FAST_FUNC;
+ #if ENABLE_UDHCPC || ENABLE_UDHCPD
+diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
+index 4b23e4d39..5b3fd531c 100644
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -1691,7 +1691,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+  * They say ISC DHCP client supports this case.
+  */
+ 				server_addr = 0;
+-				temp = udhcp_get_option(&packet, DHCP_SERVER_ID);
++				temp = udhcp_get_option32(&packet, DHCP_SERVER_ID);
+ 				if (!temp) {
+ 					bb_error_msg("no server ID, using 0.0.0.0");
+ 				} else {
+@@ -1718,7 +1718,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+ 				struct in_addr temp_addr;
+ 				uint8_t *temp;
+ 
+-				temp = udhcp_get_option(&packet, DHCP_LEASE_TIME);
++				temp = udhcp_get_option32(&packet, DHCP_LEASE_TIME);
+ 				if (!temp) {
+ 					bb_error_msg("no lease time with ACK, using 1 hour lease");
+ 					lease_seconds = 60 * 60;
+@@ -1813,7 +1813,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+ 					uint32_t svid;
+ 					uint8_t *temp;
+ 
+-					temp = udhcp_get_option(&packet, DHCP_SERVER_ID);
++					temp = udhcp_get_option32(&packet, DHCP_SERVER_ID);
+ 					if (!temp) {
+  non_matching_svid:
+ 						log1("received DHCP NAK with wrong"
+diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
+index a8cd3f03b..477856d11 100644
+--- a/networking/udhcp/dhcpd.c
++++ b/networking/udhcp/dhcpd.c
+@@ -640,7 +640,7 @@ static void add_server_options(struct dhcp_packet *packet)
+ static uint32_t select_lease_time(struct dhcp_packet *packet)
+ {
+ 	uint32_t lease_time_sec = server_config.max_lease_sec;
+-	uint8_t *lease_time_opt = udhcp_get_option(packet, DHCP_LEASE_TIME);
++	uint8_t *lease_time_opt = udhcp_get_option32(packet, DHCP_LEASE_TIME);
+ 	if (lease_time_opt) {
+ 		move_from_unaligned32(lease_time_sec, lease_time_opt);
+ 		lease_time_sec = ntohl(lease_time_sec);
+@@ -987,7 +987,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
+ 		}
+ 
+ 		/* Get SERVER_ID if present */
+-		server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
++		server_id_opt = udhcp_get_option32(&packet, DHCP_SERVER_ID);
+ 		if (server_id_opt) {
+ 			uint32_t server_id_network_order;
+ 			move_from_unaligned32(server_id_network_order, server_id_opt);
+@@ -1011,7 +1011,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
+ 		}
+ 
+ 		/* Get REQUESTED_IP if present */
+-		requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
++		requested_ip_opt = udhcp_get_option32(&packet, DHCP_REQUESTED_IP);
+ 		if (requested_ip_opt) {
+ 			move_from_unaligned32(requested_nip, requested_ip_opt);
+ 		}
+-- 
+cgit v1.2.1
+
diff --git a/buildroot/package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch b/buildroot/package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch
new file mode 100644
index 000000000..05939db4a
--- /dev/null
+++ b/buildroot/package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch
@@ -0,0 +1,58 @@
+From 74d9f1ba37010face4bd1449df4d60dd84450b06 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko 
+Date: Mon, 7 Jan 2019 15:33:42 +0100
+Subject: udhcpc: when decoding DHCP_SUBNET, ensure it is 4 bytes long
+
+function                                             old     new   delta
+udhcp_run_script                                     795     801      +6
+
+Signed-off-by: Denys Vlasenko 
+Signed-off-by: Jared Bents 
+---
+ networking/udhcp/common.c | 2 +-
+ networking/udhcp/common.h | 2 +-
+ networking/udhcp/dhcpc.c  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
+index 4c2221b77..fc4de5716 100644
+--- a/networking/udhcp/common.c
++++ b/networking/udhcp/common.c
+@@ -302,7 +302,7 @@ uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code)
+ {
+ 	uint8_t *r = udhcp_get_option(packet, code);
+ 	if (r) {
+-		if (r[-1] != 4)
++		if (r[-OPT_DATA + OPT_LEN] != 4)
+ 			r = NULL;
+ 	}
+ 	return r;
+diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
+index 9511152ff..62f9a2a4a 100644
+--- a/networking/udhcp/common.h
++++ b/networking/udhcp/common.h
+@@ -119,7 +119,7 @@ enum {
+ //#define DHCP_TIME_SERVER      0x04 /* RFC 868 time server (32-bit, 0 = 1.1.1900) */
+ //#define DHCP_NAME_SERVER      0x05 /* IEN 116 _really_ ancient kind of NS */
+ //#define DHCP_DNS_SERVER       0x06
+-//#define DHCP_LOG_SERVER       0x07 /* port 704 UDP log (not syslog)
++//#define DHCP_LOG_SERVER       0x07 /* port 704 UDP log (not syslog) */
+ //#define DHCP_COOKIE_SERVER    0x08 /* "quote of the day" server */
+ //#define DHCP_LPR_SERVER       0x09
+ #define DHCP_HOST_NAME          0x0c /* 12: either client informs server or server gives name to client */
+diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
+index 5b3fd531c..dcec8cdfd 100644
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -531,7 +531,7 @@ static char **fill_envp(struct dhcp_packet *packet)
+ 		temp = udhcp_get_option(packet, code);
+ 		*curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name);
+ 		putenv(*curr++);
+-		if (code == DHCP_SUBNET) {
++		if (code == DHCP_SUBNET && temp[-OPT_DATA + OPT_LEN] == 4) {
+ 			/* Subnet option: make things like "$ip/$mask" possible */
+ 			uint32_t subnet;
+ 			move_from_unaligned32(subnet, temp);
+-- 
+cgit v1.2.1
+
diff --git a/buildroot/package/busybox/S01logging b/buildroot/package/busybox/S01logging
deleted file mode 100644
index fcb3e7d23..000000000
--- a/buildroot/package/busybox/S01logging
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# Start logging
-#
-
-SYSLOGD_ARGS=-n
-KLOGD_ARGS=-n
-[ -r /etc/default/logging ] && . /etc/default/logging
-
-start() {
-	printf "Starting logging: "
-	start-stop-daemon -b -S -q -m -p /var/run/syslogd.pid --exec /sbin/syslogd -- $SYSLOGD_ARGS
-	start-stop-daemon -b -S -q -m -p /var/run/klogd.pid --exec /sbin/klogd -- $KLOGD_ARGS
-	echo "OK"
-}
-
-stop() {
-	printf "Stopping logging: "
-	start-stop-daemon -K -q -p /var/run/syslogd.pid
-	start-stop-daemon -K -q -p /var/run/klogd.pid
-	echo "OK"
-}
-
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart|reload)
-	stop
-	start
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-esac
-
-exit $?
diff --git a/buildroot/package/busybox/S01syslogd b/buildroot/package/busybox/S01syslogd
new file mode 100644
index 000000000..15006bc06
--- /dev/null
+++ b/buildroot/package/busybox/S01syslogd
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+DAEMON="syslogd"
+PIDFILE="/var/run/$DAEMON.pid"
+
+SYSLOGD_ARGS=""
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+# BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line
+# and use "-m" to instruct start-stop-daemon to create one.
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# shellcheck disable=SC2086 # we need the word splitting
+	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
+		-- -n $SYSLOGD_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		rm -f "$PIDFILE"
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+case "$1" in
+	start|stop|restart)
+		"$1";;
+	reload)
+		# Restart, since there is no true "reload" feature.
+		restart;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
diff --git a/buildroot/package/busybox/S02klogd b/buildroot/package/busybox/S02klogd
new file mode 100644
index 000000000..0677e1e5c
--- /dev/null
+++ b/buildroot/package/busybox/S02klogd
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+DAEMON="klogd"
+PIDFILE="/var/run/$DAEMON.pid"
+
+KLOGD_ARGS=""
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+# BusyBox' klogd does not create a pidfile, so pass "-n" in the command line
+# and use "-m" to instruct start-stop-daemon to create one.
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# shellcheck disable=SC2086 # we need the word splitting
+	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
+		-- -n $KLOGD_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		rm -f "$PIDFILE"
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+case "$1" in
+	start|stop|restart)
+		"$1";;
+	reload)
+		# Restart, since there is no true "reload" feature.
+		restart;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
diff --git a/buildroot/package/busybox/S50telnet b/buildroot/package/busybox/S50telnet
old mode 100755
new mode 100644
diff --git a/buildroot/package/busybox/busybox.config b/buildroot/package/busybox/busybox.config
index 38de13d4d..1d9560d65 100644
--- a/buildroot/package/busybox/busybox.config
+++ b/buildroot/package/busybox/busybox.config
@@ -321,7 +321,7 @@ CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y
 CONFIG_UUDECODE=y
-# CONFIG_BASE64 is not set
+CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
 # CONFIG_FEATURE_WC_LARGE is not set
diff --git a/buildroot/package/busybox/busybox.mk b/buildroot/package/busybox/busybox.mk
index 757086592..179af6aea 100644
--- a/buildroot/package/busybox/busybox.mk
+++ b/buildroot/package/busybox/busybox.mk
@@ -32,6 +32,7 @@ BUSYBOX_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \
 	$(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \
 	$(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \
+	$(if $(BR2_PACKAGE_DOSFSTOOLS),dosfstools) \
 	$(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \
 	$(if $(BR2_PACKAGE_FBSET),fbset) \
 	$(if $(BR2_PACKAGE_GAWK),gawk) \
@@ -55,10 +56,8 @@ BUSYBOX_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_PCIUTILS),pciutils) \
 	$(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \
 	$(if $(BR2_PACKAGE_PSMISC),psmisc) \
-	$(if $(BR2_PACKAGE_RSYSLOGD),rsyslog) \
 	$(if $(BR2_PACKAGE_START_STOP_DAEMON),start-stop-daemon) \
 	$(if $(BR2_PACKAGE_SYSKLOGD),sysklogd) \
-	$(if $(BR2_PACKAGE_SYSLOG_NG),syslog-ng) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd) \
 	$(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \
 	$(if $(BR2_PACKAGE_TAR),tar) \
@@ -245,15 +244,21 @@ define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES
 endef
 endif
 
-# Only install our own if no other package already did.
+# Only install our logging scripts if no other package does it.
+ifeq ($(BR2_PACKAGE_SYSKLOGD)$(BR2_PACKAGE_RSYSLOG)$(BR2_PACKAGE_SYSLOG_NG),)
 define BUSYBOX_INSTALL_LOGGING_SCRIPT
-	if grep -q CONFIG_SYSLOGD=y $(@D)/.config && \
-		[ ! -e $(TARGET_DIR)/etc/init.d/S01logging ]; \
+	if grep -q CONFIG_SYSLOGD=y $(@D)/.config; \
 	then \
-		$(INSTALL) -m 0755 -D package/busybox/S01logging \
-			$(TARGET_DIR)/etc/init.d/S01logging; \
+		$(INSTALL) -m 0755 -D package/busybox/S01syslogd \
+			$(TARGET_DIR)/etc/init.d/S01syslogd; \
+	fi; \
+	if grep -q CONFIG_KLOGD=y $(@D)/.config; \
+	then \
+		$(INSTALL) -m 0755 -D package/busybox/S02klogd \
+			$(TARGET_DIR)/etc/init.d/S02klogd; \
 	fi
 endef
+endif
 
 ifeq ($(BR2_INIT_BUSYBOX),y)
 define BUSYBOX_INSTALL_INITTAB
@@ -319,10 +324,6 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
 	$(BUSYBOX_SET_INDIVIDUAL_BINARIES)
 endef
 
-define BUSYBOX_CONFIGURE_CMDS
-	$(BUSYBOX_NOCLOBBER_INSTALL)
-endef
-
 define BUSYBOX_BUILD_CMDS
 	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D)
 endef
diff --git a/buildroot/package/c-ares/c-ares.hash b/buildroot/package/c-ares/c-ares.hash
index 0c665574d..a3599aaa1 100644
--- a/buildroot/package/c-ares/c-ares.hash
+++ b/buildroot/package/c-ares/c-ares.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256 45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e c-ares-1.14.0.tar.gz
+sha256 6cdb97871f2930530c97deb7cf5c8fa4be5a0b02c7cea6e7c7667672a39d6852 c-ares-1.15.0.tar.gz
 
 # Hash for license file
 sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md
diff --git a/buildroot/package/c-ares/c-ares.mk b/buildroot/package/c-ares/c-ares.mk
index 16536137a..f9e440d9b 100644
--- a/buildroot/package/c-ares/c-ares.mk
+++ b/buildroot/package/c-ares/c-ares.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_ARES_VERSION = 1.14.0
+C_ARES_VERSION = 1.15.0
 C_ARES_SITE = http://c-ares.haxx.se/download
 C_ARES_INSTALL_STAGING = YES
 C_ARES_CONF_OPTS = --with-random=/dev/urandom
@@ -14,3 +14,4 @@ C_ARES_LICENSE = MIT
 C_ARES_LICENSE_FILES = LICENSE.md
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/buildroot/package/ca-certificates/ca-certificates.hash b/buildroot/package/ca-certificates/ca-certificates.hash
index 8100dde35..71a8da478 100644
--- a/buildroot/package/ca-certificates/ca-certificates.hash
+++ b/buildroot/package/ca-certificates/ca-certificates.hash
@@ -1,3 +1,6 @@
 # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc :
-sha1   edf0ec04b02fcbc90cc65906ff83fb042894a3b7                         ca-certificates_20180409.tar.xz
-sha256 7af6f5bfc619fd29cbf0258c1d95107c38ce840ad6274e343e1e0d971fc72b51 ca-certificates_20180409.tar.xz
+sha1   47d4584eae85fc905e4994766eb3930a8a84e2e1                         ca-certificates_20190110.tar.xz
+sha256 ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 ca-certificates_20190110.tar.xz
+
+# Locally computed
+sha256 80fd11117df5543d5cf17bfd951b0ead213f7867d0b09f09c6d5a5eca3ff7422 debian/copyright
diff --git a/buildroot/package/ca-certificates/ca-certificates.mk b/buildroot/package/ca-certificates/ca-certificates.mk
index 5c259aa3a..79c81a41e 100644
--- a/buildroot/package/ca-certificates/ca-certificates.mk
+++ b/buildroot/package/ca-certificates/ca-certificates.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CA_CERTIFICATES_VERSION = 20180409
+CA_CERTIFICATES_VERSION = 20190110
 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz
-CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20180411T111033Z/pool/main/c/ca-certificates
+CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20190513T145054Z/pool/main/c/ca-certificates
 CA_CERTIFICATES_DEPENDENCIES = host-openssl
 # ca-certificates can be built with either python 2 or python 3
 # but it must be at least python 2.7
diff --git a/buildroot/package/capnproto/Config.in b/buildroot/package/capnproto/Config.in
index 00328fa6c..a979a334f 100644
--- a/buildroot/package/capnproto/Config.in
+++ b/buildroot/package/capnproto/Config.in
@@ -10,7 +10,7 @@ config BR2_PACKAGE_CAPNPROTO
 	  Cap'n Proto is an insanely fast data interchange format
 	  and capability-based RPC system. Think JSON, except
 	  binary. Or think Protocol Buffers, except faster. In
-	  fact, in benchmarks, Cap’n Proto is INFINITY TIMES
+	  fact, in benchmarks, Cap'n Proto is INFINITY TIMES
 	  faster than Protocol Buffers.
 
 	  https://capnproto.org/index.html
diff --git a/buildroot/package/cargo/cargo.mk b/buildroot/package/cargo/cargo.mk
index 1b1053ba4..a387281b4 100644
--- a/buildroot/package/cargo/cargo.mk
+++ b/buildroot/package/cargo/cargo.mk
@@ -70,7 +70,7 @@ HOST_CARGO_SNAP_OPTS = \
 	$(if $(VERBOSE),--verbose)
 
 HOST_CARGO_ENV = \
-	RUSTFLAGS="-Clink-arg=-Wl,-rpath,$(HOST_DIR)/lib" \
+	RUSTFLAGS="$(addprefix -Clink-arg=,$(HOST_LDFLAGS))" \
 	CARGO_HOME=$(HOST_CARGO_HOME)
 
 define HOST_CARGO_BUILD_CMDS
diff --git a/buildroot/package/cc-tool/Config.in b/buildroot/package/cc-tool/Config.in
index b2cf97969..8145b676c 100644
--- a/buildroot/package/cc-tool/Config.in
+++ b/buildroot/package/cc-tool/Config.in
@@ -9,7 +9,6 @@ config BR2_PACKAGE_CC_TOOL
 	select BR2_PACKAGE_BOOST_SYSTEM
 	select BR2_PACKAGE_BOOST_REGEX
 	select BR2_PACKAGE_BOOST_FILESYSTEM
-	select BR2_PACKAGE_BOOST_SIGNALS
 	help
 	  cc-tool provides support for Texas Instruments CC Debugger
 	  for Linux OS in order to program 8051-based System-On-Chip
diff --git a/buildroot/package/ccache/ccache.hash b/buildroot/package/ccache/ccache.hash
index 4ea2305a8..779a2abc7 100644
--- a/buildroot/package/ccache/ccache.hash
+++ b/buildroot/package/ccache/ccache.hash
@@ -1,4 +1,4 @@
 # sha256 computed locally
-sha256  bdd44b72ae4506a2e2deef9fefb15c606a474bbca7658cd2be26105155eec012  ccache-3.5.tar.xz
+sha256  a6b129576328fcefad00cb72035bc87bc98b6a76aec0f4b59bed76d67a399b1f  ccache-3.6.tar.xz
 sha256  ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361  GPL-3.0.txt
-sha256  449995742c9358c55b40cefbea5d2c7f05280454d562b6e17a75f46d2c2f6e85  LICENSE.adoc
+sha256  2af7b3ec0ea737e1542e58db016122f6d75df9ea3b4f00c8151ecfef7040b39b  LICENSE.adoc
diff --git a/buildroot/package/ccache/ccache.mk b/buildroot/package/ccache/ccache.mk
index 76ae029ea..4d9de0a07 100644
--- a/buildroot/package/ccache/ccache.mk
+++ b/buildroot/package/ccache/ccache.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CCACHE_VERSION = 3.5
+CCACHE_VERSION = 3.6
 CCACHE_SITE = https://www.samba.org/ftp/ccache
 CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
 CCACHE_LICENSE = GPL-3.0+, others
diff --git a/buildroot/package/ccid/ccid.mk b/buildroot/package/ccid/ccid.mk
index c9b95a623..73da9c4b8 100644
--- a/buildroot/package/ccid/ccid.mk
+++ b/buildroot/package/ccid/ccid.mk
@@ -11,6 +11,7 @@ CCID_LICENSE = LGPL-2.1+
 CCID_LICENSE_FILES = COPYING
 CCID_INSTALL_STAGING = YES
 CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb
+CCID_CONF_OPTS = --enable-usbdropdir=/usr/lib/pcsc/drivers
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 define CCID_INSTALL_UDEV_RULES
diff --git a/buildroot/package/cgilua/Config.in b/buildroot/package/cgilua/Config.in
index d1e7fbf0e..a6761313e 100644
--- a/buildroot/package/cgilua/Config.in
+++ b/buildroot/package/cgilua/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_CGILUA
 	bool "cgilua"
-	# Runtime dependency only
-	select BR2_PACKAGE_LUAFILESYSTEM
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
 	help
 	  CGILua is a tool for creating dynamic HTML pages
 	  and manipulating input data from Web forms.
diff --git a/buildroot/package/cgilua/cgilua.hash b/buildroot/package/cgilua/cgilua.hash
index b932e80cb..ac977ec38 100644
--- a/buildroot/package/cgilua/cgilua.hash
+++ b/buildroot/package/cgilua/cgilua.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256 7d4883e6a89b3463a1d35b8084a6e2afbbb584af7aca1169380e92af0f848413  cgilua-5.2.1-1.src.rock
+# computed by luarocks/buildroot
+sha256 8e9ef583f8e1c5b600ebc6bb04924a61f72320130410191a9c56d7295fb02be1  cgilua-5.1.4-2.src.rock
+sha256 e612df003d24aeaf6d3cc09a1e9255493c691866158b5962dc4c68fff8a56a8b  cgilua-5.1.4/doc/us/license.html
diff --git a/buildroot/package/cgilua/cgilua.mk b/buildroot/package/cgilua/cgilua.mk
index cd78841fd..17b396425 100644
--- a/buildroot/package/cgilua/cgilua.mk
+++ b/buildroot/package/cgilua/cgilua.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CGILUA_VERSION = 5.2.1-1
+CGILUA_VERSION = 5.1.4-2
 CGILUA_LICENSE = MIT
 CGILUA_LICENSE_FILES = $(CGILUA_SUBDIR)/doc/us/license.html
 
diff --git a/buildroot/package/chocolate-doom/chocolate-doom.mk b/buildroot/package/chocolate-doom/chocolate-doom.mk
index 54121c43a..8c16a7fa3 100644
--- a/buildroot/package/chocolate-doom/chocolate-doom.mk
+++ b/buildroot/package/chocolate-doom/chocolate-doom.mk
@@ -21,6 +21,14 @@ CHOCOLATE_DOOM_CONF_OPTS = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--with-sdl-exec-prefix=$(STAGING_DIR)/usr
 
+CHOCOLATE_DOOM_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+CHOCOLATE_DOOM_CFLAGS += -O0
+endif
+
+CHOCOLATE_DOOM_CONF_ENV += CFLAGS="$(CHOCOLATE_DOOM_CFLAGS)"
+
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 CHOCOLATE_DOOM_DEPENDENCIES += libpng
 CHOCOLATE_DOOM_CONF_OPTS += --with-libpng
diff --git a/buildroot/package/chrony/S49chrony b/buildroot/package/chrony/S49chrony
old mode 100755
new mode 100644
diff --git a/buildroot/package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch b/buildroot/package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch
deleted file mode 100644
index aee3cfcbf..000000000
--- a/buildroot/package/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0821066f9adf8410891cd07684ecac50a9bc36a4 Mon Sep 17 00:00:00 2001
-From: Fabio Porcedda 
-Date: Wed, 25 Feb 2015 18:40:24 +0100
-Subject: [PATCH] Lua: fix a typo changing %(LFS_DIR) to $(LFS_DIR)
-
-Also this fix a error on GNU Make v4.0:
-  Makefile:203: *** mixed implicit and normal rules.  Stop.
-
-Signed-off-by: Fabio Porcedda 
----
- resources/Makefile.in-lua | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/resources/Makefile.in-lua b/resources/Makefile.in-lua
-index 0902f11..f3d95fd 100644
---- a/resources/Makefile.in-lua
-+++ b/resources/Makefile.in-lua
-@@ -57,5 +57,5 @@ LFS_CFLAGS = -I$(LFS_DIR)
- 
- OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS)
- CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM
--SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) %(LFS_DIR)
-+SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) $(LFS_DIR)
- 
--- 
-2.3.0
-
diff --git a/buildroot/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch b/buildroot/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch
new file mode 100644
index 000000000..bd1b06aed
--- /dev/null
+++ b/buildroot/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch
@@ -0,0 +1,34 @@
+From ca4325c6963e505d6fb628163abf2359427ea022 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Thu, 29 Nov 2018 21:43:28 +0100
+Subject: [PATCH] modlua.ini: include dlfcn.h
+
+dlfcn.h must be included to be able to use dlopen otherwise build will
+fail on:
+src/mod_lua.inl:2845:41: error: 'RTLD_LAZY' undeclared (first use in this function)
+  lib_handle_uuid = dlopen("libuuid.so", RTLD_LAZY);
+
+Fixes:
+ - http://autobuild.buildroot.org/results/7a189f49c5a8b6f7b3d4c57cda5982adc65dbc19
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/civetweb/civetweb/pull/706]
+---
+ src/mod_lua.inl | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mod_lua.inl b/src/mod_lua.inl
+index 97a5de1e..ce7a4b2e 100644
+--- a/src/mod_lua.inl
++++ b/src/mod_lua.inl
+@@ -2,6 +2,7 @@
+  * See https://github.com/civetweb/civetweb/
+  */
+ 
++#include 
+ #include "civetweb_lua.h"
+ #include "civetweb_private_lua.h"
+ 
+-- 
+2.14.1
+
diff --git a/buildroot/package/civetweb/Config.in b/buildroot/package/civetweb/Config.in
index d68a1ffd5..9e4396908 100644
--- a/buildroot/package/civetweb/Config.in
+++ b/buildroot/package/civetweb/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_CIVETWEB
 	bool "civetweb"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_CIVETWEB_SERVER if !BR2_PACKAGE_CIVETWEB_LIB
 	help
 	  Full featured embedded web server with Lua support.
 
@@ -9,6 +10,17 @@ config BR2_PACKAGE_CIVETWEB
 
 if BR2_PACKAGE_CIVETWEB
 
+config BR2_PACKAGE_CIVETWEB_SERVER
+	bool "enable the web server application"
+	help
+	  Include the web server and its config files.
+
+config BR2_PACKAGE_CIVETWEB_LIB
+	bool "enable library for embedding"
+	help
+	  Enable the civetweb library for embedding in another
+	  application.
+
 config BR2_PACKAGE_CIVETWEB_WITH_LUA
 	bool "enable Lua support"
 	# required by the bundled Sqlite3 and Lua code
diff --git a/buildroot/package/civetweb/civetweb.hash b/buildroot/package/civetweb/civetweb.hash
index 745f4a8ce..23f7c4aca 100644
--- a/buildroot/package/civetweb/civetweb.hash
+++ b/buildroot/package/civetweb/civetweb.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 79a852a26068eb6d2f8de5ee72e021f0d2c8bd176eb81f41909a876b736815d9  civetweb-v1.5.tar.gz
+sha256 de7d5e7a2d9551d325898c71e41d437d5f7b51e754b242af897f7be96e713a42  civetweb-v1.11.tar.gz
+sha256 1cd00da00b8649b4005757f4019acfd3102ecd407f47998081697e8e9086f706  LICENSE.md
diff --git a/buildroot/package/civetweb/civetweb.mk b/buildroot/package/civetweb/civetweb.mk
index d29765b87..1652239eb 100644
--- a/buildroot/package/civetweb/civetweb.mk
+++ b/buildroot/package/civetweb/civetweb.mk
@@ -4,16 +4,26 @@
 #
 ################################################################################
 
-CIVETWEB_VERSION = v1.5
-CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION))
+CIVETWEB_VERSION = v1.11
+CIVETWEB_SITE = $(call github,civetweb,civetweb,$(CIVETWEB_VERSION))
 CIVETWEB_LICENSE = MIT
 CIVETWEB_LICENSE_FILES = LICENSE.md
 
-CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1
+CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \
+	$(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1)
 CIVETWEB_COPT = -DHAVE_POSIX_FALLOCATE=0
 CIVETWEB_LIBS = -lpthread -lm
 CIVETWEB_SYSCONFDIR = /etc
 CIVETWEB_HTMLDIR = /var/www
+CIVETWEB_INSTALL_OPTS = \
+	DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
+	CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
+	HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
+	SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)"
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),)
+CIVETWEB_COPT += -DNO_ATOMICS=1
+endif
 
 ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y)
 CIVETWEB_CONF_OPTS += WITH_LUA=1
@@ -22,25 +32,54 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 CIVETWEB_COPT += -DNO_SSL_DL
-CIVETWEB_LIBS += -lssl -lcrypto -lz
-CIVETWEB_DEPENDENCIES += openssl
+CIVETWEB_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
+CIVETWEB_DEPENDENCIES += openssl host-pkgconf
 else
 CIVETWEB_COPT += -DNO_SSL
 endif
 
+ifeq ($(BR2_PACKAGE_CIVETWEB_SERVER),y)
+CIVETWEB_BUILD_TARGETS += build
+CIVETWEB_INSTALL_TARGETS += install
+endif
+
+ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y)
+CIVETWEB_INSTALL_STAGING = YES
+CIVETWEB_INSTALL_TARGETS += install-headers
+
+ifeq ($(BR2_STATIC_LIBS)$(BR2_STATIC_SHARED_LIBS),y)
+CIVETWEB_BUILD_TARGETS += lib
+CIVETWEB_INSTALL_TARGETS += install-lib
+endif
+
+ifeq ($(BR2_SHARED_LIBS)$(BR2_STATIC_SHARED_LIBS),y)
+CIVETWEB_BUILD_TARGETS += slib
+CIVETWEB_INSTALL_TARGETS += install-slib
+CIVETWEB_COPT += -fPIC
+endif
+
+endif # BR2_PACKAGE_CIVETWEB_LIB
+
 define CIVETWEB_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) build \
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_BUILD_TARGETS) \
 		$(CIVETWEB_CONF_OPTS) \
 		COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
 endef
 
+define CIVETWEB_INSTALL_STAGING_CMDS
+	mkdir -p $(STAGING_DIR)/usr/include
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_INSTALL_TARGETS) \
+		PREFIX="$(STAGING_DIR)/usr" \
+		$(CIVETWEB_INSTALL_OPTS) \
+		$(CIVETWEB_CONF_OPTS) \
+		COPT='$(CIVETWEB_COPT)'
+endef
+
 define CIVETWEB_INSTALL_TARGET_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \
-		DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
-		CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
-		HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
-		SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \
+	mkdir -p $(TARGET_DIR)/usr/include
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(CIVETWEB_INSTALL_TARGETS) \
 		PREFIX="$(TARGET_DIR)/usr" \
+		$(CIVETWEB_INSTALL_OPTS) \
 		$(CIVETWEB_CONF_OPTS) \
 		COPT='$(CIVETWEB_COPT)'
 endef
diff --git a/buildroot/package/cjson/cjson.hash b/buildroot/package/cjson/cjson.hash
index 278484bdd..d980fc85a 100644
--- a/buildroot/package/cjson/cjson.hash
+++ b/buildroot/package/cjson/cjson.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 6eb9d852a97ffbe149e747f54d63e39a674fa248bb24902a14c079803067949a  cjson-v1.7.7.tar.gz
+sha256 760687665ab41a5cff9c40b1053c19572bcdaadef1194e5cba1b5e6f824686e7  cjson-v1.7.12.tar.gz
 sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c  LICENSE
diff --git a/buildroot/package/cjson/cjson.mk b/buildroot/package/cjson/cjson.mk
index e91ce9b4b..ae09ea95e 100644
--- a/buildroot/package/cjson/cjson.mk
+++ b/buildroot/package/cjson/cjson.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CJSON_VERSION = v1.7.7
+CJSON_VERSION = v1.7.12
 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
 CJSON_INSTALL_STAGING = YES
 CJSON_LICENSE = MIT
diff --git a/buildroot/package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch b/buildroot/package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch
deleted file mode 100644
index 1d26b099b..000000000
--- a/buildroot/package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 6b6ff53b5931c162be13504a1efc53fc5212f9d1 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Mon, 7 May 2018 22:57:34 +0200
-Subject: [PATCH] m4/reorganization/libs/curl.m4: fix curl-config detection
- logic
-
-The current logic in curl.m4 doesn't behave properly when
---without-libcurl is passed to the ./configure script.
-
-Indeed, in this case what happens is that:
-
- (1) Since --without-libcurl is passed, LIBCURL_HOME is set to nothing
-
- (2) find_curl is set to "no"
-
- (3) Due to find_curl being "no", LIBCURL_HOME is not set to
-     /usr/local and remains empty
-
- (4) We test if $LIBCURL_HOME/bin/curl_config exists, which is
-     equivalent to testing if /bin/curl-config exists. So curl.m4 is
-     looking at /bin/curl-config, which is irrelevant in a
-     cross-compilation context: it is not because the build machine
-     has libcurl installed that it is available for the target.
-
-     Due to this mistake, it sets have_curl="yes"
-
-Due to this, the ./configure script assumes it can build the
-clamsubmit program, which fails at build time because curl/curl.h
-doesn't exist.
-
-To fix this, this commit rewrites the curl-config detection logic with
-a simpler loop. If find_curl=yes, it means we have to find libcurl
-ourselves, so we iterate over /usr/local and /usr, and check if a
-bin/curl-config binary is available there. If so, we use this path as
-LIBCURL_HOME and set have_curl="yes".
-
-This preserves the existing behavior, while fixing the situation where
---without-libcurl is passed, but /bin/curl-config exists.
-
-Signed-off-by: Thomas Petazzoni 
-Upstream-status: https://github.com/Cisco-Talos/clamav-devel/pull/87
----
- m4/reorganization/libs/curl.m4 | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/m4/reorganization/libs/curl.m4 b/m4/reorganization/libs/curl.m4
-index 2a5966ee7..b6a9c2137 100644
---- a/m4/reorganization/libs/curl.m4
-+++ b/m4/reorganization/libs/curl.m4
-@@ -19,17 +19,12 @@ fi
- [find_curl="yes"])
- 
- if test "X$find_curl" = "Xyes"; then
--    LIBCURL_HOME=/usr/local
--fi
--if test -f "$LIBCURL_HOME/bin/curl-config"; then
--    have_curl="yes"
--else
--    if test "X$find_curl" = "Xyes"; then
--        LIBCURL_HOME=/usr
--        if test -f "$LIBCURL_HOME/bin/curl-config"; then
--            have_curl="yes"
-+    for p in /usr/local /usr ; do
-+        if test -f "${p}/bin/curl-config"; then
-+           LIBCURL_HOME=$p
-+           have_curl="yes"
-         fi
--    fi
-+    done
- fi
- 
- if test "X$have_curl" = "Xyes"; then
--- 
-2.14.3
-
diff --git a/buildroot/package/clamav/Config.in b/buildroot/package/clamav/Config.in
index bc934ea45..2017011b6 100644
--- a/buildroot/package/clamav/Config.in
+++ b/buildroot/package/clamav/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_CLAMAV
 	bool "clamav"
+	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBTOOL
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
@@ -11,6 +13,7 @@ config BR2_PACKAGE_CLAMAV
 
 	  http://www.clamav.net
 
-comment "clamav needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "clamav needs a toolchain w/ C++, threads, wchar"
+	depends on !BR2_INSTALL_LIBSTDCPP \
+		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
 	depends on BR2_USE_MMU
diff --git a/buildroot/package/clamav/clamav.hash b/buildroot/package/clamav/clamav.hash
index 390251fc2..4b61cd965 100644
--- a/buildroot/package/clamav/clamav.hash
+++ b/buildroot/package/clamav/clamav.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256 4a2e4f0cd41e62adb5a713b4a1857c49145cd09a69957e6d946ecad575206dd6  clamav-0.100.2.tar.gz
+sha256 0a12ebdf6ff7a74c0bde2bdc2b55cae33449e6dd953ec90824a9e01291277634  clamav-0.101.2.tar.gz
 sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584  COPYING
 sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed  COPYING.bzip2
 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6  COPYING.file
diff --git a/buildroot/package/clamav/clamav.mk b/buildroot/package/clamav/clamav.mk
index 50990abad..5bb0aa09d 100644
--- a/buildroot/package/clamav/clamav.mk
+++ b/buildroot/package/clamav/clamav.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CLAMAV_VERSION = 0.100.2
+CLAMAV_VERSION = 0.101.2
 CLAMAV_SITE = https://www.clamav.net/downloads/production
 CLAMAV_LICENSE = GPL-2.0
 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
@@ -16,14 +16,16 @@ CLAMAV_DEPENDENCIES = \
 	openssl \
 	zlib \
 	$(TARGET_NLS_DEPENDENCIES)
-# 0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch
-CLAMAV_AUTORECONF = YES
 
 # mmap cannot be detected when cross-compiling, needed for mempool support
 CLAMAV_CONF_ENV = \
 	ac_cv_c_mmap_private=yes \
 	have_cv_ipv6=yes
 
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+CLAMAV_CONF_ENV += LIBS=-latomic
+endif
+
 # UCLIBC_HAS_FTS is disabled, therefore disable fanotify (missing fts.h)
 CLAMAV_CONF_OPTS = \
 	--with-dbdir=/var/lib/clamav \
@@ -78,11 +80,21 @@ else
 CLAMAV_CONF_OPTS += --without-iconv
 endif
 
-ifeq ($(BR2_PACKAGE_PCRE),y)
+ifeq ($(BR2_PACKAGE_PCRE2),y)
+CLAMAV_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr
+CLAMAV_DEPENDENCIES += pcre2
+else ifeq ($(BR2_PACKAGE_PCRE),y)
 CLAMAV_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr
 CLAMAV_DEPENDENCIES += pcre
 else
 CLAMAV_CONF_OPTS += --without-pcre
 endif
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+CLAMAV_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
+CLAMAV_DEPENDENCIES += systemd
+else
+CLAMAV_CONF_OPTS += --with-systemdsystemunitdir=no
+endif
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/clang/clang.hash b/buildroot/package/clang/clang.hash
index aaca1a74a..fe868f587 100644
--- a/buildroot/package/clang/clang.hash
+++ b/buildroot/package/clang/clang.hash
@@ -1,3 +1,3 @@
 # locally calculated
-sha256 550212711c752697d2f82c648714a7221b1207fd9441543ff4aa9e3be45bba55 cfe-7.0.0.src.tar.xz
+sha256 a45b62dde5d7d5fdcdfa876b0af92f164d434b06e9e89b5d0b1cbc65dfe3f418 cfe-7.0.1.src.tar.xz
 sha256 3f3f2e96e3b7319d2b4b49227d6da624a717340107ce2ca5342a25e0e57dfd35 LICENSE.TXT
diff --git a/buildroot/package/clang/clang.mk b/buildroot/package/clang/clang.mk
index f9d4ae371..c15f2b0d2 100644
--- a/buildroot/package/clang/clang.mk
+++ b/buildroot/package/clang/clang.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CLANG_VERSION = 7.0.0
+CLANG_VERSION = 7.0.1
 CLANG_SITE = http://llvm.org/releases/$(CLANG_VERSION)
 CLANG_SOURCE = cfe-$(CLANG_VERSION).src.tar.xz
 CLANG_LICENSE = NCSA
diff --git a/buildroot/package/clapack/Config.in b/buildroot/package/clapack/Config.in
index af7834d98..a912eb6c9 100644
--- a/buildroot/package/clapack/Config.in
+++ b/buildroot/package/clapack/Config.in
@@ -4,7 +4,6 @@ comment "clapack needs a glibc toolchain"
 
 config BR2_PACKAGE_CLAPACK
 	bool "cblas/clapack"
-	depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el)
 	# _fpu_control is used on PowerPC, but not available with
 	# uClibc or musl
 	depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC
diff --git a/buildroot/package/clinfo/Config.in b/buildroot/package/clinfo/Config.in
new file mode 100644
index 000000000..3df4feeca
--- /dev/null
+++ b/buildroot/package/clinfo/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_CLINFO
+	bool "clinfo"
+	depends on BR2_PACKAGE_HAS_LIBOPENCL
+	help
+	  clinfo is a simple command-line application that enumerates
+	  all possible (known) properties of the OpenCL platform and
+	  devices available on the system.
+
+	  https://github.com/Oblomov/clinfo
+
+comment "clinfo needs an OpenCL provider"
+	depends on !BR2_PACKAGE_HAS_LIBOPENCL
diff --git a/buildroot/package/clinfo/clinfo.hash b/buildroot/package/clinfo/clinfo.hash
new file mode 100644
index 000000000..d5766e632
--- /dev/null
+++ b/buildroot/package/clinfo/clinfo.hash
@@ -0,0 +1,4 @@
+# locally calculated
+sha256 64b02e68ccff3b95437bd0bd70dcb88438c58adec16a7145a5d4e5c26a898ccf clinfo-2.2.18.03.26.tar.gz
+sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 legalcode.txt
+sha256 2a7a9321be169ea6edbc6b1010e8f7bb0f4c1482a2f65c34a49e9719f129b79a LICENSE
diff --git a/buildroot/package/clinfo/clinfo.mk b/buildroot/package/clinfo/clinfo.mk
new file mode 100644
index 000000000..cf0869231
--- /dev/null
+++ b/buildroot/package/clinfo/clinfo.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# clinfo
+#
+################################################################################
+
+CLINFO_VERSION = 2.2.18.03.26
+CLINFO_SITE = $(call github,Oblomov,clinfo,$(CLINFO_VERSION))
+CLINFO_LICENSE = CC0-1.0
+CLINFO_LICENSE_FILES = legalcode.txt LICENSE
+CLINFO_DEPENDENCIES = libopencl
+
+define CLINFO_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define CLINFO_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/clinfo $(TARGET_DIR)/usr/bin/clinfo
+endef
+
+$(eval $(generic-package))
diff --git a/buildroot/package/collectd/0003-sensors-Removed-checks-for-upper-limit-of-SENSORS_AP.patch b/buildroot/package/collectd/0003-sensors-Removed-checks-for-upper-limit-of-SENSORS_AP.patch
new file mode 100644
index 000000000..9270021dd
--- /dev/null
+++ b/buildroot/package/collectd/0003-sensors-Removed-checks-for-upper-limit-of-SENSORS_AP.patch
@@ -0,0 +1,89 @@
+From 069796bd76dd1ab0089a64f7c9c2a3c9f1475414 Mon Sep 17 00:00:00 2001
+From: Pavel Rochnyack 
+Date: Mon, 3 Dec 2018 18:34:14 +0700
+Subject: [PATCH] sensors: Removed checks for upper limit of
+ SENSORS_API_VERSION
+
+That makes no more sense after lm-sensors got new maintainers.
+
+Issue: #3006
+
+[Vadim Kochan: backported to support 5.7.1 version]
+Signed-off-by: Vadim Kochan 
+---
+ src/sensors.c | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/src/sensors.c b/src/sensors.c
+index 8f1824d..409dc38 100644
+--- a/src/sensors.c
++++ b/src/sensors.c
+@@ -149,7 +149,7 @@ typedef struct featurelist {
+ static char *conffile = SENSORS_CONF_PATH;
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400)
+ typedef struct featurelist {
+   const sensors_chip_name *chip;
+   const sensors_feature *feature;
+@@ -159,11 +159,6 @@ typedef struct featurelist {
+ 
+ static char *conffile = NULL;
+ static _Bool use_labels = 0;
+-/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
+-
+-#else /* if SENSORS_API_VERSION >= 0x500 */
+-#error "This version of libsensors is not supported yet. Please report this " \
+-	"as bug."
+ #endif
+ 
+ static featurelist_t *first_feature = NULL;
+@@ -223,7 +218,7 @@ static int sensors_config(const char *key, const char *value) {
+     if (IS_TRUE(value))
+       ignorelist_set_invert(sensor_list, 0);
+   }
+-#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#if (SENSORS_API_VERSION >= 0x400)
+   else if (strcasecmp(key, "UseLabels") == 0) {
+     use_labels = IS_TRUE(value) ? 1 : 0;
+   }
+@@ -353,7 +348,7 @@ static int sensors_load_conf(void) {
+   }   /* while sensors_get_detected_chips */
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400)
+   chip_num = 0;
+   while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
+     const sensors_feature *feature;
+@@ -404,7 +399,7 @@ static int sensors_load_conf(void) {
+       } /* while (subfeature) */
+     }   /* while (feature) */
+   }     /* while (chip) */
+-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
++#endif /* (SENSORS_API_VERSION >= 0x400) */
+ 
+   if (first_feature == NULL) {
+     sensors_cleanup();
+@@ -479,7 +474,7 @@ static int sensors_read(void) {
+   } /* for fl = first_feature .. NULL */
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400)
+   for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
+     double value;
+     int status;
+@@ -518,7 +513,7 @@ static int sensors_read(void) {
+ 
+     sensors_submit(plugin_instance, type, type_instance, value);
+   } /* for fl = first_feature .. NULL */
+-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
++#endif /* (SENSORS_API_VERSION >= 0x400) */
+ 
+   return (0);
+ } /* int sensors_read */
+-- 
+2.14.1
+
diff --git a/buildroot/package/collectd/Config.in b/buildroot/package/collectd/Config.in
index 3222547b6..0cf04b518 100644
--- a/buildroot/package/collectd/Config.in
+++ b/buildroot/package/collectd/Config.in
@@ -389,7 +389,7 @@ config BR2_PACKAGE_COLLECTD_POSTGRESQL
 	  Connects to and executes SQL statements on a PostgreSQL
 	  database. It then reads back the results and, depending on the
 	  configuration, the returned values are then converted into
-	  collectd “value listsâ€.
+	  collectd 'value lists'.
 
 comment "postgresql support needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/buildroot/package/connman/S45connman b/buildroot/package/connman/S45connman
old mode 100755
new mode 100644
diff --git a/buildroot/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch b/buildroot/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch
new file mode 100644
index 000000000..9a7f38c61
--- /dev/null
+++ b/buildroot/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch
@@ -0,0 +1,49 @@
+From 8d1b5a9b973a9891d676dabf31807eb825d7f262 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Perrad?= 
+Date: Wed, 6 Sep 2017 00:00:56 +0200
+Subject: [PATCH] Do not load coxpcall for LuaJIT
+
+* coxpcall is only required with PUC Lua 5.1, but not with LuaJIT
+
+use the same logic as in copas.lua.
+this fixes issue #63.
+
+Fetch from: https://github.com/keplerproject/copas/commit/8d1b5a9b973a9891d676dabf31807eb825d7f262
+Signed-off-by: Francois Perrad 
+---
+ doc/us/index.html   | 5 +++++
+ src/copas/limit.lua | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/copas-2_0_2/doc/us/index.html b/doc/us/index.html
+index 1d008c2..c4d85ef 100644
+--- a/copas-2_0_2/doc/us/index.html
++++ b/copas-2_0_2/doc/us/index.html
+@@ -114,6 +114,11 @@ LuaSocket, Coxpcall (only
+ 
          History
          
+ 
+ 
          
++    
          Copas [unreleased]
          
++	
            
++                
          • Fixed: coxpcall dependency in limit.lua #63 (Francois Perrad)
            • 
++	
          
++
+     
          Copas 2.0.2 [2017]
          
+ 	
            
+ 		
          • Added: copas.running flag
            • 
+diff --git a/copas-2_0_2/src/copas/limit.lua b/src/copas/limit.lua
+index ea178be..f0dfe17 100644
+--- a/copas-2_0_2/src/copas/limit.lua
++++ b/copas-2_0_2/src/copas/limit.lua
+@@ -10,7 +10,7 @@ local pack = table.pack or function(...) return {n=select('#',...),...} end
+ local unpack = function(t) return (table.unpack or unpack)(t, 1, t.n or #t) end
+ 
+ local pcall = pcall
+-if _VERSION=="Lua 5.1" then     -- obsolete: only for Lua 5.1 compatibility
++if _VERSION=="Lua 5.1" and not jit then     -- obsolete: only for Lua 5.1 compatibility
+   pcall = require("coxpcall").pcall
+ end
+ 
+-- 
+2.17.1
+
diff --git a/buildroot/package/copas/Config.in b/buildroot/package/copas/Config.in
index d7800b6dd..2de196710 100644
--- a/buildroot/package/copas/Config.in
+++ b/buildroot/package/copas/Config.in
@@ -1,12 +1,11 @@
 config BR2_PACKAGE_COPAS
 	bool "copas"
-	# Runtime dependency only
-	select BR2_PACKAGE_COXPCALL if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
-	select BR2_PACKAGE_LUASOCKET
+	select BR2_PACKAGE_COXPCALL if BR2_PACKAGE_LUA_5_1 # runtime
+	select BR2_PACKAGE_LUASOCKET # runtime
 	help
 	  Copas is a dispatcher based on coroutines that can be used
 	  for asynchronous networking. For example TCP or UDP based
 	  servers. But it also features timers and client support for
 	  http(s), ftp and smtp requests.
 
-	  http://keplerproject.github.com/copas/
+	  http://www.keplerproject.org/copas/
diff --git a/buildroot/package/copas/copas.hash b/buildroot/package/copas/copas.hash
index d894b8657..4e9e78784 100644
--- a/buildroot/package/copas/copas.hash
+++ b/buildroot/package/copas/copas.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 efeded4f4633bc71551175b239199304640ef918ae8ea9dc9c5047359ae07107  copas-2.0.2-1.src.rock
+sha256 3f59cccf38e9397f6fb34dcff983a24d336df982edb5b0cde549d0c32c28c9c0  copas-2_0_2/LICENSE
diff --git a/buildroot/package/copas/copas.mk b/buildroot/package/copas/copas.mk
index 988692c4a..5b7ba9997 100644
--- a/buildroot/package/copas/copas.mk
+++ b/buildroot/package/copas/copas.mk
@@ -7,6 +7,6 @@
 COPAS_VERSION = 2.0.2-1
 COPAS_SUBDIR = copas-2_0_2
 COPAS_LICENSE = MIT
-COPAS_LICENSE_FILES = $(COPAS_SUBDIR)/doc/us/license.html
+COPAS_LICENSE_FILES = $(COPAS_SUBDIR)/LICENSE
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/coreutils/coreutils.mk b/buildroot/package/coreutils/coreutils.mk
index 3e8efbf04..8e5518f63 100644
--- a/buildroot/package/coreutils/coreutils.mk
+++ b/buildroot/package/coreutils/coreutils.mk
@@ -55,7 +55,7 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
 	MAKEINFO=true \
 	INSTALL_PROGRAM=$(INSTALL)
 
-COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \
+COREUTILS_BIN_PROGS = base64 cat chgrp chmod chown cp date dd df dir echo false \
 	kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \
 	vdir sleep stty sync touch true uname join
 
diff --git a/buildroot/package/coxpcall/coxpcall.hash b/buildroot/package/coxpcall/coxpcall.hash
index e037af9e8..953005e92 100644
--- a/buildroot/package/coxpcall/coxpcall.hash
+++ b/buildroot/package/coxpcall/coxpcall.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256 c1488ee08e5d25d59a11e19cb0322edae509202b246d0c93cb2de1676dbfdf2b  coxpcall-1.16.0-1.src.rock
+# computed by luarocks/buildroot
+sha256 11feb07f08927c39b0b93e8c0bbaf15433f86155cba4820a31a09f4754ab3258  coxpcall-1.17.0-1.src.rock
+sha256 11f0f03dda1a28eca658d5e3361c15fd4d048371364aacc5f6870d77a66866c8  coxpcall/doc/license.html
diff --git a/buildroot/package/coxpcall/coxpcall.mk b/buildroot/package/coxpcall/coxpcall.mk
index 3af81f2ce..6633b925c 100644
--- a/buildroot/package/coxpcall/coxpcall.mk
+++ b/buildroot/package/coxpcall/coxpcall.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-COXPCALL_VERSION = 1.16.0-1
+COXPCALL_VERSION = 1.17.0-1
 COXPCALL_SUBDIR = coxpcall
 COXPCALL_LICENSE = MIT
 COXPCALL_LICENSE_FILES = $(COXPCALL_SUBDIR)/doc/license.html
diff --git a/buildroot/package/cracklib/cracklib.mk b/buildroot/package/cracklib/cracklib.mk
index aeee60d1e..387fd8ba0 100644
--- a/buildroot/package/cracklib/cracklib.mk
+++ b/buildroot/package/cracklib/cracklib.mk
@@ -9,7 +9,8 @@ CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/cracklib-
 CRACKLIB_LICENSE = LGPL-2.1
 CRACKLIB_LICENSE_FILES = COPYING.LIB
 CRACKLIB_INSTALL_STAGING = YES
-CRACKLIB_DEPENDENCIES = host-cracklib
+CRACKLIB_DEPENDENCIES = host-cracklib $(TARGET_NLS_DEPENDENCIES)
+CRACKLIB_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 CRACKLIB_CONF_OPTS += --with-zlib
diff --git a/buildroot/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch b/buildroot/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch
new file mode 100644
index 000000000..7f93bceac
--- /dev/null
+++ b/buildroot/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch
@@ -0,0 +1,40 @@
+From c484938fb4a57430a2e47334f753b1d771aa0f1b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Thu, 21 Feb 2019 20:26:24 +0100
+Subject: [PATCH] config.h: avx2 depends on gcc 4.9
+
+Build of cryptopp on x86 with gcc 4.8 fails on:
+chacha_avx.cpp: In function 'void CryptoPP::ChaCha_OperateKeystream_AVX2(const word32*, const byte*, CryptoPP::byte*, unsigned int)':
+chacha_avx.cpp:98:85: error: '_mm256_broadcastsi128_si256' was not declared in this scope
+
+This is due to the fact that _mm256_broadcastsi128_si256 has been added
+only in gcc 4.9:
+https://github.com/gcc-mirror/gcc/commit/78e8d5ffbf0ba5031b736d2c6fc6a44605047cbc
+
+So bump CRYPTOPP_GCC_VERSION from 4.7 to 4.9 for AVX2 support
+
+Fixes:
+ - http://autobuild.buildroot.org/results/195e40b34344f773da51a3fbff9d8e76c517eed1
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/weidai11/cryptopp/pull/809]
+---
+ config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config.h b/config.h
+index eccba009..4516d2b3 100644
+--- a/config.h
++++ b/config.h
+@@ -591,7 +591,7 @@ NAMESPACE_END
+ // Requires Binutils 2.24
+ #if !defined(CRYPTOPP_DISABLE_AVX2) && defined(CRYPTOPP_AVX_AVAILABLE) && \
+ 	(defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \
+-	(CRYPTOPP_GCC_VERSION >= 40700) || (__INTEL_COMPILER >= 1400) || \
++	(CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1400) || \
+ 	(CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600))
+ #define CRYPTOPP_AVX2_AVAILABLE 1
+ #endif
+-- 
+2.14.1
+
diff --git a/buildroot/package/cryptopp/cryptopp.hash b/buildroot/package/cryptopp/cryptopp.hash
index 389f05f65..8d12a98da 100644
--- a/buildroot/package/cryptopp/cryptopp.hash
+++ b/buildroot/package/cryptopp/cryptopp.hash
@@ -1,5 +1,5 @@
-# Hash from: https://www.cryptopp.com/release700.html:
-sha256  a4bc939910edd3d29fb819a6fc0dfdc293f686fa62326f61c56d72d0a366ceb0  cryptopp700.zip
+# Hash from: https://www.cryptopp.com/release800.html:
+sha256  bbfd89b348846b920d97a1d32b88c85caf0d7bb423d4fcfab7c44349aaceb82c  cryptopp800.zip
 
 # Hash for license file:
 sha256  fe5f5f187e6e38ac2f833956fc5c4cab2df08797cff07f540e4ee74f12f7ee5b  License.txt
diff --git a/buildroot/package/cryptopp/cryptopp.mk b/buildroot/package/cryptopp/cryptopp.mk
index 08b18f2fb..8e3277a94 100644
--- a/buildroot/package/cryptopp/cryptopp.mk
+++ b/buildroot/package/cryptopp/cryptopp.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CRYPTOPP_VERSION = 7.0.0
+CRYPTOPP_VERSION = 8.0.0
 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip
-CRYPTOPP_SITE = http://cryptopp.com/
+CRYPTOPP_SITE = https://cryptopp.com
 CRYPTOPP_LICENSE = BSL-1.0
 CRYPTOPP_LICENSE_FILES = License.txt
 CRYPTOPP_INSTALL_STAGING = YES
diff --git a/buildroot/package/cryptsetup/cryptsetup.hash b/buildroot/package/cryptsetup/cryptsetup.hash
index 38e8ff9a8..748ea0eaf 100644
--- a/buildroot/package/cryptsetup/cryptsetup.hash
+++ b/buildroot/package/cryptsetup/cryptsetup.hash
@@ -1,4 +1,4 @@
 # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/sha256sums.asc
-sha256 9d3a3c7033293e0c97f0ad0501fd5b4d4913ae497cbf70cca06633ccc54b5734  cryptsetup-2.0.4.tar.xz
+sha256 7c51fae0f0e7ea9af0f515b2ac77009fb2969a6619ebab47d097dca38b083d30  cryptsetup-2.0.6.tar.xz
 sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
 sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL
diff --git a/buildroot/package/cryptsetup/cryptsetup.mk b/buildroot/package/cryptsetup/cryptsetup.mk
index dd1ef2e9e..7788bfb60 100644
--- a/buildroot/package/cryptsetup/cryptsetup.mk
+++ b/buildroot/package/cryptsetup/cryptsetup.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 CRYPTSETUP_VERSION_MAJOR = 2.0
-CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4
+CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).6
 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
 CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
 CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c \
diff --git a/buildroot/package/cunit/Config.in b/buildroot/package/cunit/Config.in
new file mode 100644
index 000000000..8bcfa2a4e
--- /dev/null
+++ b/buildroot/package/cunit/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_CUNIT
+	bool "cunit"
+	help
+	  An automated testing framework in 'C'.
+
+	  http://cunit.sourceforge.net/
diff --git a/buildroot/package/cunit/cunit.hash b/buildroot/package/cunit/cunit.hash
new file mode 100644
index 000000000..bbd43a78c
--- /dev/null
+++ b/buildroot/package/cunit/cunit.hash
@@ -0,0 +1,3 @@
+# Locally calculated:
+sha256 f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214  CUnit-2.1-3.tar.bz2
+sha256 5d9d73d41a57dd2f34487ef3978a2c13cdb97294baeeb81fcd274796399eb15f  COPYING
diff --git a/buildroot/package/cunit/cunit.mk b/buildroot/package/cunit/cunit.mk
new file mode 100644
index 000000000..9fc3b9614
--- /dev/null
+++ b/buildroot/package/cunit/cunit.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# cunit
+#
+################################################################################
+
+CUNIT_VERSION = 2.1-3
+CUNIT_SITE = http://downloads.sourceforge.net/project/cunit/CUnit/$(CUNIT_VERSION)
+CUNIT_SOURCE = CUnit-$(CUNIT_VERSION).tar.bz2
+CUNIT_INSTALL_STAGING = YES
+CUNIT_LICENSE = LGPL-2.0+
+CUNIT_LICENSE_FILES = COPYING
+
+# The source archive does not have the autoconf/automake material generated.
+CUNIT_AUTORECONF = YES
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/cups/0005-Fix-builds-without-PAM-Issue-5283.patch b/buildroot/package/cups/0005-Fix-builds-without-PAM-Issue-5283.patch
deleted file mode 100644
index ff242f827..000000000
--- a/buildroot/package/cups/0005-Fix-builds-without-PAM-Issue-5283.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 570933a6a3597371bae1beeb754ee8711d6305ab Mon Sep 17 00:00:00 2001
-From: Michael R Sweet 
-Date: Mon, 2 Apr 2018 20:05:13 -0400
-Subject: [PATCH] Fix builds without PAM (Issue #5283)
-
-[baruch: drop CHANGES.md hunk]
-Signed-off-by: Baruch Siach 
----
-Upstream status: commit 570933a6a3
-
- CHANGES.md       |   8 ++-
- scheduler/auth.c | 134 ++---------------------------------------------
- 2 files changed, 11 insertions(+), 131 deletions(-)
-
-diff --git a/scheduler/auth.c b/scheduler/auth.c
-index 8b134b5d7257..fa4e2715de34 100644
---- a/scheduler/auth.c
-+++ b/scheduler/auth.c
-@@ -1,8 +1,8 @@
- /*
-  * Authorization routines for the CUPS scheduler.
-  *
-- * Copyright 2007-2016 by Apple Inc.
-- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
-+ * Copyright © 2007-2018 by Apple Inc.
-+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
-  *
-  * This file contains Kerberos support code, copyright 2006 by
-  * Jelmer Vernooij.
-@@ -71,9 +71,6 @@ static int		check_authref(cupsd_client_t *con, const char *right);
- static int		compare_locations(cupsd_location_t *a,
- 			                  cupsd_location_t *b);
- static cupsd_authmask_t	*copy_authmask(cupsd_authmask_t *am, void *data);
--#if !HAVE_LIBPAM
--static char		*cups_crypt(const char *pw, const char *salt);
--#endif /* !HAVE_LIBPAM */
- static void		free_authmask(cupsd_authmask_t *am, void *data);
- #if HAVE_LIBPAM
- static int		pam_func(int, const struct pam_message **,
-@@ -694,14 +691,14 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
- 	    * client...
- 	    */
- 
--	    pass = cups_crypt(password, pw->pw_passwd);
-+	    pass = crypt(password, pw->pw_passwd);
- 
- 	    if (!pass || strcmp(pw->pw_passwd, pass))
- 	    {
- #  ifdef HAVE_SHADOW_H
- 	      if (spw)
- 	      {
--		pass = cups_crypt(password, spw->sp_pwdp);
-+		pass = crypt(password, spw->sp_pwdp);
- 
- 		if (pass == NULL || strcmp(spw->sp_pwdp, pass))
- 		{
-@@ -1995,129 +1992,6 @@ copy_authmask(cupsd_authmask_t *mask,	/* I - Existing auth mask */
- }
- 
- 
--#if !HAVE_LIBPAM
--/*
-- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms,
-- *                  as needed.
-- */
--
--static char *				/* O - Encrypted password */
--cups_crypt(const char *pw,		/* I - Password string */
--           const char *salt)		/* I - Salt (key) string */
--{
--  if (!strncmp(salt, "$1$", 3))
--  {
--   /*
--    * Use MD5 passwords without the benefit of PAM; this is for
--    * Slackware Linux, and the algorithm was taken from the
--    * old shadow-19990827/lib/md5crypt.c source code... :(
--    */
--
--    int			i;		/* Looping var */
--    unsigned long	n;		/* Output number */
--    int			pwlen;		/* Length of password string */
--    const char		*salt_end;	/* End of "salt" data for MD5 */
--    char		*ptr;		/* Pointer into result string */
--    _cups_md5_state_t	state;		/* Primary MD5 state info */
--    _cups_md5_state_t	state2;		/* Secondary MD5 state info */
--    unsigned char	digest[16];	/* MD5 digest result */
--    static char		result[120];	/* Final password string */
--
--
--   /*
--    * Get the salt data between dollar signs, e.g. $1$saltdata$md5.
--    * Get a maximum of 8 characters of salt data after $1$...
--    */
--
--    for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++)
--      if (*salt_end == '$')
--        break;
--
--   /*
--    * Compute the MD5 sum we need...
--    */
--
--    pwlen = strlen(pw);
--
--    _cupsMD5Init(&state);
--    _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--    _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt);
--
--    _cupsMD5Init(&state2);
--    _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
--    _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3);
--    _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
--    _cupsMD5Finish(&state2, digest);
--
--    for (i = pwlen; i > 0; i -= 16)
--      _cupsMD5Append(&state, digest, i > 16 ? 16 : i);
--
--    for (i = pwlen; i > 0; i >>= 1)
--      _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1);
--
--    _cupsMD5Finish(&state, digest);
--
--    for (i = 0; i < 1000; i ++)
--    {
--      _cupsMD5Init(&state);
--
--      if (i & 1)
--        _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--      else
--        _cupsMD5Append(&state, digest, 16);
--
--      if (i % 3)
--        _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3);
--
--      if (i % 7)
--        _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--
--      if (i & 1)
--        _cupsMD5Append(&state, digest, 16);
--      else
--        _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--
--      _cupsMD5Finish(&state, digest);
--    }
--
--   /*
--    * Copy the final sum to the result string and return...
--    */
--
--    memcpy(result, salt, (size_t)(salt_end - salt));
--    ptr = result + (salt_end - salt);
--    *ptr++ = '$';
--
--    for (i = 0; i < 5; i ++, ptr += 4)
--    {
--      n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8);
--
--      if (i < 4)
--        n |= (unsigned)digest[i + 12];
--      else
--        n |= (unsigned)digest[5];
--
--      to64(ptr, n, 4);
--    }
--
--    to64(ptr, (unsigned)digest[11], 2);
--    ptr += 2;
--    *ptr = '\0';
--
--    return (result);
--  }
--  else
--  {
--   /*
--    * Use the standard crypt() function...
--    */
--
--    return (crypt(pw, salt));
--  }
--}
--#endif /* !HAVE_LIBPAM */
--
--
- /*
-  * 'free_authmask()' - Free function for auth masks.
-  */
--- 
-2.17.0
-
diff --git a/buildroot/package/cups/cups.hash b/buildroot/package/cups/cups.hash
index a19b3b09a..3d238d61e 100644
--- a/buildroot/package/cups/cups.hash
+++ b/buildroot/package/cups/cups.hash
@@ -1,3 +1,3 @@
 # Locally calculated:
-sha256 3c4b637b737077565ccdfbd5f61785d03f49461ae736fcc2c0ffaf41d2c6ea6a  cups-2.2.7-source.tar.gz
+sha256 77c8b2b3bb7fe8b5fbfffc307f2c817b2d7ec67b657f261a1dd1c61ab81205bb  cups-2.2.10-source.tar.gz
 sha256 6e0e0ffbde118aae709f7ef65590de9071e8b2cd322f84fd645c6b64f3cc452c  LICENSE.txt
diff --git a/buildroot/package/cups/cups.mk b/buildroot/package/cups/cups.mk
index 8f3382487..b91fe7ac4 100644
--- a/buildroot/package/cups/cups.mk
+++ b/buildroot/package/cups/cups.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CUPS_VERSION = 2.2.7
+CUPS_VERSION = 2.2.10
 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
 CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
 CUPS_LICENSE = GPL-2.0, LGPL-2.0
diff --git a/buildroot/package/cutelyst/Config.in b/buildroot/package/cutelyst/Config.in
index 3e28cff95..8eff938d5 100644
--- a/buildroot/package/cutelyst/Config.in
+++ b/buildroot/package/cutelyst/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_CUTELYST
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
-	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_QT5BASE_GUI
 	help
 	  A C++ Web Framework built on top of Qt, using
diff --git a/buildroot/package/cutelyst/cutelyst.hash b/buildroot/package/cutelyst/cutelyst.hash
index edc83f388..87506ab90 100644
--- a/buildroot/package/cutelyst/cutelyst.hash
+++ b/buildroot/package/cutelyst/cutelyst.hash
@@ -1,3 +1,3 @@
 # Locally calculated after checking pgp signature
-sha256  d088e6dbbb9a1ef03b4481d44746a2b086724842f5ee85abe8095e2eb6fe0da4    cutelyst-2.5.2.tar.gz
+sha256  f87c2f04b148a50f5df13aa5d75b45bf20e56be2e2cd6e17c2aef5231db4b467    cutelyst-2.7.0.tar.gz
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551    COPYING
diff --git a/buildroot/package/cutelyst/cutelyst.mk b/buildroot/package/cutelyst/cutelyst.mk
index 8e117e328..42a317e76 100644
--- a/buildroot/package/cutelyst/cutelyst.mk
+++ b/buildroot/package/cutelyst/cutelyst.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CUTELYST_VERSION = 2.5.2
+CUTELYST_VERSION = 2.7.0
 CUTELYST_SITE = https://github.com/cutelyst/cutelyst/archive/v$(CUTELYST_VERSION)
 CUTELYST_INSTALL_STAGING = YES
 CUTELYST_SUPPORTS_IN_SOURCE_BUILD = NO
diff --git a/buildroot/package/dado/dado.hash b/buildroot/package/dado/dado.hash
index 973bdb3ff..a57f52b88 100644
--- a/buildroot/package/dado/dado.hash
+++ b/buildroot/package/dado/dado.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 5a10ed7ff7be34ac004d10d6ea62ee8efc2b594c50ffc93e840e7fb7a2e6b4d0  dado-1.8.3-1.src.rock
+sha256 141953aa7714e3145a6adfd71d6acbbe377e07ab920bc8ec4039394774da8a6e  dado-1.8.3/doc/license.html
diff --git a/buildroot/package/dante/dante.mk b/buildroot/package/dante/dante.mk
index 9471acc69..0bd036d37 100644
--- a/buildroot/package/dante/dante.mk
+++ b/buildroot/package/dante/dante.mk
@@ -14,6 +14,13 @@ DANTE_AUTORECONF = YES
 
 DANTE_CONF_OPTS += --disable-client --disable-preload --without-pam
 
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+DANTE_DEPENDENCIES += linux-pam
+DANTE_CONF_OPTS += --with-pam
+else
+DANTE_CONF_OPTS += --without-pam
+endif
+
 define DANTE_INSTALL_CONFIG_FILE
 	$(INSTALL) -D -m 644 $(@D)/example/sockd.conf \
 		$(TARGET_DIR)/etc/sockd.conf
diff --git a/buildroot/package/darkhttpd/S50darkhttpd b/buildroot/package/darkhttpd/S50darkhttpd
old mode 100755
new mode 100644
diff --git a/buildroot/package/dash/dash.mk b/buildroot/package/dash/dash.mk
index f699f4068..3014aafe9 100644
--- a/buildroot/package/dash/dash.mk
+++ b/buildroot/package/dash/dash.mk
@@ -28,7 +28,7 @@ DASH_CONF_OPTS += --without-libedit
 endif
 
 define DASH_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 $(@D)/src/dash $(TARGET_DIR)/bin/dash
+	$(INSTALL) -m 0755 -D $(@D)/src/dash $(TARGET_DIR)/bin/dash
 endef
 
 # Add /bin/dash to /etc/shells otherwise some login tools like dropbear
diff --git a/buildroot/package/davfs2/0002-fix-iconv.patch b/buildroot/package/davfs2/0002-fix-iconv.patch
new file mode 100644
index 000000000..f2bae8f8e
--- /dev/null
+++ b/buildroot/package/davfs2/0002-fix-iconv.patch
@@ -0,0 +1,48 @@
+webdav.c: fix iconv calls
+
+Replace HAVE_ICONV_H by HAVE_ICONV to fix build with iconv indeed
+HAVE_ICONV_H is never set as AC_CHECK_HEADERS is not called to check for
+iconv.h
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://savannah.nongnu.org/bugs/index.php?56178]
+
+diff -Naurp davfs2-1.5.4-orig/src/webdav.c davfs2-1.5.4/src/webdav.c
+--- davfs2-1.5.4-orig/src/webdav.c	2019-04-20 12:12:38.252599230 +0200
++++ davfs2-1.5.4/src/webdav.c	2019-04-20 12:13:33.012925300 +0200
+@@ -25,7 +25,7 @@
+ #ifdef HAVE_FCNTL_H
+ #include 
+ #endif
+-#ifdef HAVE_ICONV_H
++#ifdef HAVE_ICONV
+ #include 
+ #endif
+ #ifdef HAVE_LANGINFO_H
+@@ -231,7 +231,7 @@ static int initialized;
+    Needed by  ssl_verify() which may be called at any time. */
+ static int have_terminal;
+ 
+-#ifdef HAVE_ICONV_H
++#ifdef HAVE_ICONV
+ /* Handle to convert character encoding from utf-8 to LC_CTYPE.
+    If NULL no conversion is done. */
+ static iconv_t from_utf_8;
+@@ -264,7 +264,7 @@ static char **cookie_list;
+ /* Private function prototypes and inline functions */
+ /*==================================================*/
+ 
+-#ifdef HAVE_ICONV_H
++#ifdef HAVE_ICONV
+ static void
+ convert(char **s, iconv_t conv);
+ #endif
+@@ -337,7 +337,7 @@ dav_init_webdav(const dav_args *args)
+     if (args->neon_debug & ~NE_DBG_HTTPPLAIN)
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Initializing webdav");
+ 
+-#ifdef HAVE_ICONV_H
++#ifdef HAVE_ICONV
+     char *lc_charset = nl_langinfo(CODESET);
+     if (lc_charset && strcasecmp(lc_charset, "UTF-8") != 0) {
+         from_utf_8 = iconv_open(lc_charset, "UTF-8");
diff --git a/buildroot/package/davfs2/davfs2.mk b/buildroot/package/davfs2/davfs2.mk
index c1f8477f8..f2b2fdbe4 100644
--- a/buildroot/package/davfs2/davfs2.mk
+++ b/buildroot/package/davfs2/davfs2.mk
@@ -9,9 +9,13 @@ DAVFS2_SITE = http://download.savannah.nongnu.org/releases/davfs2
 DAVFS2_LICENSE = GPL-3.0+
 DAVFS2_LICENSE_FILES = COPYING
 
-DAVFS2_DEPENDENCIES = neon
+DAVFS2_DEPENDENCIES = \
+	neon \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
+	$(TARGET_NLS_DEPENDENCIES)
 
 DAVFS2_CONF_ENV += \
-	ac_cv_path_NEON_CONFIG=$(STAGING_DIR)/usr/bin/neon-config
+	ac_cv_path_NEON_CONFIG=$(STAGING_DIR)/usr/bin/neon-config \
+	LIBS=$(TARGET_NLS_LIBS)
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/dbus-python/dbus-python.hash b/buildroot/package/dbus-python/dbus-python.hash
index 080aada08..991bb4278 100644
--- a/buildroot/package/dbus-python/dbus-python.hash
+++ b/buildroot/package/dbus-python/dbus-python.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc	dbus-python-1.2.4.tar.gz
+sha256	abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f	dbus-python-1.2.8.tar.gz
diff --git a/buildroot/package/dbus-python/dbus-python.mk b/buildroot/package/dbus-python/dbus-python.mk
index da04b7404..d6af7454a 100644
--- a/buildroot/package/dbus-python/dbus-python.mk
+++ b/buildroot/package/dbus-python/dbus-python.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DBUS_PYTHON_VERSION = 1.2.4
+DBUS_PYTHON_VERSION = 1.2.8
 DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python
 DBUS_PYTHON_INSTALL_STAGING = YES
 DBUS_PYTHON_LICENSE = MIT
diff --git a/buildroot/package/ddrescue/ddrescue.mk b/buildroot/package/ddrescue/ddrescue.mk
index 9432e7a16..b7564d597 100644
--- a/buildroot/package/ddrescue/ddrescue.mk
+++ b/buildroot/package/ddrescue/ddrescue.mk
@@ -18,8 +18,14 @@ define DDRESCUE_CONFIGURE_CMDS
 	)
 endef
 
+DDRESCUE_CXXFLAGS = $(TARGET_CXXFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+DDRESCUE_CXXFLAGS += -O0
+endif
+
 define DDRESCUE_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) CXXFLAGS="$(DDRESCUE_CXXFLAGS)" -C $(@D)
 endef
 
 define DDRESCUE_INSTALL_TARGET_CMDS
diff --git a/buildroot/package/devmem2/Config.in b/buildroot/package/devmem2/Config.in
index 64d6400bd..1ccb0553b 100644
--- a/buildroot/package/devmem2/Config.in
+++ b/buildroot/package/devmem2/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_DEVMEM2
 	help
 	  Simple program to read/write from/to any location in memory.
 
-	  http://free-electrons.com/pub/mirror/devmem2.c
+	  http://bootlin.com/pub/mirror/devmem2.c
diff --git a/buildroot/package/devmem2/devmem2.mk b/buildroot/package/devmem2/devmem2.mk
index 044e6fa59..e1bbee3b7 100644
--- a/buildroot/package/devmem2/devmem2.mk
+++ b/buildroot/package/devmem2/devmem2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DEVMEM2_SITE = http://free-electrons.com/pub/mirror
+DEVMEM2_SITE = http://bootlin.com/pub/mirror
 DEVMEM2_SOURCE = devmem2.c
 DEVMEM2_VERSION = 1
 DEVMEM2_LICENSE = GPL-2.0+
diff --git a/buildroot/package/dhcp/Config.in b/buildroot/package/dhcp/Config.in
index 534083090..01d144c53 100644
--- a/buildroot/package/dhcp/Config.in
+++ b/buildroot/package/dhcp/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_DHCP
 	help
 	  DHCP relay agent from the ISC DHCP distribution.
 
-	  http://www.isc.org/products/DHCP
+	  https://www.isc.org/downloads/dhcp/
 
 if BR2_PACKAGE_DHCP
 
diff --git a/buildroot/package/dhcp/S80dhcp-relay b/buildroot/package/dhcp/S80dhcp-relay
old mode 100755
new mode 100644
diff --git a/buildroot/package/dhcp/S80dhcp-server b/buildroot/package/dhcp/S80dhcp-server
old mode 100755
new mode 100644
diff --git a/buildroot/package/dhcpcd/S41dhcpcd b/buildroot/package/dhcpcd/S41dhcpcd
old mode 100755
new mode 100644
diff --git a/buildroot/package/dhcpcd/dhcpcd.mk b/buildroot/package/dhcpcd/dhcpcd.mk
index 92a78cd7a..ae16c340d 100644
--- a/buildroot/package/dhcpcd/dhcpcd.mk
+++ b/buildroot/package/dhcpcd/dhcpcd.mk
@@ -36,6 +36,10 @@ define DHCPCD_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
 endef
 
+# When network-manager is enabled together with dhcpcd, it will use
+# dhcpcd as a DHCP client, and will be in charge of running, so we
+# don't want the init script or service file to be installed.
+ifeq ($(BR2_PACKAGE_NETWORK_MANAGER),)
 define DHCPCD_INSTALL_INIT_SYSV
 	$(INSTALL) -m 755 -D package/dhcpcd/S41dhcpcd \
 		$(TARGET_DIR)/etc/init.d/S41dhcpcd
@@ -48,6 +52,7 @@ define DHCPCD_INSTALL_INIT_SYSTEMD
 	ln -sf ../../../../usr/lib/systemd/system/dhcpcd.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpcd.service
 endef
+endif
 
 # NOTE: Even though this package has a configure script, it is not generated
 # using the autotools, so we have to use the generic package infrastructure.
diff --git a/buildroot/package/dhcpdump/0002-fix-strsep-feature-test.patch b/buildroot/package/dhcpdump/0002-fix-strsep-feature-test.patch
deleted file mode 100644
index 06bab947c..000000000
--- a/buildroot/package/dhcpdump/0002-fix-strsep-feature-test.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Use the official _BSD_SOURCE feature test macro instead of the meaningless
-HAVE_STRSEP macro in order to detect the availability of strsep().
-
-This allows toolchains supporting strsep() to use it instead of the custom
-implementation from dhcpdump, which also avoids the following error with some
-toolchains:
-
-	In file included from dhcpdump.c:30:0:
-	dhcpdump.c: At top level:
-	strsep.c:65:23: error: register name not specified for ‘delim’
-	  register const char *delim;
-	                       ^
-
-Signed-off-by: Benoît Thébaudeau 
-
-diff -Nrdup dhcpdump-1.8.orig/dhcpdump.c dhcpdump-1.8/dhcpdump.c
---- dhcpdump-1.8.orig/dhcpdump.c	2008-06-24 05:26:52.000000000 +0200
-+++ dhcpdump-1.8/dhcpdump.c	2011-05-31 19:22:15.987388498 +0200
-@@ -26,7 +26,7 @@
- #include 
- #include "dhcp_options.h"
- 
--#ifndef HAVE_STRSEP
-+#ifndef _BSD_SOURCE
- #include "strsep.c"
- #endif
- 
diff --git a/buildroot/package/dhcpdump/dhcpdump.mk b/buildroot/package/dhcpdump/dhcpdump.mk
index 96f231962..241381288 100644
--- a/buildroot/package/dhcpdump/dhcpdump.mk
+++ b/buildroot/package/dhcpdump/dhcpdump.mk
@@ -15,8 +15,11 @@ ifeq ($(BR2_STATIC_LIBS),y)
 DHCPDUMP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
 endif
 
+# glibc, uclibc and musl have strsep()
+DHCPDUMP_CFLAGS = $(TARGET_CFLAGS) -DHAVE_STRSEP
+
 define DHCPDUMP_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS) \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(DHCPDUMP_CFLAGS) \
 		-D_GNU_SOURCE" LIBS="$(DHCPDUMP_LIBS)"
 endef
 
diff --git a/buildroot/package/dmalloc/0005-fix-strdup.patch b/buildroot/package/dmalloc/0005-fix-strdup.patch
new file mode 100644
index 000000000..5884df6a8
--- /dev/null
+++ b/buildroot/package/dmalloc/0005-fix-strdup.patch
@@ -0,0 +1,24 @@
+From 59d73a473f1c1a31bcba90d314f956d0bcc3de95 Mon Sep 17 00:00:00 2001
+From: Siana Gearz 
+Date: Sat, 8 Sep 2012 22:55:17 +0200
+Subject: [PATCH] Fix strdup
+
+[Retrieved from:
+https://github.com/siana/dmalloc/commit/59d73a473f1c1a31bcba90d314f956d0bcc3de95]
+Signed-off-by: Fabrice Fontaine 
+---
+ dmalloc.h.3 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dmalloc.h.3 b/dmalloc.h.3
+index d3d1c13..3fc573a 100644
+--- a/dmalloc.h.3
++++ b/dmalloc.h.3
+@@ -459,6 +459,7 @@ DMALLOC_PNT	valloc(DMALLOC_SIZE size);
+  *
+  * string -> String we are duplicating.
+  */
++#undef strdup
+ extern
+ char	*strdup(const char *string);
+ #endif /* ifndef DMALLOC_STRDUP_MACRO */
diff --git a/buildroot/package/dmalloc/0006-fix-strndup.patch b/buildroot/package/dmalloc/0006-fix-strndup.patch
new file mode 100644
index 000000000..a1865acb8
--- /dev/null
+++ b/buildroot/package/dmalloc/0006-fix-strndup.patch
@@ -0,0 +1,24 @@
+From 005d92c2cebbde5c8623daa29725f7a62b18df7c Mon Sep 17 00:00:00 2001
+From: Siana Gearz 
+Date: Sat, 8 Sep 2012 22:44:35 +0200
+Subject: [PATCH] Fix strndup
+
+[Retrieved from:
+https://github.com/siana/dmalloc/commit/005d92c2cebbde5c8623daa29725f7a62b18df7c]
+Signed-off-by: Fabrice Fontaine 
+---
+ dmalloc.h.3 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dmalloc.h.3 b/dmalloc.h.3
+index 8bda997..fb538a8 100644
+--- a/dmalloc.h.3
++++ b/dmalloc.h.3
+@@ -429,6 +429,7 @@ char	*strdup(const char *string);
+  *
+  * len -> Length of the string to duplicate.
+  */
++#undef strndup
+ extern
+ char	*strndup(const char *string, const DMALLOC_SIZE len);
+ 
diff --git a/buildroot/package/dnsmasq/S80dnsmasq b/buildroot/package/dnsmasq/S80dnsmasq
old mode 100755
new mode 100644
diff --git a/buildroot/package/docker-cli/docker-cli.hash b/buildroot/package/docker-cli/docker-cli.hash
index 03322a4f6..e8af45cce 100644
--- a/buildroot/package/docker-cli/docker-cli.hash
+++ b/buildroot/package/docker-cli/docker-cli.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	3e578406dead2fc72c4b52f77db39dc779fa8b460352116c06f1ae29219bd8c2  docker-cli-v18.09.0.tar.gz
+sha256	02bcb73dde1c9542fa65c8b87078aaa1b01b0dbdd62346637bcf0999a2a0909f  docker-cli-v18.09.6.tar.gz
 sha256	2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0  LICENSE
diff --git a/buildroot/package/docker-cli/docker-cli.mk b/buildroot/package/docker-cli/docker-cli.mk
index c73caa265..b71bd7097 100644
--- a/buildroot/package/docker-cli/docker-cli.mk
+++ b/buildroot/package/docker-cli/docker-cli.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CLI_VERSION = v18.09.0
+DOCKER_CLI_VERSION = v18.09.6
 DOCKER_CLI_SITE = $(call github,docker,cli,$(DOCKER_CLI_VERSION))
 DOCKER_CLI_WORKSPACE = gopath
 
diff --git a/buildroot/package/docker-compose/0002-Upgrade-pyyaml-to-4.2b1.patch b/buildroot/package/docker-compose/0002-Upgrade-pyyaml-to-4.2b1.patch
new file mode 100644
index 000000000..a3b4bfb85
--- /dev/null
+++ b/buildroot/package/docker-compose/0002-Upgrade-pyyaml-to-4.2b1.patch
@@ -0,0 +1,27 @@
+From 8419a670aed3364c39b86a0608782aaeae3ce5df Mon Sep 17 00:00:00 2001
+From: Quentin Brunet 
+Date: Tue, 8 Jan 2019 14:04:54 +0100
+Subject: [PATCH] Upgrade pyyaml to 4.2b1
+
+Signed-off-by: Quentin Brunet 
+Signed-off-by: Peter Korsgaard 
+---
+ setup.py         | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4c49bab7..8b5f9d99 100644
+--- a/setup.py
++++ b/setup.py
+@@ -32,7 +32,7 @@ def find_version(*file_paths):
+ install_requires = [
+     'cached-property >= 1.2.0, < 2',
+     'docopt >= 0.6.1, < 0.7',
+-    'PyYAML >= 3.10, < 4',
++    'PyYAML >= 3.10, < 4.3',
+     'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 3.0',
+     'texttable >= 0.9.0, < 0.10',
+     'websocket-client >= 0.32.0, < 1.0',
+-- 
+2.11.0
+
diff --git a/buildroot/package/docker-containerd/Config.in b/buildroot/package/docker-containerd/Config.in
index 851345f73..72ca9313b 100644
--- a/buildroot/package/docker-containerd/Config.in
+++ b/buildroot/package/docker-containerd/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
 	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc
 	depends on BR2_USE_MMU # util-linux
 	select BR2_PACKAGE_RUNC # runtime dependency
 	select BR2_PACKAGE_UTIL_LINUX # runtime dependency
@@ -13,7 +14,7 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
 	help
 	  containerd is a daemon to control runC.
 
-	  https://github.com/docker/containerd
+	  https://containerd.io/
 
 if BR2_PACKAGE_DOCKER_CONTAINERD
 
@@ -27,8 +28,8 @@ config BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS
 
 endif
 
-comment "docker-containerd needs a toolchain w/ threads"
+comment "docker-containerd needs a glibc or musl toolchain w/ threads"
 	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/buildroot/package/docker-containerd/docker-containerd.hash b/buildroot/package/docker-containerd/docker-containerd.hash
index c5779f4e0..163a519d3 100644
--- a/buildroot/package/docker-containerd/docker-containerd.hash
+++ b/buildroot/package/docker-containerd/docker-containerd.hash
@@ -1,3 +1,3 @@
 # Computed locally
-sha256	5b23bd330f9e59e14f7dced9e3106f37f5b552e527bb6c1503001d90e853c155	docker-containerd-v1.2.4.tar.gz
+sha256	7179c709a0d187708a1eeddcbdecd7206b2c642dc4413bcdb049cd6b38d06801  docker-containerd-v1.2.7.tar.gz
 sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4	LICENSE
diff --git a/buildroot/package/docker-containerd/docker-containerd.mk b/buildroot/package/docker-containerd/docker-containerd.mk
index 698f2fe66..4c0877ecd 100644
--- a/buildroot/package/docker-containerd/docker-containerd.mk
+++ b/buildroot/package/docker-containerd/docker-containerd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = v1.2.4
+DOCKER_CONTAINERD_VERSION = v1.2.7
 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
@@ -20,7 +20,7 @@ DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
 DOCKER_CONTAINERD_TAGS = apparmor
 
 ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
-DOCKER_CONTAINERD_DEPENDENCIES += libseccomp
+DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
 DOCKER_CONTAINERD_TAGS += seccomp
 endif
 
diff --git a/buildroot/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch b/buildroot/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch
new file mode 100644
index 000000000..dc47a8f9e
--- /dev/null
+++ b/buildroot/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch
@@ -0,0 +1,45 @@
+From 324e7be4b252c13002bca6a9d82e7b2e43664634 Mon Sep 17 00:00:00 2001
+From: Christian Stewart 
+Date: Mon, 26 Nov 2018 22:59:32 -0800
+Subject: [PATCH] Fix faulty runc version commit scrape
+
+This commit replaces faulty logic to determine the runc version commit hash.
+
+The original logic takes the second line of the output of "runc --version" and
+does not work if there are a different number of lines printed from the command
+than expected. The buildroot version of runc outputs two lines instead of the
+expected three, causing the error:
+
+unknown output format: runc version commit: ...
+
+This patch replaces this logic with a simple scan of the "runc --version"
+output, searching for the "runc version commit" prefixed line.
+
+Signed-off-by: Christian Stewart 
+---
+ daemon/info_unix.go | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/info_unix.go b/daemon/info_unix.go
+index 60b2f99870..688a510796 100644
+--- a/daemon/info_unix.go
++++ b/daemon/info_unix.go
+@@ -32,10 +32,11 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo)
+ 	defaultRuntimeBinary := daemon.configStore.GetRuntime(v.DefaultRuntime).Path
+ 	if rv, err := exec.Command(defaultRuntimeBinary, "--version").Output(); err == nil {
+ 		parts := strings.Split(strings.TrimSpace(string(rv)), "\n")
+-		if len(parts) == 3 {
+-			parts = strings.Split(parts[1], ": ")
+-			if len(parts) == 2 {
+-				v.RuncCommit.ID = strings.TrimSpace(parts[1])
++		for _, pt := range parts {
++			ptKv := strings.Split(pt, ":")
++			if strings.HasSuffix(strings.TrimSpace(ptKv[0]), "commit") {
++				v.RuncCommit.ID = strings.TrimSpace(ptKv[1])
++				break
+ 			}
+ 		}
+ 
+-- 
+2.18.1
+
diff --git a/buildroot/package/docker-engine/Config.in b/buildroot/package/docker-engine/Config.in
index 11f17820a..3c9731048 100644
--- a/buildroot/package/docker-engine/Config.in
+++ b/buildroot/package/docker-engine/Config.in
@@ -3,6 +3,12 @@ config BR2_PACKAGE_DOCKER_ENGINE
 	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc
+	depends on BR2_USE_MMU # docker-containerd
+	select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
+	select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
+	select BR2_PACKAGE_IPTABLES # runtime dependency
+	select BR2_PACKAGE_SQLITE # runtime dependency
 	help
 	  Docker is a platform to build, ship,
 	  and run applications as lightweight containers.
@@ -11,23 +17,9 @@ config BR2_PACKAGE_DOCKER_ENGINE
 
 if BR2_PACKAGE_DOCKER_ENGINE
 
-config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
-	bool "docker daemon"
-	default y
-	depends on BR2_USE_MMU # docker-containerd
-	select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
-	select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
-	select BR2_PACKAGE_IPTABLES # runtime dependency
-	select BR2_PACKAGE_SQLITE # runtime dependency
-	help
-	  Build the Docker system daemon.
-	  If not selected, will build client only.
-
 config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL
 	bool "build experimental features"
 
-if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
-
 config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
 	bool "btrfs filesystem driver"
 	depends on BR2_USE_MMU # btrfs-progs
@@ -58,9 +50,8 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS
 
 endif
 
-endif
-
-comment "docker-engine needs a toolchain w/ threads"
+comment "docker-engine needs a glibc or musl toolchain w/ threads"
 	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
+	depends on BR2_USE_MMU
diff --git a/buildroot/package/docker-engine/S60dockerd b/buildroot/package/docker-engine/S60dockerd
new file mode 100644
index 000000000..def8bea14
--- /dev/null
+++ b/buildroot/package/docker-engine/S60dockerd
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+NAME=dockerd
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
+DAEMON_ARGS=""
+
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME $1
+
+do_start() {
+        echo -n "Starting $NAME: "
+        start-stop-daemon --start --quiet --background --make-pidfile \
+		--pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
+                && echo "OK" || echo "FAIL"
+}
+
+do_stop() {
+        echo -n "Stopping $NAME: "
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+                && echo "OK" || echo "FAIL"
+}
+
+case "$1" in
+        start)
+                do_start
+                ;;
+        stop)
+                do_stop
+                ;;
+        restart)
+                do_stop
+                sleep 1
+                do_start
+                ;;
+	*)
+                echo "Usage: $0 {start|stop|restart}"
+                exit 1
+esac
diff --git a/buildroot/package/docker-engine/docker-engine.hash b/buildroot/package/docker-engine/docker-engine.hash
index 1e3939f24..4e673f285 100644
--- a/buildroot/package/docker-engine/docker-engine.hash
+++ b/buildroot/package/docker-engine/docker-engine.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	b5278b3f2b460ea61f47833abd2a844f348b4518e73f309294ad178c205a48e1  docker-engine-v18.09.0.tar.gz
+sha256	7cb45266fff79245c81ec86c455d4b0513ca5d4ec1b9be8c8330df30a9467481  docker-engine-v18.09.6.tar.gz
 sha256	2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0  LICENSE
diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk
index 9ecfd1013..4a14baaf9 100644
--- a/buildroot/package/docker-engine/docker-engine.mk
+++ b/buildroot/package/docker-engine/docker-engine.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_ENGINE_VERSION = v18.09.0
+DOCKER_ENGINE_VERSION = v18.09.6
 DOCKER_ENGINE_SITE = $(call github,docker,engine,$(DOCKER_ENGINE_VERSION))
 
 DOCKER_ENGINE_LICENSE = Apache-2.0
@@ -73,6 +73,11 @@ define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service
 endef
 
+define DOCKER_ENGINE_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/docker-engine/S60dockerd \
+		$(TARGET_DIR)/etc/init.d/S60dockerd
+endef
+
 define DOCKER_ENGINE_USERS
 	- - docker -1 * - - - Docker Application Container Framework
 endef
diff --git a/buildroot/package/docker-proxy/docker-proxy.hash b/buildroot/package/docker-proxy/docker-proxy.hash
index 42609261f..3ec184f54 100644
--- a/buildroot/package/docker-proxy/docker-proxy.hash
+++ b/buildroot/package/docker-proxy/docker-proxy.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	1823f8f86b0b7fa5c65afaed75db1732b72245c318205a75180f0da6525f2f67	docker-proxy-449672e51370ccca3b115c834fd0ef2fdec9b094.tar.gz
+sha256	2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6	docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz
diff --git a/buildroot/package/docker-proxy/docker-proxy.mk b/buildroot/package/docker-proxy/docker-proxy.mk
index 92505385b..dfa9d4347 100644
--- a/buildroot/package/docker-proxy/docker-proxy.mk
+++ b/buildroot/package/docker-proxy/docker-proxy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_PROXY_VERSION = 449672e51370ccca3b115c834fd0ef2fdec9b094
+DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e
 DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
 
 DOCKER_PROXY_LICENSE = Apache-2.0
@@ -12,6 +12,8 @@ DOCKER_PROXY_LICENSE_FILES = LICENSE
 
 DOCKER_PROXY_DEPENDENCIES = host-pkgconf
 
+DOCKER_PROXY_WORKSPACE = gopath
+
 DOCKER_PROXY_BUILD_TARGETS = cmd/proxy
 
 define DOCKER_PROXY_INSTALL_TARGET_CMDS
diff --git a/buildroot/package/domoticz/Config.in b/buildroot/package/domoticz/Config.in
index 4c5338df0..b99e54801 100644
--- a/buildroot/package/domoticz/Config.in
+++ b/buildroot/package/domoticz/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_DOMOTICZ
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
-	depends on BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3
+	depends on BR2_PACKAGE_LUA_5_3
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_DATE_TIME
@@ -28,14 +28,14 @@ config BR2_PACKAGE_DOMOTICZ
 
 	  http://domoticz.com
 
-comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, gcc >= 4.8, NPTL, wchar, dynamic library"
+comment "domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 4.8, NPTL, wchar, dynamic library"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
 		!BR2_USE_WCHAR || BR2_STATIC_LIBS || \
-		!(BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3)
+		!BR2_PACKAGE_LUA_5_3
 
 comment "domoticz needs exception_ptr"
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/buildroot/package/dosfstools/dosfstools.mk b/buildroot/package/dosfstools/dosfstools.mk
index 6eb0851d0..fdf973af9 100644
--- a/buildroot/package/dosfstools/dosfstools.mk
+++ b/buildroot/package/dosfstools/dosfstools.mk
@@ -24,26 +24,36 @@ DOSFSTOOLS_CONF_OPTS += LIBS="-liconv"
 DOSFSTOOLS_DEPENDENCIES += libiconv
 endif
 
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FATLABEL),)
-define DOSFSTOOLS_REMOVE_FATLABEL
-	rm -f $(addprefix $(TARGET_DIR)/sbin/,dosfslabel fatlabel)
+ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FATLABEL),y)
+define DOSFSTOOLS_INSTALL_FATLABEL
+	$(INSTALL) -D -m 0755 $(@D)/src/fatlabel $(TARGET_DIR)/sbin/fatlabel
+	ln -sf fatlabel $(TARGET_DIR)/sbin/dosfslabel
 endef
-DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_FATLABEL
 endif
 
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT),)
-define DOSFSTOOLS_REMOVE_FSCK_FAT
-	rm -f $(addprefix $(TARGET_DIR)/sbin/,fsck.fat dosfsck fsck.msdos fsck.vfat)
+ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT),y)
+define DOSFSTOOLS_INSTALL_FSCK_FAT
+	$(INSTALL) -D -m 0755 $(@D)/src/fsck.fat $(TARGET_DIR)/sbin/fsck.fat
+	ln -sf fsck.fat $(TARGET_DIR)/sbin/fsck.vfat
+	ln -sf fsck.fat $(TARGET_DIR)/sbin/fsck.msdos
+	ln -sf fsck.fat $(TARGET_DIR)/sbin/dosfsck
 endef
-DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_FSCK_FAT
 endif
 
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT),)
-define DOSFSTOOLS_REMOVE_MKFS_FAT
-	rm -f $(addprefix $(TARGET_DIR)/sbin/,mkfs.fat mkdosfs mkfs.msdos mkfs.vfat)
+ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT),y)
+define DOSFSTOOLS_INSTALL_MKFS_FAT
+	$(INSTALL) -D -m 0755 $(@D)/src/mkfs.fat $(TARGET_DIR)/sbin/mkfs.fat
+	ln -sf mkfs.fat $(TARGET_DIR)/sbin/mkdosfs
+	ln -sf mkfs.fat $(TARGET_DIR)/sbin/mkfs.msdos
+	ln -sf mkfs.fat $(TARGET_DIR)/sbin/mkfs.vfat
 endef
-DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_MKFS_FAT
 endif
 
+define DOSFSTOOLS_INSTALL_TARGET_CMDS
+	$(call DOSFSTOOLS_INSTALL_FATLABEL)
+	$(call DOSFSTOOLS_INSTALL_FSCK_FAT)
+	$(call DOSFSTOOLS_INSTALL_MKFS_FAT)
+endef
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
index b20ab0dcf..f2b8720c6 100644
--- a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
+++ b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
@@ -1,3 +1,3 @@
 # Locally computed after checking signature
-sha256 e02f2741c05f9e2af1c5f46da35efb74997f9d4b941ba68936206d310ddf2622  dovecot-2.3-pigeonhole-0.5.3.tar.gz
+sha256 7c2fe7e23e732a8451172c00da5f19532448c95e03e44d47c61b123e8210f5b8  dovecot-2.3-pigeonhole-0.5.6.tar.gz
 sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a  COPYING
diff --git a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
index 2647426e3..1568cbc14 100644
--- a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
+++ b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOVECOT_PIGEONHOLE_VERSION = 0.5.3
+DOVECOT_PIGEONHOLE_VERSION = 0.5.6
 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
 DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3
 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1
diff --git a/buildroot/package/dovecot/dovecot.hash b/buildroot/package/dovecot/dovecot.hash
index 5f982a794..a57e51405 100644
--- a/buildroot/package/dovecot/dovecot.hash
+++ b/buildroot/package/dovecot/dovecot.hash
@@ -1,5 +1,5 @@
 # Locally computed after checking signature
-sha256 15af27ee25258afb4ad9581f8df681be998b763597086bbae54ca7d77a066d8e  dovecot-2.3.3.tar.gz
+sha256 ed1d8dc1beeae9c6c73deac73a62ef19fe9262fbffd86604a3f690452f5536c7  dovecot-2.3.6.tar.gz
 sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8  COPYING
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPL
 sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97  COPYING.MIT
diff --git a/buildroot/package/dovecot/dovecot.mk b/buildroot/package/dovecot/dovecot.mk
index 17cdc22e5..78bc41bff 100644
--- a/buildroot/package/dovecot/dovecot.mk
+++ b/buildroot/package/dovecot/dovecot.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 DOVECOT_VERSION_MAJOR = 2.3
-DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).3
+DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).6
 DOVECOT_SITE = https://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
 DOVECOT_INSTALL_STAGING = YES
 DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015
diff --git a/buildroot/package/doxygen/0001-Bug-776791-1.8.13-Regression-Segfault-building-the-b.patch b/buildroot/package/doxygen/0001-Bug-776791-1.8.13-Regression-Segfault-building-the-b.patch
deleted file mode 100644
index b64158ca6..000000000
--- a/buildroot/package/doxygen/0001-Bug-776791-1.8.13-Regression-Segfault-building-the-b.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
-From: albert-github 
-Date: Wed, 4 Jan 2017 12:24:55 +0100
-Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
- breathe docs
-
-Protected against NULL pointer of variable al
-
-[Romain: backport from upstream]
-Signed-off-by: Romain Naour 
----
- src/xmlgen.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
-index fe95c7a..70e198a 100644
---- a/src/xmlgen.cpp
-+++ b/src/xmlgen.cpp
-@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
-     if (md->isInline()) t << "yes"; else t << "no";
-     t << "\"";
- 
--    if (al->refQualifier!=RefQualifierNone)
-+    if (al!=0 && al->refQualifier!=RefQualifierNone)
-     {
-       t << " refqual=\"";
-       if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
--- 
-2.9.4
-
diff --git a/buildroot/package/doxygen/0002-build-fix-the-way-lang_cfg.h-is-generated.patch b/buildroot/package/doxygen/0002-build-fix-the-way-lang_cfg.h-is-generated.patch
deleted file mode 100644
index 282b2bdcd..000000000
--- a/buildroot/package/doxygen/0002-build-fix-the-way-lang_cfg.h-is-generated.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f9a3aa72c2bf15726bcdafd140fd21f790de555d Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski 
-Date: Wed, 21 Jun 2017 14:32:25 +0200
-Subject: [PATCH] build: fix the way lang_cfg.h is generated
-
-This header is generated by running cmake/lang_cfg.cmake and
-redirecting its stderr. If any warning is emitted by this script, it
-ends up in the generated header and breaks the build.
-
-To avoid such problems: pass the path to the header as an argument to
-the cmake script and use the cmake 'file' command instead of 'message'.
-
-We can't even use message(STATUS...) as - although it prints to stdout
-as opposed to other types of messages - it prepends all output with
-a double hyphen.
-
-Signed-off-by: Bartosz Golaszewski 
----
- cmake/lang_cfg.cmake | 10 +++++-----
- src/CMakeLists.txt   |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/lang_cfg.cmake b/cmake/lang_cfg.cmake
-index c57d3ed..86c2d9a 100644
---- a/cmake/lang_cfg.cmake
-+++ b/cmake/lang_cfg.cmake
-@@ -1,10 +1,10 @@
--if(${CMAKE_ARGC} GREATER 1)
--	if ("${CMAKE_ARGV3}" STREQUAL "ENONLY")
--		message("#define ENGLISH_ONLY")
-+if(${CMAKE_ARGC} GREATER 2)
-+	if ("${CMAKE_ARGV4}" STREQUAL "ENONLY")
-+		file(APPEND ${CMAKE_ARGV3} " #define ENGLISH_ONLY")
- 	else()
- 		math(EXPR UPTO ${CMAKE_ARGC}-1)
--		foreach(i RANGE 3 ${UPTO})
--			message("#define LANG_${CMAKE_ARGV${i}}")
-+		foreach(i RANGE 4 ${UPTO})
-+			file(APPEND ${CMAKE_ARGV3} " #define LANG_${CMAKE_ARGV${i}}")
- 		endforeach()
- 	endif()
- endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 08c8439..dcf4ef8 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -73,7 +73,7 @@ set_source_files_properties(${GENERATED_SRC}/ce_parse.h PROPERTIES GENERATED 1)
- # lang_cfg.h
- add_custom_command(
-     COMMENT  "Generating ${GENERATED_SRC}/lang_cfg.h"
--    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${LANG_CODES} 2> ${GENERATED_SRC}/lang_cfg.h
-+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${GENERATED_SRC}/lang_cfg.h ${LANG_CODES}
-     DEPENDS ${LANGUAGE_FILES}
-     OUTPUT ${GENERATED_SRC}/lang_cfg.h
- )
--- 
-2.9.3
-
diff --git a/buildroot/package/doxygen/doxygen.hash b/buildroot/package/doxygen/doxygen.hash
index 4cf53e7ac..db70b74d2 100644
--- a/buildroot/package/doxygen/doxygen.hash
+++ b/buildroot/package/doxygen/doxygen.hash
@@ -1,2 +1,2 @@
 # Computed locally
-sha256 af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b  doxygen-1.8.13.src.tar.gz
+sha256 d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d  doxygen-1.8.14.src.tar.gz
diff --git a/buildroot/package/doxygen/doxygen.mk b/buildroot/package/doxygen/doxygen.mk
index 10cdcf97e..5e11a1d18 100644
--- a/buildroot/package/doxygen/doxygen.mk
+++ b/buildroot/package/doxygen/doxygen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOXYGEN_VERSION = 1.8.13
+DOXYGEN_VERSION = 1.8.14
 DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz
 DOXYGEN_SITE = http://ftp.stack.nl/pub/users/dimitri
 DOXYGEN_LICENSE = GPL-2.0
diff --git a/buildroot/package/dropbear/dropbear.mk b/buildroot/package/dropbear/dropbear.mk
index 7b1468cfb..5f99a2208 100644
--- a/buildroot/package/dropbear/dropbear.mk
+++ b/buildroot/package/dropbear/dropbear.mk
@@ -7,7 +7,7 @@
 DROPBEAR_VERSION = 2018.76
 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
-DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause
+DROPBEAR_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause
 DROPBEAR_LICENSE_FILES = LICENSE
 DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp
 DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS)
@@ -81,6 +81,12 @@ define DROPBEAR_DISABLE_STANDALONE
 	echo '#define NON_INETD_MODE 0'                 >> $(@D)/localoptions.h
 endef
 
+define DROPBEAR_CUSTOM_PATH
+	echo '#define DEFAULT_PATH $(BR2_SYSTEM_DEFAULT_PATH)' >>$(@D)/localoptions.h
+endef
+
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_CUSTOM_PATH
+
 define DROPBEAR_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 644 package/dropbear/dropbear.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/dropbear.service
diff --git a/buildroot/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/buildroot/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch
index e4e49bf6e..bff5f4c07 100644
--- a/buildroot/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch
+++ b/buildroot/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch
@@ -1,7 +1,7 @@
-From b1f8b84489c96465b63485b884238b61d31ca84d Mon Sep 17 00:00:00 2001
+From 086283ed7f1886de05407bc75dd4c070c78a6f50 Mon Sep 17 00:00:00 2001
 From: Lothar Felten 
 Date: Mon, 8 Oct 2018 13:29:44 +0200
-Subject: [PATCH 1/1] Fix include guards for older kernel/u-boot sources
+Subject: [PATCH] Fix include guards for older kernel/u-boot sources
 
 Linux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt
 include guards with leading underscores.
@@ -12,11 +12,27 @@ This patch handles both include guard types and allows the compilation
 of older Linux kernel and u-boot sources.
 
 Signed-off-by: Lothar Felten 
+[ThomasDS: also update fdt.h which has the same issue, seen on U-Boot
+2011.03]
+Signed-off-by: Thomas De Schampheleire 
 ---
+ libfdt/fdt.h        | 4 ++++
  libfdt/libfdt.h     | 4 ++++
  libfdt/libfdt_env.h | 4 ++++
- 2 files changed, 8 insertions(+)
+ 3 files changed, 12 insertions(+)
 
+diff --git a/libfdt/fdt.h b/libfdt/fdt.h
+index 74961f9..2904f48 100644
+--- a/libfdt/fdt.h
++++ b/libfdt/fdt.h
+@@ -1,3 +1,7 @@
++#ifdef _FDT_H
++#warning "Please consider updating your kernel and/or u-boot version"
++#define FDT_H
++#endif
+ #ifndef FDT_H
+ #define FDT_H
+ /*
 diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
 index 830b77e..bef4566 100644
 --- a/libfdt/libfdt.h
@@ -42,5 +58,5 @@ index eb20538..6a61e6a 100644
  #define LIBFDT_ENV_H
  /*
 -- 
-2.11.0
+2.19.2
 
diff --git a/buildroot/package/e2fsprogs/0001-Fix-musl-compile-__GNUC_PREREQ-related.patch b/buildroot/package/e2fsprogs/0001-Fix-musl-compile-__GNUC_PREREQ-related.patch
deleted file mode 100644
index 7027347bc..000000000
--- a/buildroot/package/e2fsprogs/0001-Fix-musl-compile-__GNUC_PREREQ-related.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From 2b826d09c0c0033f52d47c477ae43655f3ae0fa9 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer 
-Date: Tue, 25 Sep 2018 21:31:16 +0200
-Subject: [PATCH] Fix musl compile (__GNUC_PREREQ related)
-
-Use __GNUC_PREREQ only if defined, patch taken frrom [1].
-
-[1] https://raw.githubusercontent.com/void-linux/void-packages/1f3b51493031cc0309009804475e3db572fc89ad/srcpkgs/e2fsprogs/patches/fix-glibcism.patch
-
-Signed-off-by: Peter Seiderer 
----
- debugfs/set_fields.c  | 5 ++++-
- e2fsck/problem.c      | 4 ++++
- lib/ext2fs/ext4_acl.h | 4 ++++
- lib/ext2fs/fiemap.h   | 4 ++++
- lib/ext2fs/hashmap.h  | 4 ++++
- lib/ext2fs/mmp.c      | 4 ++++
- lib/ext2fs/unix_io.c  | 4 ++++
- lib/uuid/gen_uuid.c   | 4 ++++
- misc/e2undo.c         | 4 ++++
- misc/filefrag.c       | 4 ++++
- misc/fuse2fs.c        | 4 ++++
- 11 files changed, 44 insertions(+), 1 deletion(-)
-
-diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c
-index e1e23a5..834a19b 100644
---- a/debugfs/set_fields.c
-+++ b/debugfs/set_fields.c
-@@ -74,11 +74,12 @@ static errcode_t parse_bmap(struct field_set_info *info, char *field, char *arg)
- static errcode_t parse_gd_csum(struct field_set_info *info, char *field, char *arg);
- static errcode_t parse_mmp_clear(struct field_set_info *info, char *field,
- 				 char *arg);
--
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
- #endif
-+#endif
- 
- static struct field_set_info super_fields[] = {
- 	{ "inodes_count", &set_sb.s_inodes_count, NULL, 4, parse_uint },
-@@ -291,9 +292,11 @@ static struct field_set_info mmp_fields[] = {
- 	{ "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint },
- 	{ 0, 0, 0, 0 }
- };
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
- #endif
-+#endif
- 
- #ifdef UNITTEST
- 
-diff --git a/e2fsck/problem.c b/e2fsck/problem.c
-index 0f60396..68eb79f 100644
---- a/e2fsck/problem.c
-+++ b/e2fsck/problem.c
-@@ -99,10 +99,12 @@ static const char *preen_msg[] = {
- 	"",			/* 20 */
- };
- 
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
- #endif
-+#endif
- 
- static struct e2fsck_problem problem_table[] = {
- 
-@@ -2094,9 +2096,11 @@ static struct latch_descr pr_latch_info[] = {
- 	{ PR_LATCH_OPTIMIZE_EXT, PR_1E_OPTIMIZE_EXT_HEADER, PR_1E_OPTIMIZE_EXT_END },
- 	{ -1, 0, 0 },
- };
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
- #endif
-+#endif
- 
- static struct e2fsck_problem *find_problem(problem_t code)
- {
-diff --git a/lib/ext2fs/ext4_acl.h b/lib/ext2fs/ext4_acl.h
-index 8d4d974..c1a2801 100644
---- a/lib/ext2fs/ext4_acl.h
-+++ b/lib/ext2fs/ext4_acl.h
-@@ -50,13 +50,17 @@ typedef struct {
- 
- typedef struct {
-         __le32                  a_version;
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
-+#endif
- #endif
-         posix_acl_xattr_entry   a_entries[0];
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
- #endif
-+#endif
- } posix_acl_xattr_header;
- 
-diff --git a/lib/ext2fs/fiemap.h b/lib/ext2fs/fiemap.h
-index 0d1072a..76860ac 100644
---- a/lib/ext2fs/fiemap.h
-+++ b/lib/ext2fs/fiemap.h
-@@ -31,14 +31,18 @@ struct fiemap {
- 	__u32 fm_mapped_extents;/* number of extents that were mapped (out) */
- 	__u32 fm_extent_count;  /* size of fm_extents array (in) */
- 	__u32 fm_reserved;
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
-+#endif
- #endif
- 	struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
- #endif
-+#endif
- };
- 
- #if defined(__linux__) && !defined(FS_IOC_FIEMAP)
-diff --git a/lib/ext2fs/hashmap.h b/lib/ext2fs/hashmap.h
-index 228f439..a6ba686 100644
---- a/lib/ext2fs/hashmap.h
-+++ b/lib/ext2fs/hashmap.h
-@@ -17,14 +17,18 @@ struct ext2fs_hashmap {
- 		struct ext2fs_hashmap_entry *next;
- 		struct ext2fs_hashmap_entry *list_next;
- 		struct ext2fs_hashmap_entry *list_prev;
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
-+#endif
- #endif
- 	} *entries[0];
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
- #endif
-+#endif
- };
- 
- struct ext2fs_hashmap *ext2fs_hashmap_create(
-diff --git a/lib/ext2fs/mmp.c b/lib/ext2fs/mmp.c
-index 2da935e..f4069c2 100644
---- a/lib/ext2fs/mmp.c
-+++ b/lib/ext2fs/mmp.c
-@@ -34,8 +34,10 @@
- #define O_DIRECT 0
- #endif
- 
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic push
-+#endif
- #ifndef CONFIG_MMP
- #pragma GCC diagnostic ignored "-Wunused-parameter"
- #endif
-@@ -467,6 +469,8 @@ mmp_error:
- 	return EXT2_ET_OP_NOT_SUPPORTED;
- #endif
- }
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
- #endif
-+#endif
-diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
-index 7a4c9bf..9e863a5 100644
---- a/lib/ext2fs/unix_io.c
-+++ b/lib/ext2fs/unix_io.c
-@@ -1127,10 +1127,12 @@ unimplemented:
- }
- 
- /* parameters might not be used if OS doesn't support zeroout */
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-parameter"
- #endif
-+#endif
- static errcode_t unix_zeroout(io_channel channel, unsigned long long block,
- 			      unsigned long long count)
- {
-@@ -1197,9 +1199,11 @@ err:
- unimplemented:
- 	return EXT2_ET_UNIMPLEMENTED;
- }
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
- #endif
-+#endif
- 
- static struct struct_io_manager struct_unix_manager = {
- 	.magic		= EXT2_ET_MAGIC_IO_MANAGER,
-diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c
-index 0198363..cc26ddc 100644
---- a/lib/uuid/gen_uuid.c
-+++ b/lib/uuid/gen_uuid.c
-@@ -484,7 +484,9 @@ static void close_all_fds(void)
- }
- #endif /* defined(USE_UUIDD) && defined(HAVE_SYS_UN_H) */
- 
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
-+#endif
- #pragma GCC diagnostic push
- #if !defined(USE_UUIDD) || !defined(HAVE_SYS_UN_H)
- #pragma GCC diagnostic ignored "-Wunused-parameter"
-@@ -572,9 +574,11 @@ fail:
- #endif
- 	return -1;
- }
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
- #endif
-+#endif
- 
- void uuid__generate_time(uuid_t out, int *num)
- {
-diff --git a/misc/e2undo.c b/misc/e2undo.c
-index 71991e0..4f5dd9f 100644
---- a/misc/e2undo.c
-+++ b/misc/e2undo.c
-@@ -81,14 +81,18 @@ struct undo_key_block {
- 	__le32 magic;		/* KEYBLOCK_MAGIC number */
- 	__le32 crc;		/* block checksum */
- 	__le64 reserved;	/* zero */
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
-+#endif
- #endif
- 	struct undo_key keys[0];	/* keys, which come immediately after */
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
- #endif
-+#endif
- };
- 
- struct undo_key_info {
-diff --git a/misc/filefrag.c b/misc/filefrag.c
-index 56f84ed..4d63ef3 100644
---- a/misc/filefrag.c
-+++ b/misc/filefrag.c
-@@ -535,9 +535,11 @@ int main(int argc, char**argv)
- 				char *end;
- 				blocksize = strtoul(optarg, &end, 0);
- 				if (end) {
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (7, 0)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-+#endif
- #endif
- 					switch (end[0]) {
- 					case 'g':
-@@ -555,8 +557,10 @@ int main(int argc, char**argv)
- 					default:
- 						break;
- 					}
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (7, 0)
- #pragma GCC diagnostic pop
-+#endif
- #endif
- 				}
- 			} else { /* Allow -b without argument for compat. Remove
-diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
-index 5c73895..bf09b55 100644
---- a/misc/fuse2fs.c
-+++ b/misc/fuse2fs.c
-@@ -118,14 +118,18 @@ typedef struct {
- 
- typedef struct {
- 	u_int32_t	a_version;
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
-+#endif
- #endif
- 	acl_ea_entry	a_entries[0];
-+#ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
- #endif
-+#endif
- } acl_ea_header;
- 
- static inline size_t acl_ea_size(int count)
--- 
-2.19.0
-
diff --git a/buildroot/package/e2fsprogs/e2fsprogs.hash b/buildroot/package/e2fsprogs/e2fsprogs.hash
index 71653c933..7619e2627 100644
--- a/buildroot/package/e2fsprogs/e2fsprogs.hash
+++ b/buildroot/package/e2fsprogs/e2fsprogs.hash
@@ -1,5 +1,5 @@
-# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.44.4/sha256sums.asc
-sha256 ee03b2f2180614c5ae5f6dd2666f8808de61c3d8b37d22ba86cc6daea25be55a  e2fsprogs-1.44.4.tar.xz
+# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.44.5/sha256sums.asc
+sha256 ba5eb3069d69160d96818bb9700de9ab5a8458d9add1fd85d427c0000d34c5b9  e2fsprogs-1.44.5.tar.xz
 # Locally calculated
 sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020  NOTICE
 sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d  lib/ss/mit-sipb-copyright.h
diff --git a/buildroot/package/e2fsprogs/e2fsprogs.mk b/buildroot/package/e2fsprogs/e2fsprogs.mk
index a483261ca..f5785ab4f 100644
--- a/buildroot/package/e2fsprogs/e2fsprogs.mk
+++ b/buildroot/package/e2fsprogs/e2fsprogs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-E2FSPROGS_VERSION = 1.44.4
+E2FSPROGS_VERSION = 1.44.5
 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
 E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
 E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)
@@ -60,20 +60,9 @@ ifeq ($(BR2_nios2),y)
 E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
 endif
 
-# Some programs are built for the host, but use definitions guessed by
-# the configure script (i.e with the cross-compiler). Help them by
-# saying that  is available on the host, which is needed
-# for util/subst.c to build properly.
-E2FSPROGS_CONF_ENV += \
-	BUILD_CFLAGS="-DHAVE_SYS_STAT_H" \
-	ac_cv_path_LDCONFIG=true
+E2FSPROGS_CONF_ENV += ac_cv_path_LDCONFIG=true
 
-# Disable use of the host magic.h, as on older hosts (e.g. RHEL 5)
-# it doesn't provide definitions expected by e2fsprogs support lib.
-HOST_E2FSPROGS_CONF_ENV += \
-	ac_cv_header_magic_h=no \
-	ac_cv_lib_magic_magic_file=no \
-	ac_cv_path_LDCONFIG=true
+HOST_E2FSPROGS_CONF_ENV += ac_cv_path_LDCONFIG=true
 
 E2FSPROGS_INSTALL_STAGING_OPTS = \
 	DESTDIR=$(STAGING_DIR) \
diff --git a/buildroot/package/ed/ed.hash b/buildroot/package/ed/ed.hash
index 1aa00c048..96c814d3c 100644
--- a/buildroot/package/ed/ed.hash
+++ b/buildroot/package/ed/ed.hash
@@ -1,2 +1,4 @@
-# From http://lists.gnu.org/archive/html/bug-ed/2017-02/msg00005.html
-sha256	f57962ba930d70d02fc71d6be5c5f2346b16992a455ab9c43be7061dec9810db	ed-1.14.2.tar.lz
+# From http://lists.gnu.org/archive/html/bug-ed/2019-01/msg00010.html
+sha256	ad4489c0ad7a108c514262da28e6c2a426946fb408a3977ef1ed34308bdfd174	ed-1.15.tar.lz
+# Locally calculated
+sha256	f03a12bef9dfb7281864a0dd965166d4f4ec7a66633df2bc72fa4363e57de02c	COPYING
diff --git a/buildroot/package/ed/ed.mk b/buildroot/package/ed/ed.mk
index ada0316a2..6ef8f951c 100644
--- a/buildroot/package/ed/ed.mk
+++ b/buildroot/package/ed/ed.mk
@@ -4,12 +4,9 @@
 #
 ################################################################################
 
-ED_VERSION = 1.14.2
+ED_VERSION = 1.15
 ED_SITE = $(BR2_GNU_MIRROR)/ed
 ED_SOURCE = ed-$(ED_VERSION).tar.lz
-ED_CONF_OPTS = \
-	CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)"
 ED_LICENSE = GPL-3.0+
 ED_LICENSE_FILES = COPYING
 
diff --git a/buildroot/package/efibootmgr/Config.in b/buildroot/package/efibootmgr/Config.in
index d31f9b13e..6644d26b6 100644
--- a/buildroot/package/efibootmgr/Config.in
+++ b/buildroot/package/efibootmgr/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_EFIBOOTMGR
 	depends on !BR2_STATIC_LIBS # efivar
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # efivar
 	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
 	select BR2_PACKAGE_EFIVAR
 	select BR2_PACKAGE_POPT
@@ -15,9 +16,10 @@ config BR2_PACKAGE_EFIBOOTMGR
 
 	  https://github.com/rhboot/efibootmgr
 
-comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9"
+comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9, host gcc >= 4.8"
 	depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS
 	depends on BR2_STATIC_LIBS || \
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8
 	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
diff --git a/buildroot/package/efibootmgr/efibootmgr.mk b/buildroot/package/efibootmgr/efibootmgr.mk
index bdc0019d9..079a9b728 100644
--- a/buildroot/package/efibootmgr/efibootmgr.mk
+++ b/buildroot/package/efibootmgr/efibootmgr.mk
@@ -12,12 +12,6 @@ EFIBOOTMGR_DEPENDENCIES = host-pkgconf efivar popt $(TARGET_NLS_DEPENDENCIES)
 EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
 EFIBOOTMGR_MAKE_ARGS = EFIDIR=buildroot
 
-define EFIBOOTMSR_PATCH_HEADER_PATH
-	$(SED) 's,-I/,-I$(STAGING_DIR)/,' $(@D)/Makefile
-endef
-
-EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH
-
 define EFIBOOTMGR_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
 		LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D) \
diff --git a/buildroot/package/efivar/Config.in b/buildroot/package/efivar/Config.in
index 74f2bb5ab..545962ed7 100644
--- a/buildroot/package/efivar/Config.in
+++ b/buildroot/package/efivar/Config.in
@@ -17,14 +17,17 @@ config BR2_PACKAGE_EFIVAR
 	# toolchains.
 	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	# needs __builtin_bswap16
+	depends on BR2_HOST_GCC_AT_LEAST_4_8
 	help
 	  Tools and libraries to manipulate EFI variables
 
 	  https://github.com/rhboot/efivar
 
-comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9"
+comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9, host gcc >= 4.8"
 	depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS
 	depends on BR2_STATIC_LIBS || \
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8
 	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
diff --git a/buildroot/package/efivar/efivar.hash b/buildroot/package/efivar/efivar.hash
index e8a65adc4..7feb5b753 100644
--- a/buildroot/package/efivar/efivar.hash
+++ b/buildroot/package/efivar/efivar.hash
@@ -1,3 +1,3 @@
 # locally computed hash
-sha256 9691399a424b8e3776b7ed2df1893c4162285a93697d781f387d0f0d258a7f4b  efivar-34.tar.gz
+sha256 747bc4d97b4bd74979e5356c44a172534a8a07184f130349fd201742e683d292  efivar-35.tar.gz
 sha256 91df770634adc2755e78cae33a0d01e702ce2f69046408ae93d0d934ff29691b  COPYING
diff --git a/buildroot/package/efivar/efivar.mk b/buildroot/package/efivar/efivar.mk
index 492a4468b..d96bd98d0 100644
--- a/buildroot/package/efivar/efivar.mk
+++ b/buildroot/package/efivar/efivar.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EFIVAR_VERSION = 34
+EFIVAR_VERSION = 35
 EFIVAR_SITE = $(call github,rhboot,efivar,$(EFIVAR_VERSION))
 EFIVAR_LICENSE = LGPL-2.1
 EFIVAR_LICENSE_FILES = COPYING
diff --git a/buildroot/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch b/buildroot/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch
new file mode 100644
index 000000000..b64a200ff
--- /dev/null
+++ b/buildroot/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch
@@ -0,0 +1,34 @@
+From d045dd99acdd47be238642d4f9384dccacde2b42 Mon Sep 17 00:00:00 2001
+From: "Carsten Haitzler (Rasterman)" 
+Date: Sat, 15 Dec 2018 16:19:01 +0000
+Subject: [PATCH] evas gl - make GLintptr etc. also ndefed for GL_VERSION_1_5
+ fix typedef
+
+It seems that GL_VERSION_1_5 define == these provided by gl already. At
+least reading the mesa headers I do, so this should fix T7502
+
+Signed-off-by: Vadim Kochan 
+---
+ src/lib/evas/Evas_GL.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
+index fa3e6f4..5524d82 100644
+--- a/src/lib/evas/Evas_GL.h
++++ b/src/lib/evas/Evas_GL.h
+@@ -4272,9 +4272,11 @@ typedef signed int       GLfixed;      // Changed khronos_int32_t
+ 
+ #ifndef GL_ES_VERSION_2_0
+ /* GL types for handling large vertex buffer objects */
+-#include 
++# ifndef GL_VERSION_1_5
++#  include 
+ typedef ptrdiff_t GLintptr;     // Changed khronos_intptr_t
+ typedef ptrdiff_t GLsizeiptr;   // Changed khronos_ssize_t
++# endif
+ #endif
+ 
+ /* Some definitions from GLES 3.0.
+-- 
+2.14.1
+
diff --git a/buildroot/package/eigen/eigen.hash b/buildroot/package/eigen/eigen.hash
index 4a1bcdf93..e5c840402 100644
--- a/buildroot/package/eigen/eigen.hash
+++ b/buildroot/package/eigen/eigen.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256 dd254beb0bafc695d0f62ae1a222ff85b52dbaa3a16f76e781dce22d0d20a4a6 3.3.4.tar.bz2
+sha256 9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce 3.3.7.tar.bz2
 sha256 4f877e5ae4672568ef82cfd0023e2cef4a7cf55d867ab249efc9569a7eb9e5b1 COPYING.BSD
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
diff --git a/buildroot/package/eigen/eigen.mk b/buildroot/package/eigen/eigen.mk
index 27c4e212a..5c9e02844 100644
--- a/buildroot/package/eigen/eigen.mk
+++ b/buildroot/package/eigen/eigen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EIGEN_VERSION = 3.3.4
+EIGEN_VERSION = 3.3.7
 EIGEN_SOURCE = $(EIGEN_VERSION).tar.bz2
 EIGEN_SITE = https://bitbucket.org/eigen/eigen/get
 EIGEN_LICENSE = MPL2, BSD-3-Clause, LGPL-2.1
diff --git a/buildroot/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch b/buildroot/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch
new file mode 100644
index 000000000..01a5362e5
--- /dev/null
+++ b/buildroot/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch
@@ -0,0 +1,35 @@
+From 277103e886c9b3ddfede8b3f5b92d3e94736f404 Mon Sep 17 00:00:00 2001
+From: Johan Oudinet 
+Date: Fri, 23 Nov 2018 16:13:21 +0100
+Subject: [PATCH] Makefile.in: do not download or compile dependencies
+
+Signed-off-by: Johan Oudinet 
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 48dca7d8..d2324dae 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -94,7 +94,7 @@ ifneq ($(INSTALLGROUP),)
+   G_USER=-g $(INSTALLGROUP)
+ endif
+ 
+-all: deps src
++all: src
+ 
+ deps: deps/.got
+ 
+@@ -108,7 +108,7 @@ deps/.built: deps/.got
+ 	$(REBAR) configure-deps
+ 	$(REBAR) compile && :> deps/.built
+ 
+-src: deps/.built
++src:
+ 	$(REBAR) skip_deps=true compile
+ 
+ update:
+-- 
+2.17.1
+
diff --git a/buildroot/package/ejabberd/0001-remove-make-targets-for-deps.patch b/buildroot/package/ejabberd/0001-remove-make-targets-for-deps.patch
deleted file mode 100644
index f012140a1..000000000
--- a/buildroot/package/ejabberd/0001-remove-make-targets-for-deps.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 21d1f05a8882657c151397d0e4723535402f1757 Mon Sep 17 00:00:00 2001
-From: Philipp Huebner 
-Date: Wed, 20 Jan 2016 10:22:57 -0500
-Subject: [PATCH] remove make targets for deps
-
-Without this patch, dependencies would be downloaded and compiled
-using rebar at build time.
-
-Signed-off-by: Frank Hunleth 
-
-diff --git a/Makefile.in b/Makefile.in
-index df2abfdc..8c8fd714 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -86,27 +86,11 @@ else
-   INIT_USER=$(INSTALLUSER)
- endif
-
--all: deps src
-+all: src
-
--deps: deps/.got
--
--deps/.got:
--	rm -rf deps/.got
--	rm -rf deps/.built
--	mkdir -p deps
--	$(REBAR) get-deps && :> deps/.got
--
--deps/.built: deps/.got
--	$(REBAR) compile && :> deps/.built
--
--src: deps/.built
-+src:
- 	$(REBAR) skip_deps=true compile
-
--update:
--	rm -rf deps/.got
--	rm -rf deps/.built
--	$(REBAR) update-deps && :> deps/.got
--
- xref: all
- 	$(REBAR) skip_deps=true xref
diff --git a/buildroot/package/ejabberd/0007-fix-ejabberdctl.patch b/buildroot/package/ejabberd/0002-fix-ejabberdctl.patch
similarity index 100%
rename from buildroot/package/ejabberd/0007-fix-ejabberdctl.patch
rename to buildroot/package/ejabberd/0002-fix-ejabberdctl.patch
diff --git a/buildroot/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch b/buildroot/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch
deleted file mode 100644
index 154c7bffd..000000000
--- a/buildroot/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 8674f61701da41cc53c532b5fa3a516838a2c5d4 Mon Sep 17 00:00:00 2001
-From: Johan Oudinet 
-Date: Wed, 10 Jan 2018 15:14:56 +0100
-Subject: [PATCH] remove dependencies from rebar config
-
-Without this patch, dependencies would be downloaded and compiled by
-rebar at build time.
-
-Signed-off-by: Johan Oudinet 
----
- rebar.config | 72 ------------------------------------------------------------
- 1 file changed, 72 deletions(-)
-
-diff --git a/rebar.config b/rebar.config
-index d6ad5e7b..0b246b92 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -18,68 +18,6 @@
- %%%
- %%%----------------------------------------------------------------------
- 
--{deps, [{lager, ".*", {git, "https://github.com/erlang-lager/lager",
--                       {tag, {if_version_above, "17", "3.4.2", "3.2.1"}}}},
--        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}},
--        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.12"}}},
--        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}},
--        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.10"}}},
--        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.25"}}},
--        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.16"}}},
--        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.12"}}},
--        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
--        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.2"}}},
--        {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}},
--	{jose, ".*", {git, "git://github.com/potatosalad/erlang-jose.git", {tag, "1.8.4"}}},
--	{fs, ".*", {git, "https://github.com/synrc/fs.git", {tag, "2.12.0"}}},
--	{if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}}},
--	{if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.17"}}}},
--        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
--                                               {tag, "1.0.4"}}}},
--        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
--                                               {tag, "1.1.4"}}}},
--        {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
--                                               {tag, "1.1.5"}}}},
--        {if_var_true, pam, {epam, ".*", {git, "https://github.com/processone/epam",
--                                           {tag, "1.0.3"}}}},
--        {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
--                                           {tag, "1.0.3"}}}},
--        {if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client.git",
--                                           {tag, {if_version_above, "19", "develop", "2.5.3"}}}}},
--	{if_var_true, graphics, {eimp, ".*", {git, "https://github.com/processone/eimp.git", {tag, "1.0.2"}}}},
--	%% Elixir support, needed to run tests
--        {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
--                                              {tag, {if_version_above, "17", "v1.4.4", "v1.1.1"}}}}},
--        %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin
--	{if_not_rebar3, {if_var_true, elixir, {rebar_elixir_plugin, ".*",
--					       {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}},
--        {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv",
--                                            {tag, "1.0.6"}}}},
--        {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck",
--                                              {tag, "0.8.4"}}}},
--        {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git",
--                                           {tag, "1.0.5c"}}}},
--        {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis",
--                                             {tag, "v1.0.8"}}}}]}.
--
--{if_var_true, latest_deps,
-- {floating_deps, [cache_tab,
--                  fast_tls,
--                  stringprep,
--                  fast_xml,
--                  esip,
--                  stun,
--                  fast_yaml,
--		  xmpp,
--                  p1_utils,
--                  p1_mysql,
--                  p1_pgsql,
--                  p1_oauth2,
--                  epam,
--                  ezlib,
--		  eimp,
--                  iconv]}}.
--
- {erl_first_files, ["src/ejabberd_config.erl", "src/gen_mod.erl", "src/mod_muc_room.erl", "src/mod_push.erl"]}.
- 
- {erl_opts, [nowarn_deprecated_function,
-@@ -153,16 +91,6 @@
- {if_version_above, "17", {cover_enabled, true}}.
- {cover_export_enabled, true}.
- 
--{post_hook_configure, [{"fast_tls", []},
--                       {"stringprep", []},
--                       {"fast_yaml", []},
--                       {if_var_true, sip, {"esip", []}},
--                       {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
--                       {if_var_true, pam, {"epam", []}},
--                       {if_var_true, zlib, {"ezlib", []}},
--		       {if_var_true, graphics, {"eimp", []}},
--                       {if_var_true, iconv, {"iconv", []}}]}.
--
- {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}.
- 
- {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}.
--- 
-2.14.1
-
diff --git a/buildroot/package/ejabberd/0003-remove-checking-erlang-version.patch b/buildroot/package/ejabberd/0003-remove-checking-erlang-version.patch
deleted file mode 100644
index da3bf2a89..000000000
--- a/buildroot/package/ejabberd/0003-remove-checking-erlang-version.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f384518dedec4ad657ad69d55754076c13c22d96 Mon Sep 17 00:00:00 2001
-From: Johan Oudinet 
-Date: Wed, 20 Jan 2016 08:11:32 -0500
-Subject: [PATCH] remove checking erlang version
-
-Without this patch, the configure will try to run erlang to simply check
-if the version is supported by ejabberd. Instead, we do this test
-statically.
-
-Signed-off-by: Johan Oudinet 
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 97e89a2..cd1ab08 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,10 +39,8 @@ AC_ARG_ENABLE(erlang-version-check,
- 	[Check Erlang/OTP version @<:@default=yes@:>@])])
- case "$enable_erlang_version_check" in
- 	yes|'')
--		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX])
- 		;;
- 	no)
--		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn])
- 		;;
- esac
- 
--- 
-2.5.0
-
diff --git a/buildroot/package/ejabberd/0004-correct-includes.patch b/buildroot/package/ejabberd/0004-correct-includes.patch
deleted file mode 100644
index f8f827a4e..000000000
--- a/buildroot/package/ejabberd/0004-correct-includes.patch
+++ /dev/null
@@ -1,1919 +0,0 @@
-From 0487178693143955ff57e3c9371fb6e7b164294c Mon Sep 17 00:00:00 2001
-From: Johan Oudinet 
-Date: Thu, 11 Jan 2018 12:49:38 +0100
-Subject: [PATCH] correct includes
-
-Use include_lib() instead of include() for files from external
-libraries. See https://github.com/processone/ejabberd/pull/1446
-
-Note: Philipp Huebner has a similar patch in Debian's port of ejabberd
-but it was easier to redo this patch from scratch with the following sed
-command on ejabberd git repository than adapting Huebner's patch format:
-for f in src/*.erl include/*.hrl; do
-    sed -i -e 's,esip/include,s1_sip/include,g' \
-    -e 's,include("ns.hrl,include_lib("p1_xmpp/include/ns.hrl,g' \
-    -e 's,include("fxml.hrl,include_lib("p1_xml/include/fxml.hrl,g' \
-    -e 's,include("xmpp\.hrl,include_lib("p1_xmpp/include/xmpp.hrl,g' \
-    -e 's,include("jid\.hrl,include_lib("p1_xmpp/include/jid.hrl,g' \
-    "$f"
-done
-
-Signed-off-by: Johan Oudinet 
----
- include/jlib.hrl                  | 4 ++--
- src/acl.erl                       | 2 +-
- src/acme_challenge.erl            | 2 +-
- src/ejabberd_acme.erl             | 2 +-
- src/ejabberd_acme_comm.erl        | 2 +-
- src/ejabberd_auth_anonymous.erl   | 2 +-
- src/ejabberd_bosh.erl             | 2 +-
- src/ejabberd_c2s.erl              | 2 +-
- src/ejabberd_captcha.erl          | 2 +-
- src/ejabberd_http.erl             | 2 +-
- src/ejabberd_http_ws.erl          | 2 +-
- src/ejabberd_iq.erl               | 2 +-
- src/ejabberd_local.erl            | 2 +-
- src/ejabberd_oauth.erl            | 2 +-
- src/ejabberd_oauth_rest.erl       | 2 +-
- src/ejabberd_oauth_sql.erl        | 2 +-
- src/ejabberd_piefxis.erl          | 2 +-
- src/ejabberd_router.erl           | 2 +-
- src/ejabberd_router_multicast.erl | 2 +-
- src/ejabberd_s2s.erl              | 2 +-
- src/ejabberd_s2s_in.erl           | 2 +-
- src/ejabberd_s2s_out.erl          | 2 +-
- src/ejabberd_service.erl          | 2 +-
- src/ejabberd_sm.erl               | 2 +-
- src/ejabberd_socket.erl           | 2 +-
- src/ejabberd_system_monitor.erl   | 2 +-
- src/ejabberd_web.erl              | 2 +-
- src/ejabberd_web_admin.erl        | 2 +-
- src/ejabberd_websocket.erl        | 2 +-
- src/ejabberd_xmlrpc.erl           | 2 +-
- src/gen_iq_handler.erl            | 2 +-
- src/gen_pubsub_node.erl           | 2 +-
- src/gen_pubsub_nodetree.erl       | 2 +-
- src/jd2ejd.erl                    | 2 +-
- src/mod_adhoc.erl                 | 2 +-
- src/mod_admin_extra.erl           | 2 +-
- src/mod_admin_update_sql.erl      | 2 +-
- src/mod_announce.erl              | 2 +-
- src/mod_announce_mnesia.erl       | 2 +-
- src/mod_announce_riak.erl         | 2 +-
- src/mod_announce_sql.erl          | 2 +-
- src/mod_avatar.erl                | 2 +-
- src/mod_block_strangers.erl       | 2 +-
- src/mod_blocking.erl              | 2 +-
- src/mod_bosh.erl                  | 2 +-
- src/mod_caps.erl                  | 2 +-
- src/mod_carboncopy.erl            | 2 +-
- src/mod_client_state.erl          | 2 +-
- src/mod_configure.erl             | 2 +-
- src/mod_delegation.erl            | 2 +-
- src/mod_disco.erl                 | 2 +-
- src/mod_echo.erl                  | 2 +-
- src/mod_fail2ban.erl              | 2 +-
- src/mod_http_api.erl              | 2 +-
- src/mod_http_upload.erl           | 2 +-
- src/mod_http_upload_quota.erl     | 2 +-
- src/mod_irc.erl                   | 2 +-
- src/mod_irc_connection.erl        | 2 +-
- src/mod_irc_mnesia.erl            | 2 +-
- src/mod_irc_riak.erl              | 2 +-
- src/mod_irc_sql.erl               | 2 +-
- src/mod_last.erl                  | 2 +-
- src/mod_legacy_auth.erl           | 2 +-
- src/mod_mam.erl                   | 2 +-
- src/mod_mam_mnesia.erl            | 2 +-
- src/mod_mam_sql.erl               | 2 +-
- src/mod_metrics.erl               | 2 +-
- src/mod_mix.erl                   | 2 +-
- src/mod_muc.erl                   | 2 +-
- src/mod_muc_admin.erl             | 2 +-
- src/mod_muc_log.erl               | 2 +-
- src/mod_muc_mnesia.erl            | 2 +-
- src/mod_muc_riak.erl              | 2 +-
- src/mod_muc_room.erl              | 2 +-
- src/mod_muc_sql.erl               | 2 +-
- src/mod_multicast.erl             | 2 +-
- src/mod_offline.erl               | 2 +-
- src/mod_offline_mnesia.erl        | 2 +-
- src/mod_offline_riak.erl          | 2 +-
- src/mod_offline_sql.erl           | 2 +-
- src/mod_ping.erl                  | 2 +-
- src/mod_pres_counter.erl          | 2 +-
- src/mod_privacy.erl               | 2 +-
- src/mod_privacy_mnesia.erl        | 2 +-
- src/mod_privacy_riak.erl          | 2 +-
- src/mod_privacy_sql.erl           | 2 +-
- src/mod_private.erl               | 2 +-
- src/mod_private_mnesia.erl        | 2 +-
- src/mod_private_riak.erl          | 2 +-
- src/mod_private_sql.erl           | 2 +-
- src/mod_privilege.erl             | 2 +-
- src/mod_proxy65_service.erl       | 2 +-
- src/mod_pubsub.erl                | 2 +-
- src/mod_push.erl                  | 2 +-
- src/mod_push_keepalive.erl        | 2 +-
- src/mod_push_mnesia.erl           | 2 +-
- src/mod_push_sql.erl              | 2 +-
- src/mod_register.erl              | 2 +-
- src/mod_register_web.erl          | 2 +-
- src/mod_roster.erl                | 2 +-
- src/mod_s2s_dialback.erl          | 2 +-
- src/mod_service_log.erl           | 2 +-
- src/mod_shared_roster.erl         | 2 +-
- src/mod_shared_roster_ldap.erl    | 2 +-
- src/mod_shared_roster_mnesia.erl  | 2 +-
- src/mod_shared_roster_riak.erl    | 2 +-
- src/mod_shared_roster_sql.erl     | 2 +-
- src/mod_sic.erl                   | 2 +-
- src/mod_sip.erl                   | 2 +-
- src/mod_sip_proxy.erl             | 2 +-
- src/mod_sip_registrar.erl         | 2 +-
- src/mod_stats.erl                 | 2 +-
- src/mod_stream_mgmt.erl           | 2 +-
- src/mod_time.erl                  | 2 +-
- src/mod_vcard.erl                 | 2 +-
- src/mod_vcard_ldap.erl            | 2 +-
- src/mod_vcard_mnesia.erl          | 2 +-
- src/mod_vcard_riak.erl            | 2 +-
- src/mod_vcard_sql.erl             | 2 +-
- src/mod_vcard_xupdate.erl         | 2 +-
- src/mod_version.erl               | 2 +-
- src/node_dag.erl                  | 2 +-
- src/node_dispatch.erl             | 2 +-
- src/node_flat.erl                 | 2 +-
- src/node_flat_sql.erl             | 2 +-
- src/node_online.erl               | 2 +-
- src/nodetree_dag.erl              | 2 +-
- src/nodetree_tree.erl             | 2 +-
- src/nodetree_tree_sql.erl         | 2 +-
- src/prosody2ejabberd.erl          | 2 +-
- src/pubsub_subscription.erl       | 2 +-
- src/pubsub_subscription_sql.erl   | 2 +-
- src/xmpp_stream_in.erl            | 2 +-
- src/xmpp_stream_out.erl           | 2 +-
- src/xmpp_stream_pkix.erl          | 2 +-
- 135 files changed, 136 insertions(+), 136 deletions(-)
-
-diff --git a/include/jlib.hrl b/include/jlib.hrl
-index cd5fedbf..293fcc0e 100644
---- a/include/jlib.hrl
-+++ b/include/jlib.hrl
-@@ -18,8 +18,8 @@
- %%%
- %%%----------------------------------------------------------------------
- 
---include("ns.hrl").
---include("fxml.hrl").
-+-include_lib("p1_xmpp/include/ns.hrl").
-+-include_lib("p1_xml/include/fxml.hrl").
- 
- -define(STANZA_ERROR(Code, Type, Condition),
- 	#xmlel{name = <<"error">>,
-diff --git a/src/acl.erl b/src/acl.erl
-index 2d848b99..88df4625 100644
---- a/src/acl.erl
-+++ b/src/acl.erl
-@@ -45,7 +45,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- 
- -record(acl, {aclname, aclspec}).
- -record(access, {name       :: aclname(),
-diff --git a/src/acme_challenge.erl b/src/acme_challenge.erl
-index f4fde4e7..45fc6d8f 100644
---- a/src/acme_challenge.erl
-+++ b/src/acme_challenge.erl
-@@ -16,7 +16,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("ejabberd_http.hrl").
- -include("ejabberd_acme.hrl").
- 
-diff --git a/src/ejabberd_acme.erl b/src/ejabberd_acme.erl
-index a5166b45..eee74092 100644
---- a/src/ejabberd_acme.erl
-+++ b/src/ejabberd_acme.erl
-@@ -21,7 +21,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("ejabberd_commands.hrl").
- -include("ejabberd_acme.hrl").
- -include_lib("public_key/include/public_key.hrl").
-diff --git a/src/ejabberd_acme_comm.erl b/src/ejabberd_acme_comm.erl
-index a5668d08..02acd1c4 100644
---- a/src/ejabberd_acme_comm.erl
-+++ b/src/ejabberd_acme_comm.erl
-@@ -24,7 +24,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_acme.hrl").
- -include_lib("public_key/include/public_key.hrl").
-diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl
-index a4f3ac1c..697b3e08 100644
---- a/src/ejabberd_auth_anonymous.erl
-+++ b/src/ejabberd_auth_anonymous.erl
-@@ -46,7 +46,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- 
- start(Host) ->
-     ejabberd_hooks:add(sm_register_connection_hook, Host,
-diff --git a/src/ejabberd_bosh.erl b/src/ejabberd_bosh.erl
-index 1df6681f..e8cc5f9b 100644
---- a/src/ejabberd_bosh.erl
-+++ b/src/ejabberd_bosh.erl
-@@ -47,7 +47,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_http.hrl").
- 
-diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
-index a94d065f..a56d9041 100644
---- a/src/ejabberd_c2s.erl
-+++ b/src/ejabberd_c2s.erl
-@@ -52,7 +52,7 @@
- 	 host_up/1, host_down/1]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- -include("mod_roster.hrl").
- 
-diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl
-index 76af5278..3a950786 100644
---- a/src/ejabberd_captcha.erl
-+++ b/src/ejabberd_captcha.erl
-@@ -43,7 +43,7 @@
- 	 is_feature_available/0, create_captcha_x/5,
- 	 opt_type/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("ejabberd.hrl").
- -include("logger.hrl").
- -include("ejabberd_http.hrl").
-diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
-index 0bc0d8fc..d39a585d 100644
---- a/src/ejabberd_http.erl
-+++ b/src/ejabberd_http.erl
-@@ -39,7 +39,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_http.hrl").
- 
-diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl
-index f9f7b07e..5c0e6ea1 100644
---- a/src/ejabberd_http_ws.erl
-+++ b/src/ejabberd_http_ws.erl
-@@ -39,7 +39,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_http.hrl").
- 
-diff --git a/src/ejabberd_iq.erl b/src/ejabberd_iq.erl
-index 7d2751dc..76a6b056 100644
---- a/src/ejabberd_iq.erl
-+++ b/src/ejabberd_iq.erl
-@@ -34,7 +34,7 @@
- -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
- 	 terminate/2, code_change/3]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- 
- -record(state, {expire = infinity :: timeout()}).
-diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl
-index cc1d6a2e..f72fd43b 100644
---- a/src/ejabberd_local.erl
-+++ b/src/ejabberd_local.erl
-@@ -50,7 +50,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- -include_lib("stdlib/include/ms_transform.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -record(state, {}).
- 
-diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl
-index df4e4bc2..34bf24f8 100644
---- a/src/ejabberd_oauth.erl
-+++ b/src/ejabberd_oauth.erl
-@@ -52,7 +52,7 @@
- 
- -export([oauth_issue_token/3, oauth_list_tokens/0, oauth_revoke_token/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
-diff --git a/src/ejabberd_oauth_rest.erl b/src/ejabberd_oauth_rest.erl
-index 206fab43..1a7287ee 100644
---- a/src/ejabberd_oauth_rest.erl
-+++ b/src/ejabberd_oauth_rest.erl
-@@ -37,7 +37,7 @@
- -include("ejabberd.hrl").
- -include("ejabberd_oauth.hrl").
- -include("logger.hrl").
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- 
- init() ->
-     rest:start(?MYNAME),
-diff --git a/src/ejabberd_oauth_sql.erl b/src/ejabberd_oauth_sql.erl
-index 14eaca6a..fcd105ba 100644
---- a/src/ejabberd_oauth_sql.erl
-+++ b/src/ejabberd_oauth_sql.erl
-@@ -36,7 +36,7 @@
- -include("ejabberd_oauth.hrl").
- -include("ejabberd.hrl").
- -include("ejabberd_sql_pt.hrl").
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- -include("logger.hrl").
- 
- init() ->
-diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl
-index ecb4908a..7331f442 100644
---- a/src/ejabberd_piefxis.erl
-+++ b/src/ejabberd_piefxis.erl
-@@ -42,7 +42,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_privacy.hrl").
- -include("mod_roster.hrl").
- 
-diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl
-index e2901483..315505ec 100644
---- a/src/ejabberd_router.erl
-+++ b/src/ejabberd_router.erl
-@@ -71,7 +71,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- -include("ejabberd_router.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -callback init() -> any().
- -callback register_route(binary(), binary(), local_hint(),
-diff --git a/src/ejabberd_router_multicast.erl b/src/ejabberd_router_multicast.erl
-index 5d5acfca..3f206ef2 100644
---- a/src/ejabberd_router_multicast.erl
-+++ b/src/ejabberd_router_multicast.erl
-@@ -43,7 +43,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -record(route_multicast, {domain = <<"">> :: binary() | '_',
- 			  pid = self() :: pid()}).
-diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
-index 0626d62f..e2fc34c9 100644
---- a/src/ejabberd_s2s.erl
-+++ b/src/ejabberd_s2s.erl
-@@ -57,7 +57,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_commands.hrl").
- 
-diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
-index a949e83d..3d8e100e 100644
---- a/src/ejabberd_s2s_in.erl
-+++ b/src/ejabberd_s2s_in.erl
-@@ -45,7 +45,7 @@
- 	 host_up/1, host_down/1]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- 
- -type state() :: map().
-diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
-index fea5d816..c035731f 100644
---- a/src/ejabberd_s2s_out.erl
-+++ b/src/ejabberd_s2s_out.erl
-@@ -43,7 +43,7 @@
- 	 route/2, establish/1, update_state/2, host_up/1, host_down/1]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- 
- -type state() :: map().
-diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl
-index 7b5f945d..895fed09 100644
---- a/src/ejabberd_service.erl
-+++ b/src/ejabberd_service.erl
-@@ -37,7 +37,7 @@
- -export([send/2]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- 
- -type state() :: map().
-diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
-index 3df1d88e..e8087c48 100644
---- a/src/ejabberd_sm.erl
-+++ b/src/ejabberd_sm.erl
-@@ -89,7 +89,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_commands.hrl").
- -include("ejabberd_sm.hrl").
-diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl
-index 9953a76a..0dd1c4ff 100644
---- a/src/ejabberd_socket.erl
-+++ b/src/ejabberd_socket.erl
-@@ -52,7 +52,7 @@
- 	 sockname/1, peername/1]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- 
- -type sockmod() :: ejabberd_bosh |
-diff --git a/src/ejabberd_system_monitor.erl b/src/ejabberd_system_monitor.erl
-index 773104f9..46e641b7 100644
---- a/src/ejabberd_system_monitor.erl
-+++ b/src/ejabberd_system_monitor.erl
-@@ -41,7 +41,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -record(state, {}).
- 
-diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl
-index 7a40d2c7..aa1abc9b 100644
---- a/src/ejabberd_web.erl
-+++ b/src/ejabberd_web.erl
-@@ -34,7 +34,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_http.hrl").
- 
-diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl
-index b3d72c19..cdd951b6 100644
---- a/src/ejabberd_web_admin.erl
-+++ b/src/ejabberd_web_admin.erl
-@@ -38,7 +38,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_http.hrl").
- 
-diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl
-index 9926c20c..fabf2293 100644
---- a/src/ejabberd_websocket.erl
-+++ b/src/ejabberd_websocket.erl
-@@ -47,7 +47,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_http.hrl").
- 
-diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl
-index 213aef7a..f5b51894 100644
---- a/src/ejabberd_xmlrpc.erl
-+++ b/src/ejabberd_xmlrpc.erl
-@@ -42,7 +42,7 @@
- -include("ejabberd_http.hrl").
- -include("mod_roster.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -record(state,
- 	{access_commands = [] :: list(),
-diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl
-index d34db358..ab04a252 100644
---- a/src/gen_iq_handler.erl
-+++ b/src/gen_iq_handler.erl
-@@ -45,7 +45,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -record(state, {host, module, function}).
- 
-diff --git a/src/gen_pubsub_node.erl b/src/gen_pubsub_node.erl
-index 4f516bd5..83de80a8 100644
---- a/src/gen_pubsub_node.erl
-+++ b/src/gen_pubsub_node.erl
-@@ -25,7 +25,7 @@
- 
- -module(gen_pubsub_node).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -type(host() :: mod_pubsub:host()).
- -type(nodeId() :: mod_pubsub:nodeId()).
-diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl
-index bf7140aa..4267b9a1 100644
---- a/src/gen_pubsub_nodetree.erl
-+++ b/src/gen_pubsub_nodetree.erl
-@@ -36,7 +36,7 @@
- 	ServerHost :: binary(),
- 	Opts :: [any()]) -> atom().
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -callback terminate(Host :: host(), ServerHost :: binary()) -> atom().
- 
-diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl
-index ae293698..bbe9bc6d 100644
---- a/src/jd2ejd.erl
-+++ b/src/jd2ejd.erl
-@@ -32,7 +32,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- %%%----------------------------------------------------------------------
- %%% API
-diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl
-index e6df3904..0f3ada11 100644
---- a/src/mod_adhoc.erl
-+++ b/src/mod_adhoc.erl
-@@ -39,7 +39,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- start(Host, Opts) ->
-     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
-diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
-index 799f0079..9fd8531b 100644
---- a/src/mod_admin_extra.erl
-+++ b/src/mod_admin_extra.erl
-@@ -84,7 +84,7 @@
- -include("mod_roster.hrl").
- -include("mod_privacy.hrl").
- -include("ejabberd_sm.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- %%%
- %%% gen_mod
-diff --git a/src/mod_admin_update_sql.erl b/src/mod_admin_update_sql.erl
-index 2f105d97..cace1b94 100644
---- a/src/mod_admin_update_sql.erl
-+++ b/src/mod_admin_update_sql.erl
-@@ -38,7 +38,7 @@
- -include("logger.hrl").
- -include("ejabberd.hrl").
- -include("ejabberd_commands.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("ejabberd_sql_pt.hrl").
- 
- %%%
-diff --git a/src/mod_announce.erl b/src/mod_announce.erl
-index b259aced..146b6a35 100644
---- a/src/mod_announce.erl
-+++ b/src/mod_announce.erl
-@@ -52,7 +52,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_announce.hrl").
- 
- -callback init(binary(), gen_mod:opts()) -> any().
-diff --git a/src/mod_announce_mnesia.erl b/src/mod_announce_mnesia.erl
-index f2e5c1c4..cecd68cc 100644
---- a/src/mod_announce_mnesia.erl
-+++ b/src/mod_announce_mnesia.erl
-@@ -31,7 +31,7 @@
- 	 get_motd/1, is_motd_user/2, set_motd_user/2, import/3]).
- -export([need_transform/1, transform/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_announce.hrl").
- -include("logger.hrl").
- 
-diff --git a/src/mod_announce_riak.erl b/src/mod_announce_riak.erl
-index 04a29a68..a3dac3e9 100644
---- a/src/mod_announce_riak.erl
-+++ b/src/mod_announce_riak.erl
-@@ -30,7 +30,7 @@
- -export([init/2, set_motd_users/2, set_motd/2, delete_motd/1,
- 	 get_motd/1, is_motd_user/2, set_motd_user/2, import/3]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_announce.hrl").
- 
- %%%===================================================================
-diff --git a/src/mod_announce_sql.erl b/src/mod_announce_sql.erl
-index c5c9eb58..b243d05d 100644
---- a/src/mod_announce_sql.erl
-+++ b/src/mod_announce_sql.erl
-@@ -33,7 +33,7 @@
- 	 get_motd/1, is_motd_user/2, set_motd_user/2, import/3,
- 	 export/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_announce.hrl").
- -include("ejabberd_sql_pt.hrl").
- -include("logger.hrl").
-diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl
-index dde58abf..ffc31c94 100644
---- a/src/mod_avatar.erl
-+++ b/src/mod_avatar.erl
-@@ -28,7 +28,7 @@
- %% Hooks
- -export([pubsub_publish_item/6, vcard_iq_convert/1, vcard_iq_publish/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- -include("pubsub.hrl").
- 
-diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl
-index b2c56f36..429c0ab2 100644
---- a/src/mod_block_strangers.erl
-+++ b/src/mod_block_strangers.erl
-@@ -34,7 +34,7 @@
- 
- -export([filter_packet/1, filter_offline_msg/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
-diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl
-index 738c5e16..479b34ea 100644
---- a/src/mod_blocking.erl
-+++ b/src/mod_blocking.erl
-@@ -35,7 +35,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("mod_privacy.hrl").
- 
-diff --git a/src/mod_bosh.erl b/src/mod_bosh.erl
-index 6ee58047..e49ab960 100644
---- a/src/mod_bosh.erl
-+++ b/src/mod_bosh.erl
-@@ -41,7 +41,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- -include_lib("stdlib/include/ms_transform.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("ejabberd_http.hrl").
- -include("bosh.hrl").
- 
-diff --git a/src/mod_caps.erl b/src/mod_caps.erl
-index edc93bbf..6ead4230 100644
---- a/src/mod_caps.erl
-+++ b/src/mod_caps.erl
-@@ -53,7 +53,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_caps.hrl").
- 
- -define(BAD_HASH_LIFETIME, 600).
-diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl
-index 307d6154..c3a998d8 100644
---- a/src/mod_carboncopy.erl
-+++ b/src/mod_carboncopy.erl
-@@ -40,7 +40,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_carboncopy.hrl").
- 
- -type direction() :: sent | received.
-diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl
-index f7adb1c6..09507b73 100644
---- a/src/mod_client_state.erl
-+++ b/src/mod_client_state.erl
-@@ -42,7 +42,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(CSI_QUEUE_MAX, 100).
- 
-diff --git a/src/mod_configure.erl b/src/mod_configure.erl
-index 31f7a9c8..6ea5bd37 100644
---- a/src/mod_configure.erl
-+++ b/src/mod_configure.erl
-@@ -40,7 +40,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("ejabberd_sm.hrl").
- -include_lib("stdlib/include/ms_transform.hrl").
- 
-diff --git a/src/mod_delegation.erl b/src/mod_delegation.erl
-index 27e00768..c93912d6 100644
---- a/src/mod_delegation.erl
-+++ b/src/mod_delegation.erl
-@@ -42,7 +42,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -type disco_acc() :: {error, stanza_error()} | {result, [binary()]} | empty.
- -record(state, {server_host = <<"">> :: binary(),
-diff --git a/src/mod_disco.erl b/src/mod_disco.erl
-index 76be408f..5bea1fb7 100644
---- a/src/mod_disco.erl
-+++ b/src/mod_disco.erl
-@@ -42,7 +42,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include_lib("stdlib/include/ms_transform.hrl").
- -include("mod_roster.hrl").
- 
-diff --git a/src/mod_echo.erl b/src/mod_echo.erl
-index 79dd5996..38199d3c 100644
---- a/src/mod_echo.erl
-+++ b/src/mod_echo.erl
-@@ -41,7 +41,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -record(state, {hosts = [] :: [binary()]}).
- 
-diff --git a/src/mod_fail2ban.erl b/src/mod_fail2ban.erl
-index 5e931853..01bdfe2f 100644
---- a/src/mod_fail2ban.erl
-+++ b/src/mod_fail2ban.erl
-@@ -39,7 +39,7 @@
- -include_lib("stdlib/include/ms_transform.hrl").
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(C2S_AUTH_BAN_LIFETIME, 3600). %% 1 hour
- -define(C2S_MAX_AUTH_FAILURES, 20).
-diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl
-index ef881d14..f7cd10bf 100644
---- a/src/mod_http_api.erl
-+++ b/src/mod_http_api.erl
-@@ -77,7 +77,7 @@
- -export([start/2, stop/1, reload/3, process/2, mod_opt_type/1, depends/2]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- -include("ejabberd_http.hrl").
- 
-diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl
-index c3c295f6..d3bd4e84 100644
---- a/src/mod_http_upload.erl
-+++ b/src/mod_http_upload.erl
-@@ -89,7 +89,7 @@
- 
- -include("ejabberd.hrl").
- -include("ejabberd_http.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- 
- -record(state,
-diff --git a/src/mod_http_upload_quota.erl b/src/mod_http_upload_quota.erl
-index 10243ac0..cda5c563 100644
---- a/src/mod_http_upload_quota.erl
-+++ b/src/mod_http_upload_quota.erl
-@@ -50,7 +50,7 @@
- %% ejabberd_hooks callback.
- -export([handle_slot_request/5]).
- 
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- -include("logger.hrl").
- -include_lib("kernel/include/file.hrl").
- 
-diff --git a/src/mod_irc.erl b/src/mod_irc.erl
-index 92093507..9b9becc8 100644
---- a/src/mod_irc.erl
-+++ b/src/mod_irc.erl
-@@ -43,7 +43,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_irc.hrl").
- 
- -define(DEFAULT_IRC_ENCODING, <<"iso8859-15">>).
-diff --git a/src/mod_irc_connection.erl b/src/mod_irc_connection.erl
-index 59336591..ca81358f 100644
---- a/src/mod_irc_connection.erl
-+++ b/src/mod_irc_connection.erl
-@@ -41,7 +41,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(SETS, gb_sets).
- 
-diff --git a/src/mod_irc_mnesia.erl b/src/mod_irc_mnesia.erl
-index eb982e1f..510ce09d 100644
---- a/src/mod_irc_mnesia.erl
-+++ b/src/mod_irc_mnesia.erl
-@@ -30,7 +30,7 @@
- -export([init/2, get_data/3, set_data/4, import/2]).
- -export([need_transform/1, transform/1]).
- 
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- -include("mod_irc.hrl").
- -include("logger.hrl").
- 
-diff --git a/src/mod_irc_riak.erl b/src/mod_irc_riak.erl
-index 23f2a2c3..d236bfa7 100644
---- a/src/mod_irc_riak.erl
-+++ b/src/mod_irc_riak.erl
-@@ -29,7 +29,7 @@
- %% API
- -export([init/2, get_data/3, set_data/4, import/2]).
- 
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- -include("mod_irc.hrl").
- 
- %%%===================================================================
-diff --git a/src/mod_irc_sql.erl b/src/mod_irc_sql.erl
-index 1f8d7d16..5f784fdc 100644
---- a/src/mod_irc_sql.erl
-+++ b/src/mod_irc_sql.erl
-@@ -31,7 +31,7 @@
- %% API
- -export([init/2, get_data/3, set_data/4, import/1, import/2, export/1]).
- 
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- -include("mod_irc.hrl").
- -include("ejabberd_sql_pt.hrl").
- 
-diff --git a/src/mod_last.erl b/src/mod_last.erl
-index e97ef43f..34498e26 100644
---- a/src/mod_last.erl
-+++ b/src/mod_last.erl
-@@ -40,7 +40,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("mod_privacy.hrl").
- -include("mod_last.hrl").
-diff --git a/src/mod_legacy_auth.erl b/src/mod_legacy_auth.erl
-index 722a0573..c6644386 100644
---- a/src/mod_legacy_auth.erl
-+++ b/src/mod_legacy_auth.erl
-@@ -29,7 +29,7 @@
- %% hooks
- -export([c2s_unauthenticated_packet/2, c2s_stream_features/2]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -type c2s_state() :: ejabberd_c2s:state().
- 
-diff --git a/src/mod_mam.erl b/src/mod_mam.erl
-index eb839ea1..abc461db 100644
---- a/src/mod_mam.erl
-+++ b/src/mod_mam.erl
-@@ -41,7 +41,7 @@
- 	 delete_old_messages/2, get_commands_spec/0, msg_to_el/4,
- 	 get_room_config/4, set_room_option/3, offline_message/1, export/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- -include("mod_muc_room.hrl").
- -include("ejabberd_commands.hrl").
-diff --git a/src/mod_mam_mnesia.erl b/src/mod_mam_mnesia.erl
-index 71f1f701..a3a7eb5f 100644
---- a/src/mod_mam_mnesia.erl
-+++ b/src/mod_mam_mnesia.erl
-@@ -31,7 +31,7 @@
- 	 extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6]).
- 
- -include_lib("stdlib/include/ms_transform.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- -include("mod_mam.hrl").
- 
-diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl
-index 40aa9836..b4fab39b 100644
---- a/src/mod_mam_sql.erl
-+++ b/src/mod_mam_sql.erl
-@@ -33,7 +33,7 @@
- 	 extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6, export/1]).
- 
- -include_lib("stdlib/include/ms_transform.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_mam.hrl").
- -include("logger.hrl").
- -include("ejabberd_sql_pt.hrl").
-diff --git a/src/mod_metrics.erl b/src/mod_metrics.erl
-index 73a68a8d..1b0d2e1b 100644
---- a/src/mod_metrics.erl
-+++ b/src/mod_metrics.erl
-@@ -30,7 +30,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -export([start/2, stop/1, mod_opt_type/1, depends/2, reload/3]).
- 
-diff --git a/src/mod_mix.erl b/src/mod_mix.erl
-index 90507665..627363f3 100644
---- a/src/mod_mix.erl
-+++ b/src/mod_mix.erl
-@@ -37,7 +37,7 @@
- 	 terminate/2, code_change/3]).
- 
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(NODES, [?NS_MIX_NODES_MESSAGES,
- 		?NS_MIX_NODES_PRESENCE,
-diff --git a/src/mod_muc.erl b/src/mod_muc.erl
-index f7d5303f..f01cde16 100644
---- a/src/mod_muc.erl
-+++ b/src/mod_muc.erl
-@@ -73,7 +73,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_muc.hrl").
- 
- -record(state,
-diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
-index e41f62b5..4d18d068 100644
---- a/src/mod_muc_admin.erl
-+++ b/src/mod_muc_admin.erl
-@@ -43,7 +43,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_muc.hrl").
- -include("mod_muc_room.hrl").
- -include("ejabberd_http.hrl").
-diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl
-index f2685aaa..abb55c42 100644
---- a/src/mod_muc_log.erl
-+++ b/src/mod_muc_log.erl
-@@ -44,7 +44,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_muc_room.hrl").
- 
- -define(T(Text), translate:translate(Lang, Text)).
-diff --git a/src/mod_muc_mnesia.erl b/src/mod_muc_mnesia.erl
-index aa59038c..7334aca4 100644
---- a/src/mod_muc_mnesia.erl
-+++ b/src/mod_muc_mnesia.erl
-@@ -44,7 +44,7 @@
- 
- -include("mod_muc.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include_lib("stdlib/include/ms_transform.hrl").
- 
- -record(state, {}).
-diff --git a/src/mod_muc_riak.erl b/src/mod_muc_riak.erl
-index 57d9666b..4ebd2949 100644
---- a/src/mod_muc_riak.erl
-+++ b/src/mod_muc_riak.erl
-@@ -38,7 +38,7 @@
- -export([set_affiliation/6, set_affiliations/4, get_affiliation/5,
- 	 get_affiliations/3, search_affiliation/4]).
- 
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- -include("mod_muc.hrl").
- 
- %%%===================================================================
-diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
-index bafa938d..d8b5e288 100644
---- a/src/mod_muc_room.erl
-+++ b/src/mod_muc_room.erl
-@@ -51,7 +51,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("mod_muc_room.hrl").
- 
-diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl
-index 8aa6071c..71d79b02 100644
---- a/src/mod_muc_sql.erl
-+++ b/src/mod_muc_sql.erl
-@@ -41,7 +41,7 @@
- -export([set_affiliation/6, set_affiliations/4, get_affiliation/5,
- 	 get_affiliations/3, search_affiliation/4]).
- 
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- -include("mod_muc.hrl").
- -include("logger.hrl").
- -include("ejabberd_sql_pt.hrl").
-diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl
-index 7b772521..7c1cab3b 100644
---- a/src/mod_multicast.erl
-+++ b/src/mod_multicast.erl
-@@ -45,7 +45,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -record(state,
- 	{lserver, lservice, access, service_limits}).
-diff --git a/src/mod_offline.erl b/src/mod_offline.erl
-index 5b95fe4b..8146ffdc 100644
---- a/src/mod_offline.erl
-+++ b/src/mod_offline.erl
-@@ -70,7 +70,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_http.hrl").
- 
-diff --git a/src/mod_offline_mnesia.erl b/src/mod_offline_mnesia.erl
-index a725ab00..126fd1bb 100644
---- a/src/mod_offline_mnesia.erl
-+++ b/src/mod_offline_mnesia.erl
-@@ -32,7 +32,7 @@
- 	 remove_all_messages/2, count_messages/2, import/1]).
- -export([need_transform/1, transform/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_offline.hrl").
- -include("logger.hrl").
- 
-diff --git a/src/mod_offline_riak.erl b/src/mod_offline_riak.erl
-index 5d0fd1af..607a78ba 100644
---- a/src/mod_offline_riak.erl
-+++ b/src/mod_offline_riak.erl
-@@ -31,7 +31,7 @@
- 	 read_message/3, remove_message/3, read_all_messages/2,
- 	 remove_all_messages/2, count_messages/2, import/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_offline.hrl").
- 
- %%%===================================================================
-diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl
-index 53a0d345..50fa83bc 100644
---- a/src/mod_offline_sql.erl
-+++ b/src/mod_offline_sql.erl
-@@ -33,7 +33,7 @@
- 	 read_message/3, remove_message/3, read_all_messages/2,
- 	 remove_all_messages/2, count_messages/2, import/1, export/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_offline.hrl").
- -include("logger.hrl").
- -include("ejabberd_sql_pt.hrl").
-diff --git a/src/mod_ping.erl b/src/mod_ping.erl
-index 02357181..7d51f4dc 100644
---- a/src/mod_ping.erl
-+++ b/src/mod_ping.erl
-@@ -36,7 +36,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(DEFAULT_SEND_PINGS, false).
- 
-diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl
-index 875aeef3..ffa95576 100644
---- a/src/mod_pres_counter.erl
-+++ b/src/mod_pres_counter.erl
-@@ -33,7 +33,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -record(pres_counter,
- 	{dir, start, count, logged = false}).
-diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl
-index 64ae9620..034a56e4 100644
---- a/src/mod_privacy.erl
-+++ b/src/mod_privacy.erl
-@@ -42,7 +42,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_privacy.hrl").
- 
- -define(PRIVACY_CACHE, privacy_cache).
-diff --git a/src/mod_privacy_mnesia.erl b/src/mod_privacy_mnesia.erl
-index 7449262b..201b92ec 100644
---- a/src/mod_privacy_mnesia.erl
-+++ b/src/mod_privacy_mnesia.erl
-@@ -32,7 +32,7 @@
- 	 remove_list/3, use_cache/1, import/1]).
- -export([need_transform/1, transform/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_privacy.hrl").
- -include("logger.hrl").
- 
-diff --git a/src/mod_privacy_riak.erl b/src/mod_privacy_riak.erl
-index 0cd39c11..88f294f8 100644
---- a/src/mod_privacy_riak.erl
-+++ b/src/mod_privacy_riak.erl
-@@ -33,7 +33,7 @@
- 
- -export([privacy_schema/0]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_privacy.hrl").
- 
- %%%===================================================================
-diff --git a/src/mod_privacy_sql.erl b/src/mod_privacy_sql.erl
-index 7939cbb2..6141feda 100644
---- a/src/mod_privacy_sql.erl
-+++ b/src/mod_privacy_sql.erl
-@@ -35,7 +35,7 @@
- 
- -export([item_to_raw/1, raw_to_item/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_privacy.hrl").
- -include("logger.hrl").
- -include("ejabberd_sql_pt.hrl").
-diff --git a/src/mod_private.erl b/src/mod_private.erl
-index cb167468..0b84d071 100644
---- a/src/mod_private.erl
-+++ b/src/mod_private.erl
-@@ -37,7 +37,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_private.hrl").
- 
- -define(PRIVATE_CACHE, private_cache).
-diff --git a/src/mod_private_mnesia.erl b/src/mod_private_mnesia.erl
-index 04c1a04a..6a9dee68 100644
---- a/src/mod_private_mnesia.erl
-+++ b/src/mod_private_mnesia.erl
-@@ -31,7 +31,7 @@
- 	 use_cache/1, import/3]).
- -export([need_transform/1, transform/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_private.hrl").
- -include("logger.hrl").
- 
-diff --git a/src/mod_private_riak.erl b/src/mod_private_riak.erl
-index be175f07..f97c2dd8 100644
---- a/src/mod_private_riak.erl
-+++ b/src/mod_private_riak.erl
-@@ -30,7 +30,7 @@
- -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
- 	 import/3]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_private.hrl").
- 
- %%%===================================================================
-diff --git a/src/mod_private_sql.erl b/src/mod_private_sql.erl
-index 5ed584c3..da4974ce 100644
---- a/src/mod_private_sql.erl
-+++ b/src/mod_private_sql.erl
-@@ -30,7 +30,7 @@
- -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
- 	 import/3, export/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_private.hrl").
- -include("ejabberd_sql_pt.hrl").
- -include("logger.hrl").
-diff --git a/src/mod_privilege.erl b/src/mod_privilege.erl
-index dab7a619..695c8acf 100644
---- a/src/mod_privilege.erl
-+++ b/src/mod_privilege.erl
-@@ -41,7 +41,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -record(state, {server_host = <<"">> :: binary(),
- 		permissions = dict:new() :: ?TDICT}).
-diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl
-index fb34ba55..f42aa461 100644
---- a/src/mod_proxy65_service.erl
-+++ b/src/mod_proxy65_service.erl
-@@ -39,7 +39,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(PROCNAME, ejabberd_mod_proxy65_service).
- 
-diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
-index d2e1f6c5..b7cd6644 100644
---- a/src/mod_pubsub.erl
-+++ b/src/mod_pubsub.erl
-@@ -41,7 +41,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("pubsub.hrl").
- -include("mod_roster.hrl").
- 
-diff --git a/src/mod_push.erl b/src/mod_push.erl
-index 1eaec6ad..ac4ed89e 100644
---- a/src/mod_push.erl
-+++ b/src/mod_push.erl
-@@ -52,7 +52,7 @@
- -include("ejabberd.hrl").
- -include("ejabberd_commands.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(PUSH_CACHE, push_cache).
- 
-diff --git a/src/mod_push_keepalive.erl b/src/mod_push_keepalive.erl
-index bcdc0c25..d979eaec 100644
---- a/src/mod_push_keepalive.erl
-+++ b/src/mod_push_keepalive.erl
-@@ -36,7 +36,7 @@
- 	 c2s_handle_cast/2, c2s_handle_info/2, c2s_stanza/3]).
- 
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(PUSH_BEFORE_TIMEOUT_SECS, 120).
- 
-diff --git a/src/mod_push_mnesia.erl b/src/mod_push_mnesia.erl
-index ff12150f..866b5630 100644
---- a/src/mod_push_mnesia.erl
-+++ b/src/mod_push_mnesia.erl
-@@ -35,7 +35,7 @@
- 
- -include_lib("stdlib/include/ms_transform.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_push.hrl").
- 
- %%%-------------------------------------------------------------------
-diff --git a/src/mod_push_sql.erl b/src/mod_push_sql.erl
-index c82d9fc0..79fedba4 100644
---- a/src/mod_push_sql.erl
-+++ b/src/mod_push_sql.erl
-@@ -32,7 +32,7 @@
- 	 lookup_sessions/3, lookup_sessions/2, lookup_sessions/1,
- 	 delete_session/3, delete_old_sessions/2, export/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- -include("ejabberd_sql_pt.hrl").
- -include("mod_push.hrl").
-diff --git a/src/mod_register.erl b/src/mod_register.erl
-index 77557ee0..8ad27fcf 100644
---- a/src/mod_register.erl
-+++ b/src/mod_register.erl
-@@ -41,7 +41,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- start(Host, Opts) ->
-     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
-diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl
-index b7bc2edc..a7bb83f5 100644
---- a/src/mod_register_web.erl
-+++ b/src/mod_register_web.erl
-@@ -60,7 +60,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("ejabberd_http.hrl").
- 
-diff --git a/src/mod_roster.erl b/src/mod_roster.erl
-index a86b50d9..57f5fdce 100644
---- a/src/mod_roster.erl
-+++ b/src/mod_roster.erl
-@@ -54,7 +54,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("mod_roster.hrl").
- 
-diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl
-index b4c2ed9d..645ab37f 100644
---- a/src/mod_s2s_dialback.erl
-+++ b/src/mod_s2s_dialback.erl
-@@ -33,7 +33,7 @@
- 	 s2s_in_features/2, s2s_out_init/2, s2s_out_closed/2]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- 
- %%%===================================================================
-diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl
-index 1c6e5fe8..c295aa45 100644
---- a/src/mod_service_log.erl
-+++ b/src/mod_service_log.erl
-@@ -35,7 +35,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- start(Host, _Opts) ->
-     ejabberd_hooks:add(user_send_packet, Host, ?MODULE,
-diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
-index 5f95266b..db641dbb 100644
---- a/src/mod_shared_roster.erl
-+++ b/src/mod_shared_roster.erl
-@@ -44,7 +44,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -include("mod_roster.hrl").
- 
-diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl
-index 66cbebd9..4b431fc4 100644
---- a/src/mod_shared_roster_ldap.erl
-+++ b/src/mod_shared_roster_ldap.erl
-@@ -46,7 +46,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_roster.hrl").
- -include("eldap.hrl").
- 
-diff --git a/src/mod_shared_roster_mnesia.erl b/src/mod_shared_roster_mnesia.erl
-index adfbac68..bdd87030 100644
---- a/src/mod_shared_roster_mnesia.erl
-+++ b/src/mod_shared_roster_mnesia.erl
-@@ -37,7 +37,7 @@
- -include("mod_roster.hrl").
- -include("mod_shared_roster.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- %%%===================================================================
- %%% API
-diff --git a/src/mod_shared_roster_riak.erl b/src/mod_shared_roster_riak.erl
-index 441aafd0..d5545eb1 100644
---- a/src/mod_shared_roster_riak.erl
-+++ b/src/mod_shared_roster_riak.erl
-@@ -35,7 +35,7 @@
- 
- -include("mod_roster.hrl").
- -include("mod_shared_roster.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- %%%===================================================================
- %%% API
-diff --git a/src/mod_shared_roster_sql.erl b/src/mod_shared_roster_sql.erl
-index 488e0ec7..f952347a 100644
---- a/src/mod_shared_roster_sql.erl
-+++ b/src/mod_shared_roster_sql.erl
-@@ -36,7 +36,7 @@
- 	 add_user_to_group/3, remove_user_from_group/3, import/3,
- 	 export/1]).
- 
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- -include("mod_roster.hrl").
- -include("mod_shared_roster.hrl").
- -include("ejabberd_sql_pt.hrl").
-diff --git a/src/mod_sic.erl b/src/mod_sic.erl
-index a2b3256e..da61b2c2 100644
---- a/src/mod_sic.erl
-+++ b/src/mod_sic.erl
-@@ -36,7 +36,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- start(Host, Opts) ->
-     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
-diff --git a/src/mod_sip.erl b/src/mod_sip.erl
-index 01327c77..70159d17 100644
---- a/src/mod_sip.erl
-+++ b/src/mod_sip.erl
-@@ -52,7 +52,7 @@ mod_opt_type(_) ->
- 	 locate/1, mod_opt_type/1, depends/2]).
- 
- -include("ejabberd.hrl").
---include_lib("esip/include/esip.hrl").
-+-include_lib("s1_sip/include/esip.hrl").
- 
- %%%===================================================================
- %%% API
-diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl
-index d600da3d..c3dfe874 100644
---- a/src/mod_sip_proxy.erl
-+++ b/src/mod_sip_proxy.erl
-@@ -40,7 +40,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include_lib("esip/include/esip.hrl").
-+-include_lib("s1_sip/include/esip.hrl").
- 
- -define(SIGN_LIFETIME, 300). %% in seconds.
- 
-diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl
-index a47de697..f89d3cab 100644
---- a/src/mod_sip_registrar.erl
-+++ b/src/mod_sip_registrar.erl
-@@ -42,7 +42,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include_lib("esip/include/esip.hrl").
-+-include_lib("s1_sip/include/esip.hrl").
- 
- -define(CALL_TIMEOUT, timer:seconds(30)).
- -define(DEFAULT_EXPIRES, 3600).
-diff --git a/src/mod_stats.erl b/src/mod_stats.erl
-index 2bdbdbd3..2969fbd2 100644
---- a/src/mod_stats.erl
-+++ b/src/mod_stats.erl
-@@ -35,7 +35,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- start(Host, Opts) ->
-     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
-diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl
-index 658bd504..46b00993 100644
---- a/src/mod_stream_mgmt.erl
-+++ b/src/mod_stream_mgmt.erl
-@@ -37,7 +37,7 @@
- -export([get_resume_timeout/1, set_resume_timeout/2]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- -include("p1_queue.hrl").
- 
-diff --git a/src/mod_time.erl b/src/mod_time.erl
-index c54f3d27..20321d36 100644
---- a/src/mod_time.erl
-+++ b/src/mod_time.erl
-@@ -38,7 +38,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- start(Host, Opts) ->
-     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
-diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl
-index 378b9430..10618c96 100644
---- a/src/mod_vcard.erl
-+++ b/src/mod_vcard.erl
-@@ -44,7 +44,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_vcard.hrl").
- 
- -define(JUD_MATCHES, 30).
-diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
-index 88621fc0..e2c741c5 100644
---- a/src/mod_vcard_ldap.erl
-+++ b/src/mod_vcard_ldap.erl
-@@ -41,7 +41,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- -include("eldap.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("translate.hrl").
- 
- -define(PROCNAME, ejabberd_mod_vcard_ldap).
-diff --git a/src/mod_vcard_mnesia.erl b/src/mod_vcard_mnesia.erl
-index 3e742ec1..6e9e0e50 100644
---- a/src/mod_vcard_mnesia.erl
-+++ b/src/mod_vcard_mnesia.erl
-@@ -33,7 +33,7 @@
- -export([need_transform/1, transform/1]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_vcard.hrl").
- -include("logger.hrl").
- -include("translate.hrl").
-diff --git a/src/mod_vcard_riak.erl b/src/mod_vcard_riak.erl
-index e5ad1b3d..5427ec7f 100644
---- a/src/mod_vcard_riak.erl
-+++ b/src/mod_vcard_riak.erl
-@@ -31,7 +31,7 @@
- 	 search_fields/1, search_reported/1, import/3, stop/1]).
- -export([is_search_supported/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_vcard.hrl").
- 
- %%%===================================================================
-diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl
-index 07d90b69..1dc5d40f 100644
---- a/src/mod_vcard_sql.erl
-+++ b/src/mod_vcard_sql.erl
-@@ -33,7 +33,7 @@
- 	 search_fields/1, search_reported/1, import/3, export/1]).
- -export([is_search_supported/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("mod_vcard.hrl").
- -include("logger.hrl").
- -include("ejabberd_sql_pt.hrl").
-diff --git a/src/mod_vcard_xupdate.erl b/src/mod_vcard_xupdate.erl
-index 7643fed4..19148654 100644
---- a/src/mod_vcard_xupdate.erl
-+++ b/src/mod_vcard_xupdate.erl
-@@ -35,7 +35,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(VCARD_XUPDATE_CACHE, vcard_xupdate_cache).
- 
-diff --git a/src/mod_version.erl b/src/mod_version.erl
-index 5f613e02..23ac02cd 100644
---- a/src/mod_version.erl
-+++ b/src/mod_version.erl
-@@ -37,7 +37,7 @@
- -include("ejabberd.hrl").
- -include("logger.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- start(Host, Opts) ->
-     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
-diff --git a/src/node_dag.erl b/src/node_dag.erl
-index 9829c27c..5f399357 100644
---- a/src/node_dag.erl
-+++ b/src/node_dag.erl
-@@ -28,7 +28,7 @@
- -author('bjc@kublai.com').
- 
- -include("pubsub.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -export([init/3, terminate/2, options/0, features/0,
-     create_node_permission/6, create_node/2, delete_node/1,
-diff --git a/src/node_dispatch.erl b/src/node_dispatch.erl
-index 92a655b8..00eb55d9 100644
---- a/src/node_dispatch.erl
-+++ b/src/node_dispatch.erl
-@@ -34,7 +34,7 @@
- -author('christophe.romain@process-one.net').
- 
- -include("pubsub.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -export([init/3, terminate/2, options/0, features/0,
-     create_node_permission/6, create_node/2, delete_node/1,
-diff --git a/src/node_flat.erl b/src/node_flat.erl
-index bc529e14..571b1b16 100644
---- a/src/node_flat.erl
-+++ b/src/node_flat.erl
-@@ -34,7 +34,7 @@
- -author('christophe.romain@process-one.net').
- 
- -include("pubsub.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -export([init/3, terminate/2, options/0, features/0,
-     create_node_permission/6, create_node/2, delete_node/1,
-diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl
-index afbc050a..ae279c4c 100644
---- a/src/node_flat_sql.erl
-+++ b/src/node_flat_sql.erl
-@@ -36,7 +36,7 @@
- -compile([{parse_transform, ejabberd_sql_pt}]).
- 
- -include("pubsub.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("ejabberd_sql_pt.hrl").
- 
- -export([init/3, terminate/2, options/0, features/0,
-diff --git a/src/node_online.erl b/src/node_online.erl
-index 39b08d99..ce71fdb0 100644
---- a/src/node_online.erl
-+++ b/src/node_online.erl
-@@ -28,7 +28,7 @@
- -author('christophe.romain@process-one.net').
- 
- -include("pubsub.hrl").
---include("jid.hrl").
-+-include_lib("p1_xmpp/include/jid.hrl").
- 
- -export([init/3, terminate/2, options/0, features/0,
-     create_node_permission/6, create_node/2, delete_node/1,
-diff --git a/src/nodetree_dag.erl b/src/nodetree_dag.erl
-index a44e7155..0c5609c4 100644
---- a/src/nodetree_dag.erl
-+++ b/src/nodetree_dag.erl
-@@ -30,7 +30,7 @@
- -include_lib("stdlib/include/qlc.hrl").
- 
- -include("pubsub.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -export([init/3, terminate/2, options/0, set_node/1,
-     get_node/3, get_node/2, get_node/1, get_nodes/2,
-diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl
-index 31724036..0fe1f5e0 100644
---- a/src/nodetree_tree.erl
-+++ b/src/nodetree_tree.erl
-@@ -40,7 +40,7 @@
- -include_lib("stdlib/include/qlc.hrl").
- 
- -include("pubsub.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -export([init/3, terminate/2, options/0, set_node/1,
-     get_node/3, get_node/2, get_node/1, get_nodes/2,
-diff --git a/src/nodetree_tree_sql.erl b/src/nodetree_tree_sql.erl
-index b310dd2d..19ff1786 100644
---- a/src/nodetree_tree_sql.erl
-+++ b/src/nodetree_tree_sql.erl
-@@ -40,7 +40,7 @@
- -compile([{parse_transform, ejabberd_sql_pt}]).
- 
- -include("pubsub.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("ejabberd_sql_pt.hrl").
- 
- -export([init/3, terminate/2, options/0, set_node/1,
-diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl
-index 2c7dabb4..b6ba864c 100644
---- a/src/prosody2ejabberd.erl
-+++ b/src/prosody2ejabberd.erl
-@@ -28,7 +28,7 @@
- -export([from_dir/1]).
- 
- -include("ejabberd.hrl").
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include("logger.hrl").
- -include("mod_roster.hrl").
- -include("mod_offline.hrl").
-diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl
-index 746e39e3..59ee734b 100644
---- a/src/pubsub_subscription.erl
-+++ b/src/pubsub_subscription.erl
-@@ -39,7 +39,7 @@
- 
- -include("pubsub.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
- -define(PUBSUB_DIGEST, <<"pubsub#digest">>).
-diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl
-index 3315748c..5700c100 100644
---- a/src/pubsub_subscription_sql.erl
-+++ b/src/pubsub_subscription_sql.erl
-@@ -35,7 +35,7 @@
- 
- -include("pubsub.hrl").
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- 
- -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
- -define(PUBSUB_DIGEST, <<"pubsub#digest">>).
-diff --git a/src/xmpp_stream_in.erl b/src/xmpp_stream_in.erl
-index 329ebad6..4ce8760c 100644
---- a/src/xmpp_stream_in.erl
-+++ b/src/xmpp_stream_in.erl
-@@ -42,7 +42,7 @@
- -define(FSMOPTS, []).
- -endif.
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -type state() :: map().
- -type stop_reason() :: {stream, reset | {in | out, stream_error()}} |
- 		       {tls, inet:posix() | atom() | binary()} |
-diff --git a/src/xmpp_stream_out.erl b/src/xmpp_stream_out.erl
-index 7ddc183b..8095bd86 100644
---- a/src/xmpp_stream_out.erl
-+++ b/src/xmpp_stream_out.erl
-@@ -44,7 +44,7 @@
- 
- -define(TCP_SEND_TIMEOUT, 15000).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include_lib("kernel/include/inet.hrl").
- 
- -type state() :: map().
-diff --git a/src/xmpp_stream_pkix.erl b/src/xmpp_stream_pkix.erl
-index 8361999f..a6fe728c 100644
---- a/src/xmpp_stream_pkix.erl
-+++ b/src/xmpp_stream_pkix.erl
-@@ -24,7 +24,7 @@
- %% API
- -export([authenticate/1, authenticate/2, get_cert_domains/1, format_error/1]).
- 
---include("xmpp.hrl").
-+-include_lib("p1_xmpp/include/xmpp.hrl").
- -include_lib("public_key/include/public_key.hrl").
- -include("XmppAddr.hrl").
- 
--- 
-2.14.1
-
diff --git a/buildroot/package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch b/buildroot/package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch
deleted file mode 100644
index 09b356219..000000000
--- a/buildroot/package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d43a65b112ec995a5ee52aca2a16e5cf9699d7c1 Mon Sep 17 00:00:00 2001
-From: Johan Oudinet 
-Date: Wed, 20 Jan 2016 08:16:26 -0500
-Subject: [PATCH] disable ERLANG_DEPRECATED_CHECK
-
-Without this patch, the configure will try to execute erlang to check
-if it uses deprecated types. Assume the answer is false.
-
-Signed-off-by: Johan Oudinet 
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cd1ab08..a4f1533 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -235,7 +235,7 @@ if test "$ENABLEUSER" != ""; then
-   AC_SUBST([INSTALLUSER], [$ENABLEUSER])
- fi
- 
--ERLANG_DEPRECATED_TYPES_CHECK
-+AC_SUBST(erlang_deprecated_types, false)
- 
- if test "$sqlite" = "true"; then
-    AX_LIB_SQLITE3([3.6.19])
--- 
-2.5.0
-
diff --git a/buildroot/package/ejabberd/0006-fix-install-permissions.patch b/buildroot/package/ejabberd/0006-fix-install-permissions.patch
deleted file mode 100644
index 9a0073f5c..000000000
--- a/buildroot/package/ejabberd/0006-fix-install-permissions.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From ef847479778cc58818e066b87aa1789ba1c4148b Mon Sep 17 00:00:00 2001
-From: Johan Oudinet 
-Date: Wed, 20 Jan 2016 09:34:07 -0500
-Subject: [PATCH] fix install permissions
-
-Without this patch, the makefile will try to install directories and
-files with incompatible permissions for ejabberd, which run as an
-ejabberd user.
-
-Signed-off-by: Frank Hunleth 
-
-diff --git a/Makefile.in b/Makefile.in
-index a0b4553d..2cae2db4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -169,10 +169,8 @@ copy-files-sub: copy-files-sub2
- install: all copy-files
- 	#
- 	# Configuration files
--	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
--	[ -f $(ETCDIR)/ejabberd.yml ] \
--		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
--		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
-+	$(INSTALL) -d $(ETCDIR)
-+	$(INSTALL) -b -m 644 ejabberd.yml.example $(ETCDIR)/ejabberd.yml
- 	$(SED) -e "s*{{rootdir}}*@prefix@*g" \
- 		-e "s*{{installuser}}*@INSTALLUSER@*g" \
- 		-e "s*{{bindir}}*@bindir@*g" \
-@@ -183,53 +181,16 @@ install: all copy-files
- 		-e "s*{{erl}}*@ERL@*g" \
- 		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
- 		> ejabberdctl.example
--	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
--		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
--		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
--	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
-+	$(INSTALL) -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
-+	$(INSTALL) -b -m 644 inetrc $(ETCDIR)/inetrc
- 	#
- 	# Administration script
--	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
--	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
-+	$(INSTALL) -D ejabberdctl.example $(SBINDIR)/ejabberdctl
- 	# Elixir binaries
- 	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
- 	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
- 	[ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir || true
- 	[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
--	#
--	# Init script
--	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
--		-e "s*@installuser@*$(INIT_USER)*g" ejabberd.init.template \
--		> ejabberd.init
--	chmod 755 ejabberd.init
--	#
--	# Service script
--	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
--		> ejabberd.service
--	chmod 644 ejabberd.service
--	#
--	# Spool directory
--	$(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR)
--	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
--	chmod -R 750 $(SPOOLDIR)
--	[ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; }
--	#
--	# ejabberdctl lock directory
--	$(INSTALL) -d -m 750 $(O_USER) $(CTLLOCKDIR)
--	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
--	chmod -R 750 $(CTLLOCKDIR)
--	#
--	# Log directory
--	$(INSTALL) -d -m 750 $(O_USER) $(LOGDIR)
--	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
--	chmod -R 750 $(LOGDIR)
--	#
--	# Documentation
--	$(INSTALL) -d $(DOCDIR)
--	[ -f doc/guide.html ] \
--		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
--		|| echo "Documentation not included in sources"
--	$(INSTALL) -m 644 COPYING $(DOCDIR)
-
- uninstall: uninstall-binary
diff --git a/buildroot/package/ejabberd/0008-handle-error-case-from-lib_dir.patch b/buildroot/package/ejabberd/0008-handle-error-case-from-lib_dir.patch
deleted file mode 100644
index f7931b4ed..000000000
--- a/buildroot/package/ejabberd/0008-handle-error-case-from-lib_dir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d0bfcbbfd8a6e7ee6213112e4078b020e4e1d15d Mon Sep 17 00:00:00 2001
-From: Paweł Chmielowski 
-Date: Wed, 10 Jan 2018 16:34:01 +0100
-Subject: [PATCH] Handle error case from code:lib_dir in ResolveDepPath in
- rebar.config.script
-
-This patch have already been applied in upstream/master.
-
-Signed-off-by: Paweł Chmielowski 
-
----
- rebar.config.script | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/rebar.config.script b/rebar.config.script
-index 85f918fffd..ba374e5c5f 100644
---- a/rebar.config.script
-+++ b/rebar.config.script
-@@ -233,9 +233,10 @@ ResolveDepPath = case {SystemDeps, IsRebar3} of
- 		     {true, _} ->
- 			 fun("deps/" ++ Rest) ->
- 				 Slash = string:str(Rest, "/"),
--				 code:lib_dir(
--				   string:sub_string(Rest, 1, Slash -1)) ++
--				     string:sub_string(Rest, Slash);
-+				 case code:lib_dir(string:sub_string(Rest, 1, Slash -1)) of
-+				     {error, _} -> Rest;
-+				     V -> V ++ string:sub_string(Rest, Slash)
-+				 end;
- 			    (Path) ->
- 				 Path
- 			 end;
diff --git a/buildroot/package/ejabberd/0009-disable-mod_avatar.patch b/buildroot/package/ejabberd/0009-disable-mod_avatar.patch
deleted file mode 100644
index ab89ba1a2..000000000
--- a/buildroot/package/ejabberd/0009-disable-mod_avatar.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e6eac74e82975e7d87b1f59c50eb007ab04c1392 Mon Sep 17 00:00:00 2001
-From: Johan Oudinet 
-Date: Tue, 16 Jan 2018 14:29:56 +0100
-Subject: [PATCH] disable mod_avatar
-
-This module requires to compile with graphics enabled.
-
-Signed-off-by: Johan Oudinet 
----
- ejabberd.yml.example | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ejabberd.yml.example b/ejabberd.yml.example
-index e178e956..7c12b76c 100644
---- a/ejabberd.yml.example
-+++ b/ejabberd.yml.example
-@@ -796,9 +796,9 @@ modules:
-     search: false
-   mod_vcard_xupdate: {}
-   ## Convert all avatars posted by Android clients from WebP to JPEG
--  mod_avatar:
--    convert:
--      webp: jpeg
-+  ## mod_avatar:
-+  ##   convert:
-+  ##     webp: jpeg
-   mod_version: {}
-   mod_stream_mgmt: {}
-   ##   Non-SASL Authentication (XEP-0078) is now disabled by default
--- 
-2.14.1
-
diff --git a/buildroot/package/ejabberd/Config.in b/buildroot/package/ejabberd/Config.in
index a7542cd12..7d51d1de9 100644
--- a/buildroot/package/ejabberd/Config.in
+++ b/buildroot/package/ejabberd/Config.in
@@ -2,11 +2,12 @@ config BR2_PACKAGE_EJABBERD
 	bool "ejabberd"
 	depends on BR2_PACKAGE_ERLANG
 	depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep
-	select BR2_PACKAGE_ERLANG_JIFFY
+	select BR2_PACKAGE_ERLANG_EIMP
+	select BR2_PACKAGE_ERLANG_JIFFY # runtime
 	select BR2_PACKAGE_ERLANG_LAGER
 	select BR2_PACKAGE_ERLANG_P1_CACHE_TAB
 	select BR2_PACKAGE_ERLANG_P1_ICONV
-	select BR2_PACKAGE_ERLANG_P1_OAUTH2
+	select BR2_PACKAGE_ERLANG_P1_OAUTH2 # runtime
 	select BR2_PACKAGE_ERLANG_P1_SIP
 	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
 	select BR2_PACKAGE_ERLANG_P1_STUN
diff --git a/buildroot/package/ejabberd/ejabberd.hash b/buildroot/package/ejabberd/ejabberd.hash
index 6fb90a230..aed269cb8 100644
--- a/buildroot/package/ejabberd/ejabberd.hash
+++ b/buildroot/package/ejabberd/ejabberd.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 bd16b33a2f1345e5847fd05b70a5fa992181bac756cd6d5d621de9c18cb76801 ejabberd-17.11.tgz
+sha256 781a68d2deefb4afae563c29a8955063c759c244d308251167d46185f145d4ff ejabberd-18.09.tgz
diff --git a/buildroot/package/ejabberd/ejabberd.mk b/buildroot/package/ejabberd/ejabberd.mk
index acd52e5b3..6982375cf 100644
--- a/buildroot/package/ejabberd/ejabberd.mk
+++ b/buildroot/package/ejabberd/ejabberd.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-EJABBERD_VERSION = 17.11
+EJABBERD_VERSION = 18.09
 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz
 EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION)
 EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception
 EJABBERD_LICENSE_FILES = COPYING
-EJABBERD_DEPENDENCIES = getent openssl host-erlang-lager erlang-lager \
+EJABBERD_DEPENDENCIES = getent openssl erlang-eimp \
+	host-erlang-lager erlang-lager \
 	erlang-p1-cache-tab erlang-p1-iconv erlang-p1-sip \
 	erlang-p1-stringprep erlang-p1-stun erlang-p1-tls \
 	erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \
@@ -35,8 +36,7 @@ EJABBERD_CONF_ENV = \
 
 EJABBERD_CONF_OPTS = \
 	--enable-system-deps \
-	--disable-erlang-version-check \
-	--disable-graphics
+	--disable-erlang-version-check
 
 define EJABBERD_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) install -C $(@D)
@@ -54,6 +54,11 @@ define EJABBERD_USERS
 	ejabberd -1 ejabberd -1 * /var/lib/ejabberd /bin/sh - ejabberd daemon
 endef
 
+define EJABBERD_PERMISSIONS
+	/etc/ejabberd r 750 root ejabberd - - - - -
+	/usr/sbin/ejabberdctl f 750 root ejabberd - - - - -
+endef
+
 define EJABBERD_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/ejabberd/S50ejabberd \
 		$(TARGET_DIR)/etc/init.d/S50ejabberd
diff --git a/buildroot/package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch b/buildroot/package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch
deleted file mode 100644
index a1d252b42..000000000
--- a/buildroot/package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From abff9db9a6e86e00613a420dd6a0ba3bc81e2b72 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer 
-Date: Fri, 2 Nov 2018 12:58:57 +0100
-Subject: [PATCH] ell/signal.h: use standard sigset_t, fixes musl compile
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use standard sigset_t (instead __sigset_t):
-
-- fixes musl compile
-- fies mismatch between header and implementation file
-
-Fixes:
-
-  In file included from ell/main.c:35:0:
-  ell/signal.h:39:40: error: unknown type name ‘__sigset_t’
-   struct l_signal *l_signal_create(const __sigset_t *mask,
-                                          ^~~~~~~~~~
-  In file included from ell/signal.c:35:0:
-  ell/signal.h:39:40: error: unknown type name ‘__sigset_t’
-   struct l_signal *l_signal_create(const __sigset_t *mask,
-                                          ^~~~~~~~~~
-  ell/signal.c:153:29: error: conflicting types for ‘l_signal_create’
-   LIB_EXPORT struct l_signal *l_signal_create(const sigset_t *mask,
-                               ^~~~~~~~~~~~~~~
-  In file included from ell/signal.c:35:0:
-  ell/signal.h:39:18: note: previous declaration of ‘l_signal_create’ was here
-   struct l_signal *l_signal_create(const __sigset_t *mask,
-                    ^~~~~~~~~~~~~~~
-
-Reverts upstream commit [1], superseeded in the next version by [2].
-
-[1] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=7af8e3ba0ed522897f5a87e6c8f2980f82ff5012
-[2] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=4a386a10d88ff52097a974167ab889b3fc2add70
-
-Signed-off-by: Peter Seiderer 
----
- ell/signal.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ell/signal.h b/ell/signal.h
-index 0d4fdc8..98cf0fa 100644
---- a/ell/signal.h
-+++ b/ell/signal.h
-@@ -36,7 +36,7 @@ typedef void (*l_signal_notify_cb_t) (struct l_signal *signal,
- 					uint32_t signo, void *user_data);
- typedef void (*l_signal_destroy_cb_t) (void *user_data);
- 
--struct l_signal *l_signal_create(const __sigset_t *mask,
-+struct l_signal *l_signal_create(const sigset_t *mask,
- 			l_signal_notify_cb_t callback,
- 			void *user_data, l_signal_destroy_cb_t destroy);
- void l_signal_remove(struct l_signal *signal);
--- 
-2.19.1
-
diff --git a/buildroot/package/ell/ell.hash b/buildroot/package/ell/ell.hash
index c6b23baec..dd6e90f3f 100644
--- a/buildroot/package/ell/ell.hash
+++ b/buildroot/package/ell/ell.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256 8e629347d49d30418e215ccf80f05eb6ff617f752396f93287ed723169aec006 ell-0.13.tar.gz
+sha256 bb7038340bfa4eed57700a42da235ba2efce19fe7ab6b976af3e69ee9597a4dd ell-0.16.tar.gz
 
 # License files
 sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
diff --git a/buildroot/package/ell/ell.mk b/buildroot/package/ell/ell.mk
index 8ea95a6d7..9f610e7d2 100644
--- a/buildroot/package/ell/ell.mk
+++ b/buildroot/package/ell/ell.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ELL_VERSION = 0.13
+ELL_VERSION = 0.16
 ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git
 ELL_SITE_METHOD = git
 ELL_LICENSE = LGPL-2.1+
diff --git a/buildroot/package/enlightenment/enlightenment.hash b/buildroot/package/enlightenment/enlightenment.hash
index 7a6d3ff8f..4872676be 100644
--- a/buildroot/package/enlightenment/enlightenment.hash
+++ b/buildroot/package/enlightenment/enlightenment.hash
@@ -1,3 +1,3 @@
-# From https://www.enlightenment.org/news/e0.22.3_release
-sha256	4d81e583073d74474b7a960b01cb596716a43cca2fadca7d1e5c91f4cf6efe9b	enlightenment-0.22.3.tar.xz
+# From https://www.enlightenment.org/news/e0.22.4_release
+sha256	59f4997c8b59457142870e40f137bc08c9735c84368d32213dacf09c4342fe79	enlightenment-0.22.4.tar.xz
 sha256	34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350	COPYING
diff --git a/buildroot/package/enlightenment/enlightenment.mk b/buildroot/package/enlightenment/enlightenment.mk
index 5bc1c5d6d..f0f9834c8 100644
--- a/buildroot/package/enlightenment/enlightenment.mk
+++ b/buildroot/package/enlightenment/enlightenment.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ENLIGHTENMENT_VERSION = 0.22.3
+ENLIGHTENMENT_VERSION = 0.22.4
 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
 ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
 ENLIGHTENMENT_LICENSE = BSD-2-Clause
diff --git a/buildroot/package/erlang-eimp/Config.in b/buildroot/package/erlang-eimp/Config.in
new file mode 100644
index 000000000..5c207e9c2
--- /dev/null
+++ b/buildroot/package/erlang-eimp/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_ERLANG_EIMP
+	bool "erlang-eimp"
+	select BR2_PACKAGE_ERLANG_P1_UTILS
+	select BR2_PACKAGE_GD
+	select BR2_PACKAGE_GD_WEBPNG
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_WEBP
+	help
+	  Erlang Image Manipulation Process
+
+	  https://github.com/processone/eimp
diff --git a/buildroot/package/erlang-eimp/erlang-eimp.mk b/buildroot/package/erlang-eimp/erlang-eimp.mk
new file mode 100644
index 000000000..83d34cd5e
--- /dev/null
+++ b/buildroot/package/erlang-eimp/erlang-eimp.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# erlang-eimp
+#
+################################################################################
+
+ERLANG_EIMP_VERSION = 1.0.8
+ERLANG_EIMP_SITE = $(call github,processone,eimp,$(ERLANG_EIMP_VERSION))
+ERLANG_EIMP_LICENSE = Apache-2.0
+ERLANG_EIMP_LICENSE_FILES = LICENSE.txt
+ERLANG_EIMP_DEPENDENCIES = erlang-p1-utils gd jpeg libpng webp
+
+$(eval $(rebar-package))
diff --git a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
index 9425bcda8..841410292 100644
--- a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
+++ b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 5ef27d3be0ef2e8dc06468ec39dc3a43506d6f85af0edc21b9c14db860669d38 erlang-p1-cache-tab-1.0.12.tar.gz
+sha256 169c3ca82b99c482e5914b616d594fed25cf34a4c995e37bfe1651d70bbaea55 erlang-p1-cache-tab-1.0.16.tar.gz
diff --git a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
index ae96103ea..a25f0a1e6 100644
--- a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
+++ b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_CACHE_TAB_VERSION = 1.0.12
+ERLANG_P1_CACHE_TAB_VERSION = 1.0.16
 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION))
 ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0
 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash b/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash
index 0f0a23161..31bcf4073 100644
--- a/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash
+++ b/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 c7214ea7503c3de1edf3bdd72b37187aa3a9a36d7cf7f5945a067ae8d262d3fb erlang-p1-iconv-1.0.6.tar.gz
+sha256 8a9ff8a3dd983284caa964f118b5782ef1c0c662995608b2ca4f4a5f285605a9 erlang-p1-iconv-1.0.10.tar.gz
diff --git a/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk b/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk
index 6b22431cc..79d8efe16 100644
--- a/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk
+++ b/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_ICONV_VERSION = 1.0.6
+ERLANG_P1_ICONV_VERSION = 1.0.10
 ERLANG_P1_ICONV_SITE = $(call github,processone,iconv,$(ERLANG_P1_ICONV_VERSION))
 ERLANG_P1_ICONV_LICENSE = Apache-2.0
 ERLANG_P1_ICONV_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
index 29fae1263..58756c6fd 100644
--- a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
+++ b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 aea823ccc49b20f7e27f1893c7edf231339f56b16ba21ce78a60f735b6211718 erlang-p1-oauth2-0.6.2.tar.gz
+sha256 d7d954376ae7c131a0884c7c80b0b9e8270b6f574182df59ce4f2fbbae322854 erlang-p1-oauth2-0.6.3.tar.gz
diff --git a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
index 5c27393ae..444bc8971 100644
--- a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
+++ b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_OAUTH2_VERSION = 0.6.2
+ERLANG_P1_OAUTH2_VERSION = 0.6.3
 ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION))
 ERLANG_P1_OAUTH2_LICENSE = MIT
 ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch b/buildroot/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch
deleted file mode 100644
index da8607698..000000000
--- a/buildroot/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Without this patch, dependencies would be downloaded and compiled
-by rebar at build time.
-
-Signed-off-by: Christophe Romain 
-
-diff --git a/rebar.config b/rebar.config
-index ed93134..5b32788 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -31,10 +31,6 @@
-
- {port_specs, [{"priv/lib/esip_drv.so", ["c_src/esip_codec.c"]}]}.
-
--{deps, [{stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}},
--	{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}},
--	{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
--
- {clean_files, ["c_src/esip_codec.gcda", "c_src/esip_codec.gcno"]}.
-
- {cover_enabled, true}.
diff --git a/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash b/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash
index 4d41b9884..2cd057b97 100644
--- a/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash
+++ b/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 6ac36594921561d0d5502bb824b7408223a3f53560a9d2fa4b0f685c0441baf0 erlang-p1-sip-1.0.17.tar.gz
+sha256 be38cceff8e2207da24805b8e1c926cdf6d63ab116be12cd829f5a3a4e5e58ab erlang-p1-sip-1.0.26.tar.gz
diff --git a/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk b/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk
index a9f572df2..846633873 100644
--- a/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk
+++ b/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_SIP_VERSION = 1.0.17
+ERLANG_P1_SIP_VERSION = 1.0.26
 ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION))
 ERLANG_P1_SIP_LICENSE = Apache-2.0
 ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
index 769e2180d..5200d661a 100644
--- a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
+++ b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 baef9e6bd59e00c9d2600e8db87078c19d76cbf66d5068efeaf1df740ee306ce erlang-p1-stringprep-1.0.10.tar.gz
+sha256 32245561f84b03b9024c8768ad2ac8d67f285a032a7f36ff35a74c77fc701f96 erlang-p1-stringprep-1.0.14.tar.gz
diff --git a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
index f104a2ce8..a05752508 100644
--- a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
+++ b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_STRINGPREP_VERSION = 1.0.10
+ERLANG_P1_STRINGPREP_VERSION = 1.0.14
 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION))
 ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest)
 ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt
diff --git a/buildroot/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch b/buildroot/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch
deleted file mode 100644
index 7e6b4b534..000000000
--- a/buildroot/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Without this patch, dependencies would be downloaded and compiled
-by rebar at build time.
-
-diff --git a/rebar.config b/rebar.config
-index f02ea40..d0af863 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -22,9 +22,6 @@
-
- {erl_opts, [debug_info, {i, "include"}]}.
-
--{deps, [{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}},
--	{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
--
- {cover_enabled, true}.
- {cover_export_enabled, true}.
diff --git a/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash b/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash
index ee32834e3..7400a276a 100644
--- a/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash
+++ b/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 8efe2f47c2460b1e0d68a680dcfcd938a2bc98c85abb5b100c15246fe6a25506 erlang-p1-stun-1.0.16.tar.gz
+sha256 a5a59ae3c75290029aa062ef19ecd52b8377959a8eb7352bd2a62c4ff1dd0613 erlang-p1-stun-1.0.25.tar.gz
diff --git a/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk b/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk
index 42bbc758e..32bdd4f24 100644
--- a/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk
+++ b/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_STUN_VERSION = 1.0.16
+ERLANG_P1_STUN_VERSION = 1.0.25
 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION))
 ERLANG_P1_STUN_LICENSE = Apache-2.0
 ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash b/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash
index b5b800b20..af635e522 100644
--- a/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash
+++ b/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 ca9670b7f78a025b101e3fee6255d7472d6b52abc46444cc45616c3d1bd75b9b erlang-p1-tls-1.0.17.tar.gz
+sha256 5bb883b03514999876c750cdb08a5e4cf80a9eb89319037b612e1265c43f6f6d erlang-p1-tls-1.0.25.tar.gz
diff --git a/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk b/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk
index ad7317dc8..b56966446 100644
--- a/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk
+++ b/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_TLS_VERSION = 1.0.17
+ERLANG_P1_TLS_VERSION = 1.0.25
 ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION))
 ERLANG_P1_TLS_LICENSE = Apache-2.0
 ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash b/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash
index 950a5540d..db925bddd 100644
--- a/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash
+++ b/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 57bfc575179733a723717f4fecb65b9f7fd056595f798b52e7bc0206e8a9333f erlang-p1-utils-1.0.10.tar.gz
+sha256 8f21fc0472c314572ebb066d624cb5463cf5b016e18b7fd7dca9dca2a4589382 erlang-p1-utils-1.0.13.tar.gz
diff --git a/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk b/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk
index 6a4920738..6025e3f56 100644
--- a/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk
+++ b/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_UTILS_VERSION = 1.0.10
+ERLANG_P1_UTILS_VERSION = 1.0.13
 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION))
 ERLANG_P1_UTILS_LICENSE = Apache-2.0
 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch b/buildroot/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch
deleted file mode 100644
index b58db3f2c..000000000
--- a/buildroot/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Without this patch, dependencies would be downloaded and compiled
-by rebar at build time.
-
-Signed-off-by: Christophe Romain 
-
-diff --git a/rebar.config b/rebar.config
-index 99f5047..ac2f3b2 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -32,8 +32,6 @@
- {port_specs, [{"priv/lib/fxml.so", ["c_src/fxml.c"]},
-               {"priv/lib/fxml_stream.so", ["c_src/fxml_stream.c"]}]}.
-
--{deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
--
- {clean_files, ["c_src/fxml.gcda", "c_src/fxml.gcno", "c_src/fxml_stream.gcda", "c_src/fxml_stream.gcno"]}.
-
- {cover_enabled, true}.
diff --git a/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash b/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash
index ae3f3241c..ac8042da6 100644
--- a/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash
+++ b/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 aeda4051c08b78e2f036d82705433a667d03736f07ff0054862e82105435e285 erlang-p1-xml-1.1.25.tar.gz
+sha256 8615f77a1448e297af25f85261b6e4a84952af797da2e317c8ec71fe2fe779ac erlang-p1-xml-1.1.34.tar.gz
diff --git a/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk b/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk
index ff9999834..c8c65ff42 100644
--- a/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk
+++ b/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_XML_VERSION = 1.1.25
+ERLANG_P1_XML_VERSION = 1.1.34
 ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION))
 ERLANG_P1_XML_LICENSE = Apache-2.0
 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch b/buildroot/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch
deleted file mode 100644
index fed44f626..000000000
--- a/buildroot/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Without this patch, dependencies would be downloaded and compiled
-by rebar at build time.
-
-Signed-off-by: Christophe Romain 
-
-diff --git a/rebar.config b/rebar.config
---- a/rebar.config	2017-11-30 14:24:52.348695123 +0100
-+++ b/rebar.config	2017-11-30 14:35:11.816407195 +0100
-@@ -29,10 +29,6 @@
-
- {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}.
-
--{deps, [{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.25"}}},
--        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.10"}}},
--        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
--
- {clean_files, ["c_src/jid.gcda", "c_src/jid.gcno"]}.
-
- {cover_enabled, true}.
diff --git a/buildroot/package/erlang-p1-xmpp/Config.in b/buildroot/package/erlang-p1-xmpp/Config.in
index 9b33e0c60..6e40fed10 100644
--- a/buildroot/package/erlang-p1-xmpp/Config.in
+++ b/buildroot/package/erlang-p1-xmpp/Config.in
@@ -6,7 +6,9 @@ config BR2_PACKAGE_ERLANG_P1_XMPP
 	depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep
 	select BR2_PACKAGE_ERLANG_P1_XML
 	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
+	select BR2_PACKAGE_ERLANG_P1_TLS
 	select BR2_PACKAGE_ERLANG_P1_UTILS
+	select BR2_PACKAGE_ERLANG_P1_ZLIB
 	help
 	  XMPP library for Erlang.
 
diff --git a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
index d3d2dafb9..e1c63a606 100644
--- a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
+++ b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 558e8d8734052bdbe679cf10165a63944c208940ab84be78c97ba661dfcf3cb2 erlang-p1-xmpp-1.1.16.tar.gz
+sha256 699f50d50850272e67160b022fd27f3ccc46570e48968d8ee30d491bf926794d erlang-p1-xmpp-1.2.5.tar.gz
diff --git a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
index 096876ca3..e20a84f4a 100644
--- a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
+++ b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-ERLANG_P1_XMPP_VERSION = 1.1.16
+ERLANG_P1_XMPP_VERSION = 1.2.5
 ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION))
 ERLANG_P1_XMPP_LICENSE = Apache-2.0
 ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_XMPP_INSTALL_STAGING = YES
 ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \
-	erlang-p1-utils host-erlang-p1-xml
+	erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-p1-xml
 
 $(eval $(rebar-package))
 $(eval $(host-rebar-package))
diff --git a/buildroot/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch b/buildroot/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch
deleted file mode 100644
index 4dfdb929c..000000000
--- a/buildroot/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Without this patch, dependencies would be downloaded and compiled
-by rebar at build time.
-
-Signed-off-by: Christophe Romain 
-
-diff --git a/rebar.config b/rebar.config
-index e09d08d..651a829 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -24,8 +24,6 @@
- {port_env, [{"CFLAGS", "$CFLAGS"}, {"LDFLAGS", "$LDFLAGS -lyaml"}]}.
- {port_specs, [{"priv/lib/fast_yaml.so", ["c_src/fast_yaml.c"]}]}.
-
--{deps, [{p1_utils, ".*", {git, "git://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
--
- {clean_files, ["c_src/fast_yaml.gcda", "c_src/fast_yaml.gcno"]}.
-
- {cover_enabled, true}.
diff --git a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash
index 24282e6c3..2f3b181f6 100644
--- a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash
+++ b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 5a6499a47cdd1f753a527cb8b79074312354063535adc0ca0fd7f72c2a015e3a erlang-p1-yaml-1.0.12.tar.gz
+sha256 d2675ec9b2f64eba6c3437597e3abe3bfaae2172560784456a2763d1d1a50b08 erlang-p1-yaml-1.0.17.tar.gz
diff --git a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk
index de138a9f9..d4173988f 100644
--- a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk
+++ b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_YAML_VERSION = 1.0.12
+ERLANG_P1_YAML_VERSION = 1.0.17
 ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION))
 ERLANG_P1_YAML_LICENSE = Apache-2.0
 ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash
index dc14dd070..6717abdde 100644
--- a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash
+++ b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 8396f9cb17fdb195d9a2537ad76327bf930d66118b87b7108f27e5ed28b7cde6 erlang-p1-zlib-1.0.3.tar.gz
+sha256 3328661c512c28e68db69b82202b8d6c4127f31f2aefc5b0040ba9bce6abe9b3 erlang-p1-zlib-1.0.4.tar.gz
diff --git a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk
index bc53efccd..f62eff637 100644
--- a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk
+++ b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_ZLIB_VERSION = 1.0.3
+ERLANG_P1_ZLIB_VERSION = 1.0.4
 ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION))
 ERLANG_P1_ZLIB_LICENSE = Apache-2.0
 ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/ethtool/ethtool.hash b/buildroot/package/ethtool/ethtool.hash
index bac7401d3..b918dca30 100644
--- a/buildroot/package/ethtool/ethtool.hash
+++ b/buildroot/package/ethtool/ethtool.hash
@@ -1,5 +1,5 @@
 # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc
-sha256	fe967a6722db2099fa63d847b6628e3e31cf9f53571a37503347dcc3e4015a03	ethtool-4.16.tar.xz
+sha256	b18a6c364e42c29cdac057cf183c9674163db96b30848adfa8c2a90450f6d0c8	ethtool-4.19.tar.xz
 # Locally calculated
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYING
 sha256	5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1	LICENSE
diff --git a/buildroot/package/ethtool/ethtool.mk b/buildroot/package/ethtool/ethtool.mk
index b974b5f76..ae15800b1 100644
--- a/buildroot/package/ethtool/ethtool.mk
+++ b/buildroot/package/ethtool/ethtool.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ETHTOOL_VERSION = 4.16
+ETHTOOL_VERSION = 4.19
 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
 ETHTOOL_LICENSE = GPL-2.0
diff --git a/buildroot/package/eudev/0002-missing.h-add-KEY_ALS_TOGGLE.patch b/buildroot/package/eudev/0002-missing.h-add-KEY_ALS_TOGGLE.patch
new file mode 100644
index 000000000..97dac3fe8
--- /dev/null
+++ b/buildroot/package/eudev/0002-missing.h-add-KEY_ALS_TOGGLE.patch
@@ -0,0 +1,34 @@
+From cad87bd3d8aa9046af0872e8c22f4a3c8fafdc78 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Tue, 4 Dec 2018 22:38:37 +0100
+Subject: [PATCH] missing.h: add KEY_ALS_TOGGLE
+
+KEY_ALS_TOGGLE has been added in kernel 4.8 with
+https://github.com/torvalds/linux/commit/9ee27487127461b5cf71670b708ed5b2b8da568c
+
+So add it to missing.h to fix build with kernel older than 4.8
+
+Fixes:
+ - http://autobuild.buildroot.org/results/0c0aff02df91cdb869efa01e397f7ccc0d9f69af
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream: https://github.com/gentoo/eudev/commit/2cb6b734de901dda6e631de5dffbd4cb8e165cbb]
+---
+ src/shared/missing.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index bebbb42be..b5b2e1194 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -179,3 +179,7 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
+ #ifndef INPUT_PROP_MAX
+ #define INPUT_PROP_MAX 0x1f
+ #endif
++
++#ifndef KEY_ALS_TOGGLE
++#define KEY_ALS_TOGGLE 0x7a
++#endif
+-- 
+2.14.1
+
diff --git a/buildroot/package/eudev/0003-missing.h-add-BTN_DPAD_UP.patch b/buildroot/package/eudev/0003-missing.h-add-BTN_DPAD_UP.patch
new file mode 100644
index 000000000..08e5fd2b7
--- /dev/null
+++ b/buildroot/package/eudev/0003-missing.h-add-BTN_DPAD_UP.patch
@@ -0,0 +1,35 @@
+From 981b8b997e119a117fada2731eeeb0475c511c8a Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan 
+Date: Tue, 11 Dec 2018 07:56:20 +0100
+Subject: [PATCH] missing.h: add BTN_DPAD_UP
+
+As explained in issue 6267 of systemd [1], Linux < 3.11 does not
+provide definitions for BTN_DPAD_{UP,RIGHT}, which were introduced in
+[2].
+
+This patch fixes this issue.
+
+[1] https://github.com/systemd/systemd/pull/6267
+[2] https://github.com/torvalds/linux/commit/9ee27487127461b5cf71670b708ed5b2b8da568c
+
+Signed-off-by: Eric Le Bihan 
+---
+ src/shared/missing.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index b5b2e1194..3a83c91a6 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -183,3 +183,8 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
+ #ifndef KEY_ALS_TOGGLE
+ #define KEY_ALS_TOGGLE 0x7a
+ #endif
++
++#ifndef BTN_DPAD_UP
++#define BTN_DPAD_UP 0x220
++#define BTN_DPAD_RIGHT 0x223
++#endif
+-- 
+2.17.2
+
diff --git a/buildroot/package/eudev/S10udev b/buildroot/package/eudev/S10udev
old mode 100755
new mode 100644
diff --git a/buildroot/package/eudev/eudev.hash b/buildroot/package/eudev/eudev.hash
index 3fa47980e..33556a2d2 100644
--- a/buildroot/package/eudev/eudev.hash
+++ b/buildroot/package/eudev/eudev.hash
@@ -1,5 +1,5 @@
 # From http://dev.gentoo.org/~blueness/eudev/
-md5 6ca08c0e14380f87df8e8aceac123671  eudev-3.2.5.tar.gz
+md5 c75d99910c1791dd9430d26ab76059c0  eudev-3.2.7.tar.gz
 # Locally calculated
-sha256 49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af  eudev-3.2.5.tar.gz
+sha256 3004614bd253c1f98558460215027aaf60d7592c70be27fd384ec01db87bf062  eudev-3.2.7.tar.gz
 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/buildroot/package/eudev/eudev.mk b/buildroot/package/eudev/eudev.mk
index 11dc93762..d88e010c2 100644
--- a/buildroot/package/eudev/eudev.mk
+++ b/buildroot/package/eudev/eudev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EUDEV_VERSION = 3.2.5
+EUDEV_VERSION = 3.2.7
 EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
 EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 EUDEV_LICENSE_FILES = COPYING
diff --git a/buildroot/package/exempi/Config.in b/buildroot/package/exempi/Config.in
new file mode 100644
index 000000000..c9af219a2
--- /dev/null
+++ b/buildroot/package/exempi/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_EXEMPI
+	bool "exempi"
+	depends on !BR2_STATIC_LIBS # dlfcn.h
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_ZLIB
+	help
+	  Exempi is an implementation of XMP (Extensible Metadata
+	  Platform). Version 2.x is based on Adobe XMP SDK.
+
+	  http://libopenraw.freedesktop.org/wiki/Exempi
+
+comment "exempi needs a toolchain w/ C++, dynamic library, threads"
+	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/buildroot/package/exempi/exempi.hash b/buildroot/package/exempi/exempi.hash
new file mode 100644
index 000000000..562a4d9b7
--- /dev/null
+++ b/buildroot/package/exempi/exempi.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 406185feb88e84ea1d4b4251370be2991205790d7113a7e28e192ff46a4f221e  exempi-2.4.5.tar.bz2
+sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607  COPYING
diff --git a/buildroot/package/exempi/exempi.mk b/buildroot/package/exempi/exempi.mk
new file mode 100644
index 000000000..91b1d5da1
--- /dev/null
+++ b/buildroot/package/exempi/exempi.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# exempi
+#
+################################################################################
+
+EXEMPI_VERSION = 2.4.5
+EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2
+EXEMPI_SITE = https://libopenraw.freedesktop.org/download
+EXEMPI_INSTALL_STAGING = YES
+EXEMPI_CONF_OPTS = --disable-unittest
+EXEMPI_DEPENDENCIES = host-pkgconf expat zlib \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
+EXEMPI_LICENSE = BSD-3-Clause
+EXEMPI_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/exim/0007-Fix-CVE-2019-10149.patch b/buildroot/package/exim/0007-Fix-CVE-2019-10149.patch
new file mode 100644
index 000000000..f8b5338b5
--- /dev/null
+++ b/buildroot/package/exim/0007-Fix-CVE-2019-10149.patch
@@ -0,0 +1,51 @@
+From d740d2111f189760593a303124ff6b9b1f83453d Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Mon, 27 May 2019 21:57:31 +0100
+Subject: [PATCH] Fix CVE-2019-10149
+
+[Peter: drop documentation update, fix path]
+Signed-off-by: Peter Korsgaard 
+---
+ src/deliver.c          | 22 ++++++++++++++--------
+ 1 files changed, 52 insertions(+), 8 deletions(-)
+ create mode 100644 doc/doc-txt/cve-2019-10149
+
+diff --git a/src/deliver.c b/src/deliver.c
+index 59256ac2..45cc0723 100644
+--- a/src/deliver.c
++++ b/src/deliver.c
+@@ -6227,17 +6227,23 @@ if (process_recipients != RECIP_IGNORE)
+ 	{
+ 	uschar * save_local =  deliver_localpart;
+ 	const uschar * save_domain = deliver_domain;
++	uschar * addr = new->address, * errmsg = NULL;
++	int start, end, dom;
+ 
+-	deliver_localpart = expand_string(
+-		      string_sprintf("${local_part:%s}", new->address));
+-	deliver_domain =    expand_string(
+-		      string_sprintf("${domain:%s}", new->address));
++	if (!parse_extract_address(addr, &errmsg, &start, &end, &dom, TRUE))
++	  log_write(0, LOG_MAIN|LOG_PANIC,
++                "failed to parse address '%.100s': %s\n", addr, errmsg);
++	else
++	  {
++	  deliver_localpart =
++	    string_copyn(addr+start, dom ? (dom-1) - start : end - start);
++	  deliver_domain = dom ? CUS string_copyn(addr+dom, end - dom) : CUS"";
+ 
+-	(void) event_raise(event_action,
+-		      US"msg:fail:internal", new->message);
++	  event_raise(event_action, US"msg:fail:internal", new->message);
+ 
+-	deliver_localpart = save_local;
+-	deliver_domain =    save_domain;
++	  deliver_localpart = save_local;
++	  deliver_domain = save_domain;
++	  }
+ 	}
+ #endif
+       }
+-- 
+2.11.0
+
diff --git a/buildroot/package/fail2ban/Config.in b/buildroot/package/fail2ban/Config.in
new file mode 100644
index 000000000..8fa63bfdc
--- /dev/null
+++ b/buildroot/package/fail2ban/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_FAIL2BAN
+	bool "fail2ban"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  Fail2ban scans log files (e.g. /var/log/apache/error_log) and
+	  bans IPs that show the malicious signs -- too many password
+	  failures, seeking for exploits, etc. Out of the box Fail2Ban
+	  comes with filters for various services (apache, courier,
+	  ssh, etc).
+
+	  Fail2Ban is able to reduce the rate of incorrect
+	  authentications attempts however it cannot eliminate the risk
+	  that weak authentication presents.
+
+	  https://www.fail2ban.org
diff --git a/buildroot/package/fail2ban/S60fail2ban b/buildroot/package/fail2ban/S60fail2ban
new file mode 100644
index 000000000..b181ecde2
--- /dev/null
+++ b/buildroot/package/fail2ban/S60fail2ban
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+case "$1" in
+	start)
+		printf "Starting fail2ban: "
+		start-stop-daemon -S -q -m -p /var/run/fail2ban.pid \
+			-b -x fail2ban-server -- -xf start
+		[ $? = 0 ] && echo "OK" || echo "FAIL"
+		;;
+	stop)
+		printf "Stopping fail2ban: "
+		start-stop-daemon -K -q -p /var/run/fail2ban.pid
+		[ $? = 0 ] && echo "OK" || echo "FAIL"
+		;;
+	restart)
+		"$0" stop
+		sleep 1
+		"$0" start
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		;;
+esac
diff --git a/buildroot/package/fail2ban/fail2ban.hash b/buildroot/package/fail2ban/fail2ban.hash
new file mode 100644
index 000000000..25d120c11
--- /dev/null
+++ b/buildroot/package/fail2ban/fail2ban.hash
@@ -0,0 +1,3 @@
+# sha256 locally computed
+sha256  d6ca1bbc7e7944f7acb2ba7c1065953cd9837680bc4d175f30ed155c6a372449  fail2ban-0.10.4.tar.gz
+sha256  a75fec0260742fe6275d63ff6a5d97b924b28766558306b3fa4069763096929b  COPYING
diff --git a/buildroot/package/fail2ban/fail2ban.mk b/buildroot/package/fail2ban/fail2ban.mk
new file mode 100644
index 000000000..b7e6bdc1a
--- /dev/null
+++ b/buildroot/package/fail2ban/fail2ban.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# fail2ban
+#
+################################################################################
+
+FAIL2BAN_VERSION = 0.10.4
+FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION))
+FAIL2BAN_LICENSE = GPL-2.0+
+FAIL2BAN_LICENSE_FILES = COPYING
+FAIL2BAN_SETUP_TYPE = distutils
+
+define FAIL2BAN_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/fail2ban/S60fail2ban \
+		$(TARGET_DIR)/etc/init.d/S60fail2ban
+endef
+
+define FAIL2BAN_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 $(@D)/files/fail2ban.service.in \
+		$(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -fs ../../../../usr/lib//systemd/system/fail2ban.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/fail2ban.service
+	$(SED) 's,@BINDIR@,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service
+endef
+
+$(eval $(python-package))
diff --git a/buildroot/package/fdk-aac/Config.in b/buildroot/package/fdk-aac/Config.in
index 111de41ca..26e060b93 100644
--- a/buildroot/package/fdk-aac/Config.in
+++ b/buildroot/package/fdk-aac/Config.in
@@ -1,9 +1,12 @@
 # These are the architectures supported by FDK AAC
 config BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS
 	bool
-	default y if BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
-		BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
-		BR2_powerpc || BR2_sh
+	default y if BR2_aarch64
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_i386 || BR2_x86_64
+	default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default y if BR2_powerpc
+	default y if BR2_sh
 
 config BR2_PACKAGE_FDK_AAC
 	bool "fdk-aac"
diff --git a/buildroot/package/fdk-aac/fdk-aac.hash b/buildroot/package/fdk-aac/fdk-aac.hash
index db0f0d535..a8f380c93 100644
--- a/buildroot/package/fdk-aac/fdk-aac.hash
+++ b/buildroot/package/fdk-aac/fdk-aac.hash
@@ -1,6 +1,6 @@
 # From https://sourceforge.net/projects/opencore-amr/files/fdk-aac/
-sha1 574103e24fe45b3b89a92cc6a7a9d260c483b9e0  fdk-aac-0.1.6.tar.gz
-md5 13c04c5f4f13f4c7414c95d7fcdea50f  fdk-aac-0.1.6.tar.gz
+sha1 30439757fe5bbc8bccedcc8e51668b74db7322c7  fdk-aac-2.0.0.tar.gz
+md5 8ccebea4fc5c9d40fff8f72bf68a6e50  fdk-aac-2.0.0.tar.gz
 # Locally computed:
-sha256 aab61b42ac6b5953e94924c73c194f08a86172d63d39c5717f526ca016bed3ad  fdk-aac-0.1.6.tar.gz
-sha256 40b9ad8a1c630853bffc51bb5a46adf5c457afcc7c70d66d2ef919b1f14ccb4e  NOTICE
+sha256 f7d6e60f978ff1db952f7d5c3e96751816f5aef238ecf1d876972697b85fd96c  fdk-aac-2.0.0.tar.gz
+sha256 95ec80da40b4af12ad4c4f3158c9cfb80f2479f3246e4260cb600827cc8c7836  NOTICE
diff --git a/buildroot/package/fdk-aac/fdk-aac.mk b/buildroot/package/fdk-aac/fdk-aac.mk
index 72ae553c2..3904a41b9 100644
--- a/buildroot/package/fdk-aac/fdk-aac.mk
+++ b/buildroot/package/fdk-aac/fdk-aac.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FDK_AAC_VERSION = 0.1.6
+FDK_AAC_VERSION = 2.0.0
 FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac
 FDK_AAC_LICENSE = fdk-aac license
 FDK_AAC_LICENSE_FILES = NOTICE
diff --git a/buildroot/package/fetchmail/0002-enable-libressl.patch b/buildroot/package/fetchmail/0001-enable-libressl.patch
similarity index 100%
rename from buildroot/package/fetchmail/0002-enable-libressl.patch
rename to buildroot/package/fetchmail/0001-enable-libressl.patch
diff --git a/buildroot/package/fetchmail/0001-fix-openssl-static-link.patch b/buildroot/package/fetchmail/0001-fix-openssl-static-link.patch
deleted file mode 100644
index 1a5f4d6f7..000000000
--- a/buildroot/package/fetchmail/0001-fix-openssl-static-link.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix checking for statically build OpenSSL with libz dependency
-
-Fixes
-http://autobuild.buildroot.net/results/48a/48ad6d3659cf1f04581b7e3d115bebf454ff17fd/
-
-configure: Enabling OpenSSL support in /home/br/br/output/host/usr/i486-buildroot-linux-uclibc/sysroot/usr.
-checking for additional library dependencies of SSL... error
-configure: error: cannot link with SSL - check config.log
-
-In config.log multiple linking errors to libz can be found:
-
-configure:10099: /home/br/br/output/host/usr/bin/i486-ctng-linux-uclibc-gcc -o
-  conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64
-  /home/br/br/output/host/usr/i486-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(c_zlib.o):
-  In function `zlib_stateful_c_zlib.c:(.text+0x56): undefined reference to `inflate'
-
-Signed-off-by: Bernd Kuhls 
-
-diff -uNr fetchmail-6.3.26.org/configure.ac fetchmail-6.3.26/configure.ac
---- fetchmail-6.3.26.org/configure.ac	2013-04-23 22:51:10.000000000 +0200
-+++ fetchmail-6.3.26/configure.ac	2014-07-27 09:20:25.000000000 +0200
-@@ -778,7 +778,7 @@
-     AC_MSG_ERROR([SSL support enabled, but OpenSSL not found])
-   fi
-   LDFLAGS="$LDFLAGS -L$with_ssl/lib"
--  LIBS="$LIBS -lssl -lcrypto"
-+  LIBS="-lssl -lcrypto $LIBS"
-   dnl check if -ldl is needed
-   AC_MSG_CHECKING([for additional library dependencies of SSL])
-   found=0
diff --git a/buildroot/package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch b/buildroot/package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch
new file mode 100644
index 000000000..aefed7f2e
--- /dev/null
+++ b/buildroot/package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch
@@ -0,0 +1,69 @@
+From 1ed0af7f1bbcaccbd7356bd90596f5c942b64720 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 22 Mar 2019 20:24:54 +0100
+Subject: [PATCH 1/1] configure.ac: use pkg-config to find openssl
+
+openssl can have multiples dependencies such as libatomic on sparcv8
+32 bits
+
+Fixes:
+ - http://autobuild.buildroot.org/results/58e5aa7c6ba8fe7474071d7a3cba6ed3a1b4cff4
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status:
+https://gitlab.com/fetchmail/fetchmail/merge_requests/14]
+---
+ configure.ac | 37 +++++++++++++++++++------------------
+ 1 file changed, 19 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 16b0fcba..3a75ec6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -778,24 +778,25 @@ then
+   else
+     AC_MSG_ERROR([SSL support enabled, but OpenSSL not found])
+   fi
+-  LDFLAGS="$LDFLAGS -L$with_ssl/lib"
+-  LIBS="$LIBS -lssl -lcrypto"
+-  dnl check if -ldl is needed
+-  AC_MSG_CHECKING([for additional library dependencies of SSL])
+-  found=0
+-  save_LIBS="$LIBS"
+-  for i in "" "-ldl" ; do
+-      LIBS="$LDFLAGS $save_LIBS $i"
+-      AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],[SSL_library_init()])],[found=1; break])
+-  done
+-  if test $found = 0 ; then
+-      AC_MSG_RESULT([error])
+-      AC_MSG_ERROR([cannot link with SSL - check config.log])
+-  fi
+-  LIBS="$save_LIBS $i"
+-  if test "$i" = "" ; then i="(none)" ; fi
+-  AC_MSG_RESULT($i)
+-  dnl XXX FIXME: use pkg-config if available!
++  PKG_CHECK_MODULES([SSL],[libssl libcrypto],[LIBS="$LIBS $SSL_LIBS"],[
++    LDFLAGS="$LDFLAGS -L$with_ssl/lib"
++    LIBS="$LIBS -lssl -lcrypto"
++    dnl check if -ldl is needed
++    AC_MSG_CHECKING([for additional library dependencies of SSL])
++    found=0
++    save_LIBS="$LIBS"
++    for i in "" "-ldl" ; do
++        LIBS="$LDFLAGS $save_LIBS $i"
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],[SSL_library_init()])],[found=1; break])
++    done
++    if test $found = 0 ; then
++        AC_MSG_RESULT([error])
++        AC_MSG_ERROR([cannot link with SSL - check config.log])
++    fi
++    LIBS="$save_LIBS $i"
++    if test "$i" = "" ; then i="(none)" ; fi
++    AC_MSG_RESULT($i)
++  ])
+   AC_DEFINE(SSL_ENABLE)
+ else
+   AC_MSG_WARN(Disabling SSL support.)
+-- 
+2.20.1
+
diff --git a/buildroot/package/fetchmail/fetchmail.mk b/buildroot/package/fetchmail/fetchmail.mk
index 37bbeabf6..41505e863 100644
--- a/buildroot/package/fetchmail/fetchmail.mk
+++ b/buildroot/package/fetchmail/fetchmail.mk
@@ -13,17 +13,12 @@ FETCHMAIL_LICENSE_FILES = COPYING
 FETCHMAIL_AUTORECONF = YES
 FETCHMAIL_GETTEXTIZE = YES
 
-# needed to help fetchmail detecting the availability of openssl,
-# because it doesn't use pkg-config
-ifeq ($(BR2_STATIC_LIBS),y)
-FETCHMAIL_CONF_ENV += LIBS="-lz"
-endif
-
 FETCHMAIL_CONF_OPTS = \
 	--with-ssl=$(STAGING_DIR)/usr
 
 FETCHMAIL_DEPENDENCIES = \
 	ca-certificates \
+	host-pkgconf \
 	openssl \
 	$(TARGET_NLS_DEPENDENCIES)
 
diff --git a/buildroot/package/ffmpeg/0002-libfdk-aacenc-Fix-building-with-libfdk-aac-v2.patch b/buildroot/package/ffmpeg/0002-libfdk-aacenc-Fix-building-with-libfdk-aac-v2.patch
new file mode 100644
index 000000000..3f452242f
--- /dev/null
+++ b/buildroot/package/ffmpeg/0002-libfdk-aacenc-Fix-building-with-libfdk-aac-v2.patch
@@ -0,0 +1,100 @@
+From c60fb550302878aba7e86037451f7996e8069289 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= 
+Date: Fri, 31 Aug 2018 14:25:30 +0300
+Subject: [PATCH] libfdk-aacenc: Fix building with libfdk-aac v2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When flushing the encoder, we now need to provide non-null buffer
+parameters for everything, even if they are unused.
+
+The encoderDelay parameter has been replaced by two, nDelay and
+nDelayCore.
+
+Downloaded from
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=141c960e21d2860e354f9b90df136184dd00a9a8
+
+Signed-off-by: Martin Storsjö 
+[Bernd: rebased for ffmpeg 3.4.5]
+Signed-off-by: Bernd Kuhls 
+---
+ libavcodec/libfdk-aacenc.c | 34 +++++++++++++++++++++++++---------
+ 1 file changed, 25 insertions(+), 9 deletions(-)
+
+diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
+index 0e2051b468..f5adb407ed 100644
+--- a/libavcodec/libfdk-aacenc.c
++++ b/libavcodec/libfdk-aacenc.c
+@@ -26,6 +26,11 @@
+ #include "audio_frame_queue.h"
+ #include "internal.h"
+ 
++#define FDKENC_VER_AT_LEAST(vl0, vl1) \
++    (defined(AACENCODER_LIB_VL0) && \
++        ((AACENCODER_LIB_VL0 > vl0) || \
++         (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)))
++
+ typedef struct AACContext {
+     const AVClass *class;
+     HANDLE_AACENCODER handle;
+@@ -286,7 +291,11 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
+     }
+ 
+     avctx->frame_size = info.frameLength;
++#if FDKENC_VER_AT_LEAST(4, 0)
++    avctx->initial_padding = info.nDelay;
++#else
+     avctx->initial_padding = info.encoderDelay;
++#endif
+     ff_af_queue_init(avctx, &s->afq);
+ 
+     if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
+@@ -319,28 +328,35 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+     int out_buffer_size, out_buffer_element_size;
+     void *in_ptr, *out_ptr;
+     int ret;
++    uint8_t dummy_buf[1];
+     AACENC_ERROR err;
+ 
+     /* handle end-of-stream small frame and flushing */
+     if (!frame) {
++        /* Must be a non-null pointer, even if it's a dummy. We could use
++         * the address of anything else on the stack as well. */
++        in_ptr               = dummy_buf;
++        in_buffer_size       = 0;
++
+         in_args.numInSamples = -1;
+     } else {
+-        in_ptr                   = frame->data[0];
+-        in_buffer_size           = 2 * avctx->channels * frame->nb_samples;
+-        in_buffer_element_size   = 2;
++        in_ptr               = frame->data[0];
++        in_buffer_size       = 2 * avctx->channels * frame->nb_samples;
+ 
+-        in_args.numInSamples     = avctx->channels * frame->nb_samples;
+-        in_buf.numBufs           = 1;
+-        in_buf.bufs              = &in_ptr;
+-        in_buf.bufferIdentifiers = &in_buffer_identifier;
+-        in_buf.bufSizes          = &in_buffer_size;
+-        in_buf.bufElSizes        = &in_buffer_element_size;
++        in_args.numInSamples = avctx->channels * frame->nb_samples;
+ 
+         /* add current frame to the queue */
+         if ((ret = ff_af_queue_add(&s->afq, frame)) < 0)
+             return ret;
+     }
+ 
++    in_buffer_element_size   = 2;
++    in_buf.numBufs           = 1;
++    in_buf.bufs              = &in_ptr;
++    in_buf.bufferIdentifiers = &in_buffer_identifier;
++    in_buf.bufSizes          = &in_buffer_size;
++    in_buf.bufElSizes        = &in_buffer_element_size;
++
+     /* The maximum packet size is 6144 bits aka 768 bytes per channel. */
+     if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels), 0)) < 0)
+         return ret;
+-- 
+2.20.1
+
diff --git a/buildroot/package/ffmpeg/0003-libfdk-aac-Consistently-use-a-proper-version-check-m.patch b/buildroot/package/ffmpeg/0003-libfdk-aac-Consistently-use-a-proper-version-check-m.patch
new file mode 100644
index 000000000..c358a045d
--- /dev/null
+++ b/buildroot/package/ffmpeg/0003-libfdk-aac-Consistently-use-a-proper-version-check-m.patch
@@ -0,0 +1,99 @@
+From 48be4c81e0ad081edab65e133e6e1bdec7de3b55 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= 
+Date: Tue, 4 Sep 2018 08:29:37 +0300
+Subject: [PATCH] libfdk-aac: Consistently use a proper version check macro for
+ detecting features
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libfdk-aac: Consistently use a proper version check macro for detecting features
+
+The previous version checks checked explicitly for the version
+where the version define was added to the installed headers,
+making an "#ifdef AACDECODER_LIB_VL0" enough. Now that we have
+a need for more diverse version checks than this, convert all checks
+to such checks.
+
+Downloaded from
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=ffb9b7a6bab6c6bfd3dd9a7c32e3724209824999
+
+Signed-off-by: Martin Storsjö 
+Signed-off-by: Bernd Kuhls 
+---
+ libavcodec/libfdk-aacdec.c | 13 ++++++++-----
+ libavcodec/libfdk-aacenc.c |  6 +++---
+ 2 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
+index 2857b9453f..ef51184ebd 100644
+--- a/libavcodec/libfdk-aacdec.c
++++ b/libavcodec/libfdk-aacdec.c
+@@ -25,9 +25,12 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ 
+-/* The version macro is introduced the same time as the setting enum was
+- * changed, so this check should suffice. */
+-#ifndef AACDECODER_LIB_VL0
++#define FDKDEC_VER_AT_LEAST(vl0, vl1) \
++    (defined(AACDECODER_LIB_VL0) && \
++        ((AACDECODER_LIB_VL0 > vl0) || \
++         (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1)))
++
++#if !FDKDEC_VER_AT_LEAST(2, 5) // < 2.5.10
+ #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
+ #endif
+ 
+@@ -72,7 +75,7 @@ static const AVOption fdk_aac_dec_options[] = {
+                      OFFSET(drc_level),      AV_OPT_TYPE_INT,   { .i64 = -1},  -1, 127, AD, NULL    },
+     { "drc_heavy", "Dynamic Range Control: heavy compression, where [1] is on (RF mode) and [0] is off",
+                      OFFSET(drc_heavy),      AV_OPT_TYPE_INT,   { .i64 = -1},  -1, 1,   AD, NULL    },
+-#ifdef AACDECODER_LIB_VL0
++#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
+     { "level_limit", "Signal level limiting", OFFSET(level_limit), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, 1, AD },
+ #endif
+     { NULL }
+@@ -293,7 +296,7 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
+         }
+     }
+ 
+-#ifdef AACDECODER_LIB_VL0
++#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
+     if (aacDecoder_SetParam(s->handle, AAC_PCM_LIMITER_ENABLE, s->level_limit) != AAC_DEC_OK) {
+         av_log(avctx, AV_LOG_ERROR, "Unable to set in signal level limiting in the decoder\n");
+         return AVERROR_UNKNOWN;
+diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
+index f5adb407ed..91dcb5a1b9 100644
+--- a/libavcodec/libfdk-aacenc.c
++++ b/libavcodec/libfdk-aacenc.c
+@@ -156,7 +156,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
+     case 6: mode = MODE_1_2_2_1; sce = 2; cpe = 2; break;
+ /* The version macro is introduced the same time as the 7.1 support, so this
+    should suffice. */
+-#ifdef AACENCODER_LIB_VL0
++#if FDKENC_VER_AT_LEAST(3, 4) // 3.4.12
+     case 8:
+         sce = 2;
+         cpe = 3;
+@@ -291,7 +291,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
+     }
+ 
+     avctx->frame_size = info.frameLength;
+-#if FDKENC_VER_AT_LEAST(4, 0)
++#if FDKENC_VER_AT_LEAST(4, 0) // 4.0.0
+     avctx->initial_padding = info.nDelay;
+ #else
+     avctx->initial_padding = info.encoderDelay;
+@@ -412,7 +412,7 @@ static const uint64_t aac_channel_layout[] = {
+     AV_CH_LAYOUT_4POINT0,
+     AV_CH_LAYOUT_5POINT0_BACK,
+     AV_CH_LAYOUT_5POINT1_BACK,
+-#ifdef AACENCODER_LIB_VL0
++#if FDKENC_VER_AT_LEAST(3, 4) // 3.4.12
+     AV_CH_LAYOUT_7POINT1_WIDE_BACK,
+     AV_CH_LAYOUT_7POINT1,
+ #endif
+-- 
+2.20.1
+
diff --git a/buildroot/package/ffmpeg/0004-libfdk-aac-Don-t-use-defined-in-a-define.patch b/buildroot/package/ffmpeg/0004-libfdk-aac-Don-t-use-defined-in-a-define.patch
new file mode 100644
index 000000000..30357b91e
--- /dev/null
+++ b/buildroot/package/ffmpeg/0004-libfdk-aac-Don-t-use-defined-in-a-define.patch
@@ -0,0 +1,72 @@
+From 452746d80fdaaaf1b546860eb78449c6de3678d7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= 
+Date: Wed, 12 Sep 2018 20:03:12 +0300
+Subject: [PATCH] libfdk-aac: Don't use defined() in a #define
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libfdk-aac: Don't use defined() in a #define
+
+MSVC expands the preprocessor directives differently, making the
+version check fail in the previous form.
+
+Clang can warn about this with -Wexpansion-to-defined (not currently
+enabled by default):
+warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined]
+
+Downloaded from
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=2a9e1c122eed66be1b26b747342b848300b226c7
+
+Signed-off-by: Martin Storsjö 
+Signed-off-by: Bernd Kuhls 
+---
+ libavcodec/libfdk-aacdec.c | 9 ++++++---
+ libavcodec/libfdk-aacenc.c | 9 ++++++---
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
+index ef51184ebd..0fbab36463 100644
+--- a/libavcodec/libfdk-aacdec.c
++++ b/libavcodec/libfdk-aacdec.c
+@@ -25,10 +25,13 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ 
++#ifdef AACDECODER_LIB_VL0
+ #define FDKDEC_VER_AT_LEAST(vl0, vl1) \
+-    (defined(AACDECODER_LIB_VL0) && \
+-        ((AACDECODER_LIB_VL0 > vl0) || \
+-         (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1)))
++    ((AACDECODER_LIB_VL0 > vl0) || \
++     (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1))
++#else
++#define FDKDEC_VER_AT_LEAST(vl0, vl1) 0
++#endif
+ 
+ #if !FDKDEC_VER_AT_LEAST(2, 5) // < 2.5.10
+ #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
+diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
+index 91dcb5a1b9..8349e56dcb 100644
+--- a/libavcodec/libfdk-aacenc.c
++++ b/libavcodec/libfdk-aacenc.c
+@@ -26,10 +26,13 @@
+ #include "audio_frame_queue.h"
+ #include "internal.h"
+ 
++#ifdef AACENCODER_LIB_VL0
+ #define FDKENC_VER_AT_LEAST(vl0, vl1) \
+-    (defined(AACENCODER_LIB_VL0) && \
+-        ((AACENCODER_LIB_VL0 > vl0) || \
+-         (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)))
++    ((AACENCODER_LIB_VL0 > vl0) || \
++     (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1))
++#else
++#define FDKENC_VER_AT_LEAST(vl0, vl1) 0
++#endif
+ 
+ typedef struct AACContext {
+     const AVClass *class;
+-- 
+2.20.1
+
diff --git a/buildroot/package/ffmpeg/Config.in b/buildroot/package/ffmpeg/Config.in
index 2d94c5712..4377a32c9 100644
--- a/buildroot/package/ffmpeg/Config.in
+++ b/buildroot/package/ffmpeg/Config.in
@@ -7,8 +7,6 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	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)
-	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
diff --git a/buildroot/package/ffmpeg/ffmpeg.mk b/buildroot/package/ffmpeg/ffmpeg.mk
index b86d465df..1e1004c37 100644
--- a/buildroot/package/ffmpeg/ffmpeg.mk
+++ b/buildroot/package/ffmpeg/ffmpeg.mk
@@ -517,6 +517,14 @@ else ifneq ($(GCC_TARGET_ARCH),)
 FFMPEG_CONF_OPTS += --cpu="$(GCC_TARGET_ARCH)"
 endif
 
+FFMPEG_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+FFMPEG_CONF_OPTS += --disable-optimizations
+FFMPEG_CFLAGS += -O0
+endif
+
+FFMPEG_CONF_ENV += CFLAGS="$(FFMPEG_CFLAGS)"
 FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
 
 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
diff --git a/buildroot/package/fftw/Config.in b/buildroot/package/fftw/Config.in
index d51f8f3c5..69dc6559a 100644
--- a/buildroot/package/fftw/Config.in
+++ b/buildroot/package/fftw/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_FFTW
 	bool "fftw"
+	select BR2_PACKAGE_FFTW_DOUBLE if !BR2_PACKAGE_FFTW_SINGLE \
+		&& !BR2_PACKAGE_FFTW_LONG_DOUBLE && !BR2_PACKAGE_FFTW_QUAD
 	help
 	  Library for computing Fast Fourier Transforms.
 
@@ -12,55 +14,10 @@ config BR2_PACKAGE_FFTW
 
 if BR2_PACKAGE_FFTW
 
-config BR2_PACKAGE_FFTW_USE_SSE
-	bool
-
-config BR2_PACKAGE_FFTW_USE_SSE2
-	bool
-
-config BR2_PACKAGE_FFTW_USE_NEON
-	bool
-
-choice
-	prompt "fftw precision"
-	default BR2_PACKAGE_FFTW_PRECISION_DOUBLE
-	help
-	  Selects fftw precision
-
-config BR2_PACKAGE_FFTW_PRECISION_SINGLE
-	bool "single"
-	select BR2_PACKAGE_FFTW_USE_SSE if BR2_X86_CPU_HAS_SSE
-	select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2
-	select BR2_PACKAGE_FFTW_USE_NEON if BR2_ARM_CPU_HAS_NEON && !BR2_ARM_SOFT_FLOAT
-	help
-	  Compile fftw in single precision, i.e. use 'float' for
-	  floating point type.
-
-config BR2_PACKAGE_FFTW_PRECISION_DOUBLE
-	bool "double"
-	select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2
-	help
-	  Compile fftw in double precision (the default), i.e. use
-	  'double' for floating point type.
-
-config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE
-	bool "long double"
-	# long-double precision require long-double trigonometric routines
-	depends on !(BR2_TOOLCHAIN_BUILDROOT_UCLIBC && \
-		(BR2_arm || BR2_mips || BR2_mipsel))
-	help
-	  Compile fftw in long double precision, i.e. use 'long double'
-	  for floating point type.
-
-config BR2_PACKAGE_FFTW_PRECISION_QUAD
-	bool "quad"
-	# quad-precision needs to have a gcc with libquadmath
-	depends on (BR2_i386 || BR2_x86_64) && BR2_USE_WCHAR
-	help
-	  Compile fftw in quadruple precision, i.e. use '__float128' for
-	  floating point type.
-
-endchoice
+source "package/fftw/fftw-single/Config.in"
+source "package/fftw/fftw-double/Config.in"
+source "package/fftw/fftw-long-double/Config.in"
+source "package/fftw/fftw-quad/Config.in"
 
 config BR2_PACKAGE_FFTW_FAST
 	bool "optimise for speed over accuracy"
diff --git a/buildroot/package/fftw/fftw-double/Config.in b/buildroot/package/fftw/fftw-double/Config.in
new file mode 100644
index 000000000..cfcd1ef99
--- /dev/null
+++ b/buildroot/package/fftw/fftw-double/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_FFTW_DOUBLE
+	bool "fftw-double"
+	help
+	  Compile fftw in double precision (the default), i.e. use
+	  'double' for floating point type.
diff --git a/buildroot/package/fftw/fftw-double/fftw-double.hash b/buildroot/package/fftw/fftw-double/fftw-double.hash
new file mode 120000
index 000000000..3ee7ecb3b
--- /dev/null
+++ b/buildroot/package/fftw/fftw-double/fftw-double.hash
@@ -0,0 +1 @@
+../fftw.hash
\ No newline at end of file
diff --git a/buildroot/package/fftw/fftw-double/fftw-double.mk b/buildroot/package/fftw/fftw-double/fftw-double.mk
new file mode 100644
index 000000000..4bacb26e5
--- /dev/null
+++ b/buildroot/package/fftw/fftw-double/fftw-double.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# fftw-double
+#
+################################################################################
+
+FFTW_DOUBLE_VERSION = $(FFTW_VERSION)
+FFTW_DOUBLE_SOURCE = fftw-$(FFTW_VERSION).tar.gz
+FFTW_DOUBLE_SITE = $(FFTW_SITE)
+FFTW_DOUBLE_DL_SUBDIR = fftw
+FFTW_DOUBLE_INSTALL_STAGING = $(FFTW_INSTALL_STAGING)
+FFTW_DOUBLE_LICENSE = $(FFTW_LICENSE)
+FFTW_DOUBLE_LICENSE_FILES = $(FFTW_LICENSE_FILES)
+
+FFTW_DOUBLE_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
+
+FFTW_DOUBLE_CONF_OPTS = \
+	$(FFTW_COMMON_CONF_OPTS) \
+	CFLAGS="$(FFTW_COMMON_CFLAGS)" \
+	$(if $(BR2_X86_CPU_HAS_SSE2),--enable,--disable)-sse2
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/fftw/fftw-long-double/Config.in b/buildroot/package/fftw/fftw-long-double/Config.in
new file mode 100644
index 000000000..3ee176285
--- /dev/null
+++ b/buildroot/package/fftw/fftw-long-double/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_FFTW_LONG_DOUBLE
+	bool "fftw-long-double"
+	# long-double precision require long-double trigonometric routines
+	depends on !(BR2_TOOLCHAIN_USES_UCLIBC && \
+		(BR2_arm || BR2_mips || BR2_mipsel))
+	help
+	  Compile fftw in long double precision, i.e. use 'long double'
+	  for floating point type.
diff --git a/buildroot/package/fftw/fftw-long-double/fftw-long-double.hash b/buildroot/package/fftw/fftw-long-double/fftw-long-double.hash
new file mode 120000
index 000000000..3ee7ecb3b
--- /dev/null
+++ b/buildroot/package/fftw/fftw-long-double/fftw-long-double.hash
@@ -0,0 +1 @@
+../fftw.hash
\ No newline at end of file
diff --git a/buildroot/package/fftw/fftw-long-double/fftw-long-double.mk b/buildroot/package/fftw/fftw-long-double/fftw-long-double.mk
new file mode 100644
index 000000000..173050446
--- /dev/null
+++ b/buildroot/package/fftw/fftw-long-double/fftw-long-double.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# fftw-long-double
+#
+################################################################################
+
+FFTW_LONG_DOUBLE_VERSION = $(FFTW_VERSION)
+FFTW_LONG_DOUBLE_SOURCE = fftw-$(FFTW_VERSION).tar.gz
+FFTW_LONG_DOUBLE_SITE = $(FFTW_SITE)
+FFTW_LONG_DOUBLE_DL_SUBDIR = fftw
+FFTW_LONG_DOUBLE_INSTALL_STAGING = $(FFTW_INSTALL_STAGING)
+FFTW_LONG_DOUBLE_LICENSE = $(FFTW_LICENSE)
+FFTW_LONG_DOUBLE_LICENSE_FILES = $(FFTW_LICENSE_FILES)
+
+FFTW_LONG_DOUBLE_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
+
+FFTW_LONG_DOUBLE_CONF_OPTS = \
+	$(FFTW_COMMON_CONF_OPTS) \
+	CFLAGS="$(FFTW_COMMON_CFLAGS)" \
+	--enable-long-double
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/fftw/fftw-quad/Config.in b/buildroot/package/fftw/fftw-quad/Config.in
new file mode 100644
index 000000000..10d296df9
--- /dev/null
+++ b/buildroot/package/fftw/fftw-quad/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_FFTW_QUAD
+	bool "fftw-quad"
+	# quad-precision needs to have a gcc with libquadmath
+	depends on BR2_TOOLCHAIN_HAS_LIBQUADMATH && BR2_USE_WCHAR
+	help
+	  Compile fftw in quadruple precision, i.e. use '__float128' for
+	  floating point type.
diff --git a/buildroot/package/fftw/fftw-quad/fftw-quad.hash b/buildroot/package/fftw/fftw-quad/fftw-quad.hash
new file mode 120000
index 000000000..3ee7ecb3b
--- /dev/null
+++ b/buildroot/package/fftw/fftw-quad/fftw-quad.hash
@@ -0,0 +1 @@
+../fftw.hash
\ No newline at end of file
diff --git a/buildroot/package/fftw/fftw-quad/fftw-quad.mk b/buildroot/package/fftw/fftw-quad/fftw-quad.mk
new file mode 100644
index 000000000..5ff79b1d4
--- /dev/null
+++ b/buildroot/package/fftw/fftw-quad/fftw-quad.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# fftw-quad
+#
+################################################################################
+
+FFTW_QUAD_VERSION = $(FFTW_VERSION)
+FFTW_QUAD_SOURCE = fftw-$(FFTW_VERSION).tar.gz
+FFTW_QUAD_SITE = $(FFTW_SITE)
+FFTW_QUAD_DL_SUBDIR = fftw
+FFTW_QUAD_INSTALL_STAGING = $(FFTW_INSTALL_STAGING)
+FFTW_QUAD_LICENSE = $(FFTW_LICENSE)
+FFTW_QUAD_LICENSE_FILES = $(FFTW_LICENSE_FILES)
+
+FFTW_QUAD_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
+
+FFTW_QUAD_CONF_OPTS = \
+	$(FFTW_COMMON_CONF_OPTS) \
+	CFLAGS="$(FFTW_COMMON_CFLAGS)" \
+	--enable-quad-precision
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/fftw/fftw-single/Config.in b/buildroot/package/fftw/fftw-single/Config.in
new file mode 100644
index 000000000..ff1486871
--- /dev/null
+++ b/buildroot/package/fftw/fftw-single/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_FFTW_SINGLE
+	bool "fftw-single"
+	help
+	  Compile fftw in single precision, i.e. use 'float'
+	  for floating point type.
diff --git a/buildroot/package/fftw/fftw-single/fftw-single.hash b/buildroot/package/fftw/fftw-single/fftw-single.hash
new file mode 120000
index 000000000..3ee7ecb3b
--- /dev/null
+++ b/buildroot/package/fftw/fftw-single/fftw-single.hash
@@ -0,0 +1 @@
+../fftw.hash
\ No newline at end of file
diff --git a/buildroot/package/fftw/fftw-single/fftw-single.mk b/buildroot/package/fftw/fftw-single/fftw-single.mk
new file mode 100644
index 000000000..1e26ff7a3
--- /dev/null
+++ b/buildroot/package/fftw/fftw-single/fftw-single.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# fftw-single
+#
+################################################################################
+
+FFTW_SINGLE_VERSION = $(FFTW_VERSION)
+FFTW_SINGLE_SOURCE = fftw-$(FFTW_VERSION).tar.gz
+FFTW_SINGLE_SITE = $(FFTW_SITE)
+FFTW_SINGLE_DL_SUBDIR = fftw
+FFTW_SINGLE_INSTALL_STAGING = $(FFTW_INSTALL_STAGING)
+FFTW_SINGLE_LICENSE = $(FFTW_LICENSE)
+FFTW_SINGLE_LICENSE_FILES = $(FFTW_LICENSE_FILES)
+
+FFTW_SINGLE_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
+
+FFTW_SINGLE_CONF_OPTS = \
+	$(FFTW_COMMON_CONF_OPTS) \
+	CFLAGS="$(FFTW_SINGLE_CFLAGS)" \
+	--enable-single
+
+FFTW_SINGLE_CFLAGS = $(FFTW_COMMON_CFLAGS)
+
+# x86 optimisations
+FFTW_SINGLE_CONF_OPTS += \
+	$(if $(BR2_X86_CPU_HAS_SSE),--enable,--disable)-sse \
+	$(if $(BR2_X86_CPU_HAS_SSE2),--enable,--disable)-sse2
+
+# ARM optimisations
+ifeq ($(BR2_ARM_CPU_HAS_NEON):$(BR2_ARM_SOFT_FLOAT),y:)
+FFTW_SINGLE_CONF_OPTS += --enable-neon
+FFTW_SINGLE_CFLAGS += -mfpu=neon
+else
+FFTW_SINGLE_CONF_OPTS += --disable-neon
+endif
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/fftw/fftw.mk b/buildroot/package/fftw/fftw.mk
index b167a2f6f..bcfdb9c96 100644
--- a/buildroot/package/fftw/fftw.mk
+++ b/buildroot/package/fftw/fftw.mk
@@ -12,38 +12,25 @@ FFTW_LICENSE_FILES = COPYING
 
 # fortran support only enables generation and installation of fortran sources
 ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y)
-FFTW_CONF_OPTS += --enable-fortran
-FFTW_CONF_ENV += FLIBS="-lgfortran -lm"
+FFTW_COMMON_CONF_OPTS += --enable-fortran
+FFTW_COMMON_CONF_ENV += FLIBS="-lgfortran -lm"
 else
-FFTW_CONF_OPTS += --disable-fortran
+FFTW_COMMON_CONF_OPTS += --disable-fortran
 endif
 
-FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_PRECISION_SINGLE),--enable,--disable)-single
-FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),--enable,--disable)-long-double
-FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_PRECISION_QUAD),--enable,--disable)-quad-precision
+FFTW_COMMON_CFLAGS = $(TARGET_CFLAGS)
 
-FFTW_CFLAGS = $(TARGET_CFLAGS)
 ifeq ($(BR2_PACKAGE_FFTW_FAST),y)
-FFTW_CFLAGS += -O3 -ffast-math
+FFTW_COMMON_CFLAGS += -O3 -ffast-math
 endif
 
-# x86 optimisations
-FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE),--enable,--disable)-sse
-FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE2),--enable,--disable)-sse2
-
-# ARM optimisations
-FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),--enable,--disable)-neon
-FFTW_CFLAGS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),-mfpu=neon)
-
 # Generic optimisations
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-FFTW_CONF_OPTS += --enable-threads
-FFTW_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--without,--with)-combined-threads
+FFTW_COMMON_CONF_OPTS += --enable-threads
+FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--without,--with)-combined-threads
 else
-FFTW_CONF_OPTS += --disable-threads
+FFTW_COMMON_CONF_OPTS += --disable-threads
 endif
-FFTW_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp
+FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp
 
-FFTW_CONF_OPTS += CFLAGS="$(FFTW_CFLAGS)"
-
-$(eval $(autotools-package))
+include $(sort $(wildcard package/fftw/*/*.mk))
diff --git a/buildroot/package/file/file.hash b/buildroot/package/file/file.hash
index c279dff6e..7948e856e 100644
--- a/buildroot/package/file/file.hash
+++ b/buildroot/package/file/file.hash
@@ -1,5 +1,7 @@
-# Locally calculated
-sha256 f15a50dbbfa83fec0bd1161e8e191b092ec832720e30cd14536e044ac623b20a  file-5.34.tar.gz
-sha256 3c0ad13c36f891a9b4f951e59eb2fc108065a46f849697cc6fd3cdb41cc23a3d  COPYING
-sha256 d98ee4d8d95e7d021a5dfc41f137ecc3b624a7b98e8bd793130202d12a21ed57  src/mygetopt.h
-sha256 85e358d575ad4ac5b38b623a25b24246ccff3c7e680d930c0a9ff5228fe434b6  src/vasprintf.c
+# Locally calculated after verifying signature
+# ftp://ftp.astron.com/pub/file/file-5.36.tar.gz.asc
+# using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A
+sha256 fb608290c0fd2405a8f63e5717abf6d03e22e183fb21884413d1edd918184379  file-5.36.tar.gz
+sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274  COPYING
+sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462  src/mygetopt.h
+sha256 7ac061e1a1c840c4dfa0573aec6f3497676c9295b5ec4190d3576646eb1646bf  src/vasprintf.c
diff --git a/buildroot/package/file/file.mk b/buildroot/package/file/file.mk
index b5b12978b..1a835015a 100644
--- a/buildroot/package/file/file.mk
+++ b/buildroot/package/file/file.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FILE_VERSION = 5.34
+FILE_VERSION = 5.36
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 HOST_FILE_DEPENDENCIES = host-zlib
diff --git a/buildroot/package/flare-engine/Config.in b/buildroot/package/flare-engine/Config.in
index e299a6b7d..cdcb01894 100644
--- a/buildroot/package/flare-engine/Config.in
+++ b/buildroot/package/flare-engine/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_FLARE_ENGINE
 	bool "flare-engine"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS # SDL2
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180
 	select BR2_PACKAGE_SDL2
 	select BR2_PACKAGE_SDL2_IMAGE
 	select BR2_PACKAGE_SDL2_MIXER
@@ -18,6 +17,3 @@ config BR2_PACKAGE_FLARE_ENGINE
 
 comment "flare-engine needs a toolchain w/ C++, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
-
-comment "flare-engine needs a toolchain not affected by GCC bug 85180"
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180
diff --git a/buildroot/package/flare-engine/flare-engine.mk b/buildroot/package/flare-engine/flare-engine.mk
index 2f3660234..8a656d695 100644
--- a/buildroot/package/flare-engine/flare-engine.mk
+++ b/buildroot/package/flare-engine/flare-engine.mk
@@ -19,4 +19,12 @@ ifeq ($(BR2_ENABLE_DEBUG),y)
 FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=RelWithDebInfo
 endif
 
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+# CMakeLists.txt sets CMAKE_CXX_FLAGS_ depending on
+# BUILD_TYPE, and this comes after the generic CMAKE_CXX_FLAGS.
+# Override CMAKE_BUILD_TYPE so no overrides are applied.
+FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=Buildroot
+FLARE_ENGINE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -O0"
+endif
+
 $(eval $(cmake-package))
diff --git a/buildroot/package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch b/buildroot/package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch
new file mode 100644
index 000000000..06eb9256e
--- /dev/null
+++ b/buildroot/package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch
@@ -0,0 +1,41 @@
+From a9a03cc6ba71825bfae0d64e1888f33c77345bc3 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Sat, 17 Mar 2018 23:08:29 -0700
+Subject: [PATCH] platform: Add riscv to known platforms
+
+Change-Id: I724a99e2493fcbf71c2fc2d9f6a1ad607c737087
+Signed-off-by: Khem Raj 
+Reviewed-on: https://review.coreboot.org/25260
+Tested-by: build bot (Jenkins) 
+Reviewed-by: Paul Menzel 
+Reviewed-by: David Hendricks 
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/flashrom/flashrom/commit/a9a03cc6ba71825bfae0d64e1888f33c77345bc3]
+---
+ platform.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/platform.h b/platform.h
+index e3b7674ae..65fe85881 100644
+--- a/platform.h
++++ b/platform.h
+@@ -69,6 +69,9 @@
+ #elif defined (__m68k__)
+ 	#define __FLASHROM_ARCH__ "m68k"
+ 	#define IS_M68K 1
++#elif defined (__riscv)
++	#define __FLASHROM_ARCH__ "riscv"
++	#define IS_RISCV 1
+ #elif defined (__sh__)
+ 	#define __FLASHROM_ARCH__ "sh"
+ 	#define IS_SH 1
+@@ -77,7 +80,7 @@
+ 	#define IS_S390 1
+ #endif
+ 
+-#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_SH || IS_S390)
++#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_RISCV || IS_SH || IS_S390)
+ #error Unknown architecture
+ #endif
+ 
diff --git a/buildroot/package/flashrom/Config.in b/buildroot/package/flashrom/Config.in
index e7844a0a6..c333c2973 100644
--- a/buildroot/package/flashrom/Config.in
+++ b/buildroot/package/flashrom/Config.in
@@ -1,13 +1,18 @@
+config BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS
+	bool
+	default y if BR2_aarch64 || BR2_aarch64_be
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_i386 || BR2_x86_64
+	default y if BR2_m68k
+	default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
+	default y if BR2_riscv
+	default y if BR2_sh
+	default y if BR2_sparc || BR2_sparc64
+
 config BR2_PACKAGE_FLASHROM
 	bool "flashrom"
-	depends on BR2_i386 || BR2_x86_64
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
-	select BR2_PACKAGE_PCIUTILS
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	select BR2_PACKAGE_LIBFTDI
-	# dmidecode is only a runtime dependency
-	select BR2_PACKAGE_DMIDECODE
+	depends on BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS
 	help
 	  flashrom is a utility for identifying, reading, writing,
 	  verifying and erasing flash chips. It is designed to flash
@@ -16,7 +21,3 @@ config BR2_PACKAGE_FLASHROM
 	  programmer devices.
 
 	  http://flashrom.org/
-
-comment "flashrom needs a toolchain w/ threads"
-	depends on BR2_i386 || BR2_x86_64
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/buildroot/package/flashrom/flashrom.mk b/buildroot/package/flashrom/flashrom.mk
index 70f47b5a0..733ad7318 100644
--- a/buildroot/package/flashrom/flashrom.mk
+++ b/buildroot/package/flashrom/flashrom.mk
@@ -7,13 +7,45 @@
 FLASHROM_VERSION = 1.0
 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
 FLASHROM_SITE = https://download.flashrom.org/releases
-FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf
 FLASHROM_LICENSE = GPL-2.0+
 FLASHROM_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_LIBFTDI),y)
+FLASHROM_DEPENDENCIES += host-pkgconf libftdi
+FLASHROM_MAKE_OPTS += \
+	CONFIG_FT2232_SPI=yes \
+	CONFIG_USBBLASTER_SPI=yes
+else
+FLASHROM_MAKE_OPTS += \
+	CONFIG_FT2232_SPI=no \
+	CONFIG_USBBLASTER_SPI=no
+endif
+
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+FLASHROM_DEPENDENCIES += host-pkgconf libusb
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=yes
+else
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no
+endif
+
+ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
+FLASHROM_DEPENDENCIES += host-pkgconf libusb-compat
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=yes
+else
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no
+endif
+
+ifeq ($(BR2_PACKAGE_PCIUTILS),y)
+FLASHROM_DEPENDENCIES += pciutils
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes
+else
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no
+endif
+
 define FLASHROM_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" -C $(@D)
+		CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" \
+		$(FLASHROM_MAKE_OPTS) -C $(@D)
 endef
 
 define FLASHROM_INSTALL_TARGET_CMDS
diff --git a/buildroot/package/fltk/fltk.mk b/buildroot/package/fltk/fltk.mk
index 611d79da5..c37a13176 100644
--- a/buildroot/package/fltk/fltk.mk
+++ b/buildroot/package/fltk/fltk.mk
@@ -54,4 +54,11 @@ else
 FLTK_CONF_OPTS += --disable-xinerama
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y)
+FLTK_DEPENDENCIES += xlib_libXrender
+FLTK_CONF_OPTS += --enable-xrender
+else
+FLTK_CONF_OPTS += --disable-xrender
+endif
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch b/buildroot/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch
new file mode 100644
index 000000000..bf04bd95f
--- /dev/null
+++ b/buildroot/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch
@@ -0,0 +1,133 @@
+From 8208f99fa1676c42bfd8d74de3e9dac5366c150c Mon Sep 17 00:00:00 2001
+From: Akira TAGOH 
+Date: Mon, 3 Sep 2018 04:56:16 +0000
+Subject: [PATCH] Fix the build issue with --enable-static
+
+Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/8208f99fa1676c42bfd8d74de3e9dac5366c150c]
+---
+ doc/fcstring.fncs       | 12 ++++++++++++
+ fontconfig/fontconfig.h |  4 ++++
+ src/fcint.h             |  4 ----
+ test/test-bz106632.c    | 35 ++++++++++++-----------------------
+ 4 files changed, 28 insertions(+), 27 deletions(-)
+
+diff --git a/doc/fcstring.fncs b/doc/fcstring.fncs
+index 0412bbd..d5ec043 100644
+--- a/doc/fcstring.fncs
++++ b/doc/fcstring.fncs
+@@ -223,6 +223,18 @@ This is just a wrapper around free(3) which helps track memory usage of
+ strings within the fontconfig library.
+ @@
+ 
++@RET@		FcChar8 *
++@FUNC@		FcStrBuildFilename
++@TYPE1@		const FcChar8 *			@ARG1@		path
++@TYPE2@		...
++@PURPOSE@	Concatenate strings as a file path
++@DESC@
++Creates a filename from the given elements of strings as file paths
++and concatenate them with the appropriate file separator.
++Arguments must be null-terminated.
++This returns a newly-allocated memory which should be freed when no longer needed.
++@@
++
+ @RET@		FcChar8 *
+ @FUNC@		FcStrDirname
+ @TYPE1@		const FcChar8 *			@ARG1@		file
+diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
+index bac1dda..af870d0 100644
+--- a/fontconfig/fontconfig.h
++++ b/fontconfig/fontconfig.h
+@@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8   *string,
+ 	    int		    *nchar,
+ 	    int		    *wchar);
+ 
++FcPublic FcChar8 *
++FcStrBuildFilename (const FcChar8 *path,
++		    ...);
++
+ FcPublic FcChar8 *
+ FcStrDirname (const FcChar8 *file);
+ 
+diff --git a/src/fcint.h b/src/fcint.h
+index de78cd8..a9d075a 100644
+--- a/src/fcint.h
++++ b/src/fcint.h
+@@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s);
+ FcPrivate FcBool
+ FcStrIsAbsoluteFilename (const FcChar8 *s);
+ 
+-FcPrivate FcChar8 *
+-FcStrBuildFilename (const FcChar8 *path,
+-		    ...);
+-
+ FcPrivate FcChar8 *
+ FcStrLastSlash (const FcChar8  *path);
+ 
+diff --git a/test/test-bz106632.c b/test/test-bz106632.c
+index daa0c1e..2d67c2e 100644
+--- a/test/test-bz106632.c
++++ b/test/test-bz106632.c
+@@ -25,25 +25,26 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
++#include 
+ #include 
++#include 
+ #include 
++#include 
++#include 
+ #ifndef HAVE_STRUCT_DIRENT_D_TYPE
+ #include 
+ #include 
+-#include 
+ #endif
+-#include "fcstr.c"
+-#undef FcConfigBuildFonts
+-#undef FcConfigCreate
+-#undef FcConfigGetCurrent
+-#undef FcConfigParseAndLoadFromMemory
+-#undef FcConfigUptoDate
+-#undef FcFontList
+-#undef FcInitReinitialize
+-#undef FcPatternCreate
+-#undef FcPatternDestroy
+ #include 
+ 
++#ifdef _WIN32
++#  define FC_DIR_SEPARATOR         '\\'
++#  define FC_DIR_SEPARATOR_S       "\\"
++#else
++#  define FC_DIR_SEPARATOR         '/'
++#  define FC_DIR_SEPARATOR_S       "/"
++#endif
++
+ #ifdef HAVE_MKDTEMP
+ #define fc_mkdtemp	mkdtemp
+ #else
+@@ -154,18 +155,6 @@ unlink_dirs (const char *dir)
+     return ret;
+ }
+ 
+-FcChar8 *
+-FcLangNormalize (const FcChar8 *lang)
+-{
+-    return NULL;
+-}
+-
+-FcChar8 *
+-FcConfigHome (void)
+-{
+-    return NULL;
+-}
+-
+ int
+ main (void)
+ {
+-- 
+2.18.1
+
diff --git a/buildroot/package/fontconfig/Config.in b/buildroot/package/fontconfig/Config.in
index 218fdb2e7..d274b0635 100644
--- a/buildroot/package/fontconfig/Config.in
+++ b/buildroot/package/fontconfig/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_FONTCONFIG
 	bool "fontconfig"
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
 	  Fontconfig is a library for configuring and customizing font
 	  access.
diff --git a/buildroot/package/fontconfig/fontconfig.hash b/buildroot/package/fontconfig/fontconfig.hash
index e9963f6f3..5243c0961 100644
--- a/buildroot/package/fontconfig/fontconfig.hash
+++ b/buildroot/package/fontconfig/fontconfig.hash
@@ -1,2 +1,2 @@
-# From https://lists.freedesktop.org/archives/fontconfig/2017-July/005961.html
-sha256 668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c  fontconfig-2.12.4.tar.bz2
+# From https://lists.freedesktop.org/archives/fontconfig/2018-August/006324.html
+sha256 f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 fontconfig-2.13.1.tar.bz2
diff --git a/buildroot/package/fontconfig/fontconfig.mk b/buildroot/package/fontconfig/fontconfig.mk
index 71a0b4579..7387452b0 100644
--- a/buildroot/package/fontconfig/fontconfig.mk
+++ b/buildroot/package/fontconfig/fontconfig.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-FONTCONFIG_VERSION = 2.12.4
+FONTCONFIG_VERSION = 2.13.1
 FONTCONFIG_SITE = http://fontconfig.org/release
 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2
 FONTCONFIG_INSTALL_STAGING = YES
-FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf
-HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf host-gperf
+FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf util-linux
+HOST_FONTCONFIG_DEPENDENCIES = \
+	host-freetype host-expat host-pkgconf host-gperf host-util-linux
 FONTCONFIG_LICENSE = fontconfig license
 FONTCONFIG_LICENSE_FILES = COPYING
 
diff --git a/buildroot/package/freerdp/0001-xf_floatbar.c-fix-build-without-Xfixes.patch b/buildroot/package/freerdp/0001-xf_floatbar.c-fix-build-without-Xfixes.patch
new file mode 100644
index 000000000..c0b419588
--- /dev/null
+++ b/buildroot/package/freerdp/0001-xf_floatbar.c-fix-build-without-Xfixes.patch
@@ -0,0 +1,32 @@
+From 7dbb64cb62049159d9d71b9be39f469bbd116f41 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Thu, 18 Apr 2019 23:40:52 +0200
+Subject: [PATCH] xf_floatbar.c: fix build without Xfixes
+
+Remove unneeded include on Xfixes.h as it is not always available and
+not used in xf_floatbar.c
+
+Fixes:
+ - http://autobuild.buildroot.org/results/69245e574787bada718c52c805ec137041dc233d
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/FreeRDP/FreeRDP/pull/5354]
+---
+ client/X11/xf_floatbar.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/client/X11/xf_floatbar.c b/client/X11/xf_floatbar.c
+index 3643b6052..04912aa79 100644
+--- a/client/X11/xf_floatbar.c
++++ b/client/X11/xf_floatbar.c
+@@ -19,7 +19,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ #include 
+ 
+ #include "xf_floatbar.h"
+-- 
+2.20.1
+
diff --git a/buildroot/package/freerdp/freerdp.hash b/buildroot/package/freerdp/freerdp.hash
index 44b7b876a..7a6859551 100644
--- a/buildroot/package/freerdp/freerdp.hash
+++ b/buildroot/package/freerdp/freerdp.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 a09e338b996fada44bf1277f423240d0fa82289799e2e5dea9d9c63201554de1 freerdp-2.0.0-rc2.tar.gz
+sha256 3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49 freerdp-2.0.0-rc4.tar.gz
 sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
diff --git a/buildroot/package/freerdp/freerdp.mk b/buildroot/package/freerdp/freerdp.mk
index 91e4ae47e..0f32ff471 100644
--- a/buildroot/package/freerdp/freerdp.mk
+++ b/buildroot/package/freerdp/freerdp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREERDP_VERSION = 2.0.0-rc2
+FREERDP_VERSION = 2.0.0-rc4
 FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION))
 FREERDP_DEPENDENCIES = libglib2 openssl zlib
 FREERDP_LICENSE = Apache-2.0
diff --git a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
index 0a503d7a6..f9db09dae 100644
--- a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -35,7 +35,7 @@ endef
 
 define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
 	# Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin.
-	# lpddr4_pmu_train_fw.bin isneeded when generating imx-boot-imx8mqevk-sd.bin
+	# lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin
 	# which is done in post-image script.
 	$(call FIRMWARE_IMX_PREPARE_LPDDR4_FW,1d)
 	$(call FIRMWARE_IMX_PREPARE_LPDDR4_FW,2d)
diff --git a/buildroot/package/freeswitch/0002-mod_av-unbreak-with-ffmpeg-4.0.patch b/buildroot/package/freeswitch/0002-mod_av-unbreak-with-ffmpeg-4.0.patch
deleted file mode 100644
index a4693971c..000000000
--- a/buildroot/package/freeswitch/0002-mod_av-unbreak-with-ffmpeg-4.0.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 72f2f7047ad35b37002d6210458667a89c301cfe Mon Sep 17 00:00:00 2001
-From: jbeich 
-Date: Thu, 16 Aug 2018 22:14:20 +0200
-Subject: [PATCH] mod_av: unbreak with ffmpeg 4.0
-
-avformat.c:471:14: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
-                        c->flags|=CODEC_FLAG_LOOP_FILTER;   // flags=+loop
-                                  ^
-avformat.c:477:47: error: use of undeclared identifier 'ME_HEX'
-                        av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0);
-                                                                   ^
-avformat.c:553:15: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
-                c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-                            ^
-avformat.c:638:31: error: use of undeclared identifier 'CODEC_CAP_VARIABLE_FRAME_SIZE'
-        if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
-                                     ^
-
-PR:		227726
-Reported by:	antoine (via exp-run)
-
-Downloaded from
-https://github.com/freebsd/freebsd-ports/commit/da104360ea7d7861aa9fe6dc04b776a1eaf794ec
-
-Original file
-https://svnweb.freebsd.org/ports/head/net/freeswitch/files/patch-ffmpeg4?view=markup
-
-[Bernd: Rebased for freeswitch 1.8.2]
-Signed-off-by: Bernd Kuhls 
----
- src/mod/applications/mod_av/avformat.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c
-index 84900b601c..2f5c0e8d20 100644
---- a/src/mod/applications/mod_av/avformat.c
-+++ b/src/mod/applications/mod_av/avformat.c
-@@ -479,13 +479,13 @@ GCC_DIAG_ON(deprecated-declarations)
- 			c->ticks_per_frame = 2;
- 
- 
--			c->flags|=CODEC_FLAG_LOOP_FILTER;   // flags=+loop
-+			c->flags|=AV_CODEC_FLAG_LOOP_FILTER;   // flags=+loop
- 			c->me_cmp|= 1;  // cmp=+chroma, where CHROMA = 1
- 			c->me_range = 16;   // me_range=16
- 			c->max_b_frames = 3;    // bf=3
- 
- 			av_opt_set_int(c->priv_data, "b_strategy", 1, 0);
--			av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0);
-+			av_opt_set(c->priv_data, "motion_est", "hex", 0);
- 			av_opt_set_int(c->priv_data, "coder", 1, 0);
- 
- 			switch (mm->vprofile) {
-@@ -568,7 +568,7 @@ GCC_DIAG_ON(deprecated-declarations)
- 
- 	/* Some formats want stream headers to be separate. */
- 	if (fc->oformat->flags & AVFMT_GLOBALHEADER) {
--		c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+		c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 	}
- 
- 	mst->active = 1;
-@@ -660,7 +660,7 @@ GCC_DIAG_ON(deprecated-declarations)
- 	mst->frame->format         = AV_SAMPLE_FMT_S16;
- 	mst->frame->channel_layout = c->channel_layout;
- 
--	if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+	if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
- 		//mst->frame->nb_samples = 10000;
- 		mst->frame->nb_samples = (mst->frame->sample_rate / 50) * c->channels;
- 	} else {
--- 
-2.19.0
-
diff --git a/buildroot/package/freeswitch/freeswitch.hash b/buildroot/package/freeswitch/freeswitch.hash
index dab2fb237..6f90c2156 100644
--- a/buildroot/package/freeswitch/freeswitch.hash
+++ b/buildroot/package/freeswitch/freeswitch.hash
@@ -1,9 +1,9 @@
-# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.2.tar.xz.md5
-md5 61de81cd70afb056dde7b1dcb91ad967 freeswitch-1.8.2.tar.xz
-# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.2.tar.xz.sha1
-sha1 f2c077db40b05c5fdf66cbe77bd879f41132f79a freeswitch-1.8.2.tar.xz
-# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.2.tar.xz.sha256
-sha256 ebcf3db970ea9bb534c0983a1c9eef88395deb6e0902d8d6407bf217b2f27b9a freeswitch-1.8.2.tar.xz
+# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.5.tar.xz.md5
+md5 e3d750ed0bbf13ce6fe228af9af07bcd freeswitch-1.8.5.tar.xz
+# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.5.tar.xz.sha1
+sha1 e9f95b42ed9dd41437a65bddbb5c1f647436e426 freeswitch-1.8.5.tar.xz
+# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.5.tar.xz.sha256
+sha256 503a551be5d6df06162ea9d98a952b6fb524852ce2352fe3ca3a36a76995b046 freeswitch-1.8.5.tar.xz
 # Locally computed
 sha256 10299420c1e8602c0daf5a59d022621cd72a9148d1f0f33501edb3db3445c7fe  COPYING
 sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4  libs/apr/LICENSE
diff --git a/buildroot/package/freeswitch/freeswitch.mk b/buildroot/package/freeswitch/freeswitch.mk
index 577d6c945..0b7544d09 100644
--- a/buildroot/package/freeswitch/freeswitch.mk
+++ b/buildroot/package/freeswitch/freeswitch.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREESWITCH_VERSION = 1.8.2
+FREESWITCH_VERSION = 1.8.5
 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz
 FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases
 # External modules need headers/libs from staging
diff --git a/buildroot/package/fwts/fwts.mk b/buildroot/package/fwts/fwts.mk
index aa006f3b8..b29de2cf2 100644
--- a/buildroot/package/fwts/fwts.mk
+++ b/buildroot/package/fwts/fwts.mk
@@ -11,6 +11,7 @@ FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom
 FWTS_LICENSE_FILES = debian/copyright
 FWTS_AUTORECONF = YES
 FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 libbsd \
+	$(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \
 	$(if $(BR2_PACKAGE_DTC),dtc)
 
 ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE
diff --git a/buildroot/package/gcc/6.4.0/0002-fix-building-on-ppc64.patch b/buildroot/package/gcc/6.4.0/0002-fix-building-on-ppc64.patch
deleted file mode 100644
index ee096cfcf..000000000
--- a/buildroot/package/gcc/6.4.0/0002-fix-building-on-ppc64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 765527ad3725c5f3e82ab2b8e5031120b409983d Mon Sep 17 00:00:00 2001
-From: marxin 
-Date: Fri, 15 Jun 2018 08:51:28 +0000
-Subject: [PATCH] Partial backport r256656
-
-2018-06-15  Martin Liska  
-
-	Backport from mainline
-	2018-01-10  Kelvin Nilsen  
-
-	* lex.c (search_line_fast): Remove illegal coercion of an
-	unaligned pointer value to vector pointer type and replace with
-	use of __builtin_vec_vsx_ld () built-in function, which operates
-	on unaligned pointer values.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@261621 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Joel Stanley 
----
- libcpp/lex.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcpp/lex.c b/libcpp/lex.c
-index e5a0397f3099..b789686f1c49 100644
---- a/libcpp/lex.c
-+++ b/libcpp/lex.c
-@@ -568,7 +568,7 @@ search_line_fast (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
-     {
-       vc m_nl, m_cr, m_bs, m_qm;
- 
--      data = *((const vc *)s);
-+      data = __builtin_vec_vsx_ld (0, s);
-       s += 16;
- 
-       m_nl = (vc) __builtin_vec_cmpeq(data, repl_nl);
--- 
-2.17.1
-
diff --git a/buildroot/package/gcc/6.4.0/0003-libsanitizer-Use-pre-computed-size.patch b/buildroot/package/gcc/6.4.0/0003-libsanitizer-Use-pre-computed-size.patch
deleted file mode 100644
index 6e73331ea..000000000
--- a/buildroot/package/gcc/6.4.0/0003-libsanitizer-Use-pre-computed-size.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001
-From: hjl 
-Date: Thu, 24 May 2018 20:21:54 +0000
-Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux
-
-Cherry-pick compiler-rt revision 333213:
-
- has been removed from glibc 2.28 by:
-
-commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
-Author: Adhemerval Zanella 
-Date:   Sun Mar 18 11:28:59 2018 +0800
-
-    Deprecate ustat syscall interface
-
-This patch uses pre-computed size of struct ustat for Linux.
-
-	PR sanitizer/85835
-	* sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
-	include  for Linux.
-	(SIZEOF_STRUCT_USTAT): New.
-	(struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260688 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Downloaded from upstream commit
-https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=61f38c64c01a15560026115a157b7021ec67bd3b
-
-Signed-off-by: Bernd Kuhls 
----
- libsanitizer/ChangeLog                                    |  8 ++++++++
- .../sanitizer_common/sanitizer_platform_limits_posix.cc   | 15 +++++++++++++--
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 31a5e69..8017afd 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t;
- # include 
- #endif
- #include 
--#include 
- #include 
- #include 
- #include 
-@@ -247,7 +246,19 @@ namespace __sanitizer {
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
- 
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
--  unsigned struct_ustat_sz = sizeof(struct ustat);
-+  // Use pre-computed size of struct ustat to avoid  which
-+  // has been removed from glibc 2.28.
-+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-+  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
-+  || defined(__x86_64__)
-+#define SIZEOF_STRUCT_USTAT 32
-+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
-+  || defined(__powerpc__) || defined(__s390__)
-+#define SIZEOF_STRUCT_USTAT 20
-+#else
-+#error Unknown size of struct ustat
-+#endif
-+  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
-   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
-   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
- #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
--- 
-2.9.3
-
diff --git a/buildroot/package/gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch b/buildroot/package/gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch
deleted file mode 100644
index 5fe384148..000000000
--- a/buildroot/package/gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3bc2ee6886f1619bc6a2257a0775142526b1a57a Mon Sep 17 00:00:00 2001
-From: jcmvbkbc 
-Date: Mon, 11 Sep 2017 21:53:38 +0000
-Subject: [PATCH] xtensa: fix PR target/82181
-
-2017-09-11  Max Filippov  
-gcc/
-	Backport from mainline
-	* config/xtensa/xtensa.c (xtensa_mem_offset): Check that both
-	words of DImode object are reachable by xtensa_uimm8x4 access.
-
-Signed-off-by: Max Filippov 
----
- gcc/config/xtensa/xtensa.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 2bdf5ccef979..92fdeb08046d 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -601,6 +601,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
-     case HImode:
-       return xtensa_uimm8x2 (v);
- 
-+    case DImode:
-     case DFmode:
-       return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
- 
--- 
-2.1.4
-
diff --git a/buildroot/package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch b/buildroot/package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch
deleted file mode 100644
index 7ead57543..000000000
--- a/buildroot/package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 87fda0741d210727672cba5e54a37a189e8ac04e Mon Sep 17 00:00:00 2001
-From: Max Filippov 
-Date: Sun, 17 Jun 2018 21:18:39 -0700
-Subject: [PATCH] xtensa: fix PR target/65416
-
-The issue is caused by reordering of stack pointer update after stack
-space allocation with instructions that write to the allocated stack
-space. In windowed ABI register spill area for the previous call frame
-is located just below the stack pointer and may be reloaded back into
-the register file on movsp.
-Implement allocate_stack pattern for windowed ABI configuration and
-insert an instruction that prevents reordering of frame memory access
-and stack pointer update.
-
-gcc/
-2018-06-19  Max Filippov  
-
-	* config/xtensa/xtensa.md (UNSPEC_FRAME_BLOCKAGE): New unspec
-	constant.
-	(allocate_stack, frame_blockage, *frame_blockage): New patterns.
-
-Signed-off-by: Max Filippov 
-Backported from: r261755
----
- gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
-
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 84967dbedc08..209f839cfb0f 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -38,6 +38,7 @@
-   (UNSPEC_MEMW		11)
-   (UNSPEC_LSETUP_START  12)
-   (UNSPEC_LSETUP_END    13)
-+  (UNSPEC_FRAME_BLOCKAGE 14)
- 
-   (UNSPECV_SET_FP	1)
-   (UNSPECV_ENTRY	2)
-@@ -1676,6 +1677,32 @@
- 
- ;; Miscellaneous instructions.
- 
-+;; In windowed ABI stack pointer adjustment must happen before any access
-+;; to the space allocated on stack is allowed, otherwise register spill
-+;; area may be clobbered.  That's what frame blockage is supposed to enforce.
-+
-+(define_expand "allocate_stack"
-+  [(set (match_operand 0 "nonimmed_operand")
-+        (minus (reg A1_REG) (match_operand 1 "add_operand")))
-+   (set (reg A1_REG)
-+        (minus (reg A1_REG) (match_dup 1)))]
-+  "TARGET_WINDOWED_ABI"
-+{
-+  if (CONST_INT_P (operands[1]))
-+    {
-+      rtx neg_op0 = GEN_INT (-INTVAL (operands[1]));
-+      emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, neg_op0));
-+    }
-+  else
-+    {
-+      emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx,
-+			     operands[1]));
-+    }
-+  emit_move_insn (operands[0], virtual_stack_dynamic_rtx);
-+  emit_insn (gen_frame_blockage ());
-+  DONE;
-+})
-+
- (define_expand "prologue"
-   [(const_int 0)]
-   ""
-@@ -1767,6 +1794,25 @@
-   [(set_attr "length" "0")
-    (set_attr "type" "nop")])
- 
-+;; Do not schedule instructions accessing memory before this point.
-+
-+(define_expand "frame_blockage"
-+  [(set (match_dup 0)
-+        (unspec:BLK [(match_dup 1)] UNSPEC_FRAME_BLOCKAGE))]
-+  ""
-+{
-+  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
-+  MEM_VOLATILE_P (operands[0]) = 1;
-+  operands[1] = stack_pointer_rtx;
-+})
-+
-+(define_insn "*frame_blockage"
-+  [(set (match_operand:BLK 0 "" "")
-+        (unspec:BLK [(match_operand:SI 1 "" "")] UNSPEC_FRAME_BLOCKAGE))]
-+  ""
-+  ""
-+  [(set_attr "length" "0")])
-+
- (define_insn "trap"
-   [(trap_if (const_int 1) (const_int 0))]
-   ""
--- 
-2.11.0
-
diff --git a/buildroot/package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch b/buildroot/package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
deleted file mode 100644
index d62d7c156..000000000
--- a/buildroot/package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001
-From: Max Filippov 
-Date: Tue, 4 Sep 2018 00:39:32 -0700
-Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic
-
-NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2.
-That fixes libatomic tests atomic-op-{1,2}.
-
-gcc/
-2018-09-04  Max Filippov  
-
-	* config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and
-	XOR operations in NAND case.
-
-Signed-off-by: Max Filippov 
-Backported from: r264087
----
- gcc/config/xtensa/xtensa.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 7cfe64d42895..080bb4ad765d 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val,
-       break;
- 
-     case MULT: /* NAND */
--      tmp = expand_simple_binop (SImode, XOR, old, ac.modemask,
-+      tmp = expand_simple_binop (SImode, AND, old, val,
- 				 NULL_RTX, 1, OPTAB_DIRECT);
--      tmp = expand_simple_binop (SImode, AND, tmp, val,
-+      tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask,
- 				 new_rtx, 1, OPTAB_DIRECT);
-       break;
- 
--- 
-2.11.0
-
diff --git a/buildroot/package/gcc/6.4.0/942-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/buildroot/package/gcc/6.4.0/942-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
deleted file mode 100644
index a2a2ea0f2..000000000
--- a/buildroot/package/gcc/6.4.0/942-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 35d8ca22047f101a700abb29cffbf03b81278a2b Mon Sep 17 00:00:00 2001
-From: jsm28 
-Date: Tue, 4 Jul 2017 10:23:57 +0000
-Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
-
-Current glibc no longer gives the ucontext_t type the tag struct
-ucontext, to conform with POSIX namespace rules.  This requires
-various linux-unwind.h files in libgcc, that were previously using
-struct ucontext, to be fixed to use ucontext_t instead.  This is
-similar to the removal of the struct siginfo tag from siginfo_t some
-years ago.
-
-This patch changes those files to use ucontext_t instead.  As the
-standard name that should be unconditionally safe, so this is not
-restricted to architectures supported by glibc, or conditioned on the
-glibc version.
-
-Tested compilation together with current glibc with glibc's
-build-many-glibcs.py.
-
-	* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state),
-	config/alpha/linux-unwind.h (alpha_fallback_frame_state),
-	config/bfin/linux-unwind.h (bfin_fallback_frame_state),
-	config/i386/linux-unwind.h (x86_64_fallback_frame_state,
-	x86_fallback_frame_state), config/m68k/linux-unwind.h (struct
-	uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext),
-	config/pa/linux-unwind.h (pa32_fallback_frame_state),
-	config/sh/linux-unwind.h (sh_fallback_frame_state),
-	config/tilepro/linux-unwind.h (tile_fallback_frame_state),
-	config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use
-	ucontext_t instead of struct ucontext.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4
-
-(cherry picked from commit b685411208e0aaa79190d54faf945763514706b8)
-[Romain rebase on gcc 6.4]
-Signed-off-by: Romain Naour 
----
- libgcc/config/aarch64/linux-unwind.h | 2 +-
- libgcc/config/alpha/linux-unwind.h   | 2 +-
- libgcc/config/bfin/linux-unwind.h    | 2 +-
- libgcc/config/i386/linux-unwind.h    | 4 ++--
- libgcc/config/m68k/linux-unwind.h    | 2 +-
- libgcc/config/nios2/linux-unwind.h   | 2 +-
- libgcc/config/pa/linux-unwind.h      | 2 +-
- libgcc/config/sh/linux-unwind.h      | 2 +-
- libgcc/config/tilepro/linux-unwind.h | 2 +-
- libgcc/config/xtensa/linux-unwind.h  | 2 +-
- 10 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
-index 4512efb..06de45a 100644
---- a/libgcc/config/aarch64/linux-unwind.h
-+++ b/libgcc/config/aarch64/linux-unwind.h
-@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
-   struct rt_sigframe
-   {
-     siginfo_t info;
--    struct ucontext uc;
-+    ucontext_t uc;
-   };
- 
-   struct rt_sigframe *rt_;
-diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
-index bdbba4a..e84812e 100644
---- a/libgcc/config/alpha/linux-unwind.h
-+++ b/libgcc/config/alpha/linux-unwind.h
-@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
-     {
-       struct rt_sigframe {
- 	siginfo_t info;
--	struct ucontext uc;
-+	ucontext_t uc;
-       } *rt_ = context->cfa;
-       sc = &rt_->uc.uc_mcontext;
-     }
-diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
-index 77b7c23..8bf5e82 100644
---- a/libgcc/config/bfin/linux-unwind.h
-+++ b/libgcc/config/bfin/linux-unwind.h
-@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
- 	void *puc;
- 	char retcode[8];
- 	siginfo_t info;
--	struct ucontext uc;
-+	ucontext_t uc;
-       } *rt_ = context->cfa;
- 
-       /* The void * cast is necessary to avoid an aliasing warning.
-diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
-index 540a0a2..29efbe3 100644
---- a/libgcc/config/i386/linux-unwind.h
-+++ b/libgcc/config/i386/linux-unwind.h
-@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
-   if (*(unsigned char *)(pc+0) == 0x48
-       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
-     {
--      struct ucontext *uc_ = context->cfa;
-+      ucontext_t *uc_ = context->cfa;
-       /* The void * cast is necessary to avoid an aliasing warning.
-          The aliasing warning is correct, but should not be a problem
-          because it does not alias anything.  */
-@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
- 	siginfo_t *pinfo;
- 	void *puc;
- 	siginfo_t info;
--	struct ucontext uc;
-+	ucontext_t uc;
-       } *rt_ = context->cfa;
-       /* The void * cast is necessary to avoid an aliasing warning.
-          The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
-index 75b7cf7..f964e24 100644
---- a/libgcc/config/m68k/linux-unwind.h
-+++ b/libgcc/config/m68k/linux-unwind.h
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- /*  is unfortunately broken right now.  */
- struct uw_ucontext {
- 	unsigned long	  uc_flags;
--	struct ucontext  *uc_link;
-+	ucontext_t	 *uc_link;
- 	stack_t		  uc_stack;
- 	mcontext_t	  uc_mcontext;
- 	unsigned long	  uc_filler[80];
-diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
-index 2304142..30f25ea 100644
---- a/libgcc/config/nios2/linux-unwind.h
-+++ b/libgcc/config/nios2/linux-unwind.h
-@@ -38,7 +38,7 @@ struct nios2_mcontext {
- 
- struct nios2_ucontext {
-   unsigned long uc_flags;
--  struct ucontext *uc_link;
-+  ucontext_t *uc_link;
-   stack_t uc_stack;
-   struct nios2_mcontext uc_mcontext;
-   sigset_t uc_sigmask;	/* mask last for extensibility */
-diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
-index 9a2657f..e47493d 100644
---- a/libgcc/config/pa/linux-unwind.h
-+++ b/libgcc/config/pa/linux-unwind.h
-@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
-   struct sigcontext *sc;
-   struct rt_sigframe {
-     siginfo_t info;
--    struct ucontext uc;
-+    ucontext_t uc;
-   } *frame;
- 
-   /* rt_sigreturn trampoline:
-diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
-index e389cac..0bf43ba 100644
---- a/libgcc/config/sh/linux-unwind.h
-+++ b/libgcc/config/sh/linux-unwind.h
-@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
-     {
-       struct rt_sigframe {
- 	siginfo_t info;
--	struct ucontext uc;
-+	ucontext_t uc;
-       } *rt_ = context->cfa;
-       /* The void * cast is necessary to avoid an aliasing warning.
-          The aliasing warning is correct, but should not be a problem
-diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
-index 796e976..75f8890 100644
---- a/libgcc/config/tilepro/linux-unwind.h
-+++ b/libgcc/config/tilepro/linux-unwind.h
-@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
-   struct rt_sigframe {
-     unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
-     siginfo_t info;
--    struct ucontext uc;
-+    ucontext_t uc;
-   } *rt_;
- 
-   /* Return if this is not a signal handler.  */
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9872492..586a9d4 100644
---- a/libgcc/config/xtensa/linux-unwind.h
-+++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
- 
-   struct rt_sigframe {
-     siginfo_t info;
--    struct ucontext uc;
-+    ucontext_t uc;
-   } *rt_;
- 
-   /* movi a2, __NR_rt_sigreturn; syscall */
--- 
-2.9.5
-
diff --git a/buildroot/package/gcc/6.4.0/943-sanitizer-linux.patch b/buildroot/package/gcc/6.4.0/943-sanitizer-linux.patch
deleted file mode 100644
index 640d68c85..000000000
--- a/buildroot/package/gcc/6.4.0/943-sanitizer-linux.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From a3e3d1b5f73380a99126c4937a95225ba3bd214b Mon Sep 17 00:00:00 2001
-From: doko 
-Date: Thu, 7 Sep 2017 07:15:24 +0000
-Subject: [PATCH] 2017-09-07  Matthias Klose  
-
-        Backported from mainline
-        2017-07-14  Jakub Jelinek  
-
-        PR sanitizer/81066
-        * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969.
-        * sanitizer_common/sanitizer_linux.cc: Likewise.
-        * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise.
-        * tsan/tsan_platform_linux.cc: Likewise.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@251828 138bc75d-0d04-0410-961f-82ee72b054a4
-
-(cherry picked from commit 8937b94d1a643fd9760714642296d034a45254a8)
-[Romain rebase on gcc 6.4]
-Signed-off-by: Romain Naour 
----
- libsanitizer/sanitizer_common/sanitizer_linux.cc                      | 3 +--
- libsanitizer/sanitizer_common/sanitizer_linux.h                       | 4 +---
- libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +-
- libsanitizer/tsan/tsan_platform_linux.cc                              | 2 +-
- 4 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc
-index 2cefa20..223d9c6 100644
---- a/libsanitizer/sanitizer_common/sanitizer_linux.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc
-@@ -546,8 +546,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
- }
- #endif
- 
--uptr internal_sigaltstack(const struct sigaltstack *ss,
--                         struct sigaltstack *oss) {
-+uptr internal_sigaltstack(const void *ss, void *oss) {
-   return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
- }
- 
-diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h
-index 4497702..1594058 100644
---- a/libsanitizer/sanitizer_common/sanitizer_linux.h
-+++ b/libsanitizer/sanitizer_common/sanitizer_linux.h
-@@ -19,7 +19,6 @@
- #include "sanitizer_platform_limits_posix.h"
- 
- struct link_map;  // Opaque type returned by dlopen().
--struct sigaltstack;
- 
- namespace __sanitizer {
- // Dirent structure for getdents(). Note that this structure is different from
-@@ -28,8 +27,7 @@ struct linux_dirent;
- 
- // Syscall wrappers.
- uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
--uptr internal_sigaltstack(const struct sigaltstack* ss,
--                          struct sigaltstack* oss);
-+uptr internal_sigaltstack(const void* ss, void* oss);
- uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
-     __sanitizer_sigset_t *oldset);
- void internal_sigfillset(__sanitizer_sigset_t *set);
-diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
-index c919e4f..014162af 100644
---- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
-@@ -267,7 +267,7 @@ static int TracerThread(void* argument) {
- 
-   // Alternate stack for signal handling.
-   InternalScopedBuffer handler_stack_memory(kHandlerStackSize);
--  struct sigaltstack handler_stack;
-+  stack_t handler_stack;
-   internal_memset(&handler_stack, 0, sizeof(handler_stack));
-   handler_stack.ss_sp = handler_stack_memory.data();
-   handler_stack.ss_size = kHandlerStackSize;
-diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc
-index 09cec5f..908f4fe 100644
---- a/libsanitizer/tsan/tsan_platform_linux.cc
-+++ b/libsanitizer/tsan/tsan_platform_linux.cc
-@@ -291,7 +291,7 @@ bool IsGlobalVar(uptr addr) {
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
- #if SANITIZER_LINUX
-   int cnt = 0;
--  __res_state *statp = (__res_state*)state;
-+  struct __res_state *statp = (struct __res_state*)state;
-   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
-     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
-       fds[cnt++] = statp->_u._ext.nssocks[i];
--- 
-2.9.5
-
diff --git a/buildroot/package/gcc/6.4.0/0001-m68k-coldfire-pr68467.patch b/buildroot/package/gcc/6.5.0/0001-m68k-coldfire-pr68467.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/0001-m68k-coldfire-pr68467.patch
rename to buildroot/package/gcc/6.5.0/0001-m68k-coldfire-pr68467.patch
diff --git a/buildroot/package/gcc/6.4.0/0004-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch b/buildroot/package/gcc/6.5.0/0004-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/0004-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch
rename to buildroot/package/gcc/6.5.0/0004-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch
diff --git a/buildroot/package/gcc/6.4.0/100-uclibc-conf.patch b/buildroot/package/gcc/6.5.0/100-uclibc-conf.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/100-uclibc-conf.patch
rename to buildroot/package/gcc/6.5.0/100-uclibc-conf.patch
diff --git a/buildroot/package/gcc/6.4.0/301-missing-execinfo_h.patch b/buildroot/package/gcc/6.5.0/301-missing-execinfo_h.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/301-missing-execinfo_h.patch
rename to buildroot/package/gcc/6.5.0/301-missing-execinfo_h.patch
diff --git a/buildroot/package/gcc/6.4.0/810-arm-softfloat-libgcc.patch b/buildroot/package/gcc/6.5.0/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/810-arm-softfloat-libgcc.patch
rename to buildroot/package/gcc/6.5.0/810-arm-softfloat-libgcc.patch
diff --git a/buildroot/package/gcc/6.4.0/830-arm_unbreak_armv4t.patch b/buildroot/package/gcc/6.5.0/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/830-arm_unbreak_armv4t.patch
rename to buildroot/package/gcc/6.5.0/830-arm_unbreak_armv4t.patch
diff --git a/buildroot/package/gcc/6.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/buildroot/package/gcc/6.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
rename to buildroot/package/gcc/6.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
diff --git a/buildroot/package/gcc/6.4.0/860-cilk-wchar.patch b/buildroot/package/gcc/6.5.0/860-cilk-wchar.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/860-cilk-wchar.patch
rename to buildroot/package/gcc/6.5.0/860-cilk-wchar.patch
diff --git a/buildroot/package/gcc/6.4.0/890-fix-m68k-compile.patch b/buildroot/package/gcc/6.5.0/890-fix-m68k-compile.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/890-fix-m68k-compile.patch
rename to buildroot/package/gcc/6.5.0/890-fix-m68k-compile.patch
diff --git a/buildroot/package/gcc/6.4.0/896-microblaze-Revert.patch b/buildroot/package/gcc/6.5.0/896-microblaze-Revert.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/896-microblaze-Revert.patch
rename to buildroot/package/gcc/6.5.0/896-microblaze-Revert.patch
diff --git a/buildroot/package/gcc/6.4.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch b/buildroot/package/gcc/6.5.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch
rename to buildroot/package/gcc/6.5.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch
diff --git a/buildroot/package/gcc/6.4.0/940-uclinux-enable-threads.patch b/buildroot/package/gcc/6.5.0/940-uclinux-enable-threads.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/940-uclinux-enable-threads.patch
rename to buildroot/package/gcc/6.5.0/940-uclinux-enable-threads.patch
diff --git a/buildroot/package/gcc/6.4.0/941-mips-Add-support-for-mips-r6-musl.patch b/buildroot/package/gcc/6.5.0/941-mips-Add-support-for-mips-r6-musl.patch
similarity index 100%
rename from buildroot/package/gcc/6.4.0/941-mips-Add-support-for-mips-r6-musl.patch
rename to buildroot/package/gcc/6.5.0/941-mips-Add-support-for-mips-r6-musl.patch
diff --git a/buildroot/package/gcc/7.3.0/0001-m68k-coldfire-pr68467.patch b/buildroot/package/gcc/7.3.0/0001-m68k-coldfire-pr68467.patch
deleted file mode 100644
index 629c6496e..000000000
--- a/buildroot/package/gcc/7.3.0/0001-m68k-coldfire-pr68467.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Backport from upstream, see
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467
-
-Signed-off-by: Waldemar Brodkorb 
-
-diff -Nur gcc-7.2.0.orig/gcc/config/m68k/m68k.c gcc-7.2.0/gcc/config/m68k/m68k.c
---- gcc-7.2.0.orig/gcc/config/m68k/m68k.c	2017-04-03 22:30:56.274463000 +0000
-+++ gcc-7.2.0/gcc/config/m68k/m68k.c	2018-01-27 02:16:53.779367849 +0000
-@@ -182,6 +182,8 @@
- 			      const_tree, bool);
- static bool m68k_cannot_force_const_mem (machine_mode mode, rtx x);
- static bool m68k_output_addr_const_extra (FILE *, rtx);
-+static machine_mode m68k_promote_function_mode (const_tree, machine_mode,
-+						int *, const_tree, int);
- static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED;
- static enum flt_eval_method
- m68k_excess_precision (enum excess_precision_type);
-@@ -332,6 +334,9 @@
- #undef TARGET_ATOMIC_TEST_AND_SET_TRUEVAL
- #define TARGET_ATOMIC_TEST_AND_SET_TRUEVAL 128
- 
-+#undef TARGET_PROMOTE_FUNCTION_MODE
-+#define TARGET_PROMOTE_FUNCTION_MODE m68k_promote_function_mode
-+
- static const struct attribute_spec m68k_attribute_table[] =
- {
-   /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler,
-@@ -6571,4 +6576,20 @@
-   return FLT_EVAL_METHOD_UNPREDICTABLE;
- }
- 
-+/* Implement TARGET_PROMOTE_FUNCTION_MODE.  */
-+
-+static machine_mode
-+m68k_promote_function_mode (const_tree type, machine_mode mode,
-+                            int *punsignedp ATTRIBUTE_UNUSED,
-+                            const_tree fntype ATTRIBUTE_UNUSED,
-+                            int for_return)
-+{
-+  /* Promote libcall arguments narrower than int to match the normal C
-+     ABI (for which promotions are handled via
-+     TARGET_PROMOTE_PROTOTYPES).  */
-+  if (type == NULL_TREE && !for_return && (mode == QImode || mode == HImode))
-+    return SImode;
-+  return mode;
-+}
-+
- #include "gt-m68k.h"
diff --git a/buildroot/package/gcc/7.3.0/0002-fix-building-on-ppc64.patch b/buildroot/package/gcc/7.3.0/0002-fix-building-on-ppc64.patch
deleted file mode 100644
index 78a028c29..000000000
--- a/buildroot/package/gcc/7.3.0/0002-fix-building-on-ppc64.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From aa65a43516da1d48011ef621ed5988289711d99b Mon Sep 17 00:00:00 2001
-From: marxin 
-Date: Fri, 29 Jun 2018 09:31:30 +0000
-Subject: [PATCH] Partial backport r256656
-
-2018-06-29  Martin Liska  
-
-	Backport from mainline
-	2018-01-10  Kelvin Nilsen  
-
-	* lex.c (search_line_fast): Remove illegal coercion of an
-	unaligned pointer value to vector pointer type and replace with
-	use of __builtin_vec_vsx_ld () built-in function, which operates
-	on unaligned pointer values.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@261621 138bc75d-0d04-0410-961f-82ee72b054a4
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@262243 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Joel Stanley 
----
- libcpp/lex.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcpp/lex.c b/libcpp/lex.c
-index 097c78002cbb..e0fb9e822c44 100644
---- a/libcpp/lex.c
-+++ b/libcpp/lex.c
-@@ -568,7 +568,7 @@ search_line_fast (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
-     {
-       vc m_nl, m_cr, m_bs, m_qm;
- 
--      data = *((const vc *)s);
-+      data = __builtin_vec_vsx_ld (0, s);
-       s += 16;
- 
-       m_nl = (vc) __builtin_vec_cmpeq(data, repl_nl);
--- 
-2.17.1
-
diff --git a/buildroot/package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch b/buildroot/package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
deleted file mode 100644
index d62d7c156..000000000
--- a/buildroot/package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001
-From: Max Filippov 
-Date: Tue, 4 Sep 2018 00:39:32 -0700
-Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic
-
-NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2.
-That fixes libatomic tests atomic-op-{1,2}.
-
-gcc/
-2018-09-04  Max Filippov  
-
-	* config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and
-	XOR operations in NAND case.
-
-Signed-off-by: Max Filippov 
-Backported from: r264087
----
- gcc/config/xtensa/xtensa.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 7cfe64d42895..080bb4ad765d 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val,
-       break;
- 
-     case MULT: /* NAND */
--      tmp = expand_simple_binop (SImode, XOR, old, ac.modemask,
-+      tmp = expand_simple_binop (SImode, AND, old, val,
- 				 NULL_RTX, 1, OPTAB_DIRECT);
--      tmp = expand_simple_binop (SImode, AND, tmp, val,
-+      tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask,
- 				 new_rtx, 1, OPTAB_DIRECT);
-       break;
- 
--- 
-2.11.0
-
diff --git a/buildroot/package/gcc/7.3.0/0003-xtensa-fix-PR-target-65416.patch b/buildroot/package/gcc/7.3.0/0003-xtensa-fix-PR-target-65416.patch
deleted file mode 100644
index 7ead57543..000000000
--- a/buildroot/package/gcc/7.3.0/0003-xtensa-fix-PR-target-65416.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 87fda0741d210727672cba5e54a37a189e8ac04e Mon Sep 17 00:00:00 2001
-From: Max Filippov 
-Date: Sun, 17 Jun 2018 21:18:39 -0700
-Subject: [PATCH] xtensa: fix PR target/65416
-
-The issue is caused by reordering of stack pointer update after stack
-space allocation with instructions that write to the allocated stack
-space. In windowed ABI register spill area for the previous call frame
-is located just below the stack pointer and may be reloaded back into
-the register file on movsp.
-Implement allocate_stack pattern for windowed ABI configuration and
-insert an instruction that prevents reordering of frame memory access
-and stack pointer update.
-
-gcc/
-2018-06-19  Max Filippov  
-
-	* config/xtensa/xtensa.md (UNSPEC_FRAME_BLOCKAGE): New unspec
-	constant.
-	(allocate_stack, frame_blockage, *frame_blockage): New patterns.
-
-Signed-off-by: Max Filippov 
-Backported from: r261755
----
- gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
-
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 84967dbedc08..209f839cfb0f 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -38,6 +38,7 @@
-   (UNSPEC_MEMW		11)
-   (UNSPEC_LSETUP_START  12)
-   (UNSPEC_LSETUP_END    13)
-+  (UNSPEC_FRAME_BLOCKAGE 14)
- 
-   (UNSPECV_SET_FP	1)
-   (UNSPECV_ENTRY	2)
-@@ -1676,6 +1677,32 @@
- 
- ;; Miscellaneous instructions.
- 
-+;; In windowed ABI stack pointer adjustment must happen before any access
-+;; to the space allocated on stack is allowed, otherwise register spill
-+;; area may be clobbered.  That's what frame blockage is supposed to enforce.
-+
-+(define_expand "allocate_stack"
-+  [(set (match_operand 0 "nonimmed_operand")
-+        (minus (reg A1_REG) (match_operand 1 "add_operand")))
-+   (set (reg A1_REG)
-+        (minus (reg A1_REG) (match_dup 1)))]
-+  "TARGET_WINDOWED_ABI"
-+{
-+  if (CONST_INT_P (operands[1]))
-+    {
-+      rtx neg_op0 = GEN_INT (-INTVAL (operands[1]));
-+      emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, neg_op0));
-+    }
-+  else
-+    {
-+      emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx,
-+			     operands[1]));
-+    }
-+  emit_move_insn (operands[0], virtual_stack_dynamic_rtx);
-+  emit_insn (gen_frame_blockage ());
-+  DONE;
-+})
-+
- (define_expand "prologue"
-   [(const_int 0)]
-   ""
-@@ -1767,6 +1794,25 @@
-   [(set_attr "length" "0")
-    (set_attr "type" "nop")])
- 
-+;; Do not schedule instructions accessing memory before this point.
-+
-+(define_expand "frame_blockage"
-+  [(set (match_dup 0)
-+        (unspec:BLK [(match_dup 1)] UNSPEC_FRAME_BLOCKAGE))]
-+  ""
-+{
-+  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
-+  MEM_VOLATILE_P (operands[0]) = 1;
-+  operands[1] = stack_pointer_rtx;
-+})
-+
-+(define_insn "*frame_blockage"
-+  [(set (match_operand:BLK 0 "" "")
-+        (unspec:BLK [(match_operand:SI 1 "" "")] UNSPEC_FRAME_BLOCKAGE))]
-+  ""
-+  ""
-+  [(set_attr "length" "0")])
-+
- (define_insn "trap"
-   [(trap_if (const_int 1) (const_int 0))]
-   ""
--- 
-2.11.0
-
diff --git a/buildroot/package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch b/buildroot/package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch
deleted file mode 100644
index 6e73331ea..000000000
--- a/buildroot/package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001
-From: hjl 
-Date: Thu, 24 May 2018 20:21:54 +0000
-Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux
-
-Cherry-pick compiler-rt revision 333213:
-
- has been removed from glibc 2.28 by:
-
-commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
-Author: Adhemerval Zanella 
-Date:   Sun Mar 18 11:28:59 2018 +0800
-
-    Deprecate ustat syscall interface
-
-This patch uses pre-computed size of struct ustat for Linux.
-
-	PR sanitizer/85835
-	* sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
-	include  for Linux.
-	(SIZEOF_STRUCT_USTAT): New.
-	(struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260688 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Downloaded from upstream commit
-https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=61f38c64c01a15560026115a157b7021ec67bd3b
-
-Signed-off-by: Bernd Kuhls 
----
- libsanitizer/ChangeLog                                    |  8 ++++++++
- .../sanitizer_common/sanitizer_platform_limits_posix.cc   | 15 +++++++++++++--
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 31a5e69..8017afd 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t;
- # include 
- #endif
- #include 
--#include 
- #include 
- #include 
- #include 
-@@ -247,7 +246,19 @@ namespace __sanitizer {
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
- 
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
--  unsigned struct_ustat_sz = sizeof(struct ustat);
-+  // Use pre-computed size of struct ustat to avoid  which
-+  // has been removed from glibc 2.28.
-+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-+  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
-+  || defined(__x86_64__)
-+#define SIZEOF_STRUCT_USTAT 32
-+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
-+  || defined(__powerpc__) || defined(__s390__)
-+#define SIZEOF_STRUCT_USTAT 20
-+#else
-+#error Unknown size of struct ustat
-+#endif
-+  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
-   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
-   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
- #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
--- 
-2.9.3
-
diff --git a/buildroot/package/gcc/7.3.0/0005-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch b/buildroot/package/gcc/7.3.0/0005-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch
deleted file mode 100644
index 360947cbb..000000000
--- a/buildroot/package/gcc/7.3.0/0005-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 960a2552f7b418134cdf7a31e96023a3811b98dd Mon Sep 17 00:00:00 2001
-From: Max Filippov 
-Date: Sun, 4 Nov 2018 23:55:59 -0800
-Subject: [PATCH] gcc: xtensa: don't force PIC for uclinux target
-
-xtensa-uclinux uses bFLT executable file format that cannot relocate
-fields representing offsets from data to code. C++ objects built as PIC
-use offsets to encode FDE structures. As a result C++ exception handling
-doesn't work correctly on xtensa-uclinux. Don't use PIC by default on
-xtensa-uclinux.
-
-gcc/
-2018-11-05  Max Filippov  
-
-	* config/xtensa/uclinux.h (XTENSA_ALWAYS_PIC): Change to 0.
-
-Signed-off-by: Max Filippov 
----
-Backported from: r265823
-
- gcc/config/xtensa/uclinux.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
-index ba26187c8f7a..c7743df9d97c 100644
---- a/gcc/config/xtensa/uclinux.h
-+++ b/gcc/config/xtensa/uclinux.h
-@@ -59,8 +59,8 @@ along with GCC; see the file COPYING3.  If not see
- #undef LOCAL_LABEL_PREFIX
- #define LOCAL_LABEL_PREFIX	"."
- 
--/* Always enable "-fpic" for Xtensa Linux.  */
--#define XTENSA_ALWAYS_PIC 1
-+/* Don't enable "-fpic" for Xtensa uclinux.  */
-+#define XTENSA_ALWAYS_PIC 0
- 
- #undef TARGET_LIBC_HAS_FUNCTION
- #define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
--- 
-2.11.0
-
diff --git a/buildroot/package/gcc/7.3.0/0100-uclibc-conf.patch b/buildroot/package/gcc/7.4.0/0100-uclibc-conf.patch
similarity index 100%
rename from buildroot/package/gcc/7.3.0/0100-uclibc-conf.patch
rename to buildroot/package/gcc/7.4.0/0100-uclibc-conf.patch
diff --git a/buildroot/package/gcc/7.3.0/0810-arm-softfloat-libgcc.patch b/buildroot/package/gcc/7.4.0/0810-arm-softfloat-libgcc.patch
similarity index 100%
rename from buildroot/package/gcc/7.3.0/0810-arm-softfloat-libgcc.patch
rename to buildroot/package/gcc/7.4.0/0810-arm-softfloat-libgcc.patch
diff --git a/buildroot/package/gcc/7.3.0/0860-cilk-fix-build-without-wchar.patch b/buildroot/package/gcc/7.4.0/0860-cilk-fix-build-without-wchar.patch
similarity index 100%
rename from buildroot/package/gcc/7.3.0/0860-cilk-fix-build-without-wchar.patch
rename to buildroot/package/gcc/7.4.0/0860-cilk-fix-build-without-wchar.patch
diff --git a/buildroot/package/gcc/7.3.0/0892-microblaze-Revert.patch b/buildroot/package/gcc/7.4.0/0892-microblaze-Revert.patch
similarity index 96%
rename from buildroot/package/gcc/7.3.0/0892-microblaze-Revert.patch
rename to buildroot/package/gcc/7.4.0/0892-microblaze-Revert.patch
index 7026d0efe..f7ea1e838 100644
--- a/buildroot/package/gcc/7.3.0/0892-microblaze-Revert.patch
+++ b/buildroot/package/gcc/7.4.0/0892-microblaze-Revert.patch
@@ -14,6 +14,7 @@ Subject: [PATCH] 	Revert: 	2016-01-21  Ajit Agarwal
 
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248540 138bc75d-0d04-0410-961f-82ee72b054a4
 Signed-off-by: Waldemar Brodkorb 
+Signed-off-by: Romain Naour 
 diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h
 index 66e4ef5..2c9ece1 100644
 --- a/gcc/config/microblaze/microblaze.h
diff --git a/buildroot/package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch b/buildroot/package/gcc/7.4.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch
similarity index 97%
rename from buildroot/package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch
rename to buildroot/package/gcc/7.4.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch
index 37acc8b65..fb8509fae 100644
--- a/buildroot/package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch
+++ b/buildroot/package/gcc/7.4.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch
@@ -38,11 +38,11 @@ with the first arm-specific C++ tests (in that directory).
 	* g++.target/arm/arm.exp: New file.
 	* g++.target/arm/pr81497.C: Likewise.
 
-
 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261191 138bc75d-0d04-0410-961f-82ee72b054a4
 Upstream-Status: Merged (gcc-8-branch)
 Signed-off-by: Gaël PORTAY 
 [gportay: drop gcc/{,testsuite/}ChangeLog changes]
+Signed-off-by: Romain Naour 
 ---
  gcc/config/arm/arm-builtins.c          | 42 +++++++++++++---------
  gcc/config/arm/arm_acle.h              | 28 +++++++--------
@@ -56,7 +56,7 @@ diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c
 index 7fde7a04672..183a7b907f6 100644
 --- a/gcc/config/arm/arm-builtins.c
 +++ b/gcc/config/arm/arm-builtins.c
-@@ -78,7 +78,11 @@ enum arm_type_qualifiers
+@@ -75,7 +75,11 @@ enum arm_type_qualifiers
    /* Lane indices - must be within range of previous argument = a vector.  */
    qualifier_lane_index = 0x200,
    /* Lane indices for single lane structure loads and stores.  */
@@ -69,7 +69,7 @@ index 7fde7a04672..183a7b907f6 100644
  };
  
  /*  The qualifier_internal allows generation of a unary builtin from
-@@ -202,7 +206,7 @@ arm_cdp_qualifiers[SIMD_MAX_BUILTIN_ARGS]
+@@ -185,7 +189,7 @@ arm_cdp_qualifiers[SIMD_MAX_BUILTIN_ARGS]
  static enum arm_type_qualifiers
  arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS]
    = { qualifier_void, qualifier_unsigned_immediate,
@@ -78,7 +78,7 @@ index 7fde7a04672..183a7b907f6 100644
  #define LDC_QUALIFIERS \
    (arm_ldc_qualifiers)
  
-@@ -210,7 +214,7 @@ arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS]
+@@ -193,7 +197,7 @@ arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS]
  static enum arm_type_qualifiers
  arm_stc_qualifiers[SIMD_MAX_BUILTIN_ARGS]
    = { qualifier_void, qualifier_unsigned_immediate,
@@ -87,7 +87,7 @@ index 7fde7a04672..183a7b907f6 100644
  #define STC_QUALIFIERS \
    (arm_stc_qualifiers)
  
-@@ -1095,19 +1099,25 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d,
+@@ -1079,19 +1083,25 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d,
        if (qualifiers & qualifier_pointer && VECTOR_MODE_P (op_mode))
  	op_mode = GET_MODE_INNER (op_mode);
  
diff --git a/buildroot/package/gcc/7.3.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch b/buildroot/package/gcc/7.4.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
similarity index 94%
rename from buildroot/package/gcc/7.3.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
rename to buildroot/package/gcc/7.4.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
index 1d4f8c015..accaf0214 100644
--- a/buildroot/package/gcc/7.3.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
+++ b/buildroot/package/gcc/7.4.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
@@ -8,6 +8,7 @@ is defined. Added the CPP_SPEC definition from gcc 8.1.0 to correct
 this.
 
 Signed-off-by: Mark Corbin 
+Signed-off-by: Romain Naour 
 ---
  gcc/config/riscv/linux.h | 2 ++
  1 file changed, 2 insertions(+)
diff --git a/buildroot/package/gcc/8.2.0/0001-uclibc-conf.patch b/buildroot/package/gcc/8.2.0/0001-uclibc-conf.patch
deleted file mode 100644
index dc223f965..000000000
--- a/buildroot/package/gcc/8.2.0/0001-uclibc-conf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 897881dfdf6a922957c40cbbe9f96bbbe5374770 Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Tue, 2 May 2017 22:36:15 +0200
-Subject: [PATCH] uclibc-conf
-
-[Romain: convert to git patch]
-Signed-off-by: Romain Naour 
----
- contrib/regression/objs-gcc.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh
-index 60b0497fea2..6dc7eadff36 100755
---- a/contrib/regression/objs-gcc.sh
-+++ b/contrib/regression/objs-gcc.sh
-@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ]
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
--- 
-2.14.3
-
diff --git a/buildroot/package/gcc/8.2.0/0002-arm-softfloat-libgcc.patch b/buildroot/package/gcc/8.2.0/0002-arm-softfloat-libgcc.patch
deleted file mode 100644
index a72e57dff..000000000
--- a/buildroot/package/gcc/8.2.0/0002-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b05e2b0942d49f9611a92fd2bb2b292f3d486285 Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Tue, 2 May 2017 22:46:18 +0200
-Subject: [PATCH] arm softfloat libgcc
-
-[Romain: convert to git patch]
-Signed-off-by: Romain Naour 
----
- gcc/config/arm/linux-elf.h | 2 +-
- libgcc/config/arm/t-linux  | 7 ++++++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index cfcd9cb1a5c..b8a9a9ca4ae 100644
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -58,7 +58,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-diff --git a/libgcc/config/arm/t-linux b/libgcc/config/arm/t-linux
-index 3d520decafb..e7bc042d4e4 100644
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
--- 
-2.14.3
-
diff --git a/buildroot/package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch b/buildroot/package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
deleted file mode 100644
index d62d7c156..000000000
--- a/buildroot/package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001
-From: Max Filippov 
-Date: Tue, 4 Sep 2018 00:39:32 -0700
-Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic
-
-NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2.
-That fixes libatomic tests atomic-op-{1,2}.
-
-gcc/
-2018-09-04  Max Filippov  
-
-	* config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and
-	XOR operations in NAND case.
-
-Signed-off-by: Max Filippov 
-Backported from: r264087
----
- gcc/config/xtensa/xtensa.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 7cfe64d42895..080bb4ad765d 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val,
-       break;
- 
-     case MULT: /* NAND */
--      tmp = expand_simple_binop (SImode, XOR, old, ac.modemask,
-+      tmp = expand_simple_binop (SImode, AND, old, val,
- 				 NULL_RTX, 1, OPTAB_DIRECT);
--      tmp = expand_simple_binop (SImode, AND, tmp, val,
-+      tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask,
- 				 new_rtx, 1, OPTAB_DIRECT);
-       break;
- 
--- 
-2.11.0
-
diff --git a/buildroot/package/gcc/8.2.0/0005-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch b/buildroot/package/gcc/8.2.0/0005-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch
deleted file mode 100644
index 360947cbb..000000000
--- a/buildroot/package/gcc/8.2.0/0005-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 960a2552f7b418134cdf7a31e96023a3811b98dd Mon Sep 17 00:00:00 2001
-From: Max Filippov 
-Date: Sun, 4 Nov 2018 23:55:59 -0800
-Subject: [PATCH] gcc: xtensa: don't force PIC for uclinux target
-
-xtensa-uclinux uses bFLT executable file format that cannot relocate
-fields representing offsets from data to code. C++ objects built as PIC
-use offsets to encode FDE structures. As a result C++ exception handling
-doesn't work correctly on xtensa-uclinux. Don't use PIC by default on
-xtensa-uclinux.
-
-gcc/
-2018-11-05  Max Filippov  
-
-	* config/xtensa/uclinux.h (XTENSA_ALWAYS_PIC): Change to 0.
-
-Signed-off-by: Max Filippov 
----
-Backported from: r265823
-
- gcc/config/xtensa/uclinux.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
-index ba26187c8f7a..c7743df9d97c 100644
---- a/gcc/config/xtensa/uclinux.h
-+++ b/gcc/config/xtensa/uclinux.h
-@@ -59,8 +59,8 @@ along with GCC; see the file COPYING3.  If not see
- #undef LOCAL_LABEL_PREFIX
- #define LOCAL_LABEL_PREFIX	"."
- 
--/* Always enable "-fpic" for Xtensa Linux.  */
--#define XTENSA_ALWAYS_PIC 1
-+/* Don't enable "-fpic" for Xtensa uclinux.  */
-+#define XTENSA_ALWAYS_PIC 0
- 
- #undef TARGET_LIBC_HAS_FUNCTION
- #define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
--- 
-2.11.0
-
diff --git a/buildroot/package/gcc/Config.in.host b/buildroot/package/gcc/Config.in.host
index 1d4e946f5..4934c2852 100644
--- a/buildroot/package/gcc/Config.in.host
+++ b/buildroot/package/gcc/Config.in.host
@@ -9,10 +9,10 @@ choice
 	  Select the version of gcc you wish to use.
 
 config BR2_GCC_VERSION_ARC
-	bool "gcc arc (7.x)"
+	bool "gcc arc (8.x)"
 	# Only supported architecture
 	depends on BR2_arc
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_7
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_8
 
 config BR2_GCC_VERSION_OR1K
 	bool "gcc or1k (5.x)"
@@ -68,6 +68,9 @@ config BR2_GCC_VERSION_8_X
 	bool "gcc 8.x"
 	# Broken or unsupported architectures
 	depends on !BR2_or1k
+	# powerpc spe support has been deprecated since gcc 8.x.
+	# https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html
+	depends on !BR2_powerpc_SPE
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_8
 
 endchoice
@@ -82,10 +85,10 @@ config BR2_GCC_VERSION
 	string
 	default "4.9.4"     if BR2_GCC_VERSION_4_9_X
 	default "5.5.0"     if BR2_GCC_VERSION_5_X
-	default "6.4.0"     if BR2_GCC_VERSION_6_X
-	default "7.3.0"     if BR2_GCC_VERSION_7_X
-	default "8.2.0"     if BR2_GCC_VERSION_8_X
-	default "arc-2018.03" if BR2_GCC_VERSION_ARC
+	default "6.5.0"     if BR2_GCC_VERSION_6_X
+	default "7.4.0"     if BR2_GCC_VERSION_7_X
+	default "8.3.0"     if BR2_GCC_VERSION_8_X
+	default "arc-2018.09-release" if BR2_GCC_VERSION_ARC
 	default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
diff --git a/buildroot/package/gcc/arc-2018.03/0860-cilk-fix-build-without-wchar.patch b/buildroot/package/gcc/arc-2018.03/0860-cilk-fix-build-without-wchar.patch
deleted file mode 100644
index 61ab01c71..000000000
--- a/buildroot/package/gcc/arc-2018.03/0860-cilk-fix-build-without-wchar.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 714739e69ead1d9823233af40645277f6d4633ea Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard 
-Date: Tue, 2 May 2017 23:21:46 +0200
-Subject: [PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard 
-[Romain: convert to git patch]
-Signed-off-by: Romain Naour 
----
- libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h
-index 641aa82..4f8e010 100644
---- a/libcilkrts/include/cilk/reducer_min_max.h
-+++ b/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3289,7 +3289,9 @@ __CILKRTS_BEGIN_EXTERN_C
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3441,7 +3443,9 @@ __CILKRTS_BEGIN_EXTERN_C
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3567,7 +3571,9 @@ __CILKRTS_BEGIN_EXTERN_C
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3719,7 +3725,9 @@ __CILKRTS_BEGIN_EXTERN_C
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
--- 
-2.9.3
-
diff --git a/buildroot/package/gcc/arc-2018.03/0100-uclibc-conf.patch b/buildroot/package/gcc/arc-2018.09-release/0100-uclibc-conf.patch
similarity index 100%
rename from buildroot/package/gcc/arc-2018.03/0100-uclibc-conf.patch
rename to buildroot/package/gcc/arc-2018.09-release/0100-uclibc-conf.patch
diff --git a/buildroot/package/gcc/gcc-final/gcc-final.mk b/buildroot/package/gcc/gcc-final/gcc-final.mk
index cbde56ce1..49f16f699 100644
--- a/buildroot/package/gcc/gcc-final/gcc-final.mk
+++ b/buildroot/package/gcc/gcc-final/gcc-final.mk
@@ -15,7 +15,6 @@ HOST_GCC_FINAL_DEPENDENCIES = \
 	$(BR_LIBC)
 
 HOST_GCC_FINAL_EXCLUDES = $(HOST_GCC_EXCLUDES)
-HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
 
 ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
 HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
@@ -69,10 +68,12 @@ HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib*
 # doesn't use floating point operations.
 ifeq ($(BR2_sh4)$(BR2_sh4eb),y)
 HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4,m4-nofpu"
+# check-package OverriddenVariable
 HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4*
 endif
 ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y)
 HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4a,m4a-nofpu"
+# check-package OverriddenVariable
 HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4*
 endif
 
diff --git a/buildroot/package/gcc/gcc-initial/gcc-initial.mk b/buildroot/package/gcc/gcc-initial/gcc-initial.mk
index d5d925a3d..1decca825 100644
--- a/buildroot/package/gcc/gcc-initial/gcc-initial.mk
+++ b/buildroot/package/gcc/gcc-initial/gcc-initial.mk
@@ -16,7 +16,6 @@ HOST_GCC_INITIAL_DL_SUBDIR = gcc
 HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
 
 HOST_GCC_INITIAL_EXCLUDES = $(HOST_GCC_EXCLUDES)
-HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
 
 ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
 HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
diff --git a/buildroot/package/gcc/gcc.hash b/buildroot/package/gcc/gcc.hash
index 079bf7a2f..4f1e7f932 100644
--- a/buildroot/package/gcc/gcc.hash
+++ b/buildroot/package/gcc/gcc.hash
@@ -2,14 +2,14 @@
 sha512  93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe  gcc-4.9.4.tar.bz2
 # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.5.0/sha512.sum
 sha512  670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1  gcc-5.5.0.tar.xz
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.4.0/sha512.sum
-sha512  02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90  gcc-6.4.0.tar.xz
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.3.0/sha512.sum
-sha512  ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4  gcc-7.3.0.tar.xz
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.2.0/sha512.sum
-sha512  64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed  gcc-8.2.0.tar.xz
+# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.5.0/sha512.sum
+sha512  ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac  gcc-6.5.0.tar.xz
+# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.4.0/sha512.sum
+sha512  8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e  gcc-7.4.0.tar.xz
+# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.3.0/sha512.sum
+sha512  1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802  gcc-8.3.0.tar.xz
 
 # Locally calculated (fetched from Github)
-sha512  7c6555d629957d154c9c0524fc2c82301c9ab9192f5b9175c47b1f2dde298ac032e86360d91866c3c4d001cf8e191a90dc88f3c900ebfc367c5888ab7bf2ce79  gcc-arc-2018.03.tar.gz
+sha512  4d12c3ac27b9de9c533be3b8964cf23d21bf6933b5073183e1affe714b0ff33f9d6169e3b55a5c505d7dae33c9bb4f8b0d110461e3a124182d8c8d51b66b8e45  gcc-arc-2018.09-release.tar.gz
 # Locally calculated (fetched from Github)
 sha512  2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1  gcc-or1k-musl-5.4.0-20170218.tar.gz
diff --git a/buildroot/package/gcc/gcc.mk b/buildroot/package/gcc/gcc.mk
index e47435677..5901624ea 100644
--- a/buildroot/package/gcc/gcc.mk
+++ b/buildroot/package/gcc/gcc.mk
@@ -87,7 +87,7 @@ HOST_GCC_COMMON_DEPENDENCIES = \
 HOST_GCC_COMMON_CONF_OPTS = \
 	--target=$(GNU_TARGET_NAME) \
 	--with-sysroot=$(STAGING_DIR) \
-	--disable-__cxa_atexit \
+	--enable-__cxa_atexit \
 	--with-gnu-ld \
 	--disable-libssp \
 	--disable-multilib \
diff --git a/buildroot/package/gdb/7.12.1/0008-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch b/buildroot/package/gdb/7.12.1/0008-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
new file mode 100644
index 000000000..3cfc0feb5
--- /dev/null
+++ b/buildroot/package/gdb/7.12.1/0008-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
@@ -0,0 +1,54 @@
+From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001
+From: James Clarke 
+Date: Fri, 19 Jan 2018 17:22:49 +0000
+Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
+ gdb_wait.h
+
+On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
+contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
+define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
+earlier; include it from linux-ptrace.h so it can never come afterwards.
+
+gdb/ChangeLog:
+
+	* nat/linux-ptrace.c: Remove unnecessary reinclusion of
+	gdb_ptrace.h, and move including gdb_wait.h ...
+	* nat/linux-ptrace.h: ... to here.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved (and backported/updated to remove ChangeLog update) from:
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
+---
+ gdb/ChangeLog          | 6 ++++++
+ gdb/nat/linux-ptrace.c | 2 --
+ gdb/nat/linux-ptrace.h | 1 +
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+index 5c4ddc9..1f21ef0 100644
+--- a/gdb/nat/linux-ptrace.c
++++ b/gdb/nat/linux-ptrace.c
+@@ -21,8 +21,6 @@
+ #include "linux-procfs.h"
+ #include "linux-waitpid.h"
+ #include "buffer.h"
+-#include "gdb_wait.h"
+-#include "gdb_ptrace.h"
+ #include 
+
+ /* Stores the ptrace options supported by the running kernel.
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 60967a3..dc180fb 100644
+--- a/gdb/nat/linux-ptrace.h
++++ b/gdb/nat/linux-ptrace.h
+@@ -21,6 +21,7 @@
+ struct buffer;
+ 
+ #include "nat/gdb_ptrace.h"
++#include "gdb_wait.h"
+ 
+ #ifdef __UCLIBC__
+ #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
+-- 
+2.9.3
+
diff --git a/buildroot/package/gdb/8.0.1/0006-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch b/buildroot/package/gdb/8.0.1/0006-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
new file mode 100644
index 000000000..1e85d9314
--- /dev/null
+++ b/buildroot/package/gdb/8.0.1/0006-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
@@ -0,0 +1,54 @@
+From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001
+From: James Clarke 
+Date: Fri, 19 Jan 2018 17:22:49 +0000
+Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
+ gdb_wait.h
+
+On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
+contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
+define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
+earlier; include it from linux-ptrace.h so it can never come afterwards.
+
+gdb/ChangeLog:
+
+	* nat/linux-ptrace.c: Remove unnecessary reinclusion of
+	gdb_ptrace.h, and move including gdb_wait.h ...
+	* nat/linux-ptrace.h: ... to here.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved (and updated to remove ChangeLog update) from:
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
+---
+ gdb/ChangeLog          | 6 ++++++
+ gdb/nat/linux-ptrace.c | 2 --
+ gdb/nat/linux-ptrace.h | 1 +
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+index 5c4ddc9..1f21ef0 100644
+--- a/gdb/nat/linux-ptrace.c
++++ b/gdb/nat/linux-ptrace.c
+@@ -21,8 +21,6 @@
+ #include "linux-procfs.h"
+ #include "linux-waitpid.h"
+ #include "buffer.h"
+-#include "gdb_wait.h"
+-#include "gdb_ptrace.h"
+ #ifdef HAVE_SYS_PROCFS_H
+ #include 
+ #endif
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 60967a3..dc180fb 100644
+--- a/gdb/nat/linux-ptrace.h
++++ b/gdb/nat/linux-ptrace.h
+@@ -21,6 +21,7 @@
+ struct buffer;
+ 
+ #include "nat/gdb_ptrace.h"
++#include "gdb_wait.h"
+ 
+ #ifdef __UCLIBC__
+ #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
+-- 
+2.9.3
+
diff --git a/buildroot/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch b/buildroot/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
new file mode 100644
index 000000000..1e85d9314
--- /dev/null
+++ b/buildroot/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
@@ -0,0 +1,54 @@
+From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001
+From: James Clarke 
+Date: Fri, 19 Jan 2018 17:22:49 +0000
+Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
+ gdb_wait.h
+
+On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
+contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
+define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
+earlier; include it from linux-ptrace.h so it can never come afterwards.
+
+gdb/ChangeLog:
+
+	* nat/linux-ptrace.c: Remove unnecessary reinclusion of
+	gdb_ptrace.h, and move including gdb_wait.h ...
+	* nat/linux-ptrace.h: ... to here.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved (and updated to remove ChangeLog update) from:
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
+---
+ gdb/ChangeLog          | 6 ++++++
+ gdb/nat/linux-ptrace.c | 2 --
+ gdb/nat/linux-ptrace.h | 1 +
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+index 5c4ddc9..1f21ef0 100644
+--- a/gdb/nat/linux-ptrace.c
++++ b/gdb/nat/linux-ptrace.c
+@@ -21,8 +21,6 @@
+ #include "linux-procfs.h"
+ #include "linux-waitpid.h"
+ #include "buffer.h"
+-#include "gdb_wait.h"
+-#include "gdb_ptrace.h"
+ #ifdef HAVE_SYS_PROCFS_H
+ #include 
+ #endif
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 60967a3..dc180fb 100644
+--- a/gdb/nat/linux-ptrace.h
++++ b/gdb/nat/linux-ptrace.h
+@@ -21,6 +21,7 @@
+ struct buffer;
+ 
+ #include "nat/gdb_ptrace.h"
++#include "gdb_wait.h"
+ 
+ #ifdef __UCLIBC__
+ #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
+-- 
+2.9.3
+
diff --git a/buildroot/package/gdb/8.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/buildroot/package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
similarity index 100%
rename from buildroot/package/gdb/8.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
rename to buildroot/package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
diff --git a/buildroot/package/gdb/8.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/buildroot/package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
similarity index 100%
rename from buildroot/package/gdb/8.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
rename to buildroot/package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
diff --git a/buildroot/package/gdb/8.2/0003-use-asm-sgidefs.h.patch b/buildroot/package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch
similarity index 100%
rename from buildroot/package/gdb/8.2/0003-use-asm-sgidefs.h.patch
rename to buildroot/package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch
diff --git a/buildroot/package/gdb/8.2/0004-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch
similarity index 100%
rename from buildroot/package/gdb/8.2/0004-gdbserver-fix-build-for-m68k.patch
rename to buildroot/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch
diff --git a/buildroot/package/gdb/8.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/buildroot/package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch
similarity index 100%
rename from buildroot/package/gdb/8.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch
rename to buildroot/package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch
diff --git a/buildroot/package/gdb/8.2/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch b/buildroot/package/gdb/8.2/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch
deleted file mode 100644
index a228affce..000000000
--- a/buildroot/package/gdb/8.2/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From d4b53d090e09f8929df0367e446569dc32cf269d Mon Sep 17 00:00:00 2001
-From: Sergio Durigan Junior 
-Date: Wed, 12 Sep 2018 13:16:02 -0400
-Subject: [PATCH] Move 'is_regular_file' from common-utils.c to filestuff.c
-
-There is no reason for 'is_regular_file' to be in common-utils.c; it
-belongs to 'filestuff.c'.  This commit moves the function definition
-and its prototype to the appropriate files.
-
-The motivation behind this move is a failure that happens on certain
-cross-compilation environments when compiling the IPA library, due to
-the way gnulib probes the need for a 'stat' call replacement.  Because
-configure checks when cross-compiling are more limited, gnulib decides
-that it needs to substitute the 'stat' calls its own 'rpl_stat';
-however, the IPA library doesn't link with gnulib, which leads to an
-error when compiling 'common-utils.c':
-
-  ...
-  /opt/x86-core2--musl--bleeding-edge-2018.09-1/bin/i686-buildroot-linux-musl-g++  -shared -fPIC -Wl,--soname=libinproctrace.so -Wl,--no-undefined -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os      -I. -I. -I./../common -I./../regformats -I./.. -I./../../include -I./../gnulib/import -Ibuild-gnulib-gdbserver/import -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-narrowing -Wno-error=maybe-uninitialized  -DGDBSERVER \
-   -Wl,--dynamic-list=./proc-service.list -o libinproctrace.so ax-ipa.o common-utils-ipa.o errors-ipa.o format-ipa.o print-utils-ipa.o regcache-ipa.o remote-utils-ipa.o rsp-low-ipa.o tdesc-ipa.o tracepoint-ipa.o utils-ipa.o vec-ipa.o linux-i386-ipa.o linux-x86-tdesc-ipa.o arch/i386-ipa.o -ldl -pthread
-  /opt/x86-core2--musl--bleeding-edge-2018.09-1/lib/gcc/i686-buildroot-linux-musl/8.2.0/../../../../i686-buildroot-linux-musl/bin/ld: common-utils-ipa.o: in function `is_regular_file(char const*, int*)':
-  common-utils.c:(.text+0x695): undefined reference to `rpl_stat'
-  collect2: error: ld returned 1 exit status
-  Makefile:413: recipe for target 'libinproctrace.so' failed
-  make[1]: *** [libinproctrace.so] Error 1
-  ...
-
-More details can also be found at:
-
-  https://sourceware.org/ml/gdb-patches/2018-09/msg00304.html
-
-The most simple fix for this problem is to move 'is_regular_file' to
-'filestuff.c', which is not used by IPA.  This ends up making the
-files more logically organized as well, since 'is_regular_file' is a
-file operation.
-
-No regressions found.
-
-gdb/ChangeLog:
-2018-09-12  Sergio Durigan Junior  
-
-	* common/common-utils.c: Don't include ''.
-	(is_regular_file): Move to...
-	* common/filestuff.c (is_regular_file): ... here.
-	* common/common-utils.h (is_regular_file): Move to...
-	* common/filestuff.h (is_regular_file): ... here.
-
-(cherry picked from commit 3c025cfe5efc44eb4dfb03b53dca28e75096dd1e)
-[Romain: backport to gdb 8.2 and remove ChangeLog enty]
-Signed-off-by: Romain Naour 
----
- gdb/common/common-utils.c | 32 --------------------------------
- gdb/common/common-utils.h |  5 -----
- gdb/common/filestuff.c    | 31 +++++++++++++++++++++++++++++++
- gdb/common/filestuff.h    |  5 +++++
- 4 files changed, 36 insertions(+), 37 deletions(-)
-
-diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c
-index 8d839d10fa8..24b3936f3dc 100644
---- a/gdb/common/common-utils.c
-+++ b/gdb/common/common-utils.c
-@@ -20,7 +20,6 @@
- #include "common-defs.h"
- #include "common-utils.h"
- #include "host-defs.h"
--#include 
- #include 
- 
- /* The xmalloc() (libiberty.h) family of memory management routines.
-@@ -412,37 +411,6 @@ stringify_argv (const std::vector &args)
- 
- /* See common/common-utils.h.  */
- 
--bool
--is_regular_file (const char *name, int *errno_ptr)
--{
--  struct stat st;
--  const int status = stat (name, &st);
--
--  /* Stat should never fail except when the file does not exist.
--     If stat fails, analyze the source of error and return true
--     unless the file does not exist, to avoid returning false results
--     on obscure systems where stat does not work as expected.  */
--
--  if (status != 0)
--    {
--      if (errno != ENOENT)
--	return true;
--      *errno_ptr = ENOENT;
--      return false;
--    }
--
--  if (S_ISREG (st.st_mode))
--    return true;
--
--  if (S_ISDIR (st.st_mode))
--    *errno_ptr = EISDIR;
--  else
--    *errno_ptr = EINVAL;
--  return false;
--}
--
--/* See common/common-utils.h.  */
--
- ULONGEST
- align_up (ULONGEST v, int n)
- {
-diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h
-index 7bc6e90f05c..a961514fd66 100644
---- a/gdb/common/common-utils.h
-+++ b/gdb/common/common-utils.h
-@@ -146,11 +146,6 @@ in_inclusive_range (T value, T low, T high)
-   return value >= low && value <= high;
- }
- 
--/* Return true if the file NAME exists and is a regular file.
--   If the result is false then *ERRNO_PTR is set to a useful value assuming
--   we're expecting a regular file.  */
--extern bool is_regular_file (const char *name, int *errno_ptr);
--
- /* Ensure that V is aligned to an N byte boundary (B's assumed to be a
-    power of 2).  Round up/down when necessary.  Examples of correct
-    use include:
-diff --git a/gdb/common/filestuff.c b/gdb/common/filestuff.c
-index f5a754ffa66..fa10165a7ca 100644
---- a/gdb/common/filestuff.c
-+++ b/gdb/common/filestuff.c
-@@ -417,3 +417,34 @@ make_cleanup_close (int fd)
-   *saved_fd = fd;
-   return make_cleanup_dtor (do_close_cleanup, saved_fd, xfree);
- }
-+
-+/* See common/filestuff.h.  */
-+
-+bool
-+is_regular_file (const char *name, int *errno_ptr)
-+{
-+  struct stat st;
-+  const int status = stat (name, &st);
-+
-+  /* Stat should never fail except when the file does not exist.
-+     If stat fails, analyze the source of error and return true
-+     unless the file does not exist, to avoid returning false results
-+     on obscure systems where stat does not work as expected.  */
-+
-+  if (status != 0)
-+    {
-+      if (errno != ENOENT)
-+	return true;
-+      *errno_ptr = ENOENT;
-+      return false;
-+    }
-+
-+  if (S_ISREG (st.st_mode))
-+    return true;
-+
-+  if (S_ISDIR (st.st_mode))
-+    *errno_ptr = EISDIR;
-+  else
-+    *errno_ptr = EINVAL;
-+  return false;
-+}
-diff --git a/gdb/common/filestuff.h b/gdb/common/filestuff.h
-index 0e46eb5da0b..21b4edd6bf6 100644
---- a/gdb/common/filestuff.h
-+++ b/gdb/common/filestuff.h
-@@ -98,4 +98,9 @@ struct gdb_dir_deleter
- 
- typedef std::unique_ptr gdb_dir_up;
- 
-+/* Return true if the file NAME exists and is a regular file.
-+   If the result is false then *ERRNO_PTR is set to a useful value assuming
-+   we're expecting a regular file.  */
-+extern bool is_regular_file (const char *name, int *errno_ptr);
-+
- #endif /* FILESTUFF_H */
--- 
-2.14.4
-
diff --git a/buildroot/package/gdb/Config.in.host b/buildroot/package/gdb/Config.in.host
index ade2371d5..969168ffa 100644
--- a/buildroot/package/gdb/Config.in.host
+++ b/buildroot/package/gdb/Config.in.host
@@ -94,9 +94,9 @@ config BR2_PACKAGE_GDB_NEEDS_CXX11
 # If cross-gdb is not enabled, the latest working version is chosen.
 config BR2_GDB_VERSION
 	string
-	default "arc-2018.03-gdb" if BR2_arc
+	default "arc-2018.09-release-gdb" if BR2_arc
 	default "7.12.1"   if BR2_GDB_VERSION_7_12
 	default "8.0.1"    if BR2_GDB_VERSION_8_0
 	default "8.1.1"    if BR2_GDB_VERSION_8_1 || !BR2_PACKAGE_HOST_GDB
-	default "8.2"      if BR2_GDB_VERSION_8_2
+	default "8.2.1"    if BR2_GDB_VERSION_8_2
 	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
diff --git a/buildroot/package/gdb/arc-2018.09-gdb/0001-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch b/buildroot/package/gdb/arc-2018.09-gdb/0001-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch
new file mode 100644
index 000000000..1ee39658f
--- /dev/null
+++ b/buildroot/package/gdb/arc-2018.09-gdb/0001-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch
@@ -0,0 +1,52 @@
+From e213d8e1b5317389c3beee648811bc649d62d743 Mon Sep 17 00:00:00 2001
+From: James Clarke 
+Date: Fri, 19 Jan 2018 17:22:49 +0000
+Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
+ gdb_wait.h
+
+On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
+contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
+define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
+earlier; include it from linux-ptrace.h so it can never come afterwards.
+
+gdb/ChangeLog:
+
+	* nat/linux-ptrace.c: Remove unnecessary reinclusion of
+	gdb_ptrace.h, and move including gdb_wait.h ...
+	* nat/linux-ptrace.h: ... to here.
+
+[Backport from upstream 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
+Signed-off-by: Alexey Brodkin 
+---
+ gdb/nat/linux-ptrace.c | 2 --
+ gdb/nat/linux-ptrace.h | 1 +
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+index 438177fa7622..1240eead0d50 100644
+--- a/gdb/nat/linux-ptrace.c
++++ b/gdb/nat/linux-ptrace.c
+@@ -21,8 +21,6 @@
+ #include "linux-procfs.h"
+ #include "linux-waitpid.h"
+ #include "buffer.h"
+-#include "gdb_wait.h"
+-#include "gdb_ptrace.h"
+ #ifdef HAVE_SYS_PROCFS_H
+ #include 
+ #endif
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 59549452c099..6faa89b22a0e 100644
+--- a/gdb/nat/linux-ptrace.h
++++ b/gdb/nat/linux-ptrace.h
+@@ -21,6 +21,7 @@
+ struct buffer;
+ 
+ #include "nat/gdb_ptrace.h"
++#include "gdb_wait.h"
+ 
+ #ifdef __UCLIBC__
+ #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
+-- 
+2.19.2
+
diff --git a/buildroot/package/gdb/gdb.hash b/buildroot/package/gdb/gdb.hash
index f7c7b8032..1104da5dc 100644
--- a/buildroot/package/gdb/gdb.hash
+++ b/buildroot/package/gdb/gdb.hash
@@ -2,7 +2,7 @@
 sha512  0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8	gdb-7.12.1.tar.xz
 sha512  5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1	gdb-8.0.1.tar.xz
 sha512  7dcd5e8c90de92f577834d887b5f54edb93a07083bfe661bc46c270a6cc4919f0b348e7e2fe8ae4511298a570ef150eeefdc667ef7cf527f0cf60943177ab6c9	gdb-8.1.1.tar.xz
-sha512  11cc481bebc51eb6db73249ecb62b8c07455cf3db169f4860b3a83114849fbd2b5860a2db64488ba6c5909cf07b255c04770f1e36059eae6bee16d2a3581be90	gdb-8.2.tar.xz
+sha512  2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11	gdb-8.2.1.tar.xz
 
 # Locally calculated (fetched from Github)
-sha512  b17e4066730491f6a75b00eab78012f67cc445fe95ecd82c06cda7c1255190e6c471ac89b92f2fcdba4790b0046756b9cecf1f827537afcb44e1e578345852ad 	gdb-arc-2018.03-gdb.tar.gz
+sha512  8303e399e396f5c15dc976e48503fc7d45a720dd1a470443f755c5f2458d092b4392e7ae582abc251bc4b43a778ad784f764286a2a05abfc1649cbeeeb6e7d15 	gdb-arc-2018.09-release-gdb.tar.gz
diff --git a/buildroot/package/gdb/gdb.mk b/buildroot/package/gdb/gdb.mk
index 062f3a730..a92696137 100644
--- a/buildroot/package/gdb/gdb.mk
+++ b/buildroot/package/gdb/gdb.mk
@@ -139,6 +139,11 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 GDB_CONF_OPTS += --disable-build-with-cxx
 endif
 
+# inprocess-agent can't be built statically
+ifeq ($(BR2_STATIC_LIBS),y)
+GDB_CONF_OPTS += --disable-inprocess-agent
+endif
+
 ifeq ($(BR2_PACKAGE_GDB_TUI),y)
 GDB_CONF_OPTS += --enable-tui
 else
diff --git a/buildroot/package/geoip/geoip.hash b/buildroot/package/geoip/geoip.hash
index 2b1f7433c..c2ddf390e 100644
--- a/buildroot/package/geoip/geoip.hash
+++ b/buildroot/package/geoip/geoip.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 b0e5a92200b5ab540d118983f7b7191caf4faf1ae879c44afa3ff2a2abcdb0f5  GeoIP-1.6.11.tar.gz
+sha256 1dfb748003c5e4b7fd56ba8c4cd786633d5d6f409547584f6910398389636f80  GeoIP-1.6.12.tar.gz
+sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89  COPYING
diff --git a/buildroot/package/geoip/geoip.mk b/buildroot/package/geoip/geoip.mk
index 030c7b368..cbd428232 100644
--- a/buildroot/package/geoip/geoip.mk
+++ b/buildroot/package/geoip/geoip.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GEOIP_VERSION = 1.6.11
+GEOIP_VERSION = 1.6.12
 GEOIP_SOURCE = GeoIP-$(GEOIP_VERSION).tar.gz
 GEOIP_SITE = https://github.com/maxmind/geoip-api-c/releases/download/v$(GEOIP_VERSION)
 GEOIP_INSTALL_STAGING = YES
diff --git a/buildroot/package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch b/buildroot/package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch
new file mode 100644
index 000000000..94f742c3f
--- /dev/null
+++ b/buildroot/package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch
@@ -0,0 +1,41 @@
+From de0e7fe3b56cff79c11aedc89448814fab8d1877 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 8 Mar 2019 19:11:11 +0100
+Subject: [PATCH] MakeLists.txt: fix static build with curl and libidn2
+
+curl can be statically linked with libidn2, in this case, build fails:
+/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libcurl.a(libcurl_la-url.o): In function `free_idnconverted_hostname.isra.1':
+url.c:(.text+0xf4): undefined reference to `idn2_free'
+
+To fix this issue, add a call to pkg_check_modules to retrieve any
+needed dependencies
+
+Fixes:
+ - http://autobuild.buildroot.org/results/be5893b507d22a23951efeea20c18642742cef5a
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/gerbera/gerbera/pull/429]
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d0eed230..e6b62c96 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -443,7 +443,11 @@ if(WITH_MYSQL)
+ endif()
+ 
+ if(WITH_CURL)
+-    find_package (CURL REQUIRED)
++    find_package(PkgConfig QUIET)
++    pkg_check_modules (CURL QUIET libcurl)
++    if (NOT CURL_FOUND)
++        find_package (CURL REQUIRED)
++    endif()
+     if (CURL_FOUND)
+         include_directories(${CURL_INCLUDE_DIRS})
+         target_link_libraries (gerbera ${CURL_LIBRARIES})
+-- 
+2.20.1
+
diff --git a/buildroot/package/gerbera/0002-cmake-FindFFMPEG-cmake-use-pkgconfig.patch b/buildroot/package/gerbera/0002-cmake-FindFFMPEG-cmake-use-pkgconfig.patch
new file mode 100644
index 000000000..b5f79173b
--- /dev/null
+++ b/buildroot/package/gerbera/0002-cmake-FindFFMPEG-cmake-use-pkgconfig.patch
@@ -0,0 +1,175 @@
+From fbbc07ce53e884b1603461ee5642d5f02788678d Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Thu, 21 Mar 2019 16:32:44 +0100
+Subject: [PATCH] cmake/FindFFMPEG.cmake: use pkgconfig
+
+ffmpeg has too many optional dependencies (opus, openssl, ...) instead
+of trying to find them all one by one, use pkg-config to get them and
+fallback on current mechanism
+
+Fixes:
+ - http://autobuild.buildroot.org/results/2b99fabd798db84a0fce26ad696c58e54c6ff626
+ - http://autobuild.buildroot.org/results/95e410e5ab34c6d4626a58f97c0d2d5e6829a300
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved (and backported) from:
+https://github.com/gerbera/gerbera/commit/fbbc07ce53e884b1603461ee5642d5f02788678d]
+---
+ cmake/FindFFMPEG.cmake | 147 +++++++++++++++++++++--------------------
+ 1 file changed, 75 insertions(+), 72 deletions(-)
+
+diff --git a/cmake/FindFFMPEG.cmake b/cmake/FindFFMPEG.cmake
+index 0a4a409f..9548b566 100644
+--- a/cmake/FindFFMPEG.cmake
++++ b/cmake/FindFFMPEG.cmake
+@@ -82,70 +82,76 @@ ENDIF (NOT FFMPEG_INCLUDE_DIR)
+ # ffmpeg uses relative includes such as  or 
+ get_filename_component(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR} ABSOLUTE)
+ 
+-FIND_LIBRARY(FFMPEG_avformat_LIBRARY avformat
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_avcodec_LIBRARY avcodec
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_avutil_LIBRARY avutil
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_swresample_LIBRARY swresample
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_vorbis_LIBRARY vorbis
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_dc1394_LIBRARY dc1394_control
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_vorbisenc_LIBRARY vorbisenc
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_theora_LIBRARY theora
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_dts_LIBRARY dts
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_gsm_LIBRARY gsm
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_swscale_LIBRARY swscale
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_z_LIBRARY z
+-        /usr/local/lib
+-        /usr/lib
+-        )
+-
+-FIND_LIBRARY(FFMPEG_bz2_LIBRARY bz2
+-        /usr/local/lib
+-        /usr/lib
+-        )
++CHECK_STRUCT_HAS_MEMBER("struct AVStream" codecpar libavformat/avformat.h HAVE_AVSTREAM_CODECPAR LANGUAGE C)
++
++FIND_PACKAGE(PkgConfig QUIET)
++PKG_CHECK_MODULES(FFMPEG QUIET libavformat libavutil)
++IF (NOT FFMPEG_FOUND)
++	FIND_LIBRARY(FFMPEG_avformat_LIBRARY avformat
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_avcodec_LIBRARY avcodec
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_avutil_LIBRARY avutil
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_swresample_LIBRARY swresample
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_vorbis_LIBRARY vorbis
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_dc1394_LIBRARY dc1394_control
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_vorbisenc_LIBRARY vorbisenc
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_theora_LIBRARY theora
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_dts_LIBRARY dts
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_gsm_LIBRARY gsm
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_swscale_LIBRARY swscale
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_z_LIBRARY z
++		/usr/local/lib
++		/usr/lib
++		)
++
++	FIND_LIBRARY(FFMPEG_bz2_LIBRARY bz2
++		/usr/local/lib
++		/usr/lib
++		)
++ENDIF(NOT FFMPEG_FOUND)
+ 
+ SET(FFMPEG_LIBRARIES)
+ IF (FFMPEG_INCLUDE_DIR)
+@@ -205,9 +211,6 @@ IF (FFMPEG_INCLUDE_DIR)
+                 ENDIF (FFMPEG_bz2_LIBRARY)
+ 
+                 SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} CACHE INTERNAL "All presently found FFMPEG libraries.")
+-
+-                CHECK_STRUCT_HAS_MEMBER("struct AVStream" codecpar libavformat/avformat.h HAVE_AVSTREAM_CODECPAR LANGUAGE C)
+-
+             ENDIF (FFMPEG_avutil_LIBRARY)
+         ENDIF (FFMPEG_avcodec_LIBRARY)
+     ENDIF (FFMPEG_avformat_LIBRARY)
diff --git a/buildroot/package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch b/buildroot/package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch
new file mode 100644
index 000000000..510bf2837
--- /dev/null
+++ b/buildroot/package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch
@@ -0,0 +1,44 @@
+From e2f8e6c30e43c1818a6677d17de87f53c9414405 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Tue, 2 Apr 2019 10:44:06 +0200
+Subject: [PATCH] cmake/FindLibUpnp.cmake: fix static linking
+
+Fix static linking with an openssl enabled upnp:
+ - remove libupnp-1.8 from pkg_check_modules call otherwise test will
+   fail if libupnp-1.8.pc is not found
+ - add PC_UPNP_LIBRARIES to UPNP_LIBRARIES
+
+Fixes:
+ - http://autobuild.buildroot.org/results/10098c8972725d54b717ddc8ea41f4de5e5b066d
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/gerbera/gerbera/pull/443]
+---
+ cmake/FindLibUpnp.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindLibUpnp.cmake b/cmake/FindLibUpnp.cmake
+index ec198d4d..5d2b032d 100644
+--- a/cmake/FindLibUpnp.cmake
++++ b/cmake/FindLibUpnp.cmake
+@@ -8,7 +8,7 @@
+ #  UPNP_HAS_REUSEADDR - If LinUPnP was built with SO_REUSEADDR support
+ 
+ find_package(PkgConfig QUIET)
+-pkg_check_modules (PC_UPNP QUIET libupnp-1.8 libupnp)
++pkg_search_module (PC_UPNP QUIET libupnp-1.8 libupnp)
+ 
+ find_path(UPNP_INCLUDE_DIR upnp.h
+     HINTS ${PC_UPNP_INCLUDEDIR} ${PC_UPNP_INCLUDE_DIRS}
+@@ -41,7 +41,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(UPnP
+     VERSION_VAR UPNP_VERSION_STRING)
+ 
+ if (UPNP_FOUND)
+-    set (UPNP_LIBRARIES ${UPNP_UPNP_LIBRARY} ${UPNP_IXML_LIBRARY})
++    set (UPNP_LIBRARIES ${UPNP_UPNP_LIBRARY} ${UPNP_IXML_LIBRARY} ${PC_UPNP_LIBRARIES})
+     set (UPNP_INCLUDE_DIRS ${UPNP_INCLUDE_DIR} )
+ endif ()
+ 
+-- 
+2.14.1
+
diff --git a/buildroot/package/gerbera/Config.in b/buildroot/package/gerbera/Config.in
new file mode 100644
index 000000000..e10f78b77
--- /dev/null
+++ b/buildroot/package/gerbera/Config.in
@@ -0,0 +1,27 @@
+config BR2_PACKAGE_GERBERA
+	bool "gerbera"
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 optional
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_PACKAGE_LIBUPNP # libupnp18
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_LIBUPNP18
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_ZLIB
+	help
+	  A free media server.
+	  Stream your media to devices on your home network.
+
+	  https://gerbera.io
+
+comment "gerbera needs a toolchain w/ C++, threads, gcc >= 7"
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC
+	depends on !BR2_PACKAGE_LIBUPNP
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_7
diff --git a/buildroot/package/gerbera/S99gerbera b/buildroot/package/gerbera/S99gerbera
new file mode 100644
index 000000000..d1c74c887
--- /dev/null
+++ b/buildroot/package/gerbera/S99gerbera
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+DAEMON="gerbera"
+PIDFILE="/var/run/$DAEMON.pid"
+
+GERBERA_ARGS="-c /etc/gerbera/config.xml -l /var/log/gerbera.log"
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# shellcheck disable=SC2086 # we need the word splitting
+	start-stop-daemon -S -q -m -b -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
+		-- $GERBERA_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		rm -f "$PIDFILE"
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+        start|stop|restart)
+		"$1";;
+	reload)
+		# Restart, since there is no true "reload" feature.
+		restart;;
+        *)
+                echo "Usage: $0 {start|stop|restart|reload}"
+                exit 1
+esac
diff --git a/buildroot/package/gerbera/config.xml b/buildroot/package/gerbera/config.xml
new file mode 100644
index 000000000..fa990d150
--- /dev/null
+++ b/buildroot/package/gerbera/config.xml
@@ -0,0 +1,139 @@
+
+  
+  
+    
+      
+        
+      
+    
+    Gerbera
+    uuid:ac20d9b6-5c82-48e6-80de-436965fbe1d7
+    /var/lib/gerbera
+    /usr/share/gerbera/web
+    
+    1800
+    
+      
+        gerbera.db
+      
+    
+    
+    
+    
+    
+    
+    
+      
+        *
+        
+          video
+        
+      
+    
+  
+  
+    
+      
+    
+    
+      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
+      
+        
+        
+        
+        
+      
+      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
+    
+  
+  
+    
+      
+      
+      
+      
+    
+    
+      
+        audio/L16
+        no
+        yes
+        no
+        
+        
+      
+      
+        video/mpeg
+        yes
+        yes
+        yes
+        
+        
+      
+    
+  
+
diff --git a/buildroot/package/gerbera/gerbera.hash b/buildroot/package/gerbera/gerbera.hash
new file mode 100644
index 000000000..bcac080c9
--- /dev/null
+++ b/buildroot/package/gerbera/gerbera.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256	5e40971c519eb322fe0111754cafa12d99c47c2ae7d0f9f1aebb19b06e74a912	gerbera-v1.3.0.tar.gz
+sha256	cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6	LICENSE.md
diff --git a/buildroot/package/gerbera/gerbera.mk b/buildroot/package/gerbera/gerbera.mk
new file mode 100644
index 000000000..7ded7cec7
--- /dev/null
+++ b/buildroot/package/gerbera/gerbera.mk
@@ -0,0 +1,114 @@
+################################################################################
+#
+# gerbera
+#
+################################################################################
+
+GERBERA_VERSION = v1.3.0
+GERBERA_SITE = $(call github,gerbera,gerbera,$(GERBERA_VERSION))
+GERBERA_LICENSE = GPL-2.0
+GERBERA_LICENSE_FILES = LICENSE.md
+GERBERA_DEPENDENCIES = \
+	expat \
+	host-pkgconf \
+	libupnp18 \
+	sqlite \
+	util-linux \
+	zlib
+GERBERA_CONF_OPTS = \
+	-DWITH_DEBUG=OFF \
+	-DWITH_JS=OFF
+
+# Uses __atomic_fetch_add_4
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+GERBERA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
+endif
+
+ifeq ($(BR2_PACKAGE_EXIV2),y)
+GERBERA_DEPENDENCIES += exiv2
+GERBERA_CONF_OPTS += -DWITH_EXIV2=ON
+else
+GERBERA_CONF_OPTS += -DWITH_EXIV2=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG),y)
+GERBERA_DEPENDENCIES += ffmpeg
+GERBERA_CONF_OPTS += -DWITH_AVCODEC=ON
+else
+GERBERA_CONF_OPTS += -DWITH_AVCODEC=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_FILE),y)
+GERBERA_DEPENDENCIES += file
+GERBERA_CONF_OPTS += -DWITH_MAGIC=ON
+else
+GERBERA_CONF_OPTS += -DWITH_MAGIC=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+GERBERA_DEPENDENCIES += libcurl
+GERBERA_CONF_OPTS += -DWITH_CURL=ON
+else
+GERBERA_CONF_OPTS += -DWITH_CURL=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEXIF),y)
+GERBERA_DEPENDENCIES += libexif
+GERBERA_CONF_OPTS += -DWITH_EXIF=ON
+else
+GERBERA_CONF_OPTS += -DWITH_EXIF=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+GERBERA_DEPENDENCIES += libiconv
+endif
+
+ifeq ($(BR2_PACKAGE_MYSQL),y)
+GERBERA_DEPENDENCIES += mysql
+GERBERA_CONF_OPTS += -DWITH_MYSQL=ON
+else
+GERBERA_CONF_OPTS += -DWITH_MYSQL=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+GERBERA_DEPENDENCIES += systemd
+GERBERA_CONF_OPTS += -DWITH_SYSTEMD=ON
+else
+GERBERA_CONF_OPTS += -DWITH_SYSTEMD=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_TAGLIB),y)
+GERBERA_DEPENDENCIES += taglib
+GERBERA_CONF_OPTS += -DWITH_TAGLIB=ON
+else
+GERBERA_CONF_OPTS += -DWITH_TAGLIB=OFF
+endif
+
+# gerbera does not provide a default configuration file, it can be
+# created during run time through --create-config:
+# http://docs.gerbera.io/en/latest/config-overview.html#generating-configuration
+# However, to have a correct home directory and UDN, install it ourself
+define GERBERA_INSTALL_CONFIGURATION
+	$(INSTALL) -D -m 0644 package/gerbera/config.xml \
+		$(TARGET_DIR)/etc/gerbera/config.xml
+endef
+
+GERBERA_POST_INSTALL_TARGET_HOOKS += GERBERA_INSTALL_CONFIGURATION
+
+define GERBERA_USERS
+	gerbera -1 gerbera -1 * /var/lib/gerbera - - Gerbera user
+endef
+
+define GERBERA_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/gerbera/S99gerbera \
+		$(TARGET_DIR)/etc/init.d/S99gerbera
+endef
+
+# gerbera.service is installed by cmake in $(TARGET_DIR)/usr/lib/systemd/system
+define GERBERA_INSTALL_INIT_SYSTEMD
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/gerbera.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/gerbera.service
+endef
+
+$(eval $(cmake-package))
diff --git a/buildroot/package/ghostscript/0002-Bug-700986-Remove-the-crazy-md5-file-copying-nonsense.patch b/buildroot/package/ghostscript/0002-Bug-700986-Remove-the-crazy-md5-file-copying-nonsense.patch
new file mode 100644
index 000000000..49bcfcdd3
--- /dev/null
+++ b/buildroot/package/ghostscript/0002-Bug-700986-Remove-the-crazy-md5-file-copying-nonsense.patch
@@ -0,0 +1,252 @@
+From d86210973df93ccca0befd56afba2132da925ebc Mon Sep 17 00:00:00 2001
+From: Chris Liddell 
+Date: Thu, 18 Apr 2019 16:58:41 +0100
+Subject: [PATCH] Bug 700986: Remove the crazy md5 file copying nonsense
+
+To preserve building as a standalone test exe, we avoided using Ghostscript
+includes in the md5 source and header files, but dynamically add them to
+copies of the files during the build. Since we no longer need/care for the
+stand alone exe, remove the build complication, and just include the header
+file normally.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+http://git.ghostscript.com/?p=user/chrisl/ghostpdl.git;a=commitdiff;h=d86210973df9]
+---
+ base/gsmd5.h                   |   2 +
+ base/lib.mak                   |  10 +--
+ base/md5main.c                 | 141 -----------------------------------------
+ doc/Develop.htm                |   1 -
+ windows/ghostscript.vcproj     |   4 --
+ windows/ghostscript_rt.vcxproj |   1 -
+ 6 files changed, 5 insertions(+), 154 deletions(-)
+ delete mode 100644 base/md5main.c
+
+diff --git a/base/gsmd5.h b/base/gsmd5.h
+index 206ea6b..b159afb 100644
+--- a/base/gsmd5.h
++++ b/base/gsmd5.h
+@@ -50,6 +50,8 @@
+ #ifndef md5_INCLUDED
+ #  define md5_INCLUDED
+ 
++#include "memory_.h"
++
+ /*
+  * This package supports both compile-time and run-time determination of CPU
+  * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+diff --git a/base/lib.mak b/base/lib.mak
+index 3ed088a..21e2cb7 100644
+--- a/base/lib.mak
++++ b/base/lib.mak
+@@ -387,13 +387,8 @@ gsmd5_h=$(GLSRC)gsmd5.h
+ # We have to use a slightly different compilation approach in order to
+ # get std.h included when compiling md5.c.
+ md5_=$(GLOBJ)gsmd5.$(OBJ)
+-$(GLOBJ)gsmd5.$(OBJ) : $(GLSRC)gsmd5.c $(AK) $(gsmd5_h)\
+- $(EXP)$(ECHOGS_XE) $(LIB_MAK) $(MAKEDIRS)
+-	$(EXP)$(ECHOGS_XE) -w $(GLGEN)gsmd5.h -x 23 include -x 2022 memory_.h -x 22
+-	$(EXP)$(ECHOGS_XE) -a $(GLGEN)gsmd5.h -+R $(GLSRC)gsmd5.h
+-	$(CP_) $(GLSRC)gsmd5.c $(GLGEN)gsmd5.c
+-	$(GLCC) $(GLO_)gsmd5.$(OBJ) $(C_) $(GLGEN)gsmd5.c
+-	$(RM_) $(GLGEN)gsmd5.c $(GLGEN)gsmd5.h
++$(GLOBJ)gsmd5.$(OBJ) : $(GLSRC)gsmd5.c $(AK) $(gsmd5_h) $(LIB_MAK) $(MAKEDIRS)
++	$(GLCC) $(GLO_)gsmd5.$(OBJ) $(C_) $(GLSRC)gsmd5.c
+ 
+ # SHA-256 digest
+ sha2_h=$(GLSRC)sha2.h
+@@ -12346,3 +12341,4 @@ $(GLSRC)gxshade4.h:$(GLSRC)gstypes.h
+ $(GLSRC)gxshade4.h:$(GLSRC)stdpre.h
+ $(GLSRC)gxshade4.h:$(GLGEN)arch.h
+ $(GLSRC)gxshade4.h:$(GLSRC)gs_dll_call.h
++$(GLSRC)gsmd5.h:$(GLSRC)memory_.h
+diff --git a/base/md5main.c b/base/md5main.c
+deleted file mode 100644
+index 75c523b..0000000
+--- a/base/md5main.c
++++ /dev/null
+@@ -1,141 +0,0 @@
+-/*
+-  Copyright (C) 2002-2018 Artifex Software, Inc.
+-  All rights reserved.
+-
+-  This software is provided 'as-is', without any express or implied
+-  warranty.  In no event will the authors be held liable for any damages
+-  arising from the use of this software.
+-
+-  Permission is granted to anyone to use this software for any purpose,
+-  including commercial applications, and to alter it and redistribute it
+-  freely, subject to the following restrictions:
+-
+-  1. The origin of this software must not be misrepresented; you must not
+-     claim that you wrote the original software. If you use this software
+-     in a product, an acknowledgment in the product documentation would be
+-     appreciated but is not required.
+-  2. Altered source versions must be plainly marked as such, and must not be
+-     misrepresented as being the original software.
+-  3. This notice may not be removed or altered from any source distribution.
+-
+-  L. Peter Deutsch
+-  ghost@aladdin.com
+-
+- */
+-/*
+-  Independent implementation of MD5 (RFC 1321).
+-
+-  This code implements the MD5 Algorithm defined in RFC 1321, whose
+-  text is available at
+-        http://www.ietf.org/rfc/rfc1321.txt
+-  The code is derived from the text of the RFC, including the test suite
+-  (section A.5) but excluding the rest of Appendix A.  It does not include
+-  any code or documentation that is identified in the RFC as being
+-  copyrighted.
+-
+-  The original and principal author of md5.c is L. Peter Deutsch
+-  .  Other authors are noted in the change history
+-  that follows (in reverse chronological order):
+-
+-  2007-06-08 RG  Namespaced the api calls to avoid conflict with other
+-        implementations when linking gs as a library.
+-  2002-04-13 lpd Splits off main program into a separate file, md5main.c.
+- */
+-
+-#include "gsmd5.h"
+-#include 
+-#include 
+-#include 
+-
+-/*
+- * This file builds an executable that performs various functions related
+- * to the MD5 library.  Typical compilation:
+- *	gcc -o md5main -lm md5main.c md5.c
+- */
+-static const char *const usage = "\
+-Usage:\n\
+-    md5main --test		# run the self-test (A.5 of RFC 1321)\n\
+-    md5main --t-values		# print the T values for the library\n\
+-    md5main --version		# print the version of the package\n\
+-";
+-static const char *const version = "2002-04-13";
+-
+-/* Run the self-test. */
+-static int
+-do_test(void)
+-{
+-    static const char *const test[7*2] = {
+-        "", "d41d8cd98f00b204e9800998ecf8427e",
+-        "a", "0cc175b9c0f1b6a831c399e269772661",
+-        "abc", "900150983cd24fb0d6963f7d28e17f72",
+-        "message digest", "f96b697d7cb7938d525a2f31aaf161d0",
+-        "abcdefghijklmnopqrstuvwxyz", "c3fcd3d76192e4007dfb496cca67e13b",
+-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+-                                "d174ab98d277d9f5a5611c2c9f419d9f",
+-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890", "57edf4a22be3c955ac49da2e2107b67a"
+-    };
+-    int i;
+-    int status = 0;
+-
+-    for (i = 0; i < 7*2; i += 2) {
+-        gs_md5_state_t state;
+-        gs_md5_byte_t digest[16];
+-        char hex_output[16*2 + 1];
+-        int di;
+-
+-        gs_md5_init(&state);
+-        gs_md5_append(&state, (const gs_md5_byte_t *)test[i], strlen(test[i]));
+-        gs_md5_finish(&state, digest);
+-        for (di = 0; di < 16; ++di)
+-            gs_sprintf(hex_output + di * 2, "%02x", digest[di]);
+-        if (strcmp(hex_output, test[i + 1])) {
+-            printf("MD5 (\"%s\") = ", test[i]);
+-            puts(hex_output);
+-            printf("**** ERROR, should be: %s\n", test[i + 1]);
+-            status = 1;
+-        }
+-    }
+-    if (status == 0)
+-        puts("md5 self-test completed successfully.");
+-    return status;
+-}
+-
+-/* Print the T values. */
+-static int
+-do_t_values(void)
+-{
+-    int i;
+-    for (i = 1; i <= 64; ++i) {
+-        unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
+-
+-        /*
+-         * The following nonsense is only to avoid compiler warnings about
+-         * "integer constant is unsigned in ANSI C, signed with -traditional".
+-         */
+-        if (v >> 31) {
+-            printf("#define T%d /* 0x%08lx */ (T_MASK ^ 0x%08lx)\n", i,
+-                   v, (unsigned long)(unsigned int)(~v));
+-        } else {
+-            printf("#define T%d    0x%08lx\n", i, v);
+-        }
+-    }
+-    return 0;
+-}
+-
+-/* Main program */
+-int
+-main(int argc, char *argv[])
+-{
+-    if (argc == 2) {
+-        if (!strcmp(argv[1], "--test"))
+-            return do_test();
+-        if (!strcmp(argv[1], "--t-values"))
+-            return do_t_values();
+-        if (!strcmp(argv[1], "--version")) {
+-            puts(version);
+-            return 0;
+-        }
+-    }
+-    puts(usage);
+-    return 0;
+-}
+diff --git a/doc/Develop.htm b/doc/Develop.htm
+index c1ffceb..1ed3030 100644
+--- a/doc/Develop.htm
++++ b/doc/Develop.htm
+@@ -684,7 +684,6 @@ Other:
+ base/gx.h,
+ base/gsmd5.c,
+ base/gsmd5.h,
+-base/md5main.c,
+ base/aes.c,
+ base/aes.h.
+ 
+diff --git a/windows/ghostscript.vcproj b/windows/ghostscript.vcproj
+index d607949..fdbeaa1 100644
+--- a/windows/ghostscript.vcproj
++++ b/windows/ghostscript.vcproj
+@@ -2510,10 +2510,6 @@
+ 				>
+ 			
+ 			
+-			
+-			
+ 			
+diff --git a/windows/ghostscript_rt.vcxproj b/windows/ghostscript_rt.vcxproj
+index 589b2d1..fca736b 100644
+--- a/windows/ghostscript_rt.vcxproj
++++ b/windows/ghostscript_rt.vcxproj
+@@ -597,7 +597,6 @@
+     
+     
+     
+-    
+     
+     
+     
+-- 
+2.9.1
+
+
diff --git a/buildroot/package/ghostscript/ghostscript.hash b/buildroot/package/ghostscript/ghostscript.hash
index 15ef95e77..383a414da 100644
--- a/buildroot/package/ghostscript/ghostscript.hash
+++ b/buildroot/package/ghostscript/ghostscript.hash
@@ -1,5 +1,5 @@
-# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926/SHA512SUMS
-sha512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e  ghostscript-9.26.tar.xz
+# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927/SHA512SUMS
+sha512 5e67ad45a80f01c6ef0eabb1c76dfa8fb6e7f0fde8d82fd5daaf12f370c288a672f8fa69c74d9e30255582267e9a906e4e8b13655f8d993fefdfc8dbdb5d5401  ghostscript-9.27.tar.xz
 
 # Hash for license file:
 sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2  LICENSE
diff --git a/buildroot/package/ghostscript/ghostscript.mk b/buildroot/package/ghostscript/ghostscript.mk
index 357fd08c3..fefac2aee 100644
--- a/buildroot/package/ghostscript/ghostscript.mk
+++ b/buildroot/package/ghostscript/ghostscript.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GHOSTSCRIPT_VERSION = 9.26
-GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926
+GHOSTSCRIPT_VERSION = 9.27
+GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION))
 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz
 GHOSTSCRIPT_LICENSE = AGPL-3.0
 GHOSTSCRIPT_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/git/0001-configure.ac-Properly-check-for-libintl.patch b/buildroot/package/git/0001-configure.ac-Properly-check-for-libintl.patch
new file mode 100644
index 000000000..2f367f547
--- /dev/null
+++ b/buildroot/package/git/0001-configure.ac-Properly-check-for-libintl.patch
@@ -0,0 +1,49 @@
+From 01da08fd60a0bdb2994f85f943dba148d9321d4d Mon Sep 17 00:00:00 2001
+From: Vadim Kochan 
+Date: Wed, 17 Apr 2019 01:25:40 +0300
+Subject: [PATCH 1/1] configure.ac: Properly check for libintl
+
+Some libc implementations like uclibc or musl provides
+gettext stubs via libintl library but this case is not checked
+by AC_CHECK_LIBRARY(c, gettext ...) because gcc has gettext as builtin
+which passess the check.
+
+So check it with included libintl.h where gettext may unfold into
+libintl_gettext which will cause check to fail if libintl_gettext are
+needed to be linked with -lintl.
+
+Signed-off-by: Vadim Kochan 
+---
+ configure.ac | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7f84151..0b8e25f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -762,9 +762,19 @@ AC_CHECK_LIB([c], [basename],
+ GIT_CONF_SUBST([NEEDS_LIBGEN])
+ test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen"
+ 
+-AC_CHECK_LIB([c], [gettext],
+-[LIBC_CONTAINS_LIBINTL=YesPlease],
+-[LIBC_CONTAINS_LIBINTL=])
++AC_DEFUN([LIBINTL_SRC], [
++AC_LANG_PROGRAM([[
++#include 
++]],[[
++char *msg = gettext("test");
++]])])
++
++AC_MSG_CHECKING([if libc contains libintl])
++AC_LINK_IFELSE([LIBINTL_SRC],
++	[AC_MSG_RESULT([yes])
++	LIBC_CONTAINS_LIBINTL=YesPlease],
++	[AC_MSG_RESULT([no])
++	LIBC_CONTAINS_LIBINTL=])
+ GIT_CONF_SUBST([LIBC_CONTAINS_LIBINTL])
+ 
+ #
+-- 
+2.14.1
+
diff --git a/buildroot/package/git/git.mk b/buildroot/package/git/git.mk
index 9b176d366..804a6e232 100644
--- a/buildroot/package/git/git.mk
+++ b/buildroot/package/git/git.mk
@@ -10,11 +10,12 @@ GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
 GIT_LICENSE = GPL-2.0, LGPL-2.1+
 GIT_LICENSE_FILES = COPYING LGPL-2.1
 GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES)
+GIT_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-GIT_DEPENDENCIES += openssl
+GIT_DEPENDENCIES += host-pkgconf openssl
 GIT_CONF_OPTS += --with-openssl
-GIT_CONF_ENV_LIBS += $(if $(BR2_STATIC_LIBS),-lz)
+GIT_MAKE_OPTS += LIB_4_CRYPTO="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`"
 else
 GIT_CONF_OPTS += --without-openssl
 endif
diff --git a/buildroot/package/glib-networking/Config.in b/buildroot/package/glib-networking/Config.in
index ec2962392..b84a73946 100644
--- a/buildroot/package/glib-networking/Config.in
+++ b/buildroot/package/glib-networking/Config.in
@@ -1,12 +1,14 @@
 config BR2_PACKAGE_GLIB_NETWORKING
 	bool "glib-networking"
-	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_USE_WCHAR # glib2, gnutls
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_USE_MMU # glib2
+	depends on !BR2_STATIC_LIBS # gnutls
+	select BR2_PACKAGE_GNUTLS
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Network-related GIO modules for glib.
 
-comment "glib-networking needs a toolchain w/ wchar, threads"
+comment "glib-networking needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/buildroot/package/glib-networking/glib-networking.hash b/buildroot/package/glib-networking/glib-networking.hash
index bbcecb7ad..d959175e7 100644
--- a/buildroot/package/glib-networking/glib-networking.hash
+++ b/buildroot/package/glib-networking/glib-networking.hash
@@ -1,2 +1,3 @@
-# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.50/glib-networking-2.50.0.sha256sum
-sha256	3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee	glib-networking-2.50.0.tar.xz
+# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.58/glib-networking-2.58.0.sha256sum
+sha256  bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068 glib-networking-2.58.0.tar.xz
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
diff --git a/buildroot/package/glib-networking/glib-networking.mk b/buildroot/package/glib-networking/glib-networking.mk
index 10a3b706b..325cbcf8a 100644
--- a/buildroot/package/glib-networking/glib-networking.mk
+++ b/buildroot/package/glib-networking/glib-networking.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GLIB_NETWORKING_VERSION_MAJOR = 2.50
+GLIB_NETWORKING_VERSION_MAJOR = 2.58
 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0
 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR)
 GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
@@ -13,19 +13,18 @@ GLIB_NETWORKING_DEPENDENCIES = \
 	$(TARGET_NLS_DEPENDENCIES) \
 	host-pkgconf \
 	host-intltool \
-	libglib2
+	libglib2 \
+	gnutls
+
 GLIB_NETWORKING_CONF_OPTS = \
-	--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
+	-Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt \
+	-Dlibproxy_support=false \
+	-Dgnome_proxy_support=false \
+	-Dpkcs11_support=false
+
 GLIB_NETWORKING_LICENSE = LGPL-2.0+
 GLIB_NETWORKING_LICENSE_FILES = COPYING
 GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \
 	GIO_MODULE_DIR=/usr/lib/gio/modules install
 
-ifeq ($(BR2_PACKAGE_GNUTLS),y)
-GLIB_NETWORKING_DEPENDENCIES += gnutls
-GLIB_NETWORKING_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr
-else
-GLIB_NETWORKING_CONF_OPTS += --without-gnutls
-endif
-
-$(eval $(autotools-package))
+$(eval $(meson-package))
diff --git a/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch b/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch
new file mode 100644
index 000000000..ab157e9e7
--- /dev/null
+++ b/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch
@@ -0,0 +1,59 @@
+From 4909cfbbe8dd512b8fc0892859549c26e1b14d30 Mon Sep 17 00:00:00 2001
+From: Mark Corbin 
+Date: Sun, 21 Oct 2018 10:38:18 +0100
+Subject: [PATCH] Fix RISC-V 32-bit build of riscv-glibc 2.26
+
+This patch fixes two build errors with the 32-bit version of
+glibc-2.26 from the riscv-glibc repository.
+
+A void reference to 'refsym' has been added to dl-runtime.c to avoid
+an 'unused variable' error when building with '-Werror'.
+
+Some data types were hard-coded for 64-bit in ldsodefs.h. These have
+been modified to allow 32-bit builds.
+
+This patch was provided by Fabrice Bellard as part of his RISC-V
+Buildroot development source.
+
+Signed-off-by: Mark Corbin 
+---
+ elf/dl-runtime.c         | 1 +
+ sysdeps/riscv/ldsodefs.h | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
+index 51d3819d4a..e728e8907e 100644
+--- a/elf/dl-runtime.c
++++ b/elf/dl-runtime.c
+@@ -146,6 +146,7 @@ _dl_fixup (
+   if (__glibc_unlikely (GLRO(dl_bind_not)))
+     return value;
+ 
++  (void)refsym;
+   return elf_machine_fixup_plt (l, result, refsym, sym, reloc, rel_addr, value);
+ }
+ 
+diff --git a/sysdeps/riscv/ldsodefs.h b/sysdeps/riscv/ldsodefs.h
+index db993df80a..91e7a8c88f 100644
+--- a/sysdeps/riscv/ldsodefs.h
++++ b/sysdeps/riscv/ldsodefs.h
+@@ -25,14 +25,14 @@ struct La_riscv_regs;
+ struct La_riscv_retval;
+ 
+ #define ARCH_PLTENTER_MEMBERS						\
+-    Elf64_Addr (*riscv_gnu_pltenter) (Elf64_Sym *, unsigned int,	\
++    ElfW(Addr) (*riscv_gnu_pltenter) (ElfW(Sym) *, unsigned int,	\
+ 				      uintptr_t *, uintptr_t *,		\
+ 				      const struct La_riscv_regs *,	\
+ 				      unsigned int *, const char *name,	\
+ 				      long int *framesizep);
+ 
+ #define ARCH_PLTEXIT_MEMBERS						\
+-    unsigned int (*riscv_gnu_pltexit) (Elf64_Sym *, unsigned int,	\
++    unsigned int (*riscv_gnu_pltexit) (ElfW(Sym) *, unsigned int,	\
+ 				       uintptr_t *, uintptr_t *,	\
+ 				       const struct La_riscv_regs *,	\
+ 				       struct La_riscv_retval *,	\
+-- 
+2.17.1
+
diff --git a/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch b/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch
new file mode 100644
index 000000000..961d5a1cb
--- /dev/null
+++ b/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch
@@ -0,0 +1,39 @@
+From 6b4520e13c2ed7fca725d5f5c879854cd7c96c19 Mon Sep 17 00:00:00 2001
+From: Mark Corbin 
+Date: Mon, 4 Feb 2019 10:35:27 +0000
+Subject: [PATCH] Fix mcontext_t error that breaks RISC-V architecture
+ package builds
+
+The riscv-glibc repository version of glibc 2.26 will build for
+RISC-V 32bit, but when many packages are built against the resulting
+library an 'unknown type name mcontext_t' error is reported. The
+definition of mcontext_h in the ucontext.h header file needs to be
+moved outside of the '#ifdef __USE_MISC' structure to fix this
+issue.
+
+Signed-off-by: Mark Corbin 
+---
+ sysdeps/unix/sysv/linux/riscv/sys/ucontext.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h b/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h
+index 8f02f09106..b9dd04564a 100644
+--- a/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h
++++ b/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h
+@@ -48,12 +48,11 @@ typedef greg_t gregset_t[NGREG];
+ 
+ /* Container for floating-point state.  */
+ typedef union __riscv_fp_state fpregset_t;
++#endif
+ 
+ /* Context to describe whole processor state.  */
+ typedef struct sigcontext mcontext_t;
+ 
+-#endif
+-
+ /* Userlevel context.  */
+ typedef struct ucontext
+   {
+-- 
+2.19.1
+
diff --git a/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/glibc.hash b/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/glibc.hash
new file mode 100644
index 000000000..3eb5e04e9
--- /dev/null
+++ b/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/glibc.hash
@@ -0,0 +1,7 @@
+# Locally calculated (fetched from Github)
+sha256 a40f908125135bad2cf92c18d07ad25b3091b161b3a5d3aea46c23ffd2ac90b8  glibc-4e2943456e690d89f48e6e710757dd09404b0c9a.tar.gz
+
+# Hashes for license files
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
+sha256 61abdd6930c9c599062d89e916b3e7968783879b6be0ee1c6229dd6169def431 LICENSES
diff --git a/buildroot/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash b/buildroot/package/glibc/arc-2018.09-release/glibc.hash
similarity index 69%
rename from buildroot/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash
rename to buildroot/package/glibc/arc-2018.09-release/glibc.hash
index 7429ab380..8e70ce043 100644
--- a/buildroot/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash
+++ b/buildroot/package/glibc/arc-2018.09-release/glibc.hash
@@ -1,5 +1,5 @@
 # Locally calculated (fetched from Github)
-sha256  b070f746f932cfce107bb9be2d59ded5b44b25ddafb480c9110c52b88cc2dec1  glibc-glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa.tar.gz
+sha256  cc2aa6b16641ebcf1492bf6245897d8c263c96b6e30375d09351306a12b6d529  glibc-arc-2018.09-release.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/buildroot/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch b/buildroot/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch
deleted file mode 100644
index febcd36f7..000000000
--- a/buildroot/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 4a06ceea33ecc220bbfe264d8f1e74de2f04e90d Mon Sep 17 00:00:00 2001
-From: Martin Jansa 
-Date: Tue, 2 Oct 2018 15:38:43 +0000
-Subject: [PATCH] sysdeps/ieee754/soft-fp: ignore maybe-uninitialized with -O
- [BZ #19444]
-
-* with -O, -O1, -Os it fails with:
-
-In file included from ../soft-fp/soft-fp.h:318,
-                 from ../sysdeps/ieee754/soft-fp/s_fdiv.c:28:
-../sysdeps/ieee754/soft-fp/s_fdiv.c: In function '__fdiv':
-../soft-fp/op-2.h:98:25: error: 'R_f1' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-        X##_f0 = (X##_f1 << (_FP_W_TYPE_SIZE - (N)) | X##_f0 >> (N) \
-                         ^~
-../sysdeps/ieee754/soft-fp/s_fdiv.c:38:14: note: 'R_f1' was declared here
-   FP_DECL_D (R);
-              ^
-../soft-fp/op-2.h:37:36: note: in definition of macro '_FP_FRAC_DECL_2'
-   _FP_W_TYPE X##_f0 _FP_ZERO_INIT, X##_f1 _FP_ZERO_INIT
-                                    ^
-../soft-fp/double.h:95:24: note: in expansion of macro '_FP_DECL'
- # define FP_DECL_D(X)  _FP_DECL (2, X)
-                        ^~~~~~~~
-../sysdeps/ieee754/soft-fp/s_fdiv.c:38:3: note: in expansion of macro 'FP_DECL_D'
-   FP_DECL_D (R);
-   ^~~~~~~~~
-../soft-fp/op-2.h:101:17: error: 'R_f0' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-       : (X##_f0 << (_FP_W_TYPE_SIZE - (N))) != 0)); \
-                 ^~
-../sysdeps/ieee754/soft-fp/s_fdiv.c:38:14: note: 'R_f0' was declared here
-   FP_DECL_D (R);
-              ^
-../soft-fp/op-2.h:37:14: note: in definition of macro '_FP_FRAC_DECL_2'
-   _FP_W_TYPE X##_f0 _FP_ZERO_INIT, X##_f1 _FP_ZERO_INIT
-              ^
-../soft-fp/double.h:95:24: note: in expansion of macro '_FP_DECL'
- # define FP_DECL_D(X)  _FP_DECL (2, X)
-                        ^~~~~~~~
-../sysdeps/ieee754/soft-fp/s_fdiv.c:38:3: note: in expansion of macro 'FP_DECL_D'
-   FP_DECL_D (R);
-   ^~~~~~~~~
-
-Build tested with Yocto for ARM, AARCH64, X86, X86_64, PPC, MIPS, MIPS64
-with -O, -O1, -Os.
-For AARCH64 it needs one more fix in locale for -Os.
-
-	[BZ #19444]
-	* sysdeps/ieee754/soft-fp/s_fdiv.c: Include  and use
-	DIAG_PUSH_NEEDS_COMMENT, DIAG_IGNORE_NEEDS_COMMENT and
-	DIAG_POP_NEEDS_COMMENT to disable -Wmaybe-uninitialized.
-
-
-Signed-off-by: Yegor Yefremov 
----
- sysdeps/ieee754/soft-fp/s_fdiv.c | 12 ++++++++++++
- 1 files changed, 12 insertions(+)
-
-diff --git a/sysdeps/ieee754/soft-fp/s_fdiv.c b/sysdeps/ieee754/soft-fp/s_fdiv.c
-index 341339f5ed..7a15cbeee6 100644
---- a/sysdeps/ieee754/soft-fp/s_fdiv.c
-+++ b/sysdeps/ieee754/soft-fp/s_fdiv.c
-@@ -25,6 +25,16 @@
- #undef fdivl
- 
- #include 
-+#include 
-+
-+/* R_f[01] are not set in cases where they are not used in packing,
-+   but the compiler does not see that they are set in all cases where
-+   they are used, resulting in warnings that they may be used
-+   uninitialized.  The location of the warning differs in different
-+   versions of GCC, it may be where R is defined using a macro or it
-+   may be where the macro is defined.  This happens only with -O1.  */
-+DIAG_PUSH_NEEDS_COMMENT;
-+DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
- #include 
- #include 
- #include 
-@@ -53,4 +63,6 @@ __fdiv (double x, double y)
-   CHECK_NARROW_DIV (ret, x, y);
-   return ret;
- }
-+DIAG_POP_NEEDS_COMMENT;
-+
- libm_alias_float_double (div)
--- 
-2.17.0
-
diff --git a/buildroot/package/glibc/arc-2018.03-release/glibc.hash b/buildroot/package/glibc/glibc-2.28-94-g4aeff335ca19286ee2382d8eba794ae5fd49281a/glibc.hash
similarity index 51%
rename from buildroot/package/glibc/arc-2018.03-release/glibc.hash
rename to buildroot/package/glibc/glibc-2.28-94-g4aeff335ca19286ee2382d8eba794ae5fd49281a/glibc.hash
index f3b10d910..442ef0d7a 100644
--- a/buildroot/package/glibc/arc-2018.03-release/glibc.hash
+++ b/buildroot/package/glibc/glibc-2.28-94-g4aeff335ca19286ee2382d8eba794ae5fd49281a/glibc.hash
@@ -1,7 +1,7 @@
 # Locally calculated (fetched from Github)
-sha256  e08ab67b2db2d0f0e8f3311d23c54fb8f6d4c1ef6fa0b4047fd5da400e3ce9de  glibc-arc-2018.03-release.tar.gz
+sha256  295d436aac4dc45afc3b440f85fc4556c03b1140ca0f625ee015c8156d2f52ae  glibc-glibc-2.28-94-g4aeff335ca19286ee2382d8eba794ae5fd49281a.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
-sha256  61abdd6930c9c599062d89e916b3e7968783879b6be0ee1c6229dd6169def431  LICENSES
+sha256  35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f  LICENSES
diff --git a/buildroot/package/glibc/glibc.mk b/buildroot/package/glibc/glibc.mk
index 88178d7eb..cb6f8097d 100644
--- a/buildroot/package/glibc/glibc.mk
+++ b/buildroot/package/glibc/glibc.mk
@@ -5,12 +5,15 @@
 ################################################################################
 
 ifeq ($(BR2_arc),y)
-GLIBC_VERSION =  arc-2018.03-release
+GLIBC_VERSION =  arc-2018.09-release
 GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION))
+else ifeq ($(BR2_RISCV_32),y)
+GLIBC_VERSION = 4e2943456e690d89f48e6e710757dd09404b0c9a
+GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION))
 else
 # Generate version string using:
 #   git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master
-GLIBC_VERSION = glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa
+GLIBC_VERSION = glibc-2.28-94-g4aeff335ca19286ee2382d8eba794ae5fd49281a
 # Upstream doesn't officially provide an https download link.
 # There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
 # sometimes the connection times out. So use an unofficial github mirror.
@@ -75,7 +78,11 @@ GLIBC_CONF_ENV = \
 # Override the default library locations of /lib64/ and
 # /usr/lib64// for RISC-V.
 ifeq ($(BR2_riscv),y)
+ifeq ($(BR2_RISCV_64),y)
 GLIBC_CONF_ENV += libc_cv_slibdir=/lib64 libc_cv_rtlddir=/lib
+else
+GLIBC_CONF_ENV += libc_cv_slibdir=/lib32 libc_cv_rtlddir=/lib
+endif
 endif
 
 # glibc requires make >= 4.0 since 2.28 release.
diff --git a/buildroot/package/glibmm/glibmm.mk b/buildroot/package/glibmm/glibmm.mk
index 71f1dfd36..e66d56eac 100644
--- a/buildroot/package/glibmm/glibmm.mk
+++ b/buildroot/package/glibmm/glibmm.mk
@@ -13,4 +13,12 @@ GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJ
 GLIBMM_INSTALL_STAGING = YES
 GLIBMM_DEPENDENCIES = libglib2 libsigc host-pkgconf
 
+GLIBMM_CXXFLAGS = $(TARGET_CXXFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+GLIBMM_CXXFLAGS += -O0
+endif
+
+GLIBMM_CONF_ENV += CXXFLAGS="$(GLIBMM_CXXFLAGS)"
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch b/buildroot/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch
deleted file mode 100644
index 11507388e..000000000
--- a/buildroot/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From eea0f62a1f6712f10afe47635b80a061505d2d2f Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Sat, 17 Jan 2015 18:33:37 +0100
-Subject: [PATCH 1/2] Allow CFLAGS/CPPFLAGS to be completed from the
- environment
-
-Buildroot passes its own CPPFLAGS and CFLAGS in the environment, so
-the CFLAGS += and CPPFLAGS += statements in gnu-efi Makefile have no
-effect. Change these to override  += so that they extend the
-flags passed by Buildroot.
-
-[Romain:
- - rebase on top of 3.0.1 release]
-[Bernd:
- - rebase on top of 3.0.5 release]
-[Benoît:
- - rebase on top of 3.0.6 release]
-
-Signed-off-by: Thomas Petazzoni 
-Signed-off-by: Romain Naour 
-Signed-off-by: Bernd Kuhls 
-Signed-off-by: Benoît Allard 
----
- Make.defaults |   22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/Make.defaults b/Make.defaults
-index 51bd7d8..7d7e8e7 100755
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -85,14 +85,14 @@ OBJDIR       := $(TOPDIR)/$(ARCH)
- #
- 
- # Arch-specific compilation flags
--CPPFLAGS += -DCONFIG_$(ARCH)
-+override CPPFLAGS += -DCONFIG_$(ARCH)
- 
- ifeq ($(ARCH),ia64)
--  CFLAGS += -mfixed-range=f32-f127
-+  override CFLAGS += -mfixed-range=f32-f127
- endif
- 
- ifeq ($(ARCH),ia32)
--  CFLAGS += -mno-mmx -mno-sse
-+  override CFLAGS += -mno-mmx -mno-sse
-   ifeq ($(HOSTARCH),x86_64)
-     ARCH3264 = -m32
-   endif
-@@ -109,19 +109,19 @@ ifeq ($(ARCH),x86_64)
-                                  && [ $(GCCMINOR) -ge "7" ] ) ) \
-                           && echo 1)
-   ifeq ($(GCCNEWENOUGH),1)
--    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
-+    override CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
-   else ifeq ($(USING_CLANG),clang)
--    CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
-+    override CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
-   endif
- 
--  CFLAGS += -mno-red-zone
-+  override CFLAGS += -mno-red-zone
-   ifeq ($(HOSTARCH),ia32)
-     ARCH3264 = -m64
-   endif
- endif
- 
- ifeq ($(ARCH),mips64el)
--  CFLAGS += -march=mips64r2
-+  override CFLAGS += -march=mips64r2
-   ARCH3264 = -mabi=64
- endif
- 
-@@ -142,7 +142,7 @@ export LIBGCC=$(shell $(CC) $(ARCH3264)
- endif
- 
- ifeq ($(ARCH),arm)
--CFLAGS += -marm
-+override CFLAGS += -marm
- endif
- 
- # Generic compilation flags
-@@ -152,15 +152,15 @@ INCDIR  += -I$(SRCDIR) -I$(TOPDIR)/inc -
- # Only enable -fpic for non MinGW compilers (unneeded on MinGW)
- GCCMACHINE := $(shell $(CC) -dumpmachine)
- ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE)))
--  CFLAGS += -fpic
-+  override CFLAGS += -fpic
- endif
- 
- ifeq (FreeBSD, $(findstring FreeBSD, $(OS)))
--CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
-+override CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
-            -fshort-wchar -fno-strict-aliasing \
-            -ffreestanding -fno-stack-protector
- else
--CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
-+override CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
-            -fshort-wchar -fno-strict-aliasing \
-            -fno-merge-all-constants -ffreestanding -fno-stack-protector \
-            -fno-stack-check
--- 
-2.11.0
-
diff --git a/buildroot/package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch b/buildroot/package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch
new file mode 100644
index 000000000..57c78c9bd
--- /dev/null
+++ b/buildroot/package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch
@@ -0,0 +1,35 @@
+From 6335e5c697c57d8b5854b8202de3733bcb151ca6 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 18 Jan 2019 22:05:37 +0100
+Subject: [PATCH] efilink: fix build with gcc 4.8
+
+intptr_t is undefined without an include on stdint.h
+
+Fixes:
+ - http://autobuild.buildroot.org/results/a0ca37b5ed27af445344e3ac49dc87bb17512c50
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status:
+https://sourceforge.net/p/gnu-efi/code/merge-requests/3]
+---
+ inc/efilink.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/inc/efilink.h b/inc/efilink.h
+index cc5aa2d..b69a6fd 100644
+--- a/inc/efilink.h
++++ b/inc/efilink.h
+@@ -1,6 +1,10 @@
+ #ifndef _EFI_LINK_H
+ #define _EFI_LINK_H
+ 
++#if defined(__GNUC__)
++#include 
++#endif
++
+ /*++
+ 
+ Copyright (c) 1998  Intel Corporation
+-- 
+2.14.1
+
diff --git a/buildroot/package/gnu-efi/0002-Make.defaults-don-t-override-ARCH-when-cross-compili.patch b/buildroot/package/gnu-efi/0002-Make.defaults-don-t-override-ARCH-when-cross-compili.patch
new file mode 100644
index 000000000..c25654178
--- /dev/null
+++ b/buildroot/package/gnu-efi/0002-Make.defaults-don-t-override-ARCH-when-cross-compili.patch
@@ -0,0 +1,32 @@
+From 3452721eafae90749f4af63264c412f398460b15 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 20 Jan 2019 21:07:11 +0100
+Subject: [PATCH] Make.defaults: don't override ARCH when cross-compiling
+
+Don't override the user-provided ARCH when cross-compiling otherwise
+ARCH won't be correct for armv5, aarch64 and x86_64
+
+Fixes:
+ - http://autobuild.buildroot.org/results/2dfc0e10da25a8382a43557420d7dc3444c02dbb
+
+Signed-off-by: Fabrice Fontaine 
+---
+ Make.defaults | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.defaults b/Make.defaults
+index ba743f1..a0e5632 100755
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -67,7 +67,7 @@ ARCH         ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[345678
+ 
+ # Get ARCH from the compiler if cross compiling 
+ ifneq ($(CROSS_COMPILE),)
+-  override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' )
++  ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' )
+ endif
+ 
+ # FreeBSD (and possibly others) reports amd64 instead of x86_64
+-- 
+2.14.1
+
diff --git a/buildroot/package/gnu-efi/Config.in b/buildroot/package/gnu-efi/Config.in
index d8d92c2c1..d456a2383 100644
--- a/buildroot/package/gnu-efi/Config.in
+++ b/buildroot/package/gnu-efi/Config.in
@@ -1,7 +1,14 @@
+config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
+	bool
+	default y if BR2_ARM_CPU_HAS_ARM
+	default y if BR2_aarch64
+	default y if BR2_aarch64_be
+	default y if BR2_i386
+	default y if BR2_x86_64
+
 config BR2_PACKAGE_GNU_EFI
 	bool "gnu-efi"
-	depends on BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || \
-		BR2_aarch64_be || BR2_i386 || BR2_x86_64
+	depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
 	help
 	  Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64
 	  (IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain
diff --git a/buildroot/package/gnu-efi/gnu-efi.hash b/buildroot/package/gnu-efi/gnu-efi.hash
index 1bd0f8c5d..9ac2b51fe 100644
--- a/buildroot/package/gnu-efi/gnu-efi.hash
+++ b/buildroot/package/gnu-efi/gnu-efi.hash
@@ -1,5 +1,6 @@
 # From http://sourceforge.net/projects/gnu-efi/files
-md5 46f633758a8a37db9fd6909fe270c26b gnu-efi-3.0.6.tar.bz2
-sha1 9f0f75b64c84423f3386da6f3200f5ed7471d9cb gnu-efi-3.0.6.tar.bz2
+md5 32af17b917545a693e549af2439c4a99 gnu-efi-3.0.9.tar.bz2
+sha1 9b39e06206e63eba56d59a648a7e4f20aead6962 gnu-efi-3.0.9.tar.bz2
 # Locally computed
-sha256 21515902d80fbea23328a61d70d3d51a47204abd1507ebfa27550a7b9bf22c91 gnu-efi-3.0.6.tar.bz2
+sha256 6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0  gnu-efi-3.0.9.tar.bz2
+sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265  README.efilib
diff --git a/buildroot/package/gnu-efi/gnu-efi.mk b/buildroot/package/gnu-efi/gnu-efi.mk
index d55e0274d..fe3c8ac34 100644
--- a/buildroot/package/gnu-efi/gnu-efi.mk
+++ b/buildroot/package/gnu-efi/gnu-efi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNU_EFI_VERSION = 3.0.6
+GNU_EFI_VERSION = 3.0.9
 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2
 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi
 GNU_EFI_INSTALL_STAGING = YES
@@ -26,17 +26,18 @@ else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y)
 GNU_EFI_PLATFORM = aarch64
 endif
 
+GNU_EFI_MAKE_OPTS = \
+	ARCH=$(GNU_EFI_PLATFORM) \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	PREFIX=/usr
+
 define GNU_EFI_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(TARGET_CONFIGURE_OPTS) \
-		ARCH=$(GNU_EFI_PLATFORM)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(GNU_EFI_MAKE_OPTS)
 endef
 
 define GNU_EFI_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(TARGET_CONFIGURE_OPTS) \
-		INSTALLROOT=$(STAGING_DIR) \
-		PREFIX=/usr ARCH=$(GNU_EFI_PLATFORM) install
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(GNU_EFI_MAKE_OPTS) \
+		INSTALLROOT=$(STAGING_DIR) install
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot/package/gnuchess/gnuchess.hash b/buildroot/package/gnuchess/gnuchess.hash
index 064a845ed..9342fc3eb 100644
--- a/buildroot/package/gnuchess/gnuchess.hash
+++ b/buildroot/package/gnuchess/gnuchess.hash
@@ -1,2 +1,3 @@
 # sha256 locally computed
-sha256 3c425c0264f253fc5cc2ba969abe667d77703c728770bd4b23c456cbe5e082ef  gnuchess-6.2.4.tar.gz
+sha256 9a99e963355706cab32099d140b698eda9de164ebce40a5420b1b9772dd04802  gnuchess-6.2.5.tar.gz
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/buildroot/package/gnuchess/gnuchess.mk b/buildroot/package/gnuchess/gnuchess.mk
index 1465ab0a0..4d91706de 100644
--- a/buildroot/package/gnuchess/gnuchess.mk
+++ b/buildroot/package/gnuchess/gnuchess.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GNUCHESS_VERSION = 6.2.4
+GNUCHESS_VERSION = 6.2.5
 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
-GNUCHESS_LICENSE = GPL-2.0+
+GNUCHESS_LICENSE = GPL-3.0+
 GNUCHESS_LICENSE_FILES = COPYING
 
 GNUCHESS_DEPENDENCIES = host-flex flex
diff --git a/buildroot/package/gnupg2/gnupg2.hash b/buildroot/package/gnupg2/gnupg2.hash
index a367effca..f985e11ad 100644
--- a/buildroot/package/gnupg2/gnupg2.hash
+++ b/buildroot/package/gnupg2/gnupg2.hash
@@ -1,7 +1,7 @@
-# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q3/000428.html
-sha1 3e87504e2ca317718aa9b6299947ebf7e906b54e  gnupg-2.2.10.tar.bz2
+# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000433.html
+sha1 2aeccc35ea8034306ff7a1072b84abbaa79619c3  gnupg-2.2.12.tar.bz2
 # Calculated based on the hash above and signature
-# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.10.tar.bz2.sig
+# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.12.tar.bz2.sig
 # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
-sha256 799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915  gnupg-2.2.10.tar.bz2
+sha256 db030f8b4c98640e91300d36d516f1f4f8fe09514a94ea9fc7411ee1a34082cb  gnupg-2.2.12.tar.bz2
 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357  COPYING
diff --git a/buildroot/package/gnupg2/gnupg2.mk b/buildroot/package/gnupg2/gnupg2.mk
index 64329522d..9365e960f 100644
--- a/buildroot/package/gnupg2/gnupg2.mk
+++ b/buildroot/package/gnupg2/gnupg2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUPG2_VERSION = 2.2.10
+GNUPG2_VERSION = 2.2.12
 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
 GNUPG2_LICENSE = GPL-3.0+
diff --git a/buildroot/package/gnuradio/Config.in b/buildroot/package/gnuradio/Config.in
index 56957d59e..6d0669779 100644
--- a/buildroot/package/gnuradio/Config.in
+++ b/buildroot/package/gnuradio/Config.in
@@ -56,6 +56,12 @@ config BR2_PACKAGE_GNURADIO_FEC
 	help
 	  FEC signal processing blocks
 
+config BR2_PACKAGE_GNURADIO_LOG
+	bool "gr-log support"
+	select BR2_PACKAGE_LOG4CPP
+	help
+	  Enable logger component
+
 config BR2_PACKAGE_GNURADIO_PYTHON
 	bool "python support"
 	depends on BR2_PACKAGE_PYTHON
@@ -78,11 +84,6 @@ config BR2_PACKAGE_GNURADIO_ZEROMQ
 	help
 	  zeromq communication support
 
-comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager, -qtgui depends fftw's single precision"
-	depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE
-
-if BR2_PACKAGE_FFTW_PRECISION_SINGLE
-
 config BR2_PACKAGE_GNURADIO_ANALOG
 	bool "gr-analog support"
 	select BR2_PACKAGE_GNURADIO_FILTER
@@ -103,6 +104,8 @@ config BR2_PACKAGE_GNURADIO_DIGITAL
 
 config BR2_PACKAGE_GNURADIO_FFT
 	bool "gr-fft support"
+	select BR2_PACKAGE_FFTW
+	select BR2_PACKAGE_FFTW_SINGLE
 	select BR2_PACKAGE_GNURADIO_BLOCKS
 	help
 	  FFT signal processing blocks
@@ -119,16 +122,6 @@ config BR2_PACKAGE_GNURADIO_PAGER
 	help
 	  FLEX pager decoder implementation blocks
 
-config BR2_PACKAGE_GNURADIO_QTGUI
-	bool "gr-qtgui"
-	depends on BR2_PACKAGE_PYTHON_PYQT
-	depends on BR2_PACKAGE_QWT
-	depends on BR2_PACKAGE_QT_STL
-	select BR2_PACKAGE_GNURADIO_FFT
-	select BR2_PACKAGE_GNURADIO_FILTER
-	help
-	  GNU Radio Qt scopes
-
 config BR2_PACKAGE_GNURADIO_TRELLIS
 	bool "gr-trellis support"
 	select BR2_PACKAGE_GNURADIO_DIGITAL
@@ -136,4 +129,3 @@ config BR2_PACKAGE_GNURADIO_TRELLIS
 	  Trellis coded modulation blocks
 
 endif
-endif
diff --git a/buildroot/package/gnuradio/gnuradio.mk b/buildroot/package/gnuradio/gnuradio.mk
index ed537e393..ef9723cb0 100644
--- a/buildroot/package/gnuradio/gnuradio.mk
+++ b/buildroot/package/gnuradio/gnuradio.mk
@@ -25,7 +25,9 @@ endif
 GNURADIO_CONF_OPTS = \
 	-DENABLE_DEFAULT=OFF \
 	-DENABLE_VOLK=ON \
-	-DENABLE_GNURADIO_RUNTIME=ON
+	-DENABLE_GNURADIO_RUNTIME=ON \
+	-DENABLE_GR_QTGUI=OFF \
+	-DXMLTO_EXECUTABLE=NOTFOUND
 
 # For third-party blocks, the gnuradio libraries are mandatory at
 # compile time.
@@ -101,7 +103,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_GNURADIO_FFT),y)
-GNURADIO_DEPENDENCIES += fftw
+GNURADIO_DEPENDENCIES += fftw-single
 GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=ON
 else
 GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=OFF
@@ -113,6 +115,13 @@ else
 GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_GNURADIO_LOG),y)
+GNURADIO_DEPENDENCIES += log4cpp
+GNURADIO_CONF_OPTS += -DENABLE_GR_LOG=ON
+else
+GNURADIO_CONF_OPTS += -DENABLE_GR_LOG=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y)
 GNURADIO_DEPENDENCIES += python
 GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON
@@ -126,13 +135,6 @@ else
 GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y)
-GNURADIO_DEPENDENCIES += python-pyqt qwt
-GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON
-else
-GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y)
 GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON
 else
diff --git a/buildroot/package/gnutls/gnutls.hash b/buildroot/package/gnutls/gnutls.hash
index bbcd5bd4d..8c0e0d69d 100644
--- a/buildroot/package/gnutls/gnutls.hash
+++ b/buildroot/package/gnutls/gnutls.hash
@@ -1,6 +1,6 @@
 # Locally calculated after checking pgp signature
-# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.19.tar.xz.sig
-sha256	1936eb64f03aaefd6eb16cef0567457777618573826b94d03376bb6a4afadc44	gnutls-3.5.19.tar.xz
+# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.7.1.tar.xz.sig
+sha256	881b26409ecd8ea4c514fd3fbdb6fae5fab422ca7b71116260e263940a4bbbad	gnutls-3.6.7.1.tar.xz
 # Locally calculated
-sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	doc/COPYING
+sha256	e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b	doc/COPYING
 sha256	6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3	doc/COPYING.LESSER
diff --git a/buildroot/package/gnutls/gnutls.mk b/buildroot/package/gnutls/gnutls.mk
index 7492254e8..e7c596820 100644
--- a/buildroot/package/gnutls/gnutls.mk
+++ b/buildroot/package/gnutls/gnutls.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GNUTLS_VERSION_MAJOR = 3.5
-GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).19
+GNUTLS_VERSION_MAJOR = 3.6
+GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).7.1
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
 GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library)
@@ -18,7 +18,6 @@ GNUTLS_CONF_OPTS = \
 	--disable-rpath \
 	--enable-local-libopts \
 	--enable-openssl-compatibility \
-	--with-libnettle-prefix=$(STAGING_DIR)/usr \
 	--with-librt-prefix=$(STAGING_DIR) \
 	--without-tpm \
 	$(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools)
@@ -29,9 +28,8 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
 	gl_cv_func_gettimeofday_clobber=no
 GNUTLS_INSTALL_STAGING = YES
 
-# libpthread and libz autodetection poison the linkpath
+# libpthread autodetection poison the linkpath
 GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
-GNUTLS_CONF_OPTS += $(if $(BR2_PACKAGE_ZLIB),--with-libz-prefix=$(STAGING_DIR)/usr)
 
 # gnutls needs libregex, but pcre can be used too
 # The check isn't cross-compile friendly
@@ -60,18 +58,11 @@ GNUTLS_CONF_OPTS += --enable-cryptodev
 GNUTLS_DEPENDENCIES += cryptodev-linux
 endif
 
-ifeq ($(BR2_PACKAGE_LIBIDN),y)
-GNUTLS_CONF_OPTS += --with-idn
-GNUTLS_DEPENDENCIES += libidn
-else
-GNUTLS_CONF_OPTS += --without-idn
-endif
-
 ifeq ($(BR2_PACKAGE_LIBIDN2),y)
-GNUTLS_CONF_OPTS += --with-libidn2
+GNUTLS_CONF_OPTS += --with-idn
 GNUTLS_DEPENDENCIES += libidn2
 else
-GNUTLS_CONF_OPTS += --without-libidn2
+GNUTLS_CONF_OPTS += --without-idn
 endif
 
 ifeq ($(BR2_PACKAGE_P11_KIT),y)
@@ -88,13 +79,6 @@ else
 GNUTLS_CONF_OPTS += --with-included-unistring
 endif
 
-ifeq ($(BR2_PACKAGE_ZLIB),y)
-GNUTLS_CONF_OPTS += --with-zlib
-GNUTLS_DEPENDENCIES += zlib
-else
-GNUTLS_CONF_OPTS += --without-zlib
-endif
-
 # Provide a default CA cert location
 ifeq ($(BR2_PACKAGE_P11_KIT),y)
 GNUTLS_CONF_OPTS += --with-default-trust-store-pkcs11=pkcs11:model=p11-kit-trust
diff --git a/buildroot/package/go/go.hash b/buildroot/package/go/go.hash
index ee1c881e6..77aa273aa 100644
--- a/buildroot/package/go/go.hash
+++ b/buildroot/package/go/go.hash
@@ -1,3 +1,3 @@
 # From https://golang.org/dl/
-sha256	4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15  go1.11.4.src.tar.gz
+sha256	ee80684b352f8d6b49d804d4e615f015ae92da41c4096cfee89ed4783b2498e3  go1.11.9.src.tar.gz
 sha256	2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  LICENSE
diff --git a/buildroot/package/go/go.mk b/buildroot/package/go/go.mk
index 0d7b961dd..6b8b0de6b 100644
--- a/buildroot/package/go/go.mk
+++ b/buildroot/package/go/go.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GO_VERSION = 1.11.4
+GO_VERSION = 1.11.9
 GO_SITE = https://storage.googleapis.com/golang
 GO_SOURCE = go$(GO_VERSION).src.tar.gz
 
@@ -37,12 +37,16 @@ GO_GOARCH = mips64le
 endif
 
 HOST_GO_DEPENDENCIES = host-go-bootstrap
+HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache
 HOST_GO_ROOT = $(HOST_DIR)/lib/go
+HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache
 
 # For the convienience of target packages.
 HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH)
 HOST_GO_TARGET_ENV = \
+	GO111MODULE=off \
 	GOARCH=$(GO_GOARCH) \
+	GOCACHE="$(HOST_GO_TARGET_CACHE)" \
 	GOROOT="$(HOST_GO_ROOT)" \
 	CC="$(TARGET_CC)" \
 	CXX="$(TARGET_CXX)" \
@@ -61,6 +65,8 @@ endif
 # The go build system is not compatible with ccache, so use
 # HOSTCC_NOCCACHE.  See https://github.com/golang/go/issues/11685.
 HOST_GO_MAKE_ENV = \
+	GO111MODULE=off \
+	GOCACHE=$(HOST_GO_HOST_CACHE) \
 	GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \
 	GOROOT_FINAL=$(HOST_GO_ROOT) \
 	GOROOT="$(@D)" \
diff --git a/buildroot/package/googlefontdirectory/Config.in b/buildroot/package/googlefontdirectory/Config.in
index 762c1b177..cf2814d88 100644
--- a/buildroot/package/googlefontdirectory/Config.in
+++ b/buildroot/package/googlefontdirectory/Config.in
@@ -1,16 +1,19 @@
 config BR2_PACKAGE_GOOGLEFONTDIRECTORY
 	bool "Google font directory"
 	help
-	  Google font directory
+	  Font files available from Google Fonts
 
-	  http://code.google.com/p/googlefontdirectory/
+	  https://github.com/google/fonts
 
 if BR2_PACKAGE_GOOGLEFONTDIRECTORY
 
 config BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS
 	string "List of fonts to install"
-	default "droid"
+	default "ufl/ubuntu"
 	help
-	  Specify a space-separated list of fonts to install
+	  Specify a space-separated list of fonts to install. They
+	  correspond to the path of the font directory within Google
+	  Font directory code base. For example: ufl/ubuntu,
+	  apache/kranky or ofl/gleego.
 
 endif
diff --git a/buildroot/package/googlefontdirectory/googlefontdirectory.hash b/buildroot/package/googlefontdirectory/googlefontdirectory.hash
index 6b15b2b8b..2525b6fff 100644
--- a/buildroot/package/googlefontdirectory/googlefontdirectory.hash
+++ b/buildroot/package/googlefontdirectory/googlefontdirectory.hash
@@ -1,2 +1,994 @@
 # Locally calculated
-sha256 8a7d04feef21fdfc09d90cd3e2c0c05dcb2fdd4e15f971e8ceaf4d90c1c123cd googlewebfonts.tgz
+sha256 ec2ddbeee673cce1b0796e3b20fbff5fd836ce9ba6d88deed8b59154fa255f06  googlefontdirectory-94dff3eaa9301b6640cccc63c56d6ff33d82882c.tar.gz
+# Locally calculated with
+# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt') ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/robotocondensed/LICENSE.txt
+sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  apache/opensanscondensed/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/walterturncoat/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/fontdinerswanky/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/aclonica/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/sunshiney/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/ultra/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/unkempt/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/slackey/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/satisfy/LICENSE.txt
+sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  apache/opensans/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/montez/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/kranky/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/arimo/LICENSE.txt
+sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  apache/opensanshebrew/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/tinos/LICENSE.txt
+sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  apache/opensanshebrewcondensed/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/justanotherhand/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/robotoslab/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/homemadeapple/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/craftygirls/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/crushed/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/robotomono/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/maidenorange/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/roboto/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/rochester/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/rocksalt/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/creepstercaps/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/nokora/LICENSE.txt
+sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  apache/mountainsofchristmas/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/cousine/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/syncopate/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/specialelite/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/luckiestguy/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/rancho/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/smokum/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/redressed/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/irishgrover/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/comingsoon/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/cherrycreamsoda/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/schoolbell/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/yellowtail/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/calligraffitti/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/permanentmarker/LICENSE.txt
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  apache/chewy/LICENSE.txt
+sha256 0fc8e6675568c02aac6b41dd3cccaf2264fc5969601effe68e09b26635879b2c  ofl/ranchers/OFL.txt
+sha256 ff72e4d89860e64ee38ccf8a5a7e9dc085d5e36115b096a6c7f8bc988e9bec61  ofl/kumarone/OFL.txt
+sha256 643c63caf03855ae29be68035d8888e95eadc767a1d92f163d686da1b0a1cd3c  ofl/cantarell/OFL.txt
+sha256 1d242ab6fbb2dfbba2e7119b00a6328bc59cb2faf7299b844e9b92a2f12c0d8b  ofl/adventpro/OFL.txt
+sha256 01af2625d6247ecd2430d1d1603c579f85989d43b2d9129e08e0ac0df8909918  ofl/tienne/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/baloobhaina/OFL.txt
+sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022  ofl/faustina/OFL.txt
+sha256 69c34ca1873308c667ddde663cbf59c0d1cf14cbb945ad010f71d21264249e24  ofl/aubrey/OFL.txt
+sha256 4febcc8d6e539db3e0c652da87bc8704f6d48e71e07f8ddb0974094a3de8da81  ofl/flavors/OFL.txt
+sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf  ofl/muktavaani/OFL.txt
+sha256 ab5499b975c2dc82f533c6f13c5fca589df4d57c7c400db5f6ca8565ad9c2fd3  ofl/butchermancaps/OFL.txt
+sha256 6a28d4d5d8b4d1ea89ace5a047ac6e0de182acdb8bfa22897bf7702102094f69  ofl/shadowsintolighttwo/OFL.txt
+sha256 7a1d085067cd589026b256dd85af1eaa1087fa0f3d468192724c5138cc14d894  ofl/copse/OFL.txt
+sha256 fd17f80dc48ff767d91d0dd9f821eebfd8b73ee82f55537a9052b6b0107622c8  ofl/voces/OFL.txt
+sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f  ofl/barlowsemicondensed/OFL.txt
+sha256 4aa1da66597f4c5cfde67790992ee55926ef6aaa87b9a10d529ab35e8b91070c  ofl/asapcondensed/OFL.txt
+sha256 301f77908df2b00141b4dcea50cc1a586c3afcee78843bd811088e8263623f9d  ofl/amaticsc/OFL.txt
+sha256 6b6c6721a30480a323cf33acf6a7703dfce46b846827a65f8ee96230060e3c3e  ofl/homenaje/OFL.txt
+sha256 393d494f9ebb5db6a3552ffa03a4c6f3746c22808b40d011b391681da55ca3f6  ofl/kellyslab/OFL.txt
+sha256 ca19ac21c7656f493189093eca52b4239fcc5eacc15ab2e3d67cfbfc0e6e443b  ofl/sirinstencil/OFL.txt
+sha256 980c2b058d331f3c5ca4a1223e549511b71630e4f4a5533879d436d583cb5665  ofl/arbutus/OFL.txt
+sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c  ofl/ptsans/OFL.txt
+sha256 7527e73a61f742a0dd050ab2fc7333de71ac7886023c100bca66a0a93b37498e  ofl/headlandone/OFL.txt
+sha256 39b26527bf9ed27b4c85b86341eceea0579f3550bcf448cf06345eaadf947ec9  ofl/rugeboogie/OFL.txt
+sha256 2ac164969308ac200eefc516151934701044f0db5695ae2acc15df2a8d22e5cb  ofl/anaheim/OFL.txt
+sha256 88d3abd47414e7912d0d2eb44ca89e0b1bd7c43cc2ebe58a8a75281ad75a0f60  ofl/stardosstencil/OFL.txt
+sha256 01003114b77326df223f291c48cdf12e95f6a5937437f164347919f2bbde12d4  ofl/josefinslab/OFL.txt
+sha256 83aa5adca2418f091b732a19cc7c30dcb5c00c217051a58f34f5eecb19be0cd3  ofl/average/OFL.txt
+sha256 585c6d2da8bcd8ffa651e0016f2e992a6891b625143a46a1dacf00699a817d9a  ofl/monoton/OFL.txt
+sha256 96e65d9c227a972e38035b849bba1e8b7879eecbb52f278be1e71dd481187f02  ofl/domine/OFL.txt
+sha256 d1bf0acea511ad1f4de53e942cffb8ab0e67c03c6203d6f390d71105d52c33f0  ofl/missfajardose/OFL.txt
+sha256 131d19126a0e7ddd25540fd6bee219cebbc8aee7e8374882998ee6c2f4ff6cf4  ofl/mergeone/OFL.txt
+sha256 042a570b306ab893c6168be7e6e79bbceae46097141357ad0af7ef8bb179ed7b  ofl/goblinone/OFL.txt
+sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360  ofl/ibmplexserif/OFL.txt
+sha256 bc80ea18223ea0db2ed73ab5bfd0cd601906a2b7a163183c6c4ea333be309ce4  ofl/baumans/OFL.txt
+sha256 5f5dbf452c1657370d9280b50d647212a53c80acae6d78e0b5e8c2b26dc62b09  ofl/puritan/OFL.txt
+sha256 90bd333a5cf0ed09264fc3e559d44979373f6c3d983b0f65cc46e952b4eb61f0  ofl/contrailone/OFL.txt
+sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9  ofl/taviraj/OFL.txt
+sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a  ofl/overlock/OFL.txt
+sha256 75798d56e448ba4d2aec3ef5f3c2d805d9c6fe2ba688cd3d7162b2dd31e9cf48  ofl/textmeone/OFL.txt
+sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0  ofl/sedansc/OFL.txt
+sha256 466aaa3bbd245e4c91c4e82c0828efe9fcfd913f5b020d75f0918516c2540fa8  ofl/spicyrice/OFL.txt
+sha256 88ac81fcd30e64f6e6b91b61b159c9b700bb3dd59012b72ec61629abcfc7fba1  ofl/medulaone/OFL.txt
+sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f  ofl/redactedscript/OFL.txt
+sha256 ce78cc8de3f6edd2738e8c02f2079db7086c9a74314baa5854675f83c33954ff  ofl/kenia/OFL.txt
+sha256 76af3e9e5d8768b17647813a443fcf5df3eb3ced017ee285796625e714d5ea2c  ofl/ruslandisplay/OFL.txt
+sha256 6e54fc004ebeb61322ecab1d86334ebf69e7051632d48eca489beee505d70762  ofl/hermeneusone/OFL.txt
+sha256 8586a7e75681c7297af4cc0641eb2b29e882c5187fe189a1160eceb4e95d4163  ofl/fenix/OFL.txt
+sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612  ofl/deliusunicase/OFL.txt
+sha256 197c3f48cff4df3d768230e0bbdbc4305d8b8b9041ea6fb5e00872af66adc5ae  ofl/novamono/OFL.txt
+sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e  ofl/allerta/OFL.txt
+sha256 af88d31020bb48a1f78f4384249814d04a44d22feeede2ff4ae79fbb4fcf74da  ofl/rammettoone/OFL.txt
+sha256 397e83b05703a4240be51e2c3a2be1d0d7693d7a2d8b1ff367c26a2b9afc013e  ofl/singleday/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/cedarvillecursive/OFL.txt
+sha256 d416bc9437e1d7d8aba0613395ee49c95ce72d680672e910c6205b545cfcbad8  ofl/cherryswash/OFL.txt
+sha256 513346ac60af1dde9d4a7bcfad3f39909d5697373a8aa1a6ee4376e6d22d3cdf  ofl/niramit/OFL.txt
+sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa  ofl/coda/OFL.txt
+sha256 2a7b0a41ef401e4e0e955280b07c0a2698932d56aad3181089bdbbaad5760491  ofl/habibi/OFL.txt
+sha256 2d62278530348951887211d79d1dba04acebd6ed3b1c413f6154702efea3ea62  ofl/iceberg/OFL.txt
+sha256 a20db45220b6c4dc9776f24c77dc9ec7a98977d8b3c65b03aabe66b2d08e0791  ofl/cabincondensed/OFL.txt
+sha256 fc1e501d419d84a8f1a800adae092045002d7141241f498237611dbb8ea763d7  ofl/stintultracondensed/OFL.txt
+sha256 9a51726e5f247cb1f07bb8f49c163bc3e9ddee5f367bb5a1871d09b854ed1b7c  ofl/basic/OFL.txt
+sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a  ofl/diplomatasc/OFL.txt
+sha256 e30f893523e50ebbe07acd783ae29c7d604e6208cae7646d993e8528ce13e35a  ofl/federo/OFL.txt
+sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff  ofl/sharetechmono/OFL.txt
+sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4  ofl/averiasanslibre/OFL.txt
+sha256 5951473ab31533bfe1452bbcece47f237a5546c7e7d45ff1aec0289619623294  ofl/fugazone/OFL.txt
+sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e  ofl/miltonian/OFL.txt
+sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038  ofl/mavenpro/OFL.txt
+sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6  ofl/yrsa/OFL.txt
+sha256 5bbeae56b9db61a9bf85b64d5ed9a74cfcf9ee3e9b005bc2906859ddecd5eaa1  ofl/esteban/OFL.txt
+sha256 7b826efb1b74a50b1c1aef0a1ba4530925b993ceadc3016d1d787c68a61649dd  ofl/tenorsans/OFL.txt
+sha256 28c6d2887c3dfa42488c5418c6c16ead580d33ff0afe60c05159689201f9ec63  ofl/jollylodger/OFL.txt
+sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a  ofl/diplomata/OFL.txt
+sha256 8f2e5a9b52cf355023104413827e17dd7126c5a3656492d45eaa1ceb270aa4f1  ofl/yantramanav/OFL.txt
+sha256 fe079cdbbad0f6520eb0a8235bce65b21596dd0c4c5a2694b3325cc87313b618  ofl/shortstack/OFL.txt
+sha256 018d17b5e04c0a217a21979fa6b6d77bd5a143a5f06ea2ea102e427abd1ebfa2  ofl/tradewinds/OFL.txt
+sha256 31c59bcdd538c113ef5c048f56827439facb12b7e5cfd158b04c83727edc453b  ofl/salsa/OFL.txt
+sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f  ofl/nanumpenscript/OFL.txt
+sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d  ofl/ptserifcaption/OFL.txt
+sha256 c867d1a613bebc4932cf28c060fefb3bcfba3be56ed498b873c79f4eb786af1d  ofl/librebaskerville/OFL.txt
+sha256 694282197de3d750a43689dc64a8116cd19578cd516e7b2490c7b5362c064dbe  ofl/kameron/OFL.txt
+sha256 cb30d3086a8b3ce0b9e3690bf48d6620402b61160bc658076f95180ccd9e9dae  ofl/sourcecodepro/OFL.txt
+sha256 a40c3a6d0c968d3a10b17a2614606de6f20178deccc2447305f31fb106a57fb0  ofl/fresca/OFL.txt
+sha256 5d3457831b42632d958fe1a14a09706d8acb006486a5ca5b2b419cd61cb22e32  ofl/chelaone/OFL.txt
+sha256 6b53fb03a50914cc382f4d025ee595c17c43f24ae870f840bc51969d3e316c7e  ofl/limelight/OFL.txt
+sha256 574430e571a6928624f4bdf044420f7547a26309b7ebf6962296d33294e0a1e0  ofl/combo/OFL.txt
+sha256 fd20b82eb12d16ec31a58fc44f7e6c533b14b425b569d83f616a1f7a9a401e75  ofl/gochihand/OFL.txt
+sha256 0e74984817cdd51dbfbd8309022aa75f733e80dff0cb1d26ad2157e90446ba97  ofl/enriqueta/OFL.txt
+sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d  ofl/ptserif/OFL.txt
+sha256 4e69611ba5017f1fde74c31d342f5c85604814b1b45387b9ab46205996dec38e  ofl/astloch/OFL.txt
+sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0  ofl/geostarfill/OFL.txt
+sha256 14b3fbd06078a869cf2ba96e6dacb852d373703c86ca7ad54a4cdd6e20fbab19  ofl/knewave/OFL.txt
+sha256 a8103c045a88bf9b28dcd7eb60a6662008f49afc0f3721bc46aaf761fc0409e7  ofl/englebert/OFL.txt
+sha256 bd22e766af8f8e58eb520cb4fa73538826d04f7371b45e82295d22d1e32a4e58  ofl/gidugu/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/justmeagaindownhere/OFL.txt
+sha256 5fba78215eb4e42aed6cb0b5c5df52e0f71246281a866cd4493dfcfcbcab9518  ofl/playball/OFL.txt
+sha256 e75230ee246a04912366cd8d759d081200d80fb0756766c96dd52f73e8b40bed  ofl/romanesco/OFL.txt
+sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70  ofl/gamjaflower/OFL.txt
+sha256 244ca4ef7b106d8c660e9a00cecf5d581b6a222f447d7d59a8f61711b2ad3400  ofl/uncialantiqua/OFL.txt
+sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166  ofl/didactgothic/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/giveyouglory/OFL.txt
+sha256 638774cdf8233b5ddaf9ebee1821e9de1d5d59c335d8ee3ba0b47fb17833b502  ofl/glegoo/OFL.txt
+sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893  ofl/seoulnamsan/OFL.txt
+sha256 a10a07aaa150c147fa3cb22e845013f38e6c2b45fe5ba32a74ed1be9d4c417ae  ofl/odormeanchey/OFL.txt
+sha256 a74380bba78a364ec70b3a5fb6a1161b83cb05cc3e75a0910afbd1b5aff4f9c8  ofl/jaldi/OFL.txt
+sha256 9b8405bf5f503f92401fc990f372b34d469670ab60041d5298d1015d3d0b45f8  ofl/thabit/OFL.txt
+sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d  ofl/asap/OFL.txt
+sha256 ca9fe3a0e10bbb082f83ecdc07f5f04845c4bd689c46456da3e6bae23e11aae2  ofl/inder/OFL.txt
+sha256 5b158abb3406e69b7408b562b7199f6ff55a41ea56e260b87176d693b0095e47  ofl/piedra/OFL.txt
+sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95  ofl/almendradisplay/OFL.txt
+sha256 87b7d831a81fe8b37e7e6c672937493f710ff81883eee3adec7b5423297efd16  ofl/sharetech/OFL.txt
+sha256 4ec46c3e4469afa19f0156bac6917472974f9c85c189f9220cf8735d3e810401  ofl/kristi/OFL.txt
+sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038  ofl/bilbo/OFL.txt
+sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19  ofl/hindcolombo/OFL.txt
+sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25  ofl/carroisgothicsc/OFL.txt
+sha256 930fed5b06a415736dc3b4e5f4f01585523b672717564bf677f93966bcd57636  ofl/lustria/OFL.txt
+sha256 9a536e5a3b55c2605b0a553eed383cd3efa42ba48dc45cc6f0635b3c53ee791e  ofl/warnes/OFL.txt
+sha256 879ec56fcc9a961937fd24d542b3b7b3f2b8cb3236b7351e62d16719e25de14c  ofl/griffy/OFL.txt
+sha256 29cca754098468057880970c604e55c4e2bcb8479742e4130c94f2ddc0363f9c  ofl/sixcaps/OFL.txt
+sha256 67261c7ceb3e627da5c94d6617dac6da29bf36b910bee304a7680ad62e2c8b46  ofl/changaone/OFL.txt
+sha256 327bac41d89cf9f32e0efe353228018e1661cff458a5d4905714958514df7bd5  ofl/lalezar/OFL.txt
+sha256 525411e604e7a1d85a4cd42641869f94388f04a6ed77829d6c4edd7fd740ceab  ofl/ramaraja/OFL.txt
+sha256 3d08baba63f1f2427fd96dee8da30b1ef6c1421b3be0e1f07cc2a78abb27c91d  ofl/seaweedscript/OFL.txt
+sha256 4c0a1150a363b42bd8681ff4a00315ac49510a944c4c9978237ff8b90a8920a5  ofl/grandhotel/OFL.txt
+sha256 bc4c7eb365ea342b1a027fb8417fb0152f5d482a2e31c012fbfa29b668827b04  ofl/cutivemono/OFL.txt
+sha256 1818771d183d203703c4b134f028527b535810e2a0666c8fe2785354ddbef686  ofl/battambang/OFL.txt
+sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95  ofl/almendra/OFL.txt
+sha256 9e0d3db586ba0abf5ca398683809dacdf4c81b2960f592bd085fbf206a67ddb0  ofl/sansitaone/OFL.txt
+sha256 fb1dbf3725bbdd389b2c569e0eed5091d8d10eed2833ec7efacfc3542e408615  ofl/scheherazade/OFL.txt
+sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f  ofl/cormorant/OFL.txt
+sha256 156ea6985861158c7dea63ecaac4c78ab0ed737d168ddffc3e34c687985a033b  ofl/sansation/OFL.txt
+sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5  ofl/blackandwhitepicture/OFL.txt
+sha256 5fe7f3c9410c29534ddd9dfaf64d3994ed4236096d0d543ae69eacc3b25632b1  ofl/bitter/OFL.txt
+sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68  ofl/alegreya/OFL.txt
+sha256 e88691a5e0a8a3f788f31db959701ec90a1d5e7505f1cc53c5663180a7d23c81  ofl/lohitbengali/OFL.txt
+sha256 ac55580be2df22a06d29a47501e2ae11e1d399620f5a779e17a66f016ba6d5ff  ofl/portersansblock/OFL.txt
+sha256 27d9af34210253e7ca1251fbace86c6f65b40031d6ce1a75493a1b2093631298  ofl/vt323/OFL.txt
+sha256 9452ef55386e77bd284ca466587d72802337621d7f10aa700e449753883b3397  ofl/trocchi/OFL.txt
+sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5  ofl/stylish/OFL.txt
+sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19  ofl/hindkochi/OFL.txt
+sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff  ofl/archivoblack/OFL.txt
+sha256 c832a4230a713d080aa2f2544d9a298ed911f689b2c48f7f276a0196b16d2b8a  ofl/cookie/OFL.txt
+sha256 ae28423a5e63cb65e651ccf62c9091b322fff1d2d4e87ad9f98b1096c2e7abb5  ofl/metrophobic/OFL.txt
+sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19  ofl/hindsiliguri/OFL.txt
+sha256 8c22fb3866eaebd77a2cb8e8ecbb095381ff32300db57758326fef35a26132f5  ofl/ranga/OFL.txt
+sha256 d2875ded3e44e9ae53ea2b35e825dafffa19e82c5d14addb9f1150fcd7a3463d  ofl/mina/OFL.txt
+sha256 8242e7737bce317f7a7f2b887ac87f5bb21305ab96bee92aadc3febac16c35bf  ofl/voltaire/OFL.txt
+sha256 fca01a37b10879d7685c7d03fc5a04086b15cdb2cb4f870cb687aa5a9a0a1361  ofl/jimnightshade/OFL.txt
+sha256 2492bb8645caaf622bdc3e880cdc9b069921e7341346d7b193666c866a1935d0  ofl/condiment/OFL.txt
+sha256 e6ac721b16f309c89fb443680afda427ea34968bad190a80edf281d01d65fa99  ofl/andadasc/OFL.txt
+sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae  ofl/cinzeldecorative/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/coveredbyyourgrace/OFL.txt
+sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19  ofl/hindvadodara/OFL.txt
+sha256 5c36e7ec460b285185ea23847aa1f508708d9ce15d5c055279defd022972f836  ofl/rakkas/OFL.txt
+sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191  ofl/biorhyme/OFL.txt
+sha256 c54957d55e7c9e66c28e474cd39de75dc044e8f69056788cae44eb78841ceef1  ofl/montserratsubrayada/OFL.txt
+sha256 fccf4916b5f84ef5f88d93fec464421aaf4121d11d4be8d74ee2d032f7661d6c  ofl/padauk/OFL.txt
+sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5  ofl/prociono/OFL.txt
+sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7  ofl/elsie/OFL.txt
+sha256 0d5fa0cce86012de872273700eef4fd162459e7c24a6a314911380627391071b  ofl/bigshotone/OFL.txt
+sha256 ca64dee162bf239c7b92d854d388bcd30552edc3ae1ef5e31714acda34c988db  ofl/jomhuria/OFL.txt
+sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454  ofl/gentiumbookbasic/OFL.txt
+sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74  ofl/bungeehairline/OFL.txt
+sha256 9c56b4e2e4e922cc37e19e1a9e2e1128beaa17a812e1b67c8ac371b0fb57ae03  ofl/kopubbatang/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/tillana/OFL.txt
+sha256 486c4d5b9baf0d0ba5546ef3c43fcfe22c062299ab6948045a43efffe4b0f74b  ofl/italiana/OFL.txt
+sha256 4539710406c656519f8ddc789056a7cd6f4fe66b44cc2f52ebca6e251bb26e13  ofl/imprima/OFL.txt
+sha256 7f55affd2bce8ed9be13297ba8df1a4a7e9835c2a006126dc2a1eb4ce75a7943  ofl/muli/OFL.txt
+sha256 867b506cb023eae20c1accde77b2e0abf7d8a9e2620da8dbebac9f7b1117ca0b  ofl/cantoraone/OFL.txt
+sha256 aa72b0185d828cb2fafa62a154e84bd3e20c88ada30326089bb20542b6363aaa  ofl/manuale/OFL.txt
+sha256 4664e83780a263c53dbab95d3590a5a9db914aeb9a3c78f7e7ad451f9151c998  ofl/spacemono/OFL.txt
+sha256 fc59ca3cd3bcb47bd4df597519111ec130c25cabcc57a8808dd2d243cdcec6ae  ofl/oldenburg/OFL.txt
+sha256 43c372f43d145c22e654781860506a75cb85b086dc76028a62a28a446506d253  ofl/italianno/OFL.txt
+sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97  ofl/fascinateinline/OFL.txt
+sha256 d13a278247ce39695f5ea6b721103faa668083022c5280b78c6392263e473929  ofl/bonbon/OFL.txt
+sha256 f0be7437bbb8b91ad4a4f7a5f3d0020368e494a803d892df03e8886d51f2db3a  ofl/candal/OFL.txt
+sha256 a68d8ec6bea7f277053ae93bf563d4b97c233f09f8e79f86ffe5db66f31fdddf  ofl/prozalibre/OFL.txt
+sha256 b00c646b7d04a6da1665a148815b8c589c1e05ed7e1febf7ccbd91758747cb03  ofl/quattrocentosans/OFL.txt
+sha256 a3deaae17ab9a15dc3c2778126aa6f80d41d567741853f84b16a9e1318ed799a  ofl/koulen/OFL.txt
+sha256 50f7b09af5ff677f611a96cdf5eb916307c59b29f2e8144942718cb432a9bf6f  ofl/margarine/OFL.txt
+sha256 72a22b6dd29b6b0cdcc98de30701b46532c9f7314ee095df3063d10775dd70c3  ofl/trochut/OFL.txt
+sha256 325e890b8b26fe0a683c3ba24c506d902bdd7034d9c47bd7fa2bb72b5433b9c9  ofl/shrikhand/OFL.txt
+sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a  ofl/overlocksc/OFL.txt
+sha256 d941aa56e280b4f204272c4b1add01a8ebc7af3e8e69ba8ba9118aa2a5306dde  ofl/berkshireswash/OFL.txt
+sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f  ofl/cormorantsc/OFL.txt
+sha256 36c285c5472c625901d4a13da7e31c5ea6126678d31d56cf95572c49f27c8950  ofl/passionone/OFL.txt
+sha256 fbc351e1b5428e4f45834647dc23a5f8aaa3e744e2f4117ca03c44f640b9a3a2  ofl/stintultraexpanded/OFL.txt
+sha256 021d5f1df697848da51620394659187be77cbe382ff2f896bc84ffb89c0c2d52  ofl/portlligatsans/OFL.txt
+sha256 85b700bfba1250a6f8bdf930cd7113faf3d8e9dc52cd89eb98c3ac8a038a4aa9  ofl/londrinasketch/OFL.txt
+sha256 c972795e48b096b6d4e3a947b0bb21c1baf1922a6e07ff9ada587c058f228740  ofl/coustard/OFL.txt
+sha256 eb4a7a082fb0e7dde0a8f975d33f02907ccbe40751c8115e790cf3679787d01c  ofl/strait/OFL.txt
+sha256 9b1cfccef4a7e19f90e2901f808f3aec4335d3cc81f978453ad0c8ded14447a0  ofl/novascript/OFL.txt
+sha256 43c89012c2b640187aae7e0c83d5ffa8381a0368c00e8426594358d44d3811e3  ofl/nunitosans/OFL.txt
+sha256 fdecdad755f4e5e95bee491c7521f31625dc08283562ea8579543c90430eb269  ofl/karlatamilinclined/OFL.txt
+sha256 5e80642a11aff2ead815949a8a929aff3fb7b9b6a24391406068a1b204dcc8ba  ofl/abeezee/OFL.txt
+sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454  ofl/gentiumbasic/OFL.txt
+sha256 f2fcbde4b8968400d661e7dcc23052b1885815c8e3b45323b26cbb833352f5de  ofl/timmana/OFL.txt
+sha256 c8af073a60e30b55ef5d0e4f80cea168e06dd65bdee7ec18c1ea8de8f7228780  ofl/strong/OFL.txt
+sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74  ofl/bungeeinline/OFL.txt
+sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0  ofl/geostar/OFL.txt
+sha256 e55c615ed00ce0054bd356041a41e5942b4a8cadceac1e32696ba2ef5f06f748  ofl/andika/OFL.txt
+sha256 4705fc9bceb299b2a951d23c321d31f3679871bb99ceadb978907704d211f4f2  ofl/pacifico/OFL.txt
+sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235  ofl/jacquesfrancois/OFL.txt
+sha256 99d67fff016522688b8f913377f8ae9f6da6ffeae42cf67c0e5e87cfb0928d33  ofl/unna/OFL.txt
+sha256 bba4a13f03d0fd5b476cc148feda6895dd8d65f34b2107ba9d010ad9539d6c0a  ofl/faunaone/OFL.txt
+sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893  ofl/seoulhangang/OFL.txt
+sha256 58bbdbe5c48dd1d7cfd658425a455c29811181873d3a46a4932c29e5b0ec16e6  ofl/euphoriascript/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/laila/OFL.txt
+sha256 17b90cece30db64934b7299fd76b033a3774c8a990e78badc74c59a5be8e0727  ofl/cairo/OFL.txt
+sha256 5f8ff4a3f951c104e99245bdb952be08c73369222048bbf19fa3bf7170d10949  ofl/sanchez/OFL.txt
+sha256 8eb1c1019fe7fe6d0b6e7d7bbbba1d9cbdd969d8c5f26455708f6cfb8a77284c  ofl/nanummyeongjo/OFL.txt
+sha256 942d51cf079299e83e9dd7a9a37eb92260524e8d1d576b2f0b3f7ca207c53f8e  ofl/newrocker/OFL.txt
+sha256 117fa195cff980e3b10fd8e8e21658c6ec954b0886647970a03c9694d3553b69  ofl/galindo/OFL.txt
+sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9  ofl/athiti/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/annieuseyourtelescope/OFL.txt
+sha256 f2ab7e5c5c750fa03a8d8f64c72a089ed86fbd3dc172440fcc704b27816d5957  ofl/noticiatext/OFL.txt
+sha256 9a33b452a3107542c35fc5fcee80e4d8798c82aca071c2f6f58a0f8dc5ad61fe  ofl/cevicheone/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/balootammudu/OFL.txt
+sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd  ofl/firasansextracondensed/OFL.txt
+sha256 746b384383888d9325ed2fa9c40d2456b458aa190dd2b8c515ed4f02a1075bb7  ofl/magra/OFL.txt
+sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd  ofl/firasanscondensed/OFL.txt
+sha256 fe9183a0b7c1ae626b14004cd533c89ec7c192aba017f81ab71ede910256abb2  ofl/abhayalibre/OFL.txt
+sha256 876db27db250a9b9c03fc2ef30a5efe1f37c2ed2686d368c3779583bdf746912  ofl/balthazar/OFL.txt
+sha256 4342add6f0f2261f8579f31c10a55938930559703eed18be4a33b74eb749d298  ofl/doppioone/OFL.txt
+sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612  ofl/deliusswashcaps/OFL.txt
+sha256 16a8be6ac4b009ba1dd1e17cea48762f4915609ea5dca1303f716cf63998739d  ofl/adamina/OFL.txt
+sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f  ofl/redacted/OFL.txt
+sha256 866669fde730bf2785f44905ec162f05f2b8d9f6dcf366aca99360fedbfe502c  ofl/dancingscript/OFL.txt
+sha256 008445a4d53fbd71bff9cf733bdfd841a1b15fb58ef3473f7bab4c456e3b2930  ofl/ovo/OFL.txt
+sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95  ofl/almendrasc/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfellgreatprimersc/OFL.txt
+sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102  ofl/archivo/OFL.txt
+sha256 3747fdcbfe4f51d6a2f101c35105bacde3715b3c32b34b6b03e5fb37983f89fc  ofl/quando/OFL.txt
+sha256 38a83f1f8b6efc3ab354b8b6eed22e8524dc71280844dc24811d95ae27b34952  ofl/khyay/OFL.txt
+sha256 b8fb5cd1bafb52e652c733fdb75ee20c763e97acb0398f6b4bbe1d8ada0c07e5  ofl/misssaintdelafield/OFL.txt
+sha256 a3b0977c5c25101d45054cf9199b9127b05fddc79d4da7dcf400821824e5a6d0  ofl/radley/OFL.txt
+sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c  ofl/montserratalternates/OFL.txt
+sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d  ofl/asapvfbeta/OFL.txt
+sha256 d3909465d5838d9d1c72b975ff1ed4f410a85dccd43801be525bf2b2bde89f92  ofl/snippet/OFL.txt
+sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98  ofl/mukta/OFL.txt
+sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73  ofl/sedgwickavedisplay/OFL.txt
+sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0  ofl/sedan/OFL.txt
+sha256 4281c00ab5b8f672fc8d686f48cb886ffbe900c8c9ee22473ca7e72e7cef8fbe  ofl/wellfleet/OFL.txt
+sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd  ofl/cabinvfbeta/OFL.txt
+sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7  ofl/laomuangdon/OFL.txt
+sha256 399b33eb38cdfc76b8665defa5f81d52e8193d630ad5858c893db6bc20031bc9  ofl/rye/OFL.txt
+sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e  ofl/miltoniantattoo/OFL.txt
+sha256 8594350034ab1cb85a1946ef8852e69290255816c311450a66fed6eeda9d6292  ofl/anonymouspro/OFL.txt
+sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae  ofl/cinzel/OFL.txt
+sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8  ofl/postnobillsjaffna/OFL.txt
+sha256 64a73da7af818283168543e24bd214aded1bfec06f013bf9cebc20064a8560c5  ofl/elmessiri/OFL.txt
+sha256 4fece81b541808b40293b0cd3f5b1990274e1100e1c20455dc2987cd96639d3f  ofl/metamorphous/OFL.txt
+sha256 8d325681662a30f58f57c92ab656dcbc9679deb78a493e4c0eab75321b2df6c3  ofl/worksans/OFL.txt
+sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235  ofl/jacquesfrancoisshadow/OFL.txt
+sha256 aac8f0cda6159b7251d1034651bcb42e07611495bc8cd764c89d22f3123032f8  ofl/aladin/OFL.txt
+sha256 81d0973236b5b5709a80a217a330db36eabedf57bf4031de46b4660b69901234  ofl/leaguescript/OFL.txt
+sha256 5454dc5cf2f46a2005f42f13ee2a998c7d0afd7f556f32fda208c72b266f7adc  ofl/cambo/OFL.txt
+sha256 b2d4b0c773afce947728ab99fca43b242b7edb0da26fe29f60c7c2d5094ec23e  ofl/suwannaphum/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/labelleaurore/OFL.txt
+sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b  ofl/jejumyeongjo/OFL.txt
+sha256 cbdf9d35f32a9a2f02fb23c8b89c115a5a8e45feaaa2266920c4594c83dd5ed4  ofl/tenaliramakrishna/OFL.txt
+sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102  ofl/archivovfbeta/OFL.txt
+sha256 967d75b89eef1f8a0ba1f5ee7dfb13427621f9116c6e7878ca04da8c9aa8641b  ofl/mrssheppards/OFL.txt
+sha256 8af83da84dd4299842f871285a88049352ab301ffa1f233d2595b29506158635  ofl/blackopsone/OFL.txt
+sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b  ofl/palanquin/OFL.txt
+sha256 c4cd9f38c3246ee6a68c264f017320dc1af09677d386166d8cda806d9a12e0d2  ofl/jockeyone/OFL.txt
+sha256 a36ab46c8b1a74a480a1c51d6a5af08b643e870c6d247f233bc97c97c8ad2098  ofl/tuffy/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/nothingyoucoulddo/OFL.txt
+sha256 b5c776129b160163c84620b35fd45dea45edf49789cda5a94c2290c230581e0b  ofl/scopeone/OFL.txt
+sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89  ofl/sintony/OFL.txt
+sha256 8928e999ff156e35852ab41d7a906598a8285acd3bcd81dff67213a6cd98d43e  ofl/mallanna/OFL.txt
+sha256 473c5e3123102434d05c66a9fc8b19cf285a3bf71cd8a91a41acef44d1448e62  ofl/sevillana/OFL.txt
+sha256 22d1914919d3fe08b179dc31169fc743ca7eede7827b91a5d48c23c8cdc7cb81  ofl/anticslab/OFL.txt
+sha256 026610186158060ad351fb20cd1452def5d35b2531634c090ce8cd1d9e9aeaf2  ofl/michroma/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/shadowsintolight/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/architectsdaughter/OFL.txt
+sha256 61056041809e0ba18bf8b9d637a375ab1c725025428533d74d668d88b2cb8b89  ofl/simonetta/OFL.txt
+sha256 0a852a06f0256a6684662663ccb1d8e08d131abd1f70cf8d972a344cf31aa381  ofl/scada/OFL.txt
+sha256 f46c3ea04f38ea73c0731d73dfba3d7361d4b38970feb31a3558bd1b75e0656a  ofl/lobstertwo/OFL.txt
+sha256 f30a7045e4e21201182b2b9fc4e4b96189aaeaceb2c8e9b68d8bd3dc4e3c5a27  ofl/greatvibes/OFL.txt
+sha256 9bc1eb1c679510b32d2e3f5f4f3b47726b1657aa121494aa68ba0b124a3c3a53  ofl/ewert/OFL.txt
+sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b  ofl/librebarcode39/OFL.txt
+sha256 359671bf16c00cae69cb66d041296b2adc7a4becd73a463cb8c5e101d97c7986  ofl/arvo/OFL.txt
+sha256 c09e3b81d9cfeec46bc29a3374000e8ad013d694bdf24a288088491dd4cd5c69  ofl/creepster/OFL.txt
+sha256 29bd0cfd0fb2a45f9b057c834a057724bae1f63b525a8ac83d3e7525706d9f80  ofl/inconsolata/OFL.txt
+sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b  ofl/siamreap/OFL.txt
+sha256 223fa23e8419ee762c662e0faf912dfcf386fa7093ac9ff690e380ce1993ba55  ofl/asar/OFL.txt
+sha256 a0369b1d5f654110f2fe101db56a02d02806f1e609ab233368bc573ec45050e5  ofl/butcherman/OFL.txt
+sha256 4f8b437578b20bff261adfe6c02f63bcf7dbb6a45ab37804b3547e5d5f44927b  ofl/nosifercaps/OFL.txt
+sha256 793891edf1f4f4f35b52fcc9706b03f779c7ea18ab8e9e441242d63ef0279488  ofl/autourone/OFL.txt
+sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893  ofl/seoulhangangcondensed/OFL.txt
+sha256 1c023b4aca0e441c55c45c86cdff57fa524a96778f291d9a29a4ad777b70e2e3  ofl/arbutusslab/OFL.txt
+sha256 de61c87e08286ad3215398340e9403125ab03c91b33bdf29de6d3e8a386d2d28  ofl/dangrek/OFL.txt
+sha256 53ad6a474f68ddfc3fe72449de3ede4d3f033b2f24b77833b1d56edf505486d2  ofl/sura/OFL.txt
+sha256 247edbf968c0a5b8defd6a9e420080a8bbca6ea002bfb326d12a472a6f95637b  ofl/cuprum/OFL.txt
+sha256 0623888cc2391c6c9853c04eafa7f687fef1a8328bbb848feab05d9e2a98764d  ofl/emilyscandy/OFL.txt
+sha256 1c43e70c49ef7a9b35fcb3758fec8ec5969ff1274c4834b4466b9014f3b9f55f  ofl/volkhov/OFL.txt
+sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853  ofl/karlatamilupright/OFL.txt
+sha256 cd354a6084383c50398fae709ebe3a5dd98b947c486c1fe9de5f89caf81f980c  ofl/snowburstone/OFL.txt
+sha256 8a59454b7f1cc0b1fa29805781769047e5c269aa629e3422c2d7fc04b89e5c1f  ofl/rosarivo/OFL.txt
+sha256 de71817dafdecfee21268b8c4f106146e1d00988c4fd6546b10445eb26b24cc0  ofl/expletussans/OFL.txt
+sha256 d1829ff3455bbf3b9d13dfb0a57758a863107c9108aab48558f26f37f1094180  ofl/firamono/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/rajdhani/OFL.txt
+sha256 26e4c39c4905bd7f1068b0bab008f5a4a9b945e2d7fda31e52719fc5aa9655bf  ofl/vibur/OFL.txt
+sha256 49f2a11271968a2ce019a43bf5401d1593652a18f27ea59037ff5e39856d2df7  ofl/changa/OFL.txt
+sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9  ofl/maitree/OFL.txt
+sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c  ofl/ptsanscaption/OFL.txt
+sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19  ofl/hindmadurai/OFL.txt
+sha256 f354ef1e7256644b320c5e1d9a07a819c2e2b930166003c96680894f9fba81be  ofl/mrssaintdelafield/OFL.txt
+sha256 5c289da4a19f054ace8e31a144a6a254601898cd7faf9eaa301141afda0adbbe  ofl/coiny/OFL.txt
+sha256 0886960207bb5bcf81a46ce663bab6c52a742dad80ee2cff5cbcda6f1df88568  ofl/rhodiumlibre/OFL.txt
+sha256 8f94e5901c371537043e0c762c827ce33963e7bd186fbea0abafc035ef7120a7  ofl/emblemaone/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/gloriahallelujah/OFL.txt
+sha256 24af1fb3ab8dfeddc83162b7f3b6c1104149b6c3022f1aa948ef4f8ff7e6bf7c  ofl/poetsenone/OFL.txt
+sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375  ofl/bowlbyone/OFL.txt
+sha256 70f664de65e7bb62e1ac728f20a9bb28de7fdc18be594186137a9e15ce9dcee5  ofl/niconne/OFL.txt
+sha256 e604b133509815768e6ec4738bb04844ce9a23e80099d2b61e5d75ef46acbeb0  ofl/ruluko/OFL.txt
+sha256 42ad5a49e171bec80308a1c9e8e66b03e638b3ea65af7fafa6fc0e42f45e7626  ofl/suravaram/OFL.txt
+sha256 4fe81901e6f84cfce1145c715e931352a9a12aa7ac75cc193eb523c0cb0e5eb5  ofl/lohitdevanagari/OFL.txt
+sha256 2937c7789b0e4fdeda6eafe93164a2ab36e20386704c4cb6f87b1deb620ec0da  ofl/leckerlione/OFL.txt
+sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360  ofl/ibmplexmono/OFL.txt
+sha256 fce9f9e2fb268507a89fceea0b3eccc044f39fc3492968a04fd9e04df5ae95fa  ofl/sourcesanspro/OFL.txt
+sha256 e12a3e737fa75c0ee072d965b6185710f35e38a4f7a0793ebc66ba14a216109b  ofl/meiescript/OFL.txt
+sha256 d2f9c74aba2716333b0a3d283083f9fdc93b2e060c5ae094c79e97e8cba9d7e6  ofl/squadaone/OFL.txt
+sha256 5d6517d497bea6116ed35079b30374043f6d90b19c8d97fc4e5ec48520d1e08b  ofl/zcoolkuaile/OFL.txt
+sha256 f8a20490ee8ad3adb2205ea44b279b19099a3a1d6b62849e90b4db20a77deeb8  ofl/brunoace/OFL.txt
+sha256 75b2a5f39a53b4cf9286eb3d2cc1f895a8f3442680013c77124121bc347a6448  ofl/lemonada/OFL.txt
+sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801  ofl/marcellus/OFL.txt
+sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b  ofl/librebarcode128text/OFL.txt
+sha256 eba176d3ae86af6b41e9b744e4d18fb56e2a6ad671381bddb61fabb86b1d39c1  ofl/croissantone/OFL.txt
+sha256 12404fcefccc3cb964cb2406510ba679b30f7d7ae689db08df5b455ae24b3feb  ofl/paytoneone/OFL.txt
+sha256 e2a176ce310235bf281f1124454e21331390ae1b4c429a2d80ae642d333a5a7f  ofl/frankruhllibre/OFL.txt
+sha256 2d83a49d05906b5e23285168e72c0d019fc15e3ad110376f640feeeda34c27d1  ofl/hennypenny/OFL.txt
+sha256 d7d8074c2dd46804990c184e25849947ab76c5ac7607fbf3966543455769bb73  ofl/yeonsung/OFL.txt
+sha256 13831d02389d917d22fcfa6c79f98f8acbf61d230add0e73a4d4dc5f3bfb9e56  ofl/chakrapetch/OFL.txt
+sha256 c39e284759a441660d4c4d852c537e271d0fd5c301fe46d065a972b6ee144ba8  ofl/aksarabaligalang/OFL.txt
+sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19  ofl/hindmysuru/OFL.txt
+sha256 0da6a3e5b24a9fa04085c20a2a1d3101eeb1e0bff56a2291f407187e1b2adcf2  ofl/mrdafoe/OFL.txt
+sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a  ofl/b612/OFL.txt
+sha256 e2f2dc7a667954c16a919acff5351e8ea89813d10f5a7504e1f4668fffbfa14b  ofl/barrio/OFL.txt
+sha256 8c495ddd455def58a45310376a747bb61bf86e4b071cc527b3618bccd3ef00fa  ofl/chauphilomeneone/OFL.txt
+sha256 b687f920fe20fe48d8f7709421e5deeb4becea295c80ce62aadcffc54132fa1b  ofl/stalinone/OFL.txt
+sha256 a90a8ebe28f3c2905a44557166010a3d219ffcce1703c3c3280ea8728d5e2ebd  ofl/heebo/OFL.txt
+sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961  ofl/alefhebrew/OFL.txt
+sha256 2cd51b11e821dad2fb7acc54d68bd9a139fc7a1207e17c432ba9ce49bba3d493  ofl/fasterone/OFL.txt
+sha256 ca424122f42a8d8442bc4cfd902f5f027ea67b5417705f5af1d1235927781720  ofl/amethysta/OFL.txt
+sha256 bb8fac04b8535d39fb9851c9d886248d25bc0c82000066c92dd577c3369f512b  ofl/chenla/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/lovedbytheking/OFL.txt
+sha256 53a9ce47085d9fef613c7ecb3730dc80d25962510bbea231b89564f58240f251  ofl/gaegu/OFL.txt
+sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff  ofl/share/OFL.txt
+sha256 9465823369fbe1ae0b5a3065021d53ef8c56e113e664229455dc80b237fa6a07  ofl/nobile/OFL.txt
+sha256 0dd8e32457e18621737b593ab0fac49905cd948a078ed0e64f4890df714a1dfb  ofl/amita/OFL.txt
+sha256 791936b10381b512512317572fb5eee91bf503344d52c37335e402fc1cf19992  ofl/reemkufi/OFL.txt
+sha256 898a9cf80636e86d6b6009b96795fda29e431ee701c28c36f274a7e8a7d8246b  ofl/rubik/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/baloothambi/OFL.txt
+sha256 382232d1add5623ba5b06394afa071f4eeecccb6d2b2bd02cfecff4a8a45065a  ofl/fondamento/OFL.txt
+sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7  ofl/elsieswashcaps/OFL.txt
+sha256 d849309d514833fe3d7a610e10f6cd5d99b4f9552bfa304969acbf89c66e4422  ofl/smythe/OFL.txt
+sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3  ofl/vollkorn/OFL.txt
+sha256 a1077580b649c7b0e05ea0e9369d48687b4ab1c585573bf86b0dcce7dde177c0  ofl/junge/OFL.txt
+sha256 a9b40759b5821a0c2ad07cbd2c2a61dca4b3e222e6370a7d5bfb6b373bf4fb10  ofl/sunflower/OFL.txt
+sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19  ofl/hindguntur/OFL.txt
+sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56  ofl/josefinsans/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/dawningofanewday/OFL.txt
+sha256 f27cbf1055db7b9dd80bce5cd12b462f2d9ed7313d84dd8bfef1ddd2b61bdfc5  ofl/chicle/OFL.txt
+sha256 aba8997e16b1e3888c6e855ba883c70d96bd4375bff8cb9c7ce0f097200f74b8  ofl/abrilfatface/OFL.txt
+sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd  ofl/firasans/OFL.txt
+sha256 d484e0dce424a9e360adabb568b6773db5f1566df71ce3e9dcd66a6cc2c38d33  ofl/ericaone/OFL.txt
+sha256 1b3b78123c94dcbc9fd4ec174317336c8c93423da62dc946b8852553cb13ddee  ofl/economica/OFL.txt
+sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486  ofl/kanit/OFL.txt
+sha256 a6a74417db7c37f69495da556a3eb86a22a784ffb0131e3e0a5a47ce8d7fa5fb  ofl/shanti/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfelldoublepicasc/OFL.txt
+sha256 963f283b5410c7df62067a35cd7def0802c583a880e7cd7e326832ec3985ec87  ofl/spectral/OFL.txt
+sha256 11bdf9c7abd81f46a88b0b017d78a0e51f451e9dc0c2272813aa9f456ee886ca  ofl/kiteone/OFL.txt
+sha256 6827fa45930d5847fca5b3d3898b3d87a229fba772a5b6c5bc33bf73ec83478d  ofl/khmer/OFL.txt
+sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca  ofl/mrbedfort/OFL.txt
+sha256 34b8afbcab7508bea23847288332a8c05a507364ca6f0c8756ce560d7d59d506  ofl/mada/OFL.txt
+sha256 b67eed9578defb59cc4ff4b58428fb816786e499e84cdeafca54723b055c169e  ofl/viga/OFL.txt
+sha256 afc1cda4eedcfe27c8cf30fe3e9879587cb43cc2882d4cb91dd3e3fc9eecd0bf  ofl/farsan/OFL.txt
+sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1  ofl/encodesanscondensed/OFL.txt
+sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5  ofl/lindenhill/OFL.txt
+sha256 a89ac8075be60f2beba79bed3fa253415a373dbdc3bb108b23f4854d0dd495b8  ofl/pathwaygothicone/OFL.txt
+sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19  ofl/hindjalandhar/OFL.txt
+sha256 f22a2beea88d631a620b15683fd03e79f13ad3297ad97fa5e42283c0b1a3a038  ofl/marckscript/OFL.txt
+sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22  ofl/terminaldosis/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfellgreatprimer/OFL.txt
+sha256 d2f87f90d108a947f98c030d9d8e4bf27e761ce83f222453b9a7230c5fb309e1  ofl/novaflat/OFL.txt
+sha256 2da0fa5707f1fab1c802969b098fd1b92ca0b3b233a80e27fca416647c064dfc  ofl/exo/OFL.txt
+sha256 f9e5dfcdb2947c0db70465668706b0617cd052b6f86e582dff8741d9e5cded0a  ofl/yinmar/OFL.txt
+sha256 bcb0bda74430ccc281a616a81d0a287fed5a423815b00b222e0b7f603f85b26f  ofl/caesardressing/OFL.txt
+sha256 a94cfd8d1f5c33f9a7506def359b907f3313f7008bb57fc893985963cd342f8f  ofl/arsenal/OFL.txt
+sha256 52caec7d90533523fa7da64e95faf90ea32a663ce21847a39234b61e18d25044  ofl/bokor/OFL.txt
+sha256 ef0bdccd20de76d517fb3939161d05ecd5808382fb8fa82cde5fcdb3adcb8029  ofl/engagement/OFL.txt
+sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da  ofl/macondo/OFL.txt
+sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e  ofl/matesc/OFL.txt
+sha256 a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad  ofl/merriweather/OFL.txt
+sha256 010cb216e8f3fbb2836fa3f38787a412b749352de546797f57c03c3bcfe46b1f  ofl/nunito/OFL.txt
+sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360  ofl/ibmplexsans/OFL.txt
+sha256 cb8bbf7a86eefa8c146f24ae5be74fffa887ba83719ab3c87036be8e3d0191e2  ofl/montaga/OFL.txt
+sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b  ofl/librebarcode128/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/overtherainbow/OFL.txt
+sha256 3621f156cc7a26e0a9cb413332e0bb35a0e76b36dbfe0b1c885b565a7bf3051e  ofl/drsugiyama/OFL.txt
+sha256 fbb941b371c6348ee2572ce8c78fb66128a61885f960dec1906c4e44ca4b4d3c  ofl/reeniebeanie/OFL.txt
+sha256 9e19c0d2e7e7adcbe9dfd0749e34dda41e7e356e0f2cc082d61d2fc9b6e0cef7  ofl/gfsdidot/OFL.txt
+sha256 812fc4af0c63d31e0e81cc153af74e397407b0630e918b8b965bcbb192bc0656  ofl/artifika/OFL.txt
+sha256 e8ad3f3de5baeff6bac6e711d8c406e0a6b8a61d2944741532d8965d893a2681  ofl/pirataone/OFL.txt
+sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f  ofl/cormorantupright/OFL.txt
+sha256 65f43260cf7e66b57ddca8d148384a6602e2c06edd389a8b3cf388045127b47d  ofl/lusitana/OFL.txt
+sha256 518962c41d4a5e96b0016bd8d8acc965413ea1a0102467e4955931e702b14a0d  ofl/iceland/OFL.txt
+sha256 2171558d2482764644a2f793696fa2e48c361730ecc87686b9a29082d6daeb10  ofl/khula/OFL.txt
+sha256 d336c098ea798bf14de111cd90dff7d6bc340852405246511345d0f8564fe76e  ofl/fingerpaint/OFL.txt
+sha256 ea274e87939d38032b31fb741af75bff9fa3f8d4a8b652265f9e0ce1ad7e9f80  ofl/asul/OFL.txt
+sha256 eb1992aec1cf892ec94ffc116d79b62c7cb03dc108141b94a57a4195d210b514  ofl/meddon/OFL.txt
+sha256 9b584984f9db0ee30347391a76eff9c0a6b03dc450c3c6afe3757a2cb3a4db87  ofl/tajawal/OFL.txt
+sha256 1dd84b611f4bed7f9ff9089e76a96337b187e6f283a4ab33bcb987f844f2c4db  ofl/parisienne/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/hind/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfelldwpica/OFL.txt
+sha256 de08ff7a460541753999b1208f1254f1d31f16b421312aca4d4b8179d997de38  ofl/aleo/OFL.txt
+sha256 7706a84d7e49e2273877106334a1eded8ae89fb5839fb81e0f2bb27c846f667e  ofl/lora/OFL.txt
+sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853  ofl/karla/OFL.txt
+sha256 0409c6582424508453ce41648067efaacf0c790622918493d8f1d934bc5329a0  ofl/bigelowrules/OFL.txt
+sha256 9e2d92fb24b4a548ab030c509ba88267e224f2523728ee9bb35cf334811106bd  ofl/exo2/OFL.txt
+sha256 f480fd19e7018942ecaf460f7a4ab9ccee0aec579abcb07d559dbede913864c6  ofl/alikeangular/OFL.txt
+sha256 6ea7a3ef1d07feb592693f3f22c26d0b09321ff81814292b49be99888d0da9d7  ofl/ponnala/OFL.txt
+sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191  ofl/biorhymeexpanded/OFL.txt
+sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb  ofl/caveat/OFL.txt
+sha256 adadb8d5d34fe2218dca0f4a4919a9b6f81dfaebb289e5446ac7b3063d6965e9  ofl/tangerine/OFL.txt
+sha256 16741ac498178f645283cfb45b7a487b6d361b5de5730c5ea729f056f414f6b0  ofl/ropasans/OFL.txt
+sha256 1e5bf8207a40678bc401e2e5456d0db1f2a183b550a30976b48dcdd6a4e4c46c  ofl/caudex/OFL.txt
+sha256 6f9e3a1c51f617e7b110862426204ec7a56d8c6d2f731373b5de6b8d069099b6  ofl/ebgaramond/OFL.txt
+sha256 c2368518f12463a93cfed44e1460f36085dc60df06f415ee9b0319809987ccce  ofl/frijole/OFL.txt
+sha256 5f247fad3e8a86b6c0779dff09277047c1ce2b0b7580a1093347a8af755352ba  ofl/sawarabigothic/OFL.txt
+sha256 6627b9c2c8ff8e0c6ef23f1b0125dd5b293320c10c916d402fef64916c296d0e  ofl/kreon/OFL.txt
+sha256 723764a50d4e6985dfcbd75fcb40dbd3abab37ba25ae626486d4a32084854487  ofl/kdamthmor/OFL.txt
+sha256 846ce83956a732edd57b74d9ba988d58abc8c8e6d0926859559318ce6aed139d  ofl/mclaren/OFL.txt
+sha256 ba01480319f922ecebbc73f1a523e7f8876e92b16553a32c494bcd3f6f5a27fa  ofl/ledger/OFL.txt
+sha256 c3bfad2900a83f571d5c984d490d51c56aef14806c28dde38125593e1e71daca  ofl/mrdehaviland/OFL.txt
+sha256 12af42b715a3901bfa7add1351e45b6ce22f3061555d52db45e963274c349360  ofl/arimamadurai/OFL.txt
+sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337  ofl/miriamlibre/OFL.txt
+sha256 3169e7e0e87168908218f11d660a52c0b81b5952fd73918a596e70721d68d3e5  ofl/inika/OFL.txt
+sha256 e711c816f7de931244976f51166baa15446fc307e5d0ea04fdca1bc2c04afb1c  ofl/nixieone/OFL.txt
+sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f  ofl/signika/OFL.txt
+sha256 b01cec9e5e2035b70a6aeb61c673d1f6d5c91539845be07733bd9880fddeb9f0  ofl/kadwa/OFL.txt
+sha256 d7577acbab1d70f2e6bd1b21d8f61db189d6aabe6375bc2d96564b8d94031664  ofl/stalemate/OFL.txt
+sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909  ofl/eatercaps/OFL.txt
+sha256 ae6de2f6fc00f76cc7eb0d97c1ae5e0b7ec734f20ad7f58cf4c74738dc822d21  ofl/chelseamarket/OFL.txt
+sha256 860cbfdc9dbc3f0e8d35af80c31e8f20945bff393d4f483dfc157469e01d321c  ofl/gorditas/OFL.txt
+sha256 9a2d8c5a3de0a6e62432322115dce136139948411dba33cd86525c0a02749fb8  ofl/unicaone/OFL.txt
+sha256 4fe01b13ffb41faa8f030d84843a95dab32792dfeeca7c072abbfd3f4d6896ad  ofl/audiowide/OFL.txt
+sha256 173ea2d0bdda981829719623c35699e8c0e4aa508e0af12817ad7ccbfa4c6137  ofl/originalsurfer/OFL.txt
+sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9  ofl/trirong/OFL.txt
+sha256 58bdc69f4c6177125c6e7cdbc78f710f5f9952f11bba7bd5b17bd7ef169d731f  ofl/goudybookletter1911/OFL.txt
+sha256 2950994bcfb8e903f0539d28a8ec4af077e0aa1fa7946c33c912d2d6969c2971  ofl/glassantiqua/OFL.txt
+sha256 7344b8b8c97c4f88c0ff8bb72bb024bba72f404be1c740b6596a73ed15d28df3  ofl/vampiroone/OFL.txt
+sha256 cacad5bf45bf5c81f4b6cbd114261bc8a08f6110b66a4c6fad8bbc16618a3096  ofl/daysone/OFL.txt
+sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a  ofl/alegreyasanssc/OFL.txt
+sha256 c8155eb9337078a9ea9f1e576ac813a03030ca43e2694593e90cd4fee6fce937  ofl/sumana/OFL.txt
+sha256 95803fae1b063e592c67b5867f1f36df1df526e5ebf33c6cd4d4afa31a9d5586  ofl/sitara/OFL.txt
+sha256 c254ae01c407f4a2bd0ad163e4c1a795d57ddfa8967c21b8a28c250b44d13963  ofl/sawarabimincho/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfellfrenchcanon/OFL.txt
+sha256 25995bcf8e8ddea1aafa5449870567cbbeae7e26b27ba30aca5642f2c02e9757  ofl/quantico/OFL.txt
+sha256 455755e2e7ce9dbac6beb3729c97c57d6f74a638dcb5be548ec953021fbdbfb3  ofl/ntr/OFL.txt
+sha256 ad6f73fa3edb7aea340aadbc63c0d7ef7663abed82664432ae09a6b377fa313f  ofl/librefranklin/OFL.txt
+sha256 581f08727777cb2a1a1ec95c0f981ce64fb1ad4354f78a0ac4f3481afa605577  ofl/moulpali/OFL.txt
+sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7  ofl/laomuangkhong/OFL.txt
+sha256 08fdc7cbd92b9bbc4d41d0945ae7f25450d91c5fc8c66c68df331af3505e4ec3  ofl/rougescript/OFL.txt
+sha256 694d5c15c1dac5e26653e18b94394d911e471549ec9b7d6247ade62e486b4915  ofl/asset/OFL.txt
+sha256 bddfe669338d0dbc24c15ccd31dbf5c101a213da38049c24baca9ccb7fde45a4  ofl/wallpoet/OFL.txt
+sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c  ofl/ptsansnarrow/OFL.txt
+sha256 3cbf579238e4eacd90ad67883d971aa346ce8990d658635f78f98d608a6830a2  ofl/zillaslabhighlight/OFL.txt
+sha256 87000f71a897c8c130c7777d058c5868f84316f99a32644b3bf595cd11edeb12  ofl/sancreek/OFL.txt
+sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e  ofl/allertastencil/OFL.txt
+sha256 9608d22ae5c586628c9904e773b7c6a6520fc16e1492ebcb5ea55d9523399964  ofl/anton/OFL.txt
+sha256 f3758ee70600ecd5450f01ea373204b202e048d0454c9db2d1175c5a5dd1e92f  ofl/vesperlibre/OFL.txt
+sha256 e43f121c788cca4a14049e58864e28021174b055710ba38e0964e816dbf905af  ofl/fruktur/OFL.txt
+sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6  ofl/notoserif/OFL.txt
+sha256 a1580ba69a8d706bd95e1e72ee0b5cfda0a478fbbab6a4af13b4a9e1b28faac0  ofl/revalia/OFL.txt
+sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73  ofl/sedgwickave/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfellfrenchcanonsc/OFL.txt
+sha256 0836fd874230b17f840efcf7d3bb529f5a7b5befbfeef94478519cfe2d8551c2  ofl/courgette/OFL.txt
+sha256 e3ed3ad6cb257e16dc1789900707c5cd1cdef2d60d155389342604991cf693f9  ofl/bahiana/OFL.txt
+sha256 391ac3126dacc95b92a8f3408467879edb3245344bc411530a30d5aada52df92  ofl/gugi/OFL.txt
+sha256 88dcde7d08e509a3eec64886292a36cbd58ed9bb52f37f91f55656fb9d21ddb8  ofl/supermercadoone/OFL.txt
+sha256 41423e9e1d0ea79d0e78bd5fe9e0b27f4c23140706f5dfbfe116839c83aae91c  ofl/charm/OFL.txt
+sha256 43186c592361336474683e302dcc988831a53857bef188c4466f6b45dc238f84  ofl/fredokaone/OFL.txt
+sha256 a21fa252efb7a1ff84de6a36df4386959668aa046f28161b4047829f7d9cd1b5  ofl/damion/OFL.txt
+sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893  ofl/seoulnamsancondensed/OFL.txt
+sha256 bfc205682f5454b42a732ec857b665293ab8bc6f0ee901a0967219ba7ffdb190  ofl/gfsneohellenic/OFL.txt
+sha256 59b91c9912b80714852a43897cbc9414d6457e22072dc99a4cea6e2bb4f3c65c  ofl/freehand/OFL.txt
+sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd  ofl/cabin/OFL.txt
+sha256 b598b7fddfd578950aa1fe6e0e2607b779abfaa686b83af8ec65c860f646b2cd  ofl/rumraisin/OFL.txt
+sha256 2bd35914efa381c80f9fb62d6ea7d736d3c0739196a3783c3122593c3408392c  ofl/gurajada/OFL.txt
+sha256 5625e91bd7c2a45c8b9f59106d587bd025470b462ea901df691defe0099621e1  ofl/taprom/OFL.txt
+sha256 37d5360d8d2433689e78302a93cd88e9add8a2294046476625edada2d4328deb  ofl/averagesans/OFL.txt
+sha256 f8e2b58dd7a8c8e21e5d744b45876bce7e010a647c071c1ed42ff0e618d4ea59  ofl/frederickathegreat/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/balootamma/OFL.txt
+sha256 09685e225ba9b697b2ccd2d4098cac5ecbed0679960605258a271af60749887b  ofl/francoisone/OFL.txt
+sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70  ofl/himelody/OFL.txt
+sha256 08a12877eda24767239f26b527bfce0c515efaf623c66da6baad92a6d5315e9a  ofl/content/OFL.txt
+sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812  ofl/saira/OFL.txt
+sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612  ofl/delius/OFL.txt
+sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9  ofl/pridi/OFL.txt
+sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6  ofl/rasa/OFL.txt
+sha256 4e66943af352059c059dd658774f25fbc831f1ad478f9f0890c06ecc2dd324c7  ofl/metalmania/OFL.txt
+sha256 f5b03ea0b27c7f5afb9702771ee57679ae8ba6b471b6ba9e62d985d3256f1929  ofl/playfairdisplay/OFL.txt
+sha256 593f0bc55c75b673772b378eaee314f128283745c4bb1cfdb9b8012a3b6c46fe  ofl/skranji/OFL.txt
+sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4  ofl/averiagruesalibre/OFL.txt
+sha256 14d28541780d90f6577bb7abcc6f005bf6969614294e75c82abb8758a696ad46  ofl/quicksand/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/baloochettan/OFL.txt
+sha256 35dca6122235851d236bd861124f4a893d409eba021cd8c6a292a19df0f4640d  ofl/codystar/OFL.txt
+sha256 ab721b35816e470fb11619ad3705f75d08dccd0864505e3d782e94fd937f6620  ofl/allan/OFL.txt
+sha256 d9cdb075679d15a99bab2a8541b9c4fdc71347502111fbe9affd1d462219d96b  ofl/indieflower/OFL.txt
+sha256 1313ae342eae4e1810304b6cd32f6815dd11b8e45812a2af98e58b6960684fa0  ofl/petrona/OFL.txt
+sha256 1e4015251ca58d4f349b4ac930259c6f3d6381ce68f8b4b27d54d53f8f63f972  ofl/angkor/OFL.txt
+sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4  ofl/averialibre/OFL.txt
+sha256 8e28b778b6e1a7ff9ca72f4dee2d53120aa2856dc1bfd0be44307e365b0e45bb  ofl/cardo/OFL.txt
+sha256 a02e8715fcdf3325c474b7209399f50230897bfa828fe4eea2639ced1a1d574b  ofl/blackhansans/OFL.txt
+sha256 d530c14e9cc263c567b47742ef20df2a41374f00732ba4f290f52adad428b1a2  ofl/meerainimai/OFL.txt
+sha256 2e2fe5f1d8916a5160060594a96c1a5116406d26847afdbd09618481e2abd6fc  ofl/denkone/OFL.txt
+sha256 56c4ff36faaaf336bc5fee659ff6fab2413d67499cc22acc29079b3892d8931b  ofl/miniver/OFL.txt
+sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da  ofl/macondoswashcaps/OFL.txt
+sha256 742a6a4386db47a2987c7c3b4aeedfb5adedfb3356c118de450a664735686535  ofl/graduate/OFL.txt
+sha256 9e53298e3629e00ae4c31531cca09051ddaa654a5de4f7b55e596132fff86e1f  ofl/dhurjati/OFL.txt
+sha256 df9fcd8f62ae79aba7fa5b0563a08dfede1fa0909d668287d70c395d88f5fe02  ofl/fjordone/OFL.txt
+sha256 02faa476b17db0044d0c502a3ce12fdc81eeeb9bd618e6a005407c79d6081bbb  ofl/monofett/OFL.txt
+sha256 1edecf3f971a11dcfd777cbda6f08c0f9a77bf57a0a2a89d8142fb933894ce16  ofl/amiri/OFL.txt
+sha256 6e6efa9b0556d100cfe60690cff5d9be7144df77adabfd2c278dbfee451351ea  ofl/phetsarath/OFL.txt
+sha256 2348c4852e6322105d130aa2addbe24c962e330094ad6dfbfd9fbd2281d76b0b  ofl/bellefair/OFL.txt
+sha256 3bbcf1617d93d3a949a10da78ae91c58be536fb04567ab4b5b9fd207126f1db5  ofl/buenard/OFL.txt
+sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22  ofl/dosis/OFL.txt
+sha256 3ac1301549523d9861fedca12871f24e575fbd26d520632fc00ba849b471d275  ofl/russoone/OFL.txt
+sha256 44b51296985184d9b27fc2c8e5b317906c5d65d9dc834e81c07902d3e5e1cf1a  ofl/brawler/OFL.txt
+sha256 afb8c471158619593df0fb501453bd39fda42396e2cc3911e2a0a471c11b863c  ofl/sarala/OFL.txt
+sha256 de985adf63cff6b1bcb7c5cb55f1c5850fb1d36289d20a0e26d97a281bfcf956  ofl/aldrich/OFL.txt
+sha256 194e25172d0144f29aff4b6fb2931ff0be0139448a5cd867db37863c9179330a  ofl/stalinistone/OFL.txt
+sha256 ae05f8781a5ef38380ef3efe8cad86783610b6a780c6c278d7472f95310fccee  ofl/oswald/OFL.txt
+sha256 2dab153a33dcb2101bba3f194d27d953c848a0fabf2e336650a81f84a0c33b3f  ofl/pragatinarrow/OFL.txt
+sha256 9d61931b909f9a738964f8fb311eb8fa40dba1ef9f1688b36039ebb15ee1805e  ofl/questrial/OFL.txt
+sha256 e315abc82a78710c7242e2f2e6529651fd631d4d50e6ad98ea194f9b54c3d701  ofl/alfaslabone/OFL.txt
+sha256 4653c63a4bab99aa50de5190853fa21ea6c0a25d69d49f5a42cd51f0f67665e0  ofl/boogaloo/OFL.txt
+sha256 bd8323cd1d2b6bbdfbbf99cb41ec1156d0352ced170de4aa3a96d95e6e20bf5b  ofl/amiko/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/sueellenfrancisco/OFL.txt
+sha256 ed93e9833f18acc2775380a28139fd88d3ebf82df7cb814042498467be3463bb  ofl/lemon/OFL.txt
+sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685  ofl/itim/OFL.txt
+sha256 fa28ba897eb819768d6bc00c30aa03ef560e80e5f6fb872eaea089c66992f502  ofl/notable/OFL.txt
+sha256 96199bf9ff12dd471a66911dee95440737b437e7f5a6fd30e9e950c16d66e8df  ofl/unifrakturmaguntia/OFL.txt
+sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166  ofl/judson/OFL.txt
+sha256 ad4f6ede2e8a017255822a6abee8d10717f1d34c20223de80285ff59e28a1cba  ofl/bangers/OFL.txt
+sha256 f8779e6871bbab04e0a1ddd9997f4d8173b56792a1e7f8b9d691d967a49c7dc3  ofl/andada/OFL.txt
+sha256 49b9214f7b40024abec2fc89a32bdda380f2174ba7005d7636e6ea340157c5a6  ofl/jomolhari/OFL.txt
+sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a  ofl/b612mono/OFL.txt
+sha256 5eca89cdd576df5e4b7c694e0425b126a9ca839aa067df85fab33904a8187076  ofl/amaranth/OFL.txt
+sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038  ofl/mavenprovfbeta/OFL.txt
+sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f  ofl/nanumgothiccoding/OFL.txt
+sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b  ofl/librebarcode39extended/OFL.txt
+sha256 3670ddaf348c62ada22a2f606158dedcd9ca5fd5422a6173d6593204a8f53d4f  ofl/varta/OFL.txt
+sha256 ab592d1abca19428b89d851706fa7815ec25139c6affb45d366577ca63fb91b7  ofl/yesevaone/OFL.txt
+sha256 e8dd8f53b2fa502ace0636debbe7e357c4888d8d02b8b41d6a9a22d3058a63dc  ofl/peralta/OFL.txt
+sha256 cdf5fc4014abe91588666a9592ec86200e5a4d743b4b6e05d28d47e850bbe5fa  ofl/digitalnumbers/OFL.txt
+sha256 f8c2225a5fdb50e2e75f98cf6e69f198571f605f1b7f6f7eacc0947e2fcdbe8d  ofl/sreekrushnadevaraya/OFL.txt
+sha256 a80ee908b60f5bec9c10b135d3da93730e2194107d1f7fd3f61bd8c1a97b3e0c  ofl/yesteryear/OFL.txt
+sha256 6d216cec166b6e139adaa599053dd49720c053e1f2adb4845de3cc9c3704344d  ofl/play/OFL.txt
+sha256 46751a31966477e3f038d1e5ff1146a33234a3a523a0e6a21be3221cba082a34  ofl/muktamahee/OFL.txt
+sha256 505bb8f3c30f2006b4e02d250fda31ed94b651a35f1124a201ca1c405ce989af  ofl/biryani/OFL.txt
+sha256 5641212407f956b828bf632afc4bbb3344f461f82255ab56756d9e3e8604c7b1  ofl/martelsans/OFL.txt
+sha256 1ed119b01f03187dbe2f5f89c95431b9a4ca46db604fd263164d8b4055189f46  ofl/lateef/OFL.txt
+sha256 4938e917ac54665be1dd862f54634d991b39c5d1eef69345d66a5089e401bfb4  ofl/creteround/OFL.txt
+sha256 9263f9488a9ed1d5f4218581b642e0f054f9a20d208f1a53c19c9f7dbd27eaf2  ofl/peddana/OFL.txt
+sha256 e75ed24435d1711de0bebfaa621c3eb5564798c88cc0c1d1f8d529bbaae703a9  ofl/yanonekaffeesatz/OFL.txt
+sha256 708e33bed791c40638926a7577bcef8ff8748f84045f3825277540cbb8d483ba  ofl/poiretone/OFL.txt
+sha256 f1d1a3536fa4b9c71d04fe4c8d8bbfc0cc5c457d6883f45086b04d0bc07ed12d  ofl/vastshadow/OFL.txt
+sha256 f9f28345ffcd6cea6e3c6699e4579cd1948053d80fe89a6a5a2ecb269afc95f8  ofl/nikukyu/OFL.txt
+sha256 c1bcd16ffc9d095822fd6b7fa1a24c7918b24815ed05711421f804293d2efa62  ofl/actor/OFL.txt
+sha256 ae629d13b06d9afc5cf3c07d585f3192b89b7decaffc5c4dfcfa7ce11a2a2b11  ofl/raviprakash/OFL.txt
+sha256 bdce62dd98db969b73f93f8e8e2151004c20ad871ceb15ad9bfcbdf2cf939dba  ofl/pompiere/OFL.txt
+sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70  ofl/poorstory/OFL.txt
+sha256 757f49d04406c93c40d1781e7867fd85a1f9fdfbfe03a5ae332900da802fffc6  ofl/harmattan/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/khand/OFL.txt
+sha256 74ba064d03f1f1c4a952da936c3eb71866c34404916734de3cae73b34357e59e  ofl/lato/OFL.txt
+sha256 94625b91cba99cf9c8e580febf5e738b2e3c7cde9034a16bcfb7538b672137e5  ofl/zcoolxiaowei/OFL.txt
+sha256 3e908f3a95680bdf3c8456bfbf76392605b34cb3fba109e46441056ab966cb35  ofl/modernantiqua/OFL.txt
+sha256 6a809aeba8af2115ca4b4c3597b1fbeb836a45f0489070f330f9c2dff870da8d  ofl/galada/OFL.txt
+sha256 2c3737ea83b48d48624068d1bbd1d9f8049eb7cf2e1f67435e420375c42e0686  ofl/spirax/OFL.txt
+sha256 92f750829545386017c3418d890769778b76fd01dfb41c62fcbb0d42ba0303eb  ofl/dorsa/OFL.txt
+sha256 656a20870fbcb8f559f1c6308c1df90ac93d7cd0279aab49b43a43b5e58534e6  ofl/neucha/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/zeyada/OFL.txt
+sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7  ofl/laosanspro/OFL.txt
+sha256 33e3a83e377c6a41149044bd919f50d9a971d801052d4e0c0a98cb417b42ae38  ofl/risque/OFL.txt
+sha256 b4fc1d55ce610f255c5712f8169543f9610536d002deb99bbc99bfbba9f8a560  ofl/pangolin/OFL.txt
+sha256 511125dc85198375795fdbc109d088654d3b7f9dbd3ccb7bf93d844aef0b153c  ofl/ptmono/OFL.txt
+sha256 819e3b25f9b50f12299a3db1638be3813efc6b938f2b86693a218d20ec4e3209  ofl/londrinashadow/OFL.txt
+sha256 e3ea566dbf689a9110b2094f9f2e5d16d7ec31720147651efc1005ca20420dd4  ofl/flamenco/OFL.txt
+sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f  ofl/barlowcondensed/OFL.txt
+sha256 705960c3281a5765ecc0b59bd4ed7ca59eed165748076bc2fc3e8fdbfeb944b0  ofl/pressstart2p/OFL.txt
+sha256 7e896665d0863d2a17a671001dbe2528a5f9302f1dff9222af8b0834e9088d0c  ofl/kiranghaerang/OFL.txt
+sha256 5f1f5510eff7922864bf326ffa1d4a62f01add5193e9367b542378e5a808b500  ofl/handlee/OFL.txt
+sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff  ofl/archivonarrow/OFL.txt
+sha256 82831e8f12ecb6deb2f4d9919a04049895b4619e0301fa6b699c861bd7311c54  ofl/kavoon/OFL.txt
+sha256 1a5e3792a425687a523fc7c0f8ab5d01d58bf853149d57f3dec4b4fc6932fcf6  ofl/hanuman/OFL.txt
+sha256 7f91d7d8854e5cb4fc630807c0f4d57c07777769dc597173fe0aef5e58f0992c  ofl/qwigley/OFL.txt
+sha256 354b4be0340cd58e381fdf58793a108897bf944a7f8faf9e877c476ed6c730d1  ofl/convergence/OFL.txt
+sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e  ofl/oxygenmono/OFL.txt
+sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97  ofl/fascinate/OFL.txt
+sha256 4dbbe5c21b46f2647d227dde69b971a1b46de1435e0752a9eda1ce120725a93c  ofl/norican/OFL.txt
+sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64  ofl/hanalei/OFL.txt
+sha256 56edbe5fff7981dae6f6eff32f61ba04cd54324e5abfa44b1257b2a307ea561c  ofl/poly/OFL.txt
+sha256 59bda6b53e28d388de5eac7bbb8f3e65889dc8489be3d922f95a525354110c0e  ofl/tharlon/OFL.txt
+sha256 3fa0ceff4b9a2d28dde43bc63cde3acfb5e6e92d13a53e484ca0e501e18c7e2e  ofl/lekton/OFL.txt
+sha256 ad9ce814ff266b57d3c4698d3fadca4b41a6f942a0ddd215db5cc66abf92d668  ofl/mako/OFL.txt
+sha256 c4afe82f49c05689c40dd4e262803b29c6e611e7b4efd3a0418f574b2be79d9a  ofl/carterone/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/karma/OFL.txt
+sha256 d38acce513eccb51d7ac34ca47be279e1fcfdeca1ed088bdd2d281dc6ca939ee  ofl/badscript/OFL.txt
+sha256 31eb7046f4c80e0f96944c4b40b0772de68b34783b794fc13aab3f54c2ef6d9b  ofl/thasadith/OFL.txt
+sha256 06c79c896894160a5810d869a822fa7d02a0e2ccffd97920b8cf3b880380f6e5  ofl/amstelvaralpha/OFL.txt
+sha256 4faa2d9e2ce0a4b5b37e62ee6fafe474a539b31578f7214ed97cc3503aeb8ebd  ofl/oldstandardtt/OFL.txt
+sha256 1e511bb01d29562932157365418c02d954d8faeef794bcd54729177fb2b03db0  ofl/istokweb/OFL.txt
+sha256 846e8cc6dc69bf685d2db14cfa758ff3d9d771d54c9e0d3b511f0ecb97ac0e8a  ofl/cambay/OFL.txt
+sha256 6c181f5a0045e8f414e1c232c35972ab83ea084ac44825f517ba001628d97b21  ofl/kronaone/OFL.txt
+sha256 d7f96801a28ea11eaa51bc4a9c87fd91f2133bc298068e6e2847a15ddda23089  ofl/librecaslontext/OFL.txt
+sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685  ofl/sriracha/OFL.txt
+sha256 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276  ofl/merriweathersans/OFL.txt
+sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b  ofl/librebarcode39text/OFL.txt
+sha256 5b26c88d163b1430561f53fd3d9021d6057f3c67d25534a5d8d232cfbf8ee2a4  ofl/wireone/OFL.txt
+sha256 57f8d60cfe9212b971f07253e303746128edd06b21e3a0e4e188308e569f03e5  ofl/orienta/OFL.txt
+sha256 c87702d8b70f714fbefb554660e8ca57a43ef62a59089d11cbf0c6bd51d56928  ofl/lohittamil/OFL.txt
+sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b  ofl/jejuhallasan/OFL.txt
+sha256 9437c26410bcd543607a6775e7d0e359c1df3926d68c92dbaceb26ce79cc0fd3  ofl/bevan/OFL.txt
+sha256 50265d2b41f8ad2dd350532d2286509aa694021b4aa0490b06f0068e4ed78c27  ofl/herrvonmuellerhoff/OFL.txt
+sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233  ofl/ribeyemarrow/OFL.txt
+sha256 1fac7a3e4e43b091c2d31aef7a375d2b969c42b2d5fce8e2d40b5f7b1233ddb7  ofl/moul/OFL.txt
+sha256 331c71cbd8f1d8a70cd6eec3d55553b64e6261a9bb0982fa12e6e48baca827c5  ofl/philosopher/OFL.txt
+sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e  ofl/oxygen/OFL.txt
+sha256 89418a3c7b5726c3f8828a7b7c3f1cad661cf5b7a1be3d2bd9ea243f8d9890c8  ofl/sniglet/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/balooda/OFL.txt
+sha256 89d9d01291eeb91074ccf1f7ce07e7a1d9d421ec1191f8e84d440cb50830ed92  ofl/purplepurse/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/baloopaaji/OFL.txt
+sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233  ofl/ribeye/OFL.txt
+sha256 f938d4076b66a13cf984ce88d92a07ff9802e8ae5e1f4a28cdc43fad122ae611  ofl/spinnaker/OFL.txt
+sha256 89bf0833b785c49b0f271273ab440bdc20c85bf0322537dc901df940bf1579da  ofl/amarante/OFL.txt
+sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1  ofl/patrickhand/OFL.txt
+sha256 684ef102ca4c5ff61cf1c1e5c2c6326f3c26f848446f98b8862dcca716a87601  ofl/quattrocento/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/rozhaone/OFL.txt
+sha256 61be7c29f4835e2be7243db12213d75d53ff028f29f4b493212a1688b1d3a1ba  ofl/titanone/OFL.txt
+sha256 9df0700fcd0ef48abd74459a8650d35f59397fbaa00c5b00527e57cc155689c0  ofl/durusans/OFL.txt
+sha256 b1958132ff727bd74409aa37ec0abbe4be13b1b379e1210e6fb77fc608c607d5  ofl/kodchasan/OFL.txt
+sha256 f1888ed385b528866a472d02f4e06ef0873aca5b3c63ff1f6116cbb150dc9a13  ofl/metal/OFL.txt
+sha256 e36d420a3b382b337c386338d8abc3635e10de5dfca7f822fc63ac659a0dcfc3  ofl/amaticasc/OFL.txt
+sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd  ofl/oleoscript/OFL.txt
+sha256 60ddc0ee6e443b78940b5f92bcbab76c98ec6965e0da9fbdaf267383ab72bba8  ofl/anticdidone/OFL.txt
+sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25  ofl/carroisgothic/OFL.txt
+sha256 3184f6a99f589c78740fbff6ddaaabb43b8cc2f3852da36e60aeb024ea8d6f00  ofl/eaglelake/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/halant/OFL.txt
+sha256 9a9f089005f389717106bb3ba427cda9bd51b8a477078644566543f2a60ca85d  ofl/rambla/OFL.txt
+sha256 99d2f30e282d6174af8ff68597f58bb53c0dcb2b104a4c1b8d19da49021d00d3  ofl/unifrakturcook/OFL.txt
+sha256 2bb0c0200723d923f8e20d08b8bd1c7af7f5cef8bb2d63ce44bd268b54334621  ofl/fjallaone/OFL.txt
+sha256 72afba97d1ac9409a9fd3bb91a02a639427ca1988977909dad273e293a508d7e  ofl/staatliches/OFL.txt
+sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b  ofl/lobster/OFL.txt
+sha256 955655cafa13f187f45a79dcf451942fd1118a8426abc5a25ffc5dbb00709da6  ofl/juliussansone/OFL.txt
+sha256 9e1c955538817c3fab7160cb3110501e73ce109eeb58c4992a14e8323d900849  ofl/pecita/OFL.txt
+sha256 96d82a96abc02fb457ddde0227833dbde9d1d02876c91f0a4e27845ca0d692fa  ofl/atomicage/OFL.txt
+sha256 7729f005b7a087368e2cf61fc4b65cdc85988e47d0e6e38c93a72de345e86b41  ofl/newscycle/OFL.txt
+sha256 336fab6956d78eb34b50cd7bc6b16116c44735fbd0bf9f4def769ca4d8e218a9  ofl/sofia/OFL.txt
+sha256 b26cae1321380296ba8311b632a397d5eac11b47197f9d0aa0b9310f1531ad60  ofl/sarabun/OFL.txt
+sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337  ofl/suezone/OFL.txt
+sha256 d3711c90a7deda6210d30e41b945f16bdaa00662b30ee0b7c36abfee82525bfe  ofl/kokoro/OFL.txt
+sha256 513b7871a360a6eccd426bab59743fbff36764588f47381423f04ad6b3d821d9  ofl/alexbrush/OFL.txt
+sha256 67f64c5509e5151796599e3ad47c3131cbe0c80c4f9430b90236a1249c2eacc9  ofl/roundedmplus1c/OFL.txt
+sha256 4a7d2f227b91046ef7a54f8f735668d86e45f4fd4089268de292a6e9de108253  ofl/bentham/OFL.txt
+sha256 3c187c861dc291b9f7f96f655656f9ac2d57b33da425bd5962810be728344f57  ofl/brunoacesc/OFL.txt
+sha256 869e4c29978c318b33c2e5c7c8f24d2e947f249071bb1471620036a9d1ba87ad  ofl/k2d/OFL.txt
+sha256 6383249ddffbd87f2bbd7878ceba2dee0f1a2193cd7a4f41c00aaceb8e6d8b5b  ofl/meriendaone/OFL.txt
+sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc  ofl/sortsmillgoudy/OFL.txt
+sha256 d64c91b0306b53fabed08762068eea8b918d654fb0721c288f13cefa4aaf088c  ofl/butterflykids/OFL.txt
+sha256 bc1175730d609233043cde47e48f69831f012e85537c5ec1a2cf4836757c1540  ofl/mali/OFL.txt
+sha256 fe5e822667a4b2e083b8fdd7a37546163f26f6481b58742236abffdcfb3e6c71  ofl/baijamjuree/OFL.txt
+sha256 b0316f404a7b291e40921c605160181065791a5010a2d2d5691fc7e28cdbdff2  ofl/underdog/OFL.txt
+sha256 c026db4c1a557cae47e6930876965f9cbc05758eb1f5d6f59b6b61c8f342a57f  ofl/alice/OFL.txt
+sha256 aad1e82802172d4c1d22dd015a5b8b4275e5665a49c1df54ed64716fca7ae194  ofl/corben/OFL.txt
+sha256 878aec7282ab41d058cedbf90e14512bcb4fbd0658496de8c2dfc592ed1f0cd0  ofl/lilyscriptone/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfellenglishsc/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/sarpanch/OFL.txt
+sha256 aff3cea99bf300b4b29f4dc04867cf9b49d83de8c5ecaf991c446d506b56173e  ofl/wendyone/OFL.txt
+sha256 b054962de0af1397d5350fddb4d6bb20f5f2e073b543eeeb694c7c3b27144fc5  ofl/chivo/OFL.txt
+sha256 19849b33c59d0cffeaad0dbdc38db767e95e03cd36fbbfe6b67a9878aa5758df  ofl/fasthand/OFL.txt
+sha256 a57810cbca0b4715ae8610dd7a268260cebbdd4fd76d304e371517f828150669  ofl/stoke/OFL.txt
+sha256 47a0b7e315bc56ca0326fca46302d87d48a61e3528d4196e966b62f5bf0243f2  ofl/armata/OFL.txt
+sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f  ofl/nanumgothic/OFL.txt
+sha256 616e75d879831bedfa7725c078e09bb56f8a17f40b194e16691b12251bb42b3e  ofl/majormonodisplay/OFL.txt
+sha256 75c7ccf4f537a7a3ebbedd299c1d2542e13d3b27aaf76a0a2d9fa91a2a8fcd3a  ofl/felipa/OFL.txt
+sha256 ee2c069b30f3e9a5aaf52357117ee3443ee27f17c29a2ec68861db283379905c  ofl/dynalight/OFL.txt
+sha256 fbe0442a6b1ce162c95e241df76cab5ef2daf6a5ac84ae1a7a6749f32c051098  ofl/breeserif/OFL.txt
+sha256 43d530580461a574f6dfed9e15af6a74e95f7c04d9bfa1174a63ff036e8eee07  ofl/rubikmonoone/OFL.txt
+sha256 40bd3f35477284c021978816e9d3b8723ff2283fd7065fafaa5bb3004e41b237  ofl/songmyung/OFL.txt
+sha256 460966d12f306a007930575c3b8bc336fe0c32f880d622af6d3b745a06ca79a4  ofl/benchnine/OFL.txt
+sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68  ofl/alegreyasc/OFL.txt
+sha256 0c922e2d65050677c26ae8dc501bc9ad3e0059c4b10df2fc9717d7bdacdfeb6d  ofl/ramabhadra/OFL.txt
+sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b  ofl/palanquindark/OFL.txt
+sha256 e39d6ec64a37ed1523a59940695a61ea5e7882d9bbe0e7eb11653fda4b04fc79  ofl/kottaone/OFL.txt
+sha256 1bfe7d2aca99042eabf37079152fef8abdda2c36dad454ae89b858a3cb1078c5  ofl/forum/OFL.txt
+sha256 5505d1a010ee0f2eeecdf624984d2a6170480adab3091170abbcedd85361f1b9  ofl/novacut/OFL.txt
+sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801  ofl/marcellussc/OFL.txt
+sha256 0786594992757ea0290ae4a490ab9249728f372adb13959c0c8ae4fec83057ff  ofl/quintessential/OFL.txt
+sha256 ca13e9cd1faaa6afb9e43dcb534a8984cec3218993fb4b436468a79a1657ee19  ofl/keaniaone/OFL.txt
+sha256 760fb433c515570f6b77ebc60299c2c91d5f03848c659452a9d2458b28935768  ofl/numans/OFL.txt
+sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f  ofl/cormorantunicase/OFL.txt
+sha256 1d1b7f3480c8d9b65c26d205e41dcbfa85731588d6ea50bccfa78e91f242d629  ofl/loversquarrel/OFL.txt
+sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9  ofl/prompt/OFL.txt
+sha256 eb6c70cb6b575ad22df022d454df7a20582915e6e8da19b579c6cbef37a26bb5  ofl/gafata/OFL.txt
+sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038  ofl/bilboswashcaps/OFL.txt
+sha256 4579982a484a9745864de2cda666fd7b5017f9182b74dbb4cd53d84c1d1b2231  ofl/gruppo/OFL.txt
+sha256 cd059851dc2abcd2865ae318e8b949736f958794210acb90316530fd100fc904  ofl/geo/OFL.txt
+sha256 af9b97696048d509e3d70f8108b7c4381084f95c8fedd97acaa76b0b287668be  ofl/molle/OFL.txt
+sha256 6958d8c61b6b223f81bdc2109941e5d0004996dde61e197d628e0293f4f1bc58  ofl/miama/OFL.txt
+sha256 7e98b49a12b51240c85b04eb0d9919a6fec7dbd491bef6cbddc22d3f851bd1f1  ofl/marmelad/OFL.txt
+sha256 b9d592c3bf421197d9b7e353416b8e2ec81584988824b43d38c86d997a08b868  ofl/myanmarsanspro/OFL.txt
+sha256 e414e07f7a4da16ed47ebec80d52dd79f21d3ca42bc92385a755d8078a038814  ofl/playfairdisplaysc/OFL.txt
+sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812  ofl/sairaextracondensed/OFL.txt
+sha256 bc85bae0b512b799bbfb2b916e4d0a34cfd963d09778cd783e248b479e67760a  ofl/comfortaa/OFL.txt
+sha256 caa697668c3cf3e622753fb202c6c2e29648b94a3499dc7b869a14192e38c553  ofl/sourceserifpro/OFL.txt
+sha256 81d6c3788a6b641cb9f543389d9d5c0cd3bf94fbb5639be19c102b9274c34291  ofl/mousememoirs/OFL.txt
+sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89  ofl/arya/OFL.txt
+sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3  ofl/vollkornsc/OFL.txt
+sha256 6506b2fa2a14259a8859608a6148a4591d67bbaef4d8e1948b43c4078561b0e5  ofl/tauri/OFL.txt
+sha256 6cca1abc09d677cf00a55674ce2775e0eeb6dc5c0137b0401816680b9e500f81  ofl/marvel/OFL.txt
+sha256 e98ce988fba1c138f4e7c0c5120809706ab1b24a3c29638ca83ab2ff082e08db  ofl/chango/OFL.txt
+sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812  ofl/sairasemicondensed/OFL.txt
+sha256 42e7b456fee0d0dc86927579b3d2626d42bb0f4cc9778f3a92ca8ada4e46348e  ofl/novaslim/OFL.txt
+sha256 1b8eef90c567309fef17962cc969dd9ed1de69176517238e744018bb983e7c1c  ofl/mandali/OFL.txt
+sha256 9e262d6d7fb789aab6a8ecc53fc9c78387eeb9f935dcd289282d8e751b6bf743  ofl/antonio/OFL.txt
+sha256 07dbf75115edfc1fd75580aa19c4c730201a099e8f86a9869887dfbed0547266  ofl/offside/OFL.txt
+sha256 f177d98c67b84250ec87a03ca6ad161e84cab15b435e960039b971797a065f4a  ofl/martel/OFL.txt
+sha256 bb3e8082faf86b1474a6b042125ef0f83669d28110b72f70416a7587b7b9f144  ofl/unlock/OFL.txt
+sha256 c4955dfe15a5db10326aa58ef767460c42cd12a3acdb3e698eee2704eb373d94  ofl/electrolize/OFL.txt
+sha256 cf6dd07485d67d20f105afb9981dffdb6b180b59af45a228839cf3fb0277c9fb  ofl/arapey/OFL.txt
+sha256 87e8d9aca71dbe0481ba8611fc90d7e3aebfa3e2546420c403e7078898b0c484  ofl/allura/OFL.txt
+sha256 55e13d77a4457aa9c60f10c5b97baea3343d3bac30960d49554a033cb9eaff7c  ofl/sail/OFL.txt
+sha256 1c5bc055869d5e9151ec7774082727db720ec4293c65be67f91a4bdcaeb02998  ofl/righteous/OFL.txt
+sha256 de5ff32211a4340b01477af39ee339d639438955e409f79b666d4b9207f3c92c  ofl/dohyeon/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/waitingforthesunrise/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfellenglish/OFL.txt
+sha256 44a7c6e4c5572392ae122d3b1d8c6ba6fd640a7797e675384585d947f2773e3c  ofl/jua/OFL.txt
+sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f  ofl/signikanegative/OFL.txt
+sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f  ofl/cormorantgaramond/OFL.txt
+sha256 9ee6b2ec20a06c599a07412690876eb457bf192c10e886e60d8bdffb80bc21a3  ofl/sahitya/OFL.txt
+sha256 dcc832bd71ea62cbf97f06327a1b5442905b49ea446801421d71f7d1362db215  ofl/dokdo/OFL.txt
+sha256 8aa063e3a1299c5e1821f386f5ca8bc157ac561bd12c739ffa81c6f0821450c0  ofl/donegalone/OFL.txt
+sha256 e588abf45ca2b19c340c4b27349c9b6b6e5e198316fd965128ed9f4422942cbe  ofl/raleway/OFL.txt
+sha256 9860b97028024085855e503e32c1971bfd603374641cd018c136433ebcf5a338  ofl/gravitasone/OFL.txt
+sha256 ee9d043332991eb6bf2bd56fb04db3c558c1ee2f0cb9aa7b18366c77e34fef30  ofl/jura/OFL.txt
+sha256 15b1a21c3fa37a475ba6b0c0cfe289c7952548caf6e432068ddaf98d139ce419  ofl/belleza/OFL.txt
+sha256 c5a77946a56488790364d060628385d51226da62a18f30d2be0181d82ee62b00  ofl/suranna/OFL.txt
+sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166  ofl/megrim/OFL.txt
+sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b  ofl/librebarcode39extendedtext/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/teko/OFL.txt
+sha256 d324289a26909a519fb16c3d468a56ab909ad6d9070cac5742e5d59ad9bd9815  ofl/gildadisplay/OFL.txt
+sha256 c0bcb72e68dd416db0bb9fcec7a7fa62321b0147cde00d8c8f82748e33aefd34  ofl/novasquare/OFL.txt
+sha256 794d72ffdd25e8f7ca8e1d68db088c30ddbf2fdb369b6cc8217d4fa5fa6dc62f  ofl/adobeblank/OFL.txt
+sha256 806cb93632b8091cd36554642a96b2752bab50015da6a2b456d786c1f9aef5a5  ofl/carme/OFL.txt
+sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a  ofl/alegreyasans/OFL.txt
+sha256 08b6f5cceaefcf2881eb009adeb78edd0fabf9c8f0eaf8b88f07a690222227e6  ofl/varelaround/OFL.txt
+sha256 3f0f27931c92453994176af3b1e7954f9aac39fe145374d6d08c47c822e82e59  ofl/princesssofia/OFL.txt
+sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74  ofl/bungeeoutline/OFL.txt
+sha256 455397ca15d39e9178bbbf4b485a29187751d60f7ceb7829980a521d5ab6848d  ofl/sofadione/OFL.txt
+sha256 b7574cd4c76770e5e3915d16bd93f09663bd77cb041a4ec09d824c52b540529a  ofl/germaniaone/OFL.txt
+sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70  ofl/eastseadokdo/OFL.txt
+sha256 520a0c239d39b379b61c4de5f8e3b02db20b0dfc137481843eac01f02c41f4a2  ofl/aguafinascript/OFL.txt
+sha256 ffaf7bc750bdaa0b95b09eb80e419748bfaf46268c6612860f0a5e19e17abb12  ofl/orbitron/OFL.txt
+sha256 c6b9c7322fe0203d4d8a0f98541136d8d76da76b92c79d206b09991b98338cc8  ofl/gemunulibre/OFL.txt
+sha256 2f871c2e81de6d0c72c981615002c30bc9f1637003d6d3d4c3f0149886b70569  ofl/mervalescript/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/baloobhaijaan/OFL.txt
+sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893  ofl/seoulnamsanvertical/OFL.txt
+sha256 00a6fe8dfdc48d6206bcc4f10a765515a73433dfba7255eff966963beb26facb  ofl/dhyana/OFL.txt
+sha256 cd2dea62cd4b0c5fb335cf07ff04fd5c4bacb49b8d6c2bbbef9766c663d79b1c  ofl/patuaone/OFL.txt
+sha256 c0a8947de199b422d30c16137e4decd5362e3a1d504422880d69c02bd6046dac  ofl/cagliostro/OFL.txt
+sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961  ofl/alef/OFL.txt
+sha256 2cc926050c4c6ccd9a0288b7792e2fcf93e5629ee6269e35986f092275e5a1b9  ofl/sarina/OFL.txt
+sha256 f1bce31b817dee01c1e4ef8bc45d8ecb95f01f4abbf0a985007cb3cd0fd8123d  ofl/zcoolqingkehuangyou/OFL.txt
+sha256 9788e3b3e67f22ab5846a0bb867a230e7df2468c3cd20f730a5d9c34e673d090  ofl/rubikone/OFL.txt
+sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022  ofl/faustinavfbeta/OFL.txt
+sha256 ee81f11dd1970e9749afd2a572256f8eefce65532872762a4d7a3d5daa0812c8  ofl/shojumaru/OFL.txt
+sha256 4f4bc3806a1e55789c6ef75ca5fc628297b05292f74966474dc0d40324abc609  ofl/abel/OFL.txt
+sha256 064539f87826887d2062b7823b2b97b7625d68b642f6c945c99c0b8dc8084195  ofl/rationale/OFL.txt
+sha256 a345b13576140008a697ac66ca8c76cd63b1dd076712bc30a0f5e97dcc53cc83  ofl/markoone/OFL.txt
+sha256 203693528d6d2e8dc5e639c6ea42b3e825b59dd6447294e37b306fe734650091  ofl/arizonia/OFL.txt
+sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5  ofl/fanwoodtext/OFL.txt
+sha256 3997621a219c7758e31dbafdd3cbd2bcb0b6144a41d1ca068d04dbcc4bafcde6  ofl/milonga/OFL.txt
+sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74  ofl/bungeeshade/OFL.txt
+sha256 162a3b5c72cba845280a6f887c11d02984540b924510138c8b1eb473bcdafb6a  ofl/concertone/OFL.txt
+sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb  ofl/caveatbrush/OFL.txt
+sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f  ofl/barlow/OFL.txt
+sha256 9551ade371e7bcb1f6d9959273bbf1fed3bdf398efb5c57cc1fd85d6a13e9e5e  ofl/londrinaoutline/OFL.txt
+sha256 f15a9a3a9a665c2d17655b8fedad86d9a8f30081d46bb91236beb1bc7294a589  ofl/akronim/OFL.txt
+sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427  ofl/slabo13px/OFL.txt
+sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812  ofl/sairacondensed/OFL.txt
+sha256 96b7bc175186cd0153a9682a1c9bb1da7103ab13a83abef8026bc64582ca616f  ofl/oregano/OFL.txt
+sha256 6fc386ac48a529b85c21f90a6c8d2111c6271b3063f9ddd78e92645db5259510  ofl/tulpenone/OFL.txt
+sha256 13e862ac3f67130f58bd4bebb61c588d147b5a555b1ac6959570799c4f648cd0  ofl/capriola/OFL.txt
+sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf  ofl/muktamalar/OFL.txt
+sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b  ofl/siemreap/OFL.txt
+sha256 f76c1013cffb3e0de0e7dad19ee5b4b7849c7ab10b67218515e39cfd87e554a7  ofl/julee/OFL.txt
+sha256 c264f64bb2b91ca0dfdeab75d71719120271fa6a30035396416af235ef481c1e  ofl/merienda/OFL.txt
+sha256 d102f22055cfa31a9659228483de3c726010f0b3b416b78e3cbefcb54816e812  ofl/galdeano/OFL.txt
+sha256 2db02cb5d05d5f8a003ffefce36a32a16520ad4cab9ed90635ff953b583e4e82  ofl/sigmarone/OFL.txt
+sha256 cdcc959c42ab255b4cea4bd82f2db5c24a2da7ecabe615d02d5a5dba3716e446  ofl/racingsansone/OFL.txt
+sha256 c88333734ad7cd30540ec6614d12aa829a0395715de30e336d22ddfa3005db42  ofl/catamaran/OFL.txt
+sha256 26daffa24723bb188643085cfc5423f9d78d22a395df4a7928380e430545a201  ofl/bubblegumsans/OFL.txt
+sha256 de2246895f0ac21fe05b095d586d36cbc9f987ebcaed1e050c61e69667caf1c6  ofl/hannari/OFL.txt
+sha256 b54d54664cddcbf05f5b4ea3aec7e89317eb917cf465920969e7b22361e0f4a5  ofl/seymourone/OFL.txt
+sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4  ofl/averiaseriflibre/OFL.txt
+sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360  ofl/ibmplexsanscondensed/OFL.txt
+sha256 5802c9e3509199c7aa9a13ea410ae27febbc0cdea184bf7d227170fac703bba8  ofl/passeroone/OFL.txt
+sha256 2400b30a72d2b1555255b81625576dfb552584a19a9c85ad8d43ff77bceab13b  ofl/plaster/OFL.txt
+sha256 4bed7eaae70cab1bdf2bcf9b1cb562fcd9cc26d1c3533c4ade0ec70516dfb3a4  ofl/trykker/OFL.txt
+sha256 45b1f44d2cb859ea4b7be2f322c57b8ff7be55075c336744e62b5550cd0a97eb  ofl/medievalsharp/OFL.txt
+sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23  ofl/overpass/OFL.txt
+sha256 ff1f38ac4e694a4ad5bd3d7a5146cd8bd73fd57aae794ced76a24b0d68e41206  ofl/pinyonscript/OFL.txt
+sha256 6aa923334ec515d26b1a61bb978a0bb5bd8884de7529add1625beef2f4a53f74  ofl/nicomoji/OFL.txt
+sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1  ofl/encodesansexpanded/OFL.txt
+sha256 38fab5a643fa935a4e11edae2d7b2bbe9866b4f4828c2be2f41451b3f27cb67a  ofl/paprika/OFL.txt
+sha256 a5fc033225d145b43fd7391482ae7689825414ce29a01614d651a3012b57c81e  ofl/monsieurladoulaise/OFL.txt
+sha256 ecc91fac753ad9ba5bb7e7819a5c59ee1e3cf89032133c6b4b0318d63c35933b  ofl/alike/OFL.txt
+sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b  ofl/jejugothic/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfelldoublepica/OFL.txt
+sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e  ofl/mate/OFL.txt
+sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8  ofl/postnobillscolombo/OFL.txt
+sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337  ofl/secularone/OFL.txt
+sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1  ofl/encodesans/OFL.txt
+sha256 136a256d6050ed32bbf96736d70b9099c6359e83dabeb6847cdf6b8ef84319cc  ofl/kantumruy/OFL.txt
+sha256 72060253bd481a8dc18664bb9117072dc07c0f0270a40617c230654821774850  ofl/pattaya/OFL.txt
+sha256 56d9c3529facf93873a2a1626dd038054d244b3af30a1e3ffe0e78bbda1c7622  ofl/preahvihear/OFL.txt
+sha256 1a2debd5ad8e656b26bb3b29213caa8f7e557a2f31454b11ebb6c3e3b59aa5d4  ofl/cutefont/OFL.txt
+sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f  ofl/kalam/OFL.txt
+sha256 d941c5b788d47aa469ee54e30f4c12d6a43c45a295f10c568bdf9772f2893b7b  ofl/oranienbaum/OFL.txt
+sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6  ofl/notosans/OFL.txt
+sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca  ofl/mrbedford/OFL.txt
+sha256 0acef93ca37cf19eeb83a1c6a29b78b08377a211c8d80cd27626e210176828da  ofl/kavivanar/OFL.txt
+sha256 c0562e066174197902a4a10606673d189f067970ef89c6013943b9cf182aadbc  ofl/titilliumweb/OFL.txt
+sha256 f8fbefb5b1004615e6d1e84b1c75e68520d91196f600cb1b07620dd2748eff64  ofl/cantataone/OFL.txt
+sha256 2e2cb5a98da665f2ab82a9fd01fb18c2337f845761b0c163f690ed65f3b94677  ofl/sacramento/OFL.txt
+sha256 251f65282ff48a7e8ef3fb661fc99254d9b3b0c368427c98b1edbfe4ca66e888  ofl/katibeh/OFL.txt
+sha256 31bc966c36352bfd33717382786d0458c38ecf540628ab134e0ce35fde801d28  ofl/poppins/OFL.txt
+sha256 f016385cb4b360e7698d22a48c6b58c0634b1ed5c9c17df78515d43887511df6  ofl/yaldevicolombo/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/swankyandmoomoo/OFL.txt
+sha256 b712dacdda5da76c0213f8478886f893b855665c1153ae438bc3e55a7dc525ef  ofl/kurale/OFL.txt
+sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486  ofl/chonburi/OFL.txt
+sha256 8f187da1eb4f23e3fe7ba68b1cb2e92881a415dd34c46489698454517e273c4f  ofl/krub/OFL.txt
+sha256 3336bf5d4e7eedba48ecb831f37bf676e901c39f2e6a422cceadd9d2ffa55be8  ofl/kaushanscript/OFL.txt
+sha256 bb655534b6c7bf3e547c1368a68a5b1032d0e96fd08b5cc75f3d7a78528784ef  ofl/novaoval/OFL.txt
+sha256 04b895d77ccec5034191e953e8e5884637269be15fe0675fc25039014eb46349  ofl/monda/OFL.txt
+sha256 d724dea493d89a7a9681186e2fb462b7cd551674960ee4142ae6b325261b5115  ofl/hanna/OFL.txt
+sha256 64ecb0c6bf5cd80c3da76035c00671272966afbd32ffbdbcad95a8b56501fb08  ofl/decovaralpha/OFL.txt
+sha256 0cf28cdcf1cdfd35054352816b2d8c81bd6d6f73632198b61507f26dd4dcbeea  ofl/sansita/OFL.txt
+sha256 d69bcd35f4a121b312a64f7e8eb15bed61c9056e9e9cdaa8d513366142c8e005  ofl/rosario/OFL.txt
+sha256 b4cff421cb89d1e32036e818f291f8ab0d3294ada70b5883d5bcc6470b869702  ofl/eczar/OFL.txt
+sha256 ecb52bab55d8d6185712fe8fd2fd98300f5c8c07fad0d0a97b1e579462b0dd3f  ofl/bayon/OFL.txt
+sha256 ed95c33f80ccca002e3a360b683c43368f9c5eb024e5b992abb51af3c10b59bc  ofl/gothica1/OFL.txt
+sha256 66b5c49d384cba754806a891ebd52f2ca08dd05c0eb3c56170192da466a00a20  ofl/londrinasolid/OFL.txt
+sha256 284a5a26e6db9a04259a5690ad57d52c56a4c515ca2ece1943d950f99e709dcd  ofl/belgrano/OFL.txt
+sha256 6cbe0f55c154b5dee71ca4f2418d69e4e916448ef2ab52dc4541197b292efa24  ofl/sonsieone/OFL.txt
+sha256 255d5debbb80eb2ea762644311f266a279e8778f00156655a516e2b7781a63e1  ofl/lilitaone/OFL.txt
+sha256 490b8f3acbce2331adc9b9d3e75ee6fe07946fb29af429a300c7d066b1250b2d  ofl/crimsontext/OFL.txt
+sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f  ofl/nanumbrushscript/OFL.txt
+sha256 f2c0dfa02d6f5c444b4babd7bc0b43be77ea85706e8524342516bc41e43c2f01  ofl/fahkwang/OFL.txt
+sha256 4398885e6b303830d81eea03444aae6fb08a44f41b6acd193c88a2f8cd17606e  ofl/srisakdi/OFL.txt
+sha256 c1f8e0feb0babaacf774b971bcfd791e44125b9d61ff074e4c20924e9661556e  ofl/antic/OFL.txt
+sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2  ofl/notosanstamil/OFL.txt
+sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa  ofl/codacaption/OFL.txt
+sha256 b41b99f35b507564e54f6b2f5162ad1c21f94a16837c632da6632b376a341f42  ofl/nosifer/OFL.txt
+sha256 e8d0118fa9d640543e7f6848d1d93f47313c7f56b64f73f37291d859cd5932bf  ofl/souliyo/OFL.txt
+sha256 bff4e5087ece354afccd073621197bbb7dd9349943b5ee6aa12b1adf0b133081  ofl/happymonkey/OFL.txt
+sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64  ofl/hanaleifill/OFL.txt
+sha256 03082243ebc53e2090bc59987f693982ccee83b30516457b11f6a2349b78f5f8  ofl/rokkitt/OFL.txt
+sha256 1152ca18eaa6159634f1eb209c60df360c1c09a52991e392f8033702036634d4  ofl/assistant/OFL.txt
+sha256 012b1870f81b0d97ca756edd9eea315c7fc22657ac2f1cbdfcb6772fed3e20f3  ofl/bhavuka/OFL.txt
+sha256 ce1108854c91696a8549bb21459f1dc74e8a1ec11664d712c3868c40042f1a8a  ofl/rufina/OFL.txt
+sha256 bac36a7fcafc5702d9d928bb81c7de9f8739eaa820e546c3d2cc52730b652af4  ofl/devonshire/OFL.txt
+sha256 ac987f9cbc5b18d3239d88adb57a4e134049811d24ddda2f6383faa589fd2727  ofl/holtwoodonesc/OFL.txt
+sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375  ofl/bowlbyonesc/OFL.txt
+sha256 965bd2c907f7bb6f36da4f85e83f29aea8b2f720783deebd7ed7b40678e67672  ofl/mysteryquest/OFL.txt
+sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1  ofl/encodesanssemiexpanded/OFL.txt
+sha256 19e186a088a50835b38b59409a76b8df2d0252ce114a99e79e306231bbe253b7  ofl/dellarespira/OFL.txt
+sha256 aa36087ecd7e9085e5a1439b0a6d0ee35966e8cd2ccaa649bebe62cae5815e82  ofl/lifesavers/OFL.txt
+sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773  ofl/imfelldwpicasc/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/loveyalikeasister/OFL.txt
+sha256 a9ef1db03f660130790beeb3b5d91b68536a44a98ec2db3097d02a1c5f91c599  ofl/buda/OFL.txt
+sha256 de318dcb99e332a746edb9f83180ee206fc3bce74ff96ad7d1cb219967ec74af  ofl/pollerone/OFL.txt
+sha256 315a576cbc7ab61c9e347b5725893bc8498fdcb8fc10831793c6864bc2cefba8  ofl/gudea/OFL.txt
+sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c  ofl/montserrat/OFL.txt
+sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a  ofl/podkovavfbeta/OFL.txt
+sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1  ofl/patrickhandsc/OFL.txt
+sha256 ec1d7de447a90e4b6d8f2b4f95c7f89a70e315fdb41969bc716059e4f2461fa4  ofl/clickerscript/OFL.txt
+sha256 7039124ec9c84f9d637637da9f80158f0d3681c82d4e6a811053467f7c33d587  ofl/prostoone/OFL.txt
+sha256 16f8621a8dda01f044b8a58489334dbaadfad44ef2fa1d5ce0864cc2f309df01  ofl/inknutantiqua/OFL.txt
+sha256 ae30055f1e31d12f6235802c25a8872bb7053fca8ed4a604c530f4b2ee83e572  ofl/pontanosans/OFL.txt
+sha256 f1ef4c3ef43322403f5c30e4fb46496969cb5c34a2a6e7247b507254b69caa6a  ofl/novaround/OFL.txt
+sha256 cf5c4103b0ecf3c38e7c26768b5caf05e1b3e16d4d87b32d859b3c19ce7c216c  ofl/petitformalscript/OFL.txt
+sha256 ed80dd9539708a531313f98fb081aeeaa395ab5726931a433845d667b019c855  ofl/abyssinicasil/OFL.txt
+sha256 1404cc9279d4ad713a372a5e1e1d20d7b9b000d2397c8529aeb3df5402446600  ofl/cutive/OFL.txt
+sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23  ofl/overpassmono/OFL.txt
+sha256 0878e7d6e842bc3c45154059a1c2812de0d31dca343fe6bc16abc9afdee3e3de  ofl/koho/OFL.txt
+sha256 636d62f04d7bda9fcf9354f258f6244e7e18288cae036b95122e204f1acbec80  ofl/neuton/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/baloo/OFL.txt
+sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a  ofl/podkova/OFL.txt
+sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74  ofl/bungee/OFL.txt
+sha256 dc35123e99a857674b3e8807e9d7df82220d298423d9fc50ce084fbcdecf602d  ofl/jotione/OFL.txt
+sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427  ofl/slabo27px/OFL.txt
+sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc  ofl/oflsortsmillgoudytt/OFL.txt
+sha256 d7b108fc1f23fb016a47bb40c63d6f6e04cc35a1edfb991638d7f03621bf7f33  ofl/terminaldosislight/OFL.txt
+sha256 71e5222c549d85a1403b6e709b4328b81d7b51ba021b8bd20df89550da80c087  ofl/yatraone/OFL.txt
+sha256 f139d6f43d2a63a8fb3ded48b8ec747d9d59a7fbb13d077d9b96ac88580bc1ad  ofl/dekko/OFL.txt
+sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56  ofl/josefinsansstdlight/OFL.txt
+sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd  ofl/oleoscriptswashcaps/OFL.txt
+sha256 64dc6a7e2a77aa340c49c3e0829703f540f8d64afa506f44eaa6741580716d0f  ofl/gabriela/OFL.txt
+sha256 17d7a7f5d9f0139535ecec516988c4c73a2ec0f225987288f3fd6ee2622d4450  ofl/federant/OFL.txt
+sha256 c0a7efe98e77cbfcf1a5ca43e874e25cf53d9185c56295bc3b5c407f95dae638  ofl/nats/OFL.txt
+sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98  ofl/ekmukta/OFL.txt
+sha256 e5ccbfc32e4d7fae98b467a9af310ac8d2efd5d90e684426cd24f3eb36090a2c  ofl/acme/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/modak/OFL.txt
+sha256 75a77451968e55a1ab404bd953bd8778983e21116d507b890fbcf838e58c8e8b  ofl/pavanam/OFL.txt
+sha256 36931b77dd81fa96fffad91b6acb54931e600845eb81f91ecf1b4459012c621a  ofl/vidaloka/OFL.txt
+sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1  ofl/baloobhai/OFL.txt
+sha256 1c45059cea5c6798c8591b0a17961a30328747d44214ff9b8f9c62a683bd6598  ofl/ruda/OFL.txt
+sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485  ofl/thegirlnextdoor/OFL.txt
+sha256 4dee45deee99672fbe342b2f4b7aa75b0cd12de18a68f9732c77f096bab47e0e  ofl/molengo/OFL.txt
+sha256 5a5cf278190adf8be3e9905c2b21460241cb376c600bdfd6eb7aceb66036c4bf  ofl/telex/OFL.txt
+sha256 bb49cbf811dafcb11e0de081efcdc8385e45ccc85a5bfc3231ec4861d444dc42  ofl/ruthie/OFL.txt
+sha256 b5c3d12a3085b96011fee65555234bb9d31fa7444cf6f8d5ae6b1f5771394399  ofl/lakkireddy/OFL.txt
+sha256 23b896f4937eac954a383340c92dfcac1c6e05ec21cc08ec6de47d30ad8496a3  ofl/charmonman/OFL.txt
+sha256 39602407e30d466bf169f46d690aaae4f5f039258e5642f91a80bb132ce6e14a  ofl/bubblerone/OFL.txt
+sha256 e31de7000a2a13b2e54ad01e788fd29e979fe05ea1fded44d6e71cc06e33bb2b  ofl/ralewaydots/OFL.txt
+sha256 8218df19bcd9786311bf1126815e8d591027aaf7611ef031af5a31c3fd66e928  ofl/arefruqaa/OFL.txt
+sha256 e37fcc467040ecd81bf4cf59c99ef56b20f57918995e82b3de1d5b4e931bc2e6  ofl/portlligatslab/OFL.txt
+sha256 60fea3a0da19167a3efb9c3792a3a15dc9235405d01bbec1233fdf3e79c74296  ofl/freckleface/OFL.txt
+sha256 da15da6b1496d4de18f97e2ad1b722ef8a1c121149c2c93b2cf7eac6ac27b35c  ofl/mplus1p/OFL.txt
+sha256 d51f3341fd7b3dfa1114d3ef0bdabbe57f60eef86a1458019e0077d676fa1fcb  ofl/lancelot/OFL.txt
+sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f  ofl/cormorantinfant/OFL.txt
+sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1  ofl/encodesanssemicondensed/OFL.txt
+sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909  ofl/eater/OFL.txt
+sha256 b43e2530c7af69fe1800f180d210b6d2745915ed4e0e404495038c861bb6dbf7  ofl/hammersmithone/OFL.txt
+sha256 5a8751bef5a4fc867ae015099267905034345260f14060fa276aac4051ddd8b4  ofl/varela/OFL.txt
+sha256 f6fc9fbae062e4efc1b0306e27715d43cd64a48b8ffba81c22034b8efee4fce2  ofl/cabinsketch/OFL.txt
+sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002  ufl/ubuntucondensed/LICENCE.txt
+sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002  ufl/ubuntumono/LICENCE.txt
+sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002  ufl/ubuntu/LICENCE.txt
diff --git a/buildroot/package/googlefontdirectory/googlefontdirectory.mk b/buildroot/package/googlefontdirectory/googlefontdirectory.mk
index c34de3b0f..8773390f0 100644
--- a/buildroot/package/googlefontdirectory/googlefontdirectory.mk
+++ b/buildroot/package/googlefontdirectory/googlefontdirectory.mk
@@ -4,20 +4,34 @@
 #
 ################################################################################
 
-GOOGLEFONTDIRECTORY_SITE = \
-	https://s3.amazonaws.com/joemaller_google_webfonts
-GOOGLEFONTDIRECTORY_SOURCE = googlewebfonts.tgz
-GOOGLEFONTDIRECTORY_LICENSE = OFL-1.1
+GOOGLEFONTDIRECTORY_VERSION = 94dff3eaa9301b6640cccc63c56d6ff33d82882c
+GOOGLEFONTDIRECTORY_SITE = $(call github,google,fonts,$(GOOGLEFONTDIRECTORY_VERSION))
 
 GOOGLEFONTDIRECTORY_FONTS = \
 	$(call qstrip,$(BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS))
 
+ifneq ($(filter apache/%,$(GOOGLEFONTDIRECTORY_FONTS)),)
+GOOGLEFONTDIRECTORY_ALL_LICENSES += Apache-2.0
+GOOGLEFONTDIRECTORY_LICENSE_FILES += $(addsuffix /LICENSE.txt,$(filter apache/%,$(GOOGLEFONTDIRECTORY_FONTS)))
+endif
+
+ifneq ($(filter ofl/%,$(GOOGLEFONTDIRECTORY_FONTS)),)
+GOOGLEFONTDIRECTORY_ALL_LICENSES += OFL-1.1
+GOOGLEFONTDIRECTORY_LICENSE_FILES += $(addsuffix /OFL.txt,$(filter ofl/%,$(GOOGLEFONTDIRECTORY_FONTS)))
+endif
+
+ifneq ($(filter ufl/%,$(GOOGLEFONTDIRECTORY_FONTS)),)
+GOOGLEFONTDIRECTORY_ALL_LICENSES += UFL-1.1
+GOOGLEFONTDIRECTORY_LICENSE_FILES += $(addsuffix /LICENCE.txt,$(filter ufl/%,$(GOOGLEFONTDIRECTORY_FONTS)))
+endif
+
+GOOGLEFONTDIRECTORY_LICENSE = $(subst $(space),$(comma)$(space),$(GOOGLEFONTDIRECTORY_ALL_LICENSES))
+
 define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS
-	for i in $(GOOGLEFONTDIRECTORY_FONTS); \
-	do \
-		$(INSTALL) -d $(TARGET_DIR)/usr/share/fonts/$$i && \
-		$(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/share/fonts/$$i $(@D)/$$i/*.ttf || exit 1; \
-	done
+	$(foreach d,$(GOOGLEFONTDIRECTORY_FONTS), \
+		mkdir -p $(TARGET_DIR)/usr/share/fonts/$(notdir $(d))
+		$(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/share/fonts/$(notdir $(d)) $(@D)/$(d)/*.ttf
+	)
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot/package/gpsd/gpsd.mk b/buildroot/package/gpsd/gpsd.mk
index ade2d2a16..bc9fcf27c 100644
--- a/buildroot/package/gpsd/gpsd.mk
+++ b/buildroot/package/gpsd/gpsd.mk
@@ -23,7 +23,8 @@ GPSD_SCONS_OPTS = \
 	prefix=/usr\
 	sysroot=$(STAGING_DIR)\
 	strip=no\
-	python=no
+	python=no \
+	qt=no
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 GPSD_DEPENDENCIES += ncurses
@@ -48,14 +49,6 @@ ifeq ($(BR2_microblaze),y)
 GPSD_CFLAGS += -O0
 endif
 
-# Enable or disable Qt binding
-ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
-GPSD_SCONS_ENV += QMAKE="$(QT_QMAKE)"
-GPSD_DEPENDENCIES += qt
-else
-GPSD_SCONS_OPTS += qt=no
-endif
-
 # If libusb is available build it before so the package can use it
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 GPSD_DEPENDENCIES += libusb
@@ -202,10 +195,10 @@ ifeq ($(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED),y)
 GPSD_SCONS_OPTS += fixed_port_speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE)
 endif
 ifeq ($(BR2_PACKAGE_GPSD_MAX_CLIENT),y)
-GPSD_SCONS_OPTS += limited_max_clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE)
+GPSD_SCONS_OPTS += max_clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE)
 endif
 ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y)
-GPSD_SCONS_OPTS += limited_max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE)
+GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE)
 endif
 
 GPSD_SCONS_ENV += LDFLAGS="$(GPSD_LDFLAGS)" CFLAGS="$(GPSD_CFLAGS)"
diff --git a/buildroot/package/gqrx/Config.in b/buildroot/package/gqrx/Config.in
index 1dc40c6d2..b0d7e7b9f 100644
--- a/buildroot/package/gqrx/Config.in
+++ b/buildroot/package/gqrx/Config.in
@@ -1,22 +1,27 @@
-comment "gqrx needs a toolchain w/ C++, threads, wchar"
+comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library"
+	depends on BR2_USE_MMU # gnuradio
+	depends on !BR2_PACKAGE_PYTHON3 # gnuradio
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_USE_WCHAR
+		!BR2_USE_WCHAR || !BR2_STATIC_LIBS
 
-comment "gqrx needs qt5, gnuradio, fftw's single precision"
-	depends on !BR2_PACKAGE_GNURADIO || !BR2_PACKAGE_FFTW_PRECISION_SINGLE || \
-		!BR2_PACKAGE_QT5
+comment "gqrx needs qt5"
+	depends on !BR2_PACKAGE_QT5
 
 config BR2_PACKAGE_GQRX
 	bool "gqrx"
-	depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio
-	depends on BR2_PACKAGE_GNURADIO
-	depends on BR2_PACKAGE_QT5
+	depends on BR2_USE_MMU # gnuradio
+	depends on !BR2_STATIC_LIBS # gnuradio
 	depends on BR2_INSTALL_LIBSTDCPP # boost
 	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
 	depends on BR2_USE_WCHAR # boost
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
+	depends on BR2_PACKAGE_QT5
+	depends on !BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
 	select BR2_PACKAGE_BOOST_SYSTEM
+	select BR2_PACKAGE_GNURADIO
 	select BR2_PACKAGE_GNURADIO_ANALOG
 	select BR2_PACKAGE_GNURADIO_AUDIO
 	select BR2_PACKAGE_GNURADIO_BLOCKS
diff --git a/buildroot/package/gqrx/gqrx.mk b/buildroot/package/gqrx/gqrx.mk
index b51bb23ea..d93c07d10 100644
--- a/buildroot/package/gqrx/gqrx.mk
+++ b/buildroot/package/gqrx/gqrx.mk
@@ -12,4 +12,10 @@ GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg
 
 GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio
 
+# gqrx can use __atomic builtins, so we need to link with
+# libatomic when available
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+GQRX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
+endif
+
 $(eval $(cmake-package))
diff --git a/buildroot/package/grep/grep.hash b/buildroot/package/grep/grep.hash
index 10a5e320e..4aa7b4ecb 100644
--- a/buildroot/package/grep/grep.hash
+++ b/buildroot/package/grep/grep.hash
@@ -1,4 +1,5 @@
 # Locally calculated after checking signature
-# http://ftp.gnu.org/gnu/grep/grep-3.1.tar.xz.sig
-sha256 db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e  grep-3.1.tar.xz
-sha256 ca372a7d92560b1fa9f6d832b440e8bcd62d9adfa8870c98287deab66d98310e  COPYING
+# http://ftp.gnu.org/gnu/grep/grep-3.3.tar.xz.sig
+# using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE
+sha256 b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514  grep-3.3.tar.xz
+sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  COPYING
diff --git a/buildroot/package/grep/grep.mk b/buildroot/package/grep/grep.mk
index 730f36a34..96685b027 100644
--- a/buildroot/package/grep/grep.mk
+++ b/buildroot/package/grep/grep.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GREP_VERSION = 3.1
+GREP_VERSION = 3.3
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_LICENSE = GPL-3.0+
diff --git a/buildroot/package/grpc/0001-target-build-using-host-plugin.patch b/buildroot/package/grpc/0001-target-build-using-host-plugin.patch
new file mode 100644
index 000000000..5993987bc
--- /dev/null
+++ b/buildroot/package/grpc/0001-target-build-using-host-plugin.patch
@@ -0,0 +1,52 @@
+From aa18148e392ef28275a182db34397ccb66fb4617 Mon Sep 17 00:00:00 2001
+From: Robert Rose 
+Date: Wed, 28 Nov 2018 09:41:52 -0800
+Subject: [PATCH] CMakeLists.txt: allow passing a pre-existing grpc_cpp_plugin
+
+The grpc_cpp_plugin is meant to be executed during the build process
+of grpc. As such, in cross-compilation contexts, this program needs to
+be built for the host machine and not the target machine. In order to
+allow this, this commit adds an option gRPC_NATIVE_CPP_PLUGIN that can
+be passed on the command line, with the path to an existing
+grpc_cpp_plugin binary. If not passed, grpc_cpp_plugin is built as
+usual.
+
+Signed-off-by: Robert Rose 
+---
+ CMakeLists.txt | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc76cf5..7a22b08 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13108,6 +13108,18 @@ target_link_libraries(grpc_cli
+ endif (gRPC_BUILD_TESTS)
+ if (gRPC_BUILD_CODEGEN)
+ 
++if (gRPC_NATIVE_CPP_PLUGIN)
++
++add_executable(grpc_cpp_plugin
++  IMPORTED
++)
++
++set_property(TARGET grpc_cpp_plugin
++  PROPERTY IMPORTED_LOCATION ${gRPC_NATIVE_CPP_PLUGIN}
++)
++
++else()
++
+ add_executable(grpc_cpp_plugin
+   src/compiler/cpp_plugin.cc
+ )
+@@ -13143,6 +13155,7 @@ if (gRPC_INSTALL)
+     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
+   )
+ endif()
++endif()
+ 
+ endif (gRPC_BUILD_CODEGEN)
+ if (gRPC_BUILD_CODEGEN)
+-- 
+2.20.0.rc0.387.gc7a69e6b6c-goog
+
diff --git a/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch b/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch
new file mode 100644
index 000000000..766f75817
--- /dev/null
+++ b/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch
@@ -0,0 +1,52 @@
+From 0aeefca28104f86f14b511feee8d5711f2e8bcb5 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni 
+Date: Mon, 31 Dec 2018 16:22:07 +0100
+Subject: [PATCH] Properly detect the availability of pthread_setname_np()
+
+This commit adds a CMake check for the availability of
+pthread_setname_np(), and only uses it on Linux when available.
+
+Indeed, some C libraries, such as uClibc, do not provide this
+non-POSIX function in all cases.
+
+Upstream: https://github.com/grpc/grpc/pull/17610
+Signed-off-by: Thomas Petazzoni 
+---
+ CMakeLists.txt                            | 6 ++++++
+ include/grpc/impl/codegen/port_platform.h | 2 ++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc76cf50da..8dd457fb1a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,6 +94,12 @@ endif()
+ 
+ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+ 
++include(CheckSymbolExists)
++check_symbol_exists(pthread_setname_np pthread.h HAVE_PTHREAD_SETNAME_NP)
++if (HAVE_PTHREAD_SETNAME_NP)
++  add_definitions(-DHAVE_PTHREAD_SETNAME_NP)
++endif ()
++
+ add_definitions(-DPB_FIELD_16BIT)
+ 
+ if (MSVC)
+diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h
+index b2028a6305..dc89e6ed57 100644
+--- a/include/grpc/impl/codegen/port_platform.h
++++ b/include/grpc/impl/codegen/port_platform.h
+@@ -173,7 +173,9 @@
+ #endif /* _LP64 */
+ #ifdef __GLIBC__
+ #define GPR_POSIX_CRASH_HANDLER 1
++#if defined(HAVE_PTHREAD_SETNAME_NP)
+ #define GPR_LINUX_PTHREAD_NAME 1
++#endif /* HAVE_PTHREAD_SETNAME_NP */
+ #include 
+ #else /* musl libc */
+ #define GPR_MUSL_LIBC_COMPAT 1
+-- 
+2.20.1
+
diff --git a/buildroot/package/grpc/Config.in b/buildroot/package/grpc/Config.in
new file mode 100644
index 000000000..2765d0fb4
--- /dev/null
+++ b/buildroot/package/grpc/Config.in
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_GRPC
+	bool "grpc"
+	depends on BR2_INSTALL_LIBSTDCPP # protobuf
+	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf
+	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # protobuf
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf
+	depends on !BR2_STATIC_LIBS # protobuf
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
+	select BR2_PACKAGE_C_ARES
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_PROTOBUF
+	select BR2_PACKAGE_ZLIB
+	help
+	  A language-neutral, platform-neutral, open source, remote
+	  procedure call (RPC) system initially developed at Google.
+
+	  http://github.com/grpc/grpc
+
+comment "grpc needs a toolchain w/ C++, threads, dynamic library, host and target gcc >= 4.8"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_4_8 \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
diff --git a/buildroot/package/grpc/grpc.hash b/buildroot/package/grpc/grpc.hash
new file mode 100644
index 000000000..9e5011125
--- /dev/null
+++ b/buildroot/package/grpc/grpc.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 a5342629fe1b689eceb3be4d4f167b04c70a84b9d61cf8b555e968bc500bdb5a grpc-v1.16.1.tar.gz
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
diff --git a/buildroot/package/grpc/grpc.mk b/buildroot/package/grpc/grpc.mk
new file mode 100644
index 000000000..6c804429f
--- /dev/null
+++ b/buildroot/package/grpc/grpc.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# grpc
+#
+################################################################################
+
+GRPC_VERSION = v1.16.1
+GRPC_SITE = $(call github,grpc,grpc,$(GRPC_VERSION))
+GRPC_LICENSE = Apache-2.0
+GRPC_LICENSE_FILES = LICENSE
+
+GRPC_INSTALL_STAGING = YES
+
+# Need to use host grpc_cpp_plugin during cross compilation.
+GRPC_DEPENDENCIES = c-ares host-grpc openssl protobuf zlib
+HOST_GRPC_DEPENDENCIES = host-c-ares host-openssl host-protobuf host-zlib
+
+GRPC_CONF_OPTS = \
+	-D_gRPC_CARES_LIBRARIES=cares \
+	-DgRPC_CARES_PROVIDER=none \
+	-DgRPC_PROTOBUF_PROVIDER=package \
+	-DgRPC_SSL_PROVIDER=package \
+	-DgRPC_ZLIB_PROVIDER=package \
+	-DgRPC_NATIVE_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin
+
+# grpc can use __atomic builtins, so we need to link with
+# libatomic when available
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
+endif
+
+HOST_GRPC_CONF_OPTS = \
+	-D_gRPC_CARES_LIBRARIES=cares \
+	-DgRPC_CARES_PROVIDER=none \
+	-DgRPC_CARES_PROVIDER=none \
+	-DgRPC_PROTOBUF_PROVIDER=package \
+	-DgRPC_SSL_PROVIDER=package \
+	-DgRPC_ZLIB_PROVIDER=package
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
diff --git a/buildroot/package/gstreamer/gst-ffmpeg/Config.in b/buildroot/package/gstreamer/gst-ffmpeg/Config.in
index 1e95d016f..32bfdd53c 100644
--- a/buildroot/package/gstreamer/gst-ffmpeg/Config.in
+++ b/buildroot/package/gstreamer/gst-ffmpeg/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_GST_FFMPEG
 	depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
 	# triggers https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65151 on sh
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180
 	select BR2_PACKAGE_GST_PLUGINS_BASE
 	help
 	  GStreamer plugin containing one plugin with a set of
@@ -29,6 +28,3 @@ endif
 
 comment "gst-ffmpeg needs a toolchain w/ gcc >= 5"
 	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 && BR2_sh
-
-comment "gst-ffmpeg needs a toolchain not affected by GCC bug 85180"
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180
diff --git a/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index 6f41efb0a..0d584a15b 100644
--- a/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -90,6 +90,14 @@ ifeq ($(BR2_STATIC_LIBS),)
 GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic
 endif
 
+GST_FFMPEG_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-optimizations
+GST_FFMPEG_CFLAGS += -O0
+endif
+
+GST_FFMPEG_CONF_ENV += CFLAGS="$(GST_FFMPEG_CFLAGS)"
 GST_FFMPEG_CONF_OPTS += --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)"
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/gstreamer/gst-plugins-bad/Config.in b/buildroot/package/gstreamer/gst-plugins-bad/Config.in
index 7bbd56a60..411e4b617 100644
--- a/buildroot/package/gstreamer/gst-plugins-bad/Config.in
+++ b/buildroot/package/gstreamer/gst-plugins-bad/Config.in
@@ -242,10 +242,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M
 
 comment "plugins with external dependencies (there may be more available)"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
-	bool "apexsink"
-	select BR2_PACKAGE_OPENSSL
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2
 	bool "bz2"
 	select BR2_PACKAGE_BZIP2
@@ -324,14 +320,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR
 	bool "zbar"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l
 	depends on BR2_USE_MMU # zbar-> libv4l
-	depends on !BR2_STATIC_LIBS # zbar-> libv4l
 	depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # zbar-> libv4l
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # zbar
 	select BR2_PACKAGE_ZBAR
 
-comment "zbar plugin needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0"
+comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.17"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
-		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	depends on !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
 
 endif
diff --git a/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
index b9416db34..a98eac423 100644
--- a/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
+++ b/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
@@ -12,7 +12,9 @@ GST_PLUGINS_BAD_LICENSE = LGPL-2.1+, GPL-2.0+
 GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING
 
 GST_PLUGINS_BAD_CONF_OPTS = \
-	--disable-examples
+	--disable-apexsink \
+	--disable-examples \
+	--disable-spandsp
 
 GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer
 
@@ -471,13 +473,6 @@ GST_PLUGINS_BAD_CONF_OPTS += --disable-y4m
 endif
 
 # plugins with deps
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK),y)
-GST_PLUGINS_BAD_CONF_OPTS += --enable-apexsink
-GST_PLUGINS_BAD_DEPENDENCIES += openssl
-else
-GST_PLUGINS_BAD_CONF_OPTS += --disable-apexsink
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y)
 GST_PLUGINS_BAD_CONF_OPTS += --enable-bz2
 GST_PLUGINS_BAD_DEPENDENCIES += bzip2
diff --git a/buildroot/package/gstreamer1/Config.in b/buildroot/package/gstreamer1/Config.in
index 28b1ed25c..922ecefcf 100644
--- a/buildroot/package/gstreamer1/Config.in
+++ b/buildroot/package/gstreamer1/Config.in
@@ -11,6 +11,7 @@ source "package/gstreamer1/gst1-imx/Config.in"
 source "package/gstreamer1/gst1-interpipe/Config.in"
 source "package/gstreamer1/gst1-libav/Config.in"
 source "package/gstreamer1/gst1-rtsp-server/Config.in"
+source "package/gstreamer1/gst1-shark/Config.in"
 source "package/gstreamer1/gst1-validate/Config.in"
 source "package/gstreamer1/gst1-vaapi/Config.in"
 source "package/gstreamer1/gst-omx/Config.in"
diff --git a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk
index 5dda1eb14..bb325ad1d 100644
--- a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk
+++ b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk
@@ -12,26 +12,26 @@ GST_OMX_LICENSE = LGPL-2.1
 GST_OMX_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-GST_OMX_CONF_OPTS = \
-	--with-omx-target=rpi
+GST_OMX_VARIANT = rpi
 GST_OMX_CONF_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) \
 		-I$(STAGING_DIR)/usr/include/IL \
 		-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
 		-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
-endif
-
-ifeq ($(BR2_PACKAGE_BELLAGIO),y)
-GST_OMX_CONF_OPTS = \
-	--with-omx-target=bellagio
+else ifeq ($(BR2_PACKAGE_BELLAGIO),y)
+GST_OMX_VARIANT = bellagio
 GST_OMX_CONF_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) \
 		-DOMX_VERSION_MAJOR=1 \
 		-DOMX_VERSION_MINOR=1 \
 		-DOMX_VERSION_REVISION=2 \
 		-DOMX_VERSION_STEP=0"
+else
+GST_OMX_VARIANT = generic
 endif
 
+GST_OMX_CONF_OPTS += --with-omx-target=$(GST_OMX_VARIANT)
+
 GST_OMX_DEPENDENCIES = gstreamer1 gst1-plugins-base libopenmax
 
 # adjust library paths to where buildroot installs them
diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/0001-fdkaacenc-Remove-MODE_2_1.patch b/buildroot/package/gstreamer1/gst1-plugins-bad/0001-fdkaacenc-Remove-MODE_2_1.patch
new file mode 100644
index 000000000..a9c5d44d9
--- /dev/null
+++ b/buildroot/package/gstreamer1/gst1-plugins-bad/0001-fdkaacenc-Remove-MODE_2_1.patch
@@ -0,0 +1,32 @@
+From f4fdb9770c76113f38515245fecc5f11b3ace20d Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Tue, 4 Dec 2018 17:54:42 +0100
+Subject: [PATCH] fdkaacenc: Remove MODE_2_1
+
+This is not a standard mode and no longer supported by fdk-aac 2.0.0.
+
+For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825
+
+Signed-off-by: Peter Korsgaard 
+---
+ ext/fdkaac/gstfdkaacenc.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/ext/fdkaac/gstfdkaacenc.c b/ext/fdkaac/gstfdkaacenc.c
+index ad2bcb492..8410e684c 100644
+--- a/ext/fdkaac/gstfdkaacenc.c
++++ b/ext/fdkaac/gstfdkaacenc.c
+@@ -71,10 +71,6 @@ static const struct
+   GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+           GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+           GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}}, {
+-    3, MODE_2_1, {
+-  GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+-          GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+-          GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
+     4, MODE_1_2_1, {
+   GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+           GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+-- 
+2.11.0
+
diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/0002-fdkaacdec-Use-WAV-channel-mapping-instead-of-interle.patch b/buildroot/package/gstreamer1/gst1-plugins-bad/0002-fdkaacdec-Use-WAV-channel-mapping-instead-of-interle.patch
new file mode 100644
index 000000000..004971426
--- /dev/null
+++ b/buildroot/package/gstreamer1/gst1-plugins-bad/0002-fdkaacdec-Use-WAV-channel-mapping-instead-of-interle.patch
@@ -0,0 +1,49 @@
+From 19d34f6b5e1633d5ec4bb2832c58470f0c829cab Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Wed, 5 Dec 2018 10:10:39 +0100
+Subject: [PATCH] fdkaacdec: Use WAV channel mapping instead of interleave
+ setting
+
+The latter is going away in libfdk-aac 2.0.0. Instead, MPEG-style output
+is always non-interleaved and WAV-style output is always interleaved.
+Earlier libfdk-aac also defaults interleaving accordingly.
+
+Since our reordering looks at the associated PCE indices instead of the
+actual channel order, we're agnostic to the mapping.
+
+For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825
+
+Signed-off-by: Peter Korsgaard 
+---
+ ext/fdkaac/gstfdkaacdec.c | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/ext/fdkaac/gstfdkaacdec.c b/ext/fdkaac/gstfdkaacdec.c
+index c27183752..f5136b334 100644
+--- a/ext/fdkaac/gstfdkaacdec.c
++++ b/ext/fdkaac/gstfdkaacdec.c
+@@ -151,17 +151,13 @@ gst_fdkaacdec_set_format (GstAudioDecoder * dec, GstCaps * caps)
+     gst_buffer_unref (codec_data);
+   }
+ 
++  /* Choose WAV channel mapping to get interleaving even with libfdk-aac 2.0.0
++   * The pChannelIndices retain the indices from the standard MPEG mapping so
++   * we're agnostic to the actual order. */
+   if ((err =
+           aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING,
+-              0)) != AAC_DEC_OK) {
+-    GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err);
+-    return FALSE;
+-  }
+-
+-  if ((err =
+-          aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_INTERLEAVED,
+               1)) != AAC_DEC_OK) {
+-    GST_ERROR_OBJECT (self, "Failed to set interleaved output: %d", err);
++    GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err);
+     return FALSE;
+   }
+ 
+-- 
+2.11.0
+
diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in b/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in
index a2ceeb903..f0a846116 100644
--- a/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -332,11 +332,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK
 	bool "decklink"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS # 
 	help
 	  Blackmagic Decklink plugin
 
-comment "decklink needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "decklink needs a toolchain w/ C++, dynamic library"
+	depends on !BR2_INSTALL_LIBSTDCPP  || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
 	bool "directfb"
diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/0001-gstrtspconnection-Security-loophole-making-heap-over.patch b/buildroot/package/gstreamer1/gst1-plugins-base/0001-gstrtspconnection-Security-loophole-making-heap-over.patch
new file mode 100644
index 000000000..de88f67a3
--- /dev/null
+++ b/buildroot/package/gstreamer1/gst1-plugins-base/0001-gstrtspconnection-Security-loophole-making-heap-over.patch
@@ -0,0 +1,31 @@
+From f672277509705c4034bc92a141eefee4524d15aa Mon Sep 17 00:00:00 2001
+From: Tobias Ronge 
+Date: Thu, 14 Mar 2019 10:12:27 +0100
+Subject: [PATCH] gstrtspconnection: Security loophole making heap overflow
+
+The former code allowed an attacker to create a heap overflow by
+sending a longer than allowed session id in a response and including a
+semicolon to change the maximum length. With this change, the parser
+will never go beyond 512 bytes.
+
+Signed-off-by: Peter Korsgaard 
+---
+ gst-libs/gst/rtsp/gstrtspconnection.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
+index a6755bedd..c0429064a 100644
+--- a/gst-libs/gst/rtsp/gstrtspconnection.c
++++ b/gst-libs/gst/rtsp/gstrtspconnection.c
+@@ -2461,7 +2461,7 @@ build_next (GstRTSPBuilder * builder, GstRTSPMessage * message,
+           maxlen = sizeof (conn->session_id) - 1;
+           /* the sessionid can have attributes marked with ;
+            * Make sure we strip them */
+-          for (i = 0; session_id[i] != '\0'; i++) {
++          for (i = 0; i < maxlen && session_id[i] != '\0'; i++) {
+             if (session_id[i] == ';') {
+               maxlen = i;
+               /* parse timeout */
+-- 
+2.11.0
+
diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index fb976f9a9..5b7db0814 100644
--- a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -11,7 +11,6 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES
 GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB
 GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+
 
-# gio_unix_2_0 is only used for tests
 GST1_PLUGINS_BASE_CONF_OPTS = \
 	--disable-examples \
 	--disable-valgrind \
diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
index 2f9b204e9..25546258c 100644
--- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -46,7 +46,7 @@ else
 GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGL1_PLUGIN_XINGMUX),y)
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y)
 GST1_PLUGINS_UGLY_CONF_OPTS += --enable-xingmux
 else
 GST1_PLUGINS_UGLY_CONF_OPTS += --disable-xingmux
diff --git a/buildroot/package/gstreamer1/gst1-shark/Config.in b/buildroot/package/gstreamer1/gst1-shark/Config.in
new file mode 100644
index 000000000..ad6b6fb9b
--- /dev/null
+++ b/buildroot/package/gstreamer1/gst1-shark/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_GST1_SHARK
+	bool "gst1-shark"
+	select BR2_PACKAGE_GSTREAMER1_CHECK
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
+	select BR2_PACKAGE_GSTREAMER1_GST_DEBUG # gst_debug_log_valist, GST_CAT_STATES
+	help
+	  GstShark leverages GStreamers newest instrumentation subsystem
+	  by installing a set of custom hooks to the trace points. A
+	  variety of data analytics are extracted and presented to the
+	  user in a graphical, friendly way.
+
+	  https://github.com/RidgeRun/gst-shark
diff --git a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash
new file mode 100644
index 000000000..fdcbc563a
--- /dev/null
+++ b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash
@@ -0,0 +1,5 @@
+# locally computed hash
+sha256 35c56b89c10f42c623f5831f9533e1b9dcab8946eff0e4000bf3137bad5c705a  gst1-shark-v0.5.5.tar.gz
+
+# Hashes for license files:
+sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b  COPYING
diff --git a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk
new file mode 100644
index 000000000..1e198f0cd
--- /dev/null
+++ b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk
@@ -0,0 +1,19 @@
+################################################################################
+#
+# gst1-shark
+#
+################################################################################
+
+GST1_SHARK_VERSION = v0.5.5
+GST1_SHARK_SITE =  https://github.com/RidgeRun/gst-shark.git
+GST1_SHARK_SITE_METHOD = git
+GST1_SHARK_GIT_SUBMODULES = YES
+
+GST1_SHARK_LICENSE = LGPL-2.1+
+GST1_SHARK_LICENSE_FILES = COPYING
+
+GST1_SHARK_AUTORECONF = YES
+GST1_SHARK_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base
+GST1_SHARK_CONF_OPTS = --disable-graphviz
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/gzip/gzip.mk b/buildroot/package/gzip/gzip.mk
index d48cb1aa1..8ac6ddd6e 100644
--- a/buildroot/package/gzip/gzip.mk
+++ b/buildroot/package/gzip/gzip.mk
@@ -12,6 +12,7 @@ GZIP_CONF_OPTS = --exec-prefix=/
 GZIP_LICENSE = GPL-3.0+
 GZIP_LICENSE_FILES = COPYING
 GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes
+HOST_GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes
 # configure substitutes $(SHELL) for the shell shebang in scripts like
 # gzexe. Unfortunately, the same $(SHELL) variable will also be used by
 # make to run its commands. Fortunately, /bin/sh is always a POSIX shell
@@ -21,3 +22,4 @@ GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes
 GZIP_CONF_ENV += ac_cv_path_shell=/bin/sh
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/buildroot/package/hackrf/Config.in b/buildroot/package/hackrf/Config.in
index 4fa27699c..b86790f2b 100644
--- a/buildroot/package/hackrf/Config.in
+++ b/buildroot/package/hackrf/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_HACKRF
 	bool "hackrf"
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE
+	select BR2_PACKAGE_FFTW
+	select BR2_PACKAGE_FFTW_SINGLE
 	select BR2_PACKAGE_LIBUSB
 	help
 	  Library and tools for accessing HackRF SDR boards.
@@ -11,6 +12,3 @@ config BR2_PACKAGE_HACKRF
 
 comment "hackrf needs a toolchain w/ threads, dynamic library"
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
-
-comment "hackrf needs fftw's single precision"
-	depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE
diff --git a/buildroot/package/hackrf/hackrf.mk b/buildroot/package/hackrf/hackrf.mk
index acab0be1d..b83f6518e 100644
--- a/buildroot/package/hackrf/hackrf.mk
+++ b/buildroot/package/hackrf/hackrf.mk
@@ -9,7 +9,7 @@ HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VER
 HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz
 HACKRF_LICENSE = GPL-2.0+ BSD-3c
 HACKRF_LICENSE_FILES = COPYING
-HACKRF_DEPENDENCIES = fftw libusb
+HACKRF_DEPENDENCIES = fftw-single libusb
 HACKRF_SUBDIR = host
 HACKRF_INSTALL_STAGING = YES
 
diff --git a/buildroot/package/haproxy/0001-Allow-configuration-of-pcre-config-path.patch b/buildroot/package/haproxy/0001-Allow-configuration-of-pcre-config-path.patch
deleted file mode 100644
index 21f36520d..000000000
--- a/buildroot/package/haproxy/0001-Allow-configuration-of-pcre-config-path.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f3dcdf6c9ffea4d9b89dca9706a48c44bd76c470 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Fri, 28 Sep 2018 19:21:26 +0200
-Subject: [PATCH] Allow configuration of pcre-config path
-
-Add PCRE_CONFIGDIR variable to allow the user to configure path of
-pcre-config or pcre-config2 instead of using the one in his path.
-This is particular useful when cross-compiling.
-
-Signed-off-by: Fabrice Fontaine 
----
- Makefile | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 382f944f..7c31f1ba 100644
---- a/Makefile
-+++ b/Makefile
-@@ -78,6 +78,7 @@
- # Other variables :
- #   DLMALLOC_SRC   : build with dlmalloc, indicate the location of dlmalloc.c.
- #   DLMALLOC_THRES : should match PAGE_SIZE on every platform (default: 4096).
-+#   PCRE_CONFIGDIR : force the path to pcre-config or pcre-config2
- #   PCREDIR        : force the path to libpcre.
- #   PCRE_LIB       : force the lib path to libpcre (defaults to $PCREDIR/lib).
- #   PCRE_INC       : force the include path to libpcre ($PCREDIR/inc)
-@@ -734,7 +735,7 @@ endif
- # Forcing PCREDIR to an empty string will let the compiler use the default
- # locations.
- 
--PCREDIR	        := $(shell pcre-config --prefix 2>/dev/null || echo /usr/local)
-+PCREDIR	        := $(shell $(PCRE_CONFIGDIR)pcre-config --prefix 2>/dev/null || echo /usr/local)
- ifneq ($(PCREDIR),)
- PCRE_INC        := $(PCREDIR)/include
- PCRE_LIB        := $(PCREDIR)/lib
-@@ -759,7 +760,7 @@ endif
- endif
- 
- ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$(USE_PCRE2_JIT),)
--PCRE2DIR	:= $(shell pcre2-config --prefix 2>/dev/null || echo /usr/local)
-+PCRE2DIR	:= $(shell $(PCRE_CONFIGDIR)pcre2-config --prefix 2>/dev/null || echo /usr/local)
- ifneq ($(PCRE2DIR),)
- PCRE2_INC       := $(PCRE2DIR)/include
- PCRE2_LIB       := $(PCRE2DIR)/lib
-@@ -777,7 +778,7 @@ endif
- endif
- 
- 
--PCRE2_LDFLAGS	:= $(shell pcre2-config --libs$(PCRE2_WIDTH) 2>/dev/null || echo -L/usr/local/lib -lpcre2-$(PCRE2_WIDTH))
-+PCRE2_LDFLAGS	:= $(shell $(PCRE_CONFIGDIR)pcre2-config --libs$(PCRE2_WIDTH) 2>/dev/null || echo -L/usr/local/lib -lpcre2-$(PCRE2_WIDTH))
- 
- ifeq ($(PCRE2_LDFLAGS),)
- $(error libpcre2-$(PCRE2_WIDTH) not found)
--- 
-2.17.1
-
diff --git a/buildroot/package/haproxy/Config.in b/buildroot/package/haproxy/Config.in
index cbcbc0c38..670de5a3e 100644
--- a/buildroot/package/haproxy/Config.in
+++ b/buildroot/package/haproxy/Config.in
@@ -1,5 +1,16 @@
+config BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS
+	bool
+	default y
+	# internal compiler error: in do_output_reload, at reload1.c:7978
+	depends on !BR2_microblaze
+	# src/proto_http.c:6330:1: internal compiler error: Segmentation fault
+	depends on !BR2_nios2
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60040
+	depends on !(BR2_sh4 && !BR2_TOOLCHAIN_GCC_AT_LEAST_7)
+
 config BR2_PACKAGE_HAPROXY
 	bool "haproxy"
+	depends on BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics
 	help
diff --git a/buildroot/package/haproxy/haproxy.hash b/buildroot/package/haproxy/haproxy.hash
index f62c34094..be3451d83 100644
--- a/buildroot/package/haproxy/haproxy.hash
+++ b/buildroot/package/haproxy/haproxy.hash
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256	b17e402578be85e58af7a3eac99b1f675953bea9f67af2e964cf8bdbd1bd3fdf	haproxy-1.8.14.tar.gz
+sha256	ad46312fa1e38763863807d2c9304551c28ad91cff83f0c21a36756913c1c8e1	haproxy-1.9.1.tar.gz
 sha256	0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28	LICENSE
 sha256	5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a	doc/lgpl.txt
 sha256	ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7	doc/gpl.txt
diff --git a/buildroot/package/haproxy/haproxy.mk b/buildroot/package/haproxy/haproxy.mk
index 061a8cbba..e382f61f8 100644
--- a/buildroot/package/haproxy/haproxy.mk
+++ b/buildroot/package/haproxy/haproxy.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-HAPROXY_VERSION_MAJOR = 1.8
-HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).14
+HAPROXY_VERSION_MAJOR = 1.9
+HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).1
 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src
 HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions
 HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt
@@ -48,12 +48,12 @@ endif
 ifeq ($(BR2_PACKAGE_PCRE2),y)
 HAPROXY_DEPENDENCIES += pcre2
 HAPROXY_MAKE_OPTS += \
-	PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \
+	PCRE2_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config \
 	USE_PCRE2=1
 else ifeq ($(BR2_PACKAGE_PCRE),y)
 HAPROXY_DEPENDENCIES += pcre
 HAPROXY_MAKE_OPTS += \
-	PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \
+	PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config \
 	USE_PCRE=1
 endif
 
diff --git a/buildroot/package/haveged/S21haveged b/buildroot/package/haveged/S21haveged
old mode 100755
new mode 100644
diff --git a/buildroot/package/hiredis/hiredis.hash b/buildroot/package/hiredis/hiredis.hash
index 682ec6d2b..7478ae0f2 100644
--- a/buildroot/package/hiredis/hiredis.hash
+++ b/buildroot/package/hiredis/hiredis.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256	717e6fc8dc2819bef522deaca516de9e51b9dfa68fe393b7db5c3b6079196f78	hiredis-v0.13.3.tar.gz
+sha256	042f965e182b80693015839a9d0278ae73fae5d5d09d8bf6d0e6a39a8c4393bd	hiredis-v0.14.0.tar.gz
 sha256	dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb	COPYING
diff --git a/buildroot/package/hiredis/hiredis.mk b/buildroot/package/hiredis/hiredis.mk
index dd7574222..e187aed52 100644
--- a/buildroot/package/hiredis/hiredis.mk
+++ b/buildroot/package/hiredis/hiredis.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-HIREDIS_VERSION_MAJOR = 0.13
-HIREDIS_VERSION = v$(HIREDIS_VERSION_MAJOR).3
+HIREDIS_VERSION_MAJOR = 0.14
+HIREDIS_VERSION = v$(HIREDIS_VERSION_MAJOR).0
 HIREDIS_SITE = $(call github,redis,hiredis,$(HIREDIS_VERSION))
 HIREDIS_LICENSE = BSD-3-Clause
 HIREDIS_LICENSE_FILES = COPYING
diff --git a/buildroot/package/hostapd/hostapd.hash b/buildroot/package/hostapd/hostapd.hash
index 588879f65..8901aa43b 100644
--- a/buildroot/package/hostapd/hostapd.hash
+++ b/buildroot/package/hostapd/hostapd.hash
@@ -1,5 +1,20 @@
 # Locally calculated
-sha256  01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d  hostapd-2.6.tar.gz
+sha256  21b0dda3cc3abe75849437f6b9746da461f88f0ea49dd621216936f87440a141  hostapd-2.7.tar.gz
+sha256  86979655f1c5a9578acbf83e8acdf69a36dcc0966a8819f3b6918530ad3e0c67  0001-OpenSSL-Use-constant-time-operations-for-private-big.patch
+sha256  5663da175ecc344c90bea8c95ab831ad47a8002ccbb834f6c091705b92e90e71  0002-Add-helper-functions-for-constant-time-operations.patch
+sha256  e5a6bc9f587351d4495740239ceb0a64958a59b3e875722dcaeb4c93fa517f64  0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch
+sha256  aa5b722bebbaf175ff89a3653c3d048afe0d0f866989fca6b4c8e882a864392a  0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch
+sha256  bad9eeaeb118f88303a7a718820b3ba03d705e99b6183b3c44556bedf99db423  0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch
+sha256  ae7be450f652f6f77ad868856ab61ba6cb6d7e768585cf5f9f9f674a66e05b40  0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch
+sha256  86b731c787ca58ac001d20fb769b136e2ca76bf81a8465a8e72c50573cfc4b09  0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch
+sha256  ff7305005217a34818dae247886b9fb1b1db781ab31fb5eac9ebdd9cb0d1edfe  0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch
+sha256  707057cc0e60fe763350f82135dbe407bc289a4958879c8ff1e9413243a1caa4  0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch
+sha256  82d8ae4fabfe3674bcb5412befe3a74e40d6485906589c219be72e4fd1e70baa  0010-SAE-Fix-confirm-message-validation-in-error-cases.patch
+sha256  ff8d6d92ad4b01987be63cdaf67a24d2eba5b3cd654f37664a8a198e501c0e3b  0011-EAP-pwd-server-Verify-received-scalar-and-element.patch
+sha256  d5ebf4e5a810e9a0c035f9268195c542273998ea70fd58697ee25965094062cc  0012-EAP-pwd-server-Detect-reflection-attacks.patch
+sha256  7156656498f03b24a0b69a26a59d17a9fcc8e76761f1dabe6d13b4176ffd2ef8  0013-EAP-pwd-client-Verify-received-scalar-and-element.patch
+sha256  69926854ec2a79dada290f79f04202764c5d6400d232e3a567ebe633a02c1c66  0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch
+sha256	cba82a051a39c48872250b2e85ca8ebc628cfe75a9ccec29f3e994abd4156152  0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch
+sha256	dc0e015463e1fd1f230795e1a49ddd1b9d00e726cd9f38846d0f4892d7978162  0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch
 sha256  e204da659d0583c71af23cb9b55536fe99598ee26a44104344f456e4d17350c6  rtlxdrv.patch
-sha256  529113cc81256c6178f3c1cf25dd8d3f33e6d770e4a180bd31c6ab7e4917f40b  rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
-sha256  147c8abe07606905d16404fb2d2c8849796ca7c85ed8673c09bb50038bcdeb9e  rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
+sha256  76eeecd8fc291a71f29189ea20e6a34387b8048a959cbc6a65c41b98194643a2  README
diff --git a/buildroot/package/hostapd/hostapd.mk b/buildroot/package/hostapd/hostapd.mk
index fa8226805..550f88720 100644
--- a/buildroot/package/hostapd/hostapd.mk
+++ b/buildroot/package/hostapd/hostapd.mk
@@ -4,11 +4,25 @@
 #
 ################################################################################
 
-HOSTAPD_VERSION = 2.6
+HOSTAPD_VERSION = 2.7
 HOSTAPD_SITE = http://w1.fi/releases
 HOSTAPD_PATCH = \
-	http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch \
-	http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
+	https://w1.fi/security/2019-1/0001-OpenSSL-Use-constant-time-operations-for-private-big.patch \
+	https://w1.fi/security/2019-1/0002-Add-helper-functions-for-constant-time-operations.patch \
+	https://w1.fi/security/2019-1/0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch \
+	https://w1.fi/security/2019-2/0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch \
+	https://w1.fi/security/2019-1/0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch \
+	https://w1.fi/security/2019-1/0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch \
+	https://w1.fi/security/2019-1/0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch \
+	https://w1.fi/security/2019-1/0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch \
+	https://w1.fi/security/2019-1/0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch \
+	https://w1.fi/security/2019-3/0010-SAE-Fix-confirm-message-validation-in-error-cases.patch \
+	https://w1.fi/security/2019-4/0011-EAP-pwd-server-Verify-received-scalar-and-element.patch \
+	https://w1.fi/security/2019-4/0012-EAP-pwd-server-Detect-reflection-attacks.patch \
+	https://w1.fi/security/2019-4/0013-EAP-pwd-client-Verify-received-scalar-and-element.patch \
+	https://w1.fi/security/2019-4/0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch \
+	https://w1.fi/security/2019-5/0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch \
+	https://w1.fi/security/2019-5/0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch
 HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_DEPENDENCIES = host-pkgconf
@@ -23,8 +37,8 @@ HOSTAPD_CONFIG_DISABLE =
 
 # Try to use openssl if it's already available
 ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
-HOSTAPD_DEPENDENCIES += libopenssl
-HOSTAPD_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz)
+HOSTAPD_DEPENDENCIES += host-pkgconf libopenssl
+HOSTAPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
 else
 HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD
diff --git a/buildroot/package/httping/httping.mk b/buildroot/package/httping/httping.mk
index 955ee3131..b3a625a8e 100644
--- a/buildroot/package/httping/httping.mk
+++ b/buildroot/package/httping/httping.mk
@@ -17,9 +17,9 @@ HTTPING_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
-	$(if $(BR2_PACKAGE_FFTW),fftw)
+	$(if $(BR2_PACKAGE_FFTW_DOUBLE),fftw-double)
 HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
-	FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \
+	FW=$(if $(BR2_PACKAGE_FFTW_DOUBLE),yes,no) \
 	NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \
 	SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
 	TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \
diff --git a/buildroot/package/i2c-tools/0001-lib-Module.mk-Add-missing-dependencies.patch b/buildroot/package/i2c-tools/0001-lib-Module.mk-Add-missing-dependencies.patch
deleted file mode 100644
index 09a78dae0..000000000
--- a/buildroot/package/i2c-tools/0001-lib-Module.mk-Add-missing-dependencies.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a6a59693066fd8da81f7107479df3e32a129247d Mon Sep 17 00:00:00 2001
-From: Jean Delvare 
-Date: Wed, 6 Dec 2017 09:55:04 +0100
-Subject: [PATCH] lib/Module.mk: Add missing dependencies
-
-The lib symlinks lacked a dependency to the actual library file, so
-parallel builds could run into a race and break.
-
-Signed-off-by: Angelo Compagnucci 
----
- lib/Module.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 432a051..fd2c8c4 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -42,11 +42,11 @@ endif
- $(LIB_DIR)/$(LIB_SHLIBNAME): $(LIB_DIR)/smbus.o
- 	$(CC) -shared $(LDFLAGS) -Wl,--version-script=$(LIB_DIR)/libi2c.map -Wl,-soname,$(LIB_SHSONAME) -o $@ $^ -lc
- 
--$(LIB_DIR)/$(LIB_SHSONAME):
-+$(LIB_DIR)/$(LIB_SHSONAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
- 	$(RM) $@
- 	$(LN) $(LIB_SHLIBNAME) $@
- 
--$(LIB_DIR)/$(LIB_SHBASENAME):
-+$(LIB_DIR)/$(LIB_SHBASENAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
- 	$(RM) $@
- 	$(LN) $(LIB_SHLIBNAME) $@
- 
--- 
-2.7.4
-
diff --git a/buildroot/package/i2c-tools/0002-Makefile-Add-flag-to-disable-dynamic-library.patch b/buildroot/package/i2c-tools/0002-Makefile-Add-flag-to-disable-dynamic-library.patch
deleted file mode 100644
index b5ec5471d..000000000
--- a/buildroot/package/i2c-tools/0002-Makefile-Add-flag-to-disable-dynamic-library.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9906b2ecb6aec02d6348d6237b784135e6930d0b Mon Sep 17 00:00:00 2001
-From: Angelo Compagnucci 
-Date: Wed, 6 Dec 2017 10:12:07 +0100
-Subject: Makefile: Add flag to disable dynamic library
-
-In such cases where you need to disable entirely the dynamic
-library compilation, now you can use the BUILD_DYNAMIC_LIB=0
-flag.
-
-Signed-off-by: Angelo Compagnucci 
-Signed-off-by: Jean Delvare 
----
- Makefile      | 10 +++++++++-
- lib/Module.mk |  6 +++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c85317c..1bb5572 100644
---- a/Makefile
-+++ b/Makefile
-@@ -32,12 +32,20 @@ CFLAGS		?= -O2
- CFLAGS		+= -Wall
- SOCFLAGS	:= -fpic -D_REENTRANT $(CFLAGS)
- 
--USE_STATIC_LIB ?= 0
-+BUILD_DYNAMIC_LIB ?= 1
- BUILD_STATIC_LIB ?= 1
-+USE_STATIC_LIB ?= 0
-+
- ifeq ($(USE_STATIC_LIB),1)
- BUILD_STATIC_LIB := 1
- endif
- 
-+ifeq ($(BUILD_DYNAMIC_LIB),0)
-+ifeq ($(BUILD_STATIC_LIB),0)
-+$(error BUILD_DYNAMIC_LIB and BUILD_STATIC_LIB cannot be disabled at the same time)
-+endif
-+endif
-+
- KERNELVERSION	:= $(shell uname -r)
- 
- .PHONY: all strip clean install uninstall
-diff --git a/lib/Module.mk b/lib/Module.mk
-index fd2c8c4..44fa938 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -27,9 +27,13 @@ LIB_SHSONAME	:= $(LIB_SHBASENAME).$(LIB_MAINVER)
- LIB_SHLIBNAME	:= $(LIB_SHBASENAME).$(LIB_VER)
- LIB_STLIBNAME	:= libi2c.a
- 
--LIB_TARGETS	:= $(LIB_SHLIBNAME)
- LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
- LIB_OBJECTS	:= smbus.o
-+
-+LIB_TARGETS	:=
-+ifeq ($(BUILD_DYNAMIC_LIB),1)
-+LIB_TARGETS	+= $(LIB_SHLIBNAME)
-+endif
- ifeq ($(BUILD_STATIC_LIB),1)
- LIB_TARGETS	+= $(LIB_STLIBNAME)
- LIB_OBJECTS	+= smbus.ao
--- 
-2.7.4
-
diff --git a/buildroot/package/i2c-tools/0003-lib-Module.mk-Drop-unused-variable-LIB_OBJECTS.patch b/buildroot/package/i2c-tools/0003-lib-Module.mk-Drop-unused-variable-LIB_OBJECTS.patch
deleted file mode 100644
index 43c915c20..000000000
--- a/buildroot/package/i2c-tools/0003-lib-Module.mk-Drop-unused-variable-LIB_OBJECTS.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1831b618fbedf0bcf15b0465981d133d9e3c53ee Mon Sep 17 00:00:00 2001
-From: Jean Delvare 
-Date: Wed, 6 Dec 2017 10:46:56 +0100
-Subject: lib/Module.mk: Drop unused variable LIB_OBJECTS
-
-Signed-off-by: Angelo Compagnucci 
----
- lib/Module.mk | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 44fa938..8a58f5b 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -28,7 +28,6 @@ LIB_SHLIBNAME	:= $(LIB_SHBASENAME).$(LIB_VER)
- LIB_STLIBNAME	:= libi2c.a
- 
- LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
--LIB_OBJECTS	:= smbus.o
- 
- LIB_TARGETS	:=
- ifeq ($(BUILD_DYNAMIC_LIB),1)
-@@ -36,7 +35,6 @@ LIB_TARGETS	+= $(LIB_SHLIBNAME)
- endif
- ifeq ($(BUILD_STATIC_LIB),1)
- LIB_TARGETS	+= $(LIB_STLIBNAME)
--LIB_OBJECTS	+= smbus.ao
- endif
- 
- #
--- 
-2.7.4
-
diff --git a/buildroot/package/i2c-tools/0004-tools-Module.mk-Add-missing-dependencies.patch b/buildroot/package/i2c-tools/0004-tools-Module.mk-Add-missing-dependencies.patch
deleted file mode 100644
index d18090be0..000000000
--- a/buildroot/package/i2c-tools/0004-tools-Module.mk-Add-missing-dependencies.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 08b0d67ba7eceb862cb17f52eb1911e9579726ea Mon Sep 17 00:00:00 2001
-From: Jean Delvare 
-Date: Thu, 14 Dec 2017 08:52:26 +0100
-Subject: [PATCH] tools/Module.mk: Add missing dependencies
-
-Better build the library before building the tools which link against
-it, otherwise parallel builds could run into a race and break.
-
-Signed-off-by: Jean Delvare 
-Tested-by: Angelo Compagnucci 
-Acked-by: Angelo Compagnucci 
-Signed-off-by: Angelo Compagnucci 
----
- lib/Module.mk   |  7 +++++++
- tools/Module.mk | 10 +++++-----
- 2 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 8a58f5b..67afe91 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -37,6 +37,13 @@ ifeq ($(BUILD_STATIC_LIB),1)
- LIB_TARGETS	+= $(LIB_STLIBNAME)
- endif
- 
-+# Library file to link against (static or dynamic)
-+ifeq ($(USE_STATIC_LIB),1)
-+LIB_DEPS	:= $(LIB_DIR)/$(LIB_STLIBNAME)
-+else
-+LIB_DEPS	:= $(LIB_DIR)/$(LIB_SHBASENAME)
-+endif
-+
- #
- # Libraries
- #
-diff --git a/tools/Module.mk b/tools/Module.mk
-index 6421a23..609de7a 100644
---- a/tools/Module.mk
-+++ b/tools/Module.mk
-@@ -24,19 +24,19 @@ TOOLS_TARGETS	:= i2cdetect i2cdump i2cset i2cget i2ctransfer
- # Programs
- #
- 
--$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o
-+$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o $(LIB_DEPS)
- 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
- 
--$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
-+$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
- 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
- 
--$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
-+$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
- 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
- 
--$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
-+$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
- 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
- 
--$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
-+$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
- 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
- 
- #
--- 
-2.7.4
-
diff --git a/buildroot/package/i2c-tools/0005-lib-Module.mk-Fix-LIB_LINKS-dependency.patch b/buildroot/package/i2c-tools/0005-lib-Module.mk-Fix-LIB_LINKS-dependency.patch
deleted file mode 100644
index 37a8ebc6f..000000000
--- a/buildroot/package/i2c-tools/0005-lib-Module.mk-Fix-LIB_LINKS-dependency.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From de278d0933e3caea2508f95fd00e7e338bc12e8f Mon Sep 17 00:00:00 2001
-From: Angelo Compagnucci 
-Date: Thu, 14 Dec 2017 13:34:29 +0100
-Subject: lib/Module.mk: Fix LIB_LINKS dependency
-
-LIB_LINKS should be added as a dependency only when
-BUILD_DYNAMIC_LIB is enabled.
-
-Signed-off-by: Angelo Compagnucci 
-Signed-off-by: Jean Delvare 
-Fixes: 9906b2ecb6ae ("Makefile: Add flag to disable dynamic library"
----
- lib/Module.mk | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 67afe91..2ebc70d 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -27,10 +27,9 @@ LIB_SHSONAME	:= $(LIB_SHBASENAME).$(LIB_MAINVER)
- LIB_SHLIBNAME	:= $(LIB_SHBASENAME).$(LIB_VER)
- LIB_STLIBNAME	:= libi2c.a
- 
--LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
--
- LIB_TARGETS	:=
- ifeq ($(BUILD_DYNAMIC_LIB),1)
-+LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
- LIB_TARGETS	+= $(LIB_SHLIBNAME)
- endif
- ifeq ($(BUILD_STATIC_LIB),1)
--- 
-2.7.4
-
diff --git a/buildroot/package/i2c-tools/0006-Makefile-Allow-to-really-disable-the-dynamic-library.patch b/buildroot/package/i2c-tools/0006-Makefile-Allow-to-really-disable-the-dynamic-library.patch
deleted file mode 100644
index 85438cbf0..000000000
--- a/buildroot/package/i2c-tools/0006-Makefile-Allow-to-really-disable-the-dynamic-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 57d2c370493f2e9e33b30e8767624c648f138ec4 Mon Sep 17 00:00:00 2001
-From: Jean Delvare 
-Date: Thu, 14 Dec 2017 13:34:34 +0100
-Subject: Makefile: Allow to really disable the dynamic library
-
-If the user disables the build of the dynamic library, we have to
-link the tools with the static library. If we don't, the dependencies
-will cause the dynamic library to be built regardless of the user's
-request.
-
-Signed-off-by: Jean Delvare 
-Fixes: 9906b2ecb6ae ("Makefile: Add flag to disable dynamic library")
-Signed-off-by: Angelo Compagnucci 
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 1bb5572..6bb741f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -43,6 +43,8 @@ endif
- ifeq ($(BUILD_DYNAMIC_LIB),0)
- ifeq ($(BUILD_STATIC_LIB),0)
- $(error BUILD_DYNAMIC_LIB and BUILD_STATIC_LIB cannot be disabled at the same time)
-+else
-+USE_STATIC_LIB := 1
- endif
- endif
- 
--- 
-2.7.4
-
diff --git a/buildroot/package/i2c-tools/0007-eeprog-Module.mk-Add-missing-dependency.patch b/buildroot/package/i2c-tools/0007-eeprog-Module.mk-Add-missing-dependency.patch
deleted file mode 100644
index 126d38856..000000000
--- a/buildroot/package/i2c-tools/0007-eeprog-Module.mk-Add-missing-dependency.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f87c97317012a3b96b67237925893b8ffd5f4f50 Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" 
-Date: Tue, 19 Dec 2017 13:46:15 +0100
-Subject: [PATCH] eeprog/Module.mk: Add missing dependency
-
-Absence of this dependency caused parallel build to run into a race
-and break.
-
-Signed-off-by: Maxin B. John 
-Signed-off-by: Jean Delvare 
----
- eeprog/Module.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/eeprog/Module.mk b/eeprog/Module.mk
-index 9d36869..d215855 100644
---- a/eeprog/Module.mk
-+++ b/eeprog/Module.mk
-@@ -20,7 +20,7 @@ EEPROG_TARGETS	:= eeprog
- # Programs
- #
- 
--$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o
-+$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o $(LIB_DEPS)
- 	$(CC) $(LDFLAGS) -o $@ $^ $(EEPROG_LDFLAGS)
- 
- #
--- 
-2.7.4
-
diff --git a/buildroot/package/i2c-tools/0008-lib-Module.mk-don-t-install-dynamic-library-when-dis.patch b/buildroot/package/i2c-tools/0008-lib-Module.mk-don-t-install-dynamic-library-when-dis.patch
deleted file mode 100644
index 69410ce54..000000000
--- a/buildroot/package/i2c-tools/0008-lib-Module.mk-don-t-install-dynamic-library-when-dis.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ae2e0c9708aeb4a8fb301a1a4016cec7b05fc142 Mon Sep 17 00:00:00 2001
-From: Baruch Siach 
-Date: Tue, 2 Jan 2018 06:55:41 +0200
-Subject: [PATCH] lib/Module.mk: don't install dynamic library when disabled
-
-Do not attempt to install the dynamic library when build of that library
-is disabled. Fixes the following installation error:
-
-install -m 755 lib/libi2c.so.0.1.0 .../target/usr/lib
-install: cannot stat 'lib/libi2c.so.0.1.0': No such file or directory
-lib/Module.mk:90: recipe for target 'install-lib' failed
-
-Cc: Angelo Compagnucci 
-Signed-off-by: Baruch Siach 
----
-
-Patch status: posted upstream
-https://marc.info/?l=linux-i2c&m=151486925730634&w=2
-
- lib/Module.mk | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 2ebc70d76ed9..c492961e0a4a 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -88,9 +88,11 @@ clean-lib:
- 
- install-lib: $(addprefix $(LIB_DIR)/,$(LIB_TARGETS))
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-+ifeq ($(BUILD_DYNAMIC_LIB),1)
- 	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHLIBNAME) $(DESTDIR)$(libdir)
- 	$(LN) $(LIB_SHLIBNAME) $(DESTDIR)$(libdir)/$(LIB_SHSONAME)
- 	$(LN) $(LIB_SHSONAME) $(DESTDIR)$(libdir)/$(LIB_SHBASENAME)
-+endif
- ifeq ($(BUILD_STATIC_LIB),1)
- 	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STLIBNAME) $(DESTDIR)$(libdir)
- endif
--- 
-2.15.1
-
diff --git a/buildroot/package/i2c-tools/i2c-tools.hash b/buildroot/package/i2c-tools/i2c-tools.hash
index 37563074f..280a139c0 100644
--- a/buildroot/package/i2c-tools/i2c-tools.hash
+++ b/buildroot/package/i2c-tools/i2c-tools.hash
@@ -1,7 +1,7 @@
 # Locally computed
-sha256 d900ca1c11c51ea20caa50b096f948008b8a7ad832311b23353e21baa7af28d6  i2c-tools-4.0.tar.xz
+sha256 57b219efd183795bd545dd5a60d9eabbe9dcb6f8fb92bc7ba2122b87f98527d5  i2c-tools-4.1.tar.xz
 
 # License files
 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPL
-sha256 158abc6886c2c6e2dec7e9cb11b46fd41cb13a015c5057c2a587ef581f9142f8  README
+sha256 b75b04b46320dff5e2b50a9c69b8e526b7db5087083ea3ba65533f08fc11b9f0  README
diff --git a/buildroot/package/i2c-tools/i2c-tools.mk b/buildroot/package/i2c-tools/i2c-tools.mk
index 11d0cf980..d4d9c012f 100644
--- a/buildroot/package/i2c-tools/i2c-tools.mk
+++ b/buildroot/package/i2c-tools/i2c-tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-I2C_TOOLS_VERSION = 4.0
+I2C_TOOLS_VERSION = 4.1
 I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz
 I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools
 I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c)
@@ -59,13 +59,13 @@ endef
 
 define I2C_TOOLS_INSTALL_TARGET_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) \
-		DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install
+		DESTDIR="$(TARGET_DIR)" PREFIX=/usr -C $(@D) install
 	$(I2C_TOOLS_INSTALL_PYSMBUS)
 endef
 
 define I2C_TOOLS_INSTALL_STAGING_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) \
-		DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install
+		DESTDIR="$(STAGING_DIR)" PREFIX=/usr -C $(@D) install
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot/package/i2pd/i2pd.hash b/buildroot/package/i2pd/i2pd.hash
index 451ee006a..c3c9a48ec 100644
--- a/buildroot/package/i2pd/i2pd.hash
+++ b/buildroot/package/i2pd/i2pd.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256	e424c368f92be5050f3dd5e98ed9ce2ea8d6076e36444c99b96e3b10f69420b1	i2pd-2.20.0.tar.gz
+sha256	6547d7a560482c5eda9106ae19267bc8afbb6af48fed3bebf423ade28103e173	i2pd-2.22.0.tar.gz
 sha256	d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c	LICENSE
diff --git a/buildroot/package/i2pd/i2pd.mk b/buildroot/package/i2pd/i2pd.mk
index 8447f3e06..3ce5f97fb 100644
--- a/buildroot/package/i2pd/i2pd.mk
+++ b/buildroot/package/i2pd/i2pd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-I2PD_VERSION = 2.20.0
+I2PD_VERSION = 2.22.0
 I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION))
 I2PD_LICENSE = BSD-3-Clause
 I2PD_LICENSE_FILES = LICENSE
@@ -21,6 +21,10 @@ I2PD_CONF_OPTS += -DWITH_GUI=OFF
 # build failure when cross-compiling.
 I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
 
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+I2PD_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
+endif
+
 ifeq ($(BR2_STATIC_LIBS),y)
 I2PD_CONF_OPTS += -DWITH_STATIC=ON
 else
diff --git a/buildroot/package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch b/buildroot/package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch
new file mode 100644
index 000000000..c55b227c0
--- /dev/null
+++ b/buildroot/package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch
@@ -0,0 +1,94 @@
+From 8118c43a53271ba2dd31ce3913a3cd21bc7dcca7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sat, 16 Feb 2019 11:58:34 +0100
+Subject: [PATCH] ibrcommon/ssl/gcm: fix static build with openssl
+
+gf_mul is already defined in libcrypto (openssl) so rename it into
+ibrdtn_gf_mul to fix following build failure:
+
+/home/buildroot/autobuild/instance-3/output/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libcrypto.a(f_impl.o): In function `gf_mul':
+f_impl.c:(.text+0x0): multiple definition of `gf_mul'
+/home/buildroot/autobuild/instance-3/output/host/arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libibrcommon.a(gf128mul.o):gf128mul.cpp:(.text+0x30): first defined here
+collect2: error: ld returned 1 exit status
+Makefile:560: recipe for target 'dtnd' failed
+
+Fixes:
+ - http://autobuild.buildroot.org/results/1d3b4b6cf043a3e185ce758b617a0a18c3d36cdb
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/ibrdtn/ibrdtn/pull/269]
+---
+ ibrcommon/ibrcommon/ssl/gcm/gcm.cpp      | 10 +++++-----
+ ibrcommon/ibrcommon/ssl/gcm/gf128mul.cpp |  2 +-
+ ibrcommon/ibrcommon/ssl/gcm/gf128mul.h   |  2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ibrcommon/ssl/gcm/gcm.cpp b/ibrcommon/ssl/gcm/gcm.cpp
+index 8a5745b4..6097b43e 100644
+--- a/ibrcommon/ssl/gcm/gcm.cpp
++++ b/ibrcommon/ssl/gcm/gcm.cpp
+@@ -89,7 +89,7 @@ ret_type gcm_init_and_key(                      /* initialise mode and set key
+ #elif defined( TABLES_256 )
+ #define gf_mul_hh(a, ctx, scr)  gf_mul_256(a, ctx->gf_t256, scr)
+ #else
+-#define gf_mul_hh(a, ctx, scr)  gf_mul(a, ui8_ptr(ctx->ghash_h))
++#define gf_mul_hh(a, ctx, scr)  ibrdtn_gf_mul(a, ui8_ptr(ctx->ghash_h))
+ #endif
+ 
+ ret_type gcm_init_message(                      /* initialise a new message     */
+@@ -334,9 +334,9 @@ ret_type gcm_compute_tag(                       /* compute authentication tag
+         memcpy(tbuf, ctx->ghash_h, BLOCK_SIZE);
+         for( ; ; )
+         {
+-            if(ln & 1) gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
++            if(ln & 1) ibrdtn_gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
+             if(!(ln >>= 1)) break;
+-            gf_mul(tbuf, tbuf);
++            ibrdtn_gf_mul(tbuf, tbuf);
+         }
+     }
+ #else   /* this one seems slower on x86 and x86_64 :-( */
+@@ -348,12 +348,12 @@ ret_type gcm_compute_tag(                       /* compute authentication tag
+         tbuf[0] = 0x80;
+         while(i)
+         {
+-            gf_mul(tbuf, tbuf);
++            ibrdtn_gf_mul(tbuf, tbuf);
+             if(i & ln)
+                 gf_mul_hh(tbuf, ctx, scratch);
+             i >>= 1;
+         }
+-        gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
++        ibrdtn_gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
+     }
+ #endif
+     i = BLOCK_SIZE; ln = (uint_32t)(ctx->txt_acnt << 3);
+diff --git a/ibrcommon/ssl/gcm/gf128mul.cpp b/ibrcommon/ssl/gcm/gf128mul.cpp
+index a553a044..d0c460c3 100644
+--- a/ibrcommon/ssl/gcm/gf128mul.cpp
++++ b/ibrcommon/ssl/gcm/gf128mul.cpp
+@@ -103,7 +103,7 @@
+ 
+ const unsigned short gf_tab[256] = gf_dat(xda);
+ 
+-void gf_mul(void *a, const void* b)
++void ibrdtn_gf_mul(void *a, const void* b)
+ {   uint_32t r[GF_BYTE_LEN >> 2], p[8][GF_BYTE_LEN >> 2];
+     int i;
+ 
+diff --git a/ibrcommon/ssl/gcm/gf128mul.h b/ibrcommon/ssl/gcm/gf128mul.h
+index 4645c7fe..65fba54b 100644
+--- a/ibrcommon/ssl/gcm/gf128mul.h
++++ b/ibrcommon/ssl/gcm/gf128mul.h
+@@ -619,7 +619,7 @@ gf_inline void mul_x(void *r, const void *x)
+ 
+ /*  A slow generic version of gf_mul (a = a * b) */
+ 
+-void gf_mul(void *a, const void* b);
++void ibrdtn_gf_mul(void *a, const void* b);
+ 
+ /*  This version uses 64k bytes of table space on the stack.
+     A 16 byte buffer has to be multiplied by a 16 byte key
+-- 
+2.14.1
+
diff --git a/buildroot/package/ibrdtnd/0001-ibrdtnd-added-openssl-compatibility.patch b/buildroot/package/ibrdtnd/0001-ibrdtnd-added-openssl-compatibility.patch
new file mode 100644
index 000000000..8d100e2a2
--- /dev/null
+++ b/buildroot/package/ibrdtnd/0001-ibrdtnd-added-openssl-compatibility.patch
@@ -0,0 +1,205 @@
+From 8785fe0be66c8d6eaa94ffde921909a7ec220123 Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz 
+Date: Sat, 26 May 2018 23:44:54 -0300
+Subject: [PATCH] ibrdtnd: added openssl compatibility
+
+This patch adds compatibility with openssl 1.1.0 to ibrdtnd.
+
+Upstream: https://github.com/ibrdtn/ibrdtn/pull/265
+
+Signed-off-by: Eneas U de Queiroz 
+Signed-off-by: Matthew Weber 
+---
+ src/security/exchange/DHProtocol.cpp | 36 ++++++++++---
+ src/security/exchange/Makefile.am    |  2 +
+ src/security/exchange/openssl_compat.cpp       | 62 ++++++++++++++++++++++
+ src/security/exchange/openssl_compat.h  | 13 +++++
+ 4 files changed, 107 insertions(+), 6 deletions(-)
+ create mode 100644 src/security/exchange/openssl_compat.cpp
+ create mode 100644 src/security/exchange/openssl_compat.h
+
+diff --git a/src/security/exchange/DHProtocol.cpp b/src/security/exchange/DHProtocol.cpp
+index e94c502..3e0ad71 100644
+--- a/src/security/exchange/DHProtocol.cpp
++++ b/src/security/exchange/DHProtocol.cpp
+@@ -30,6 +30,7 @@
+ 
+ #include 
+ #include 
++#include "openssl_compat.h"
+ 
+ #define DH_KEY_LENGTH 1024
+ 
+@@ -132,6 +133,7 @@ namespace dtn
+ 
+ 		void DHProtocol::begin(KeyExchangeSession &session, KeyExchangeData &data)
+ 		{
++			const BIGNUM *pub_key, *p, *g;
+ 			// get session state
+ 			DHState &state = session.getState();
+ 
+@@ -159,9 +161,12 @@ namespace dtn
+ 			// prepare request
+ 			KeyExchangeData request(KeyExchangeData::REQUEST, session);
+ 
+-			write(request, state.dh->pub_key);
+-			write(request, state.dh->p);
+-			write(request, state.dh->g);
++			DH_get0_pqg(state.dh, &p, NULL, &g);
++			DH_get0_key(state.dh, &pub_key, NULL);
++
++			write(request, pub_key);
++			write(request, p);
++			write(request, g);
+ 
+ 			manager.submit(session, request);
+ 		}
+@@ -177,6 +182,15 @@ namespace dtn
+ 				{
+ 					if (data.getAction() == KeyExchangeData::REQUEST)
+ 					{
++						BIGNUM *p = BN_new();
++						BIGNUM *g = BN_new();
++						if (p == NULL || g == NULL)
++						{
++							BN_free(p);
++							BN_free(g);
++							throw ibrcommon::Exception("Error while allocating space for DH parameters");
++						}
++
+ 						BIGNUM* pub_key = BN_new();
+ 						read(data, &pub_key);
+ 
+@@ -184,8 +198,16 @@ namespace dtn
+ 						state.dh = DH_new();
+ 
+ 						// read p and g paramter from message
+-						read(data, &state.dh->p);
+-						read(data, &state.dh->g);
++						read(data, &p);
++						read(data, &g);
++
++						if (DH_set0_pqg(state.dh, p, NULL, g))
++						{
++							BN_free(p);
++							BN_free(g);
++							BN_free(pub_key);
++							throw ibrcommon::Exception("Error while setting DH parameters");
++						}
+ 
+ 						int codes;
+ 						if (!DH_check(state.dh, &codes))
+@@ -213,7 +235,9 @@ namespace dtn
+ 						state.secret.assign((const char*)secret, length);
+ 
+ 						KeyExchangeData response(KeyExchangeData::RESPONSE, session);
+-						write(response, state.dh->pub_key);
++						const BIGNUM *state_dh_pub_key;
++						DH_get0_key(state.dh, &state_dh_pub_key, NULL);
++						write(response, state_dh_pub_key);
+ 
+ 						manager.submit(session, response);
+ 
+diff --git a/src/security/exchange/Makefile.am b/src/security/exchange/Makefile.am
+index a6b2f83..71ed836 100644
+--- a/src/security/exchange/Makefile.am
++++ b/src/security/exchange/Makefile.am
+@@ -22,6 +22,8 @@ exchange_SOURCES += \
+ 	NFCProtocol.cpp \
+ 	NoneProtocol.h \
+ 	NoneProtocol.cpp \
++	openssl_compat.h \
++	openssl_compat.cpp \
+ 	QRCodeProtocol.h \
+ 	QRCodeProtocol.cpp
+ 	
+diff --git a/src/security/exchange/openssl_compat.cpp b/src/security/exchange/openssl_compat.cpp
+new file mode 100644
+index 0000000..e3baba0
+--- /dev/null
++++ b/src/security/exchange/openssl_compat.cpp
+@@ -0,0 +1,62 @@
++/*
++ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
++ *
++ * Licensed under the OpenSSL license (the "License").  You may not use
++ * this file except in compliance with the License.  You can obtain a copy
++ * in the file LICENSE in the source distribution or at
++ * https://www.openssl.org/source/license.html
++ */
++
++#include "openssl_compat.h"
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++
++void DH_get0_pqg(const DH *dh,
++                 const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
++{
++    if (p != NULL)
++        *p = dh->p;
++    if (q != NULL)
++        *q = dh->q;
++    if (g != NULL)
++        *g = dh->g;
++}
++
++int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
++{
++    /* If the fields p and g in d are NULL, the corresponding input
++     * parameters MUST be non-NULL.  q may remain NULL.
++     */
++    if ((dh->p == NULL && p == NULL)
++        || (dh->g == NULL && g == NULL))
++        return 0;
++
++    if (p != NULL) {
++        BN_free(dh->p);
++        dh->p = p;
++    }
++    if (q != NULL) {
++        BN_free(dh->q);
++        dh->q = q;
++    }
++    if (g != NULL) {
++        BN_free(dh->g);
++        dh->g = g;
++    }
++
++    if (q != NULL) {
++        dh->length = BN_num_bits(q);
++    }
++
++    return 1;
++}
++
++void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
++{
++    if (pub_key != NULL)
++        *pub_key = dh->pub_key;
++    if (priv_key != NULL)
++        *priv_key = dh->priv_key;
++}
++
++#endif /* OPENSSL_VERSION_NUMBER */
+diff --git a/src/security/exchange/openssl_compat.h b/src/security/exchange/openssl_compat.h
+new file mode 100644
+index 0000000..29e7d41
+--- /dev/null
++++ b/src/security/exchange/openssl_compat.h
+@@ -0,0 +1,13 @@
++#ifndef LIBCRYPTO_COMPAT_H
++#define LIBCRYPTO_COMPAT_H
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++
++#include 
++
++void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
++int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
++void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key);
++
++#endif /* OPENSSL_VERSION_NUMBER */
++#endif /* LIBCRYPTO_COMPAT_H */
+-- 
+1.9.1
+
diff --git a/buildroot/package/ibrdtnd/0002-SecurityCertificateManager.cpp-include-cstring-267.patch b/buildroot/package/ibrdtnd/0002-SecurityCertificateManager.cpp-include-cstring-267.patch
new file mode 100644
index 000000000..e681936e9
--- /dev/null
+++ b/buildroot/package/ibrdtnd/0002-SecurityCertificateManager.cpp-include-cstring-267.patch
@@ -0,0 +1,29 @@
+From 9458a8627ed73600488a6d8a0ce2ce1d123da583 Mon Sep 17 00:00:00 2001
+From: bkuhls 
+Date: Sun, 19 Aug 2018 11:23:48 +0200
+Subject: [PATCH] SecurityCertificateManager.cpp: include cstring (#267)
+
+Fixes build with gcc-8.2.0.
+
+Upstream: https://github.com/ibrdtn/ibrdtn/commit/122fa8ed49f896abf6a389505f3d0b66d49d1e77
+
+Signed-off-by: Matthew Weber 
+---
+ src/security/SecurityCertificateManager.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/security/SecurityCertificateManager.cpp b/src/security/SecurityCertificateManager.cpp
+index 5fba703..f2bbb01 100644
+--- a/src/security/SecurityCertificateManager.cpp
++++ b/src/security/SecurityCertificateManager.cpp
+@@ -22,6 +22,7 @@
+ #include "security/SecurityCertificateManager.h"
+ #include "Configuration.h"
+ 
++#include 
+ #include 
+ 
+ #include 
+-- 
+1.9.1
+
diff --git a/buildroot/package/ifupdown-scripts/S40network b/buildroot/package/ifupdown-scripts/S40network
old mode 100755
new mode 100644
diff --git a/buildroot/package/imagemagick/Config.in b/buildroot/package/imagemagick/Config.in
index 4bd81dbd7..8b795d89e 100644
--- a/buildroot/package/imagemagick/Config.in
+++ b/buildroot/package/imagemagick/Config.in
@@ -9,8 +9,8 @@ config BR2_PACKAGE_IMAGEMAGICK
 	  JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF.
 	  Use ImageMagick to translate, flip, mirror, rotate, scale,
 	  shear and transform images, adjust image colors, apply various
-	  special effects, or draw text,
-	  lines, polygons, ellipses and Bézier curves.
+	  special effects, or draw text, lines, polygons, ellipses and
+	  Bézier curves.
 
 	  http://www.imagemagick.org/
 
diff --git a/buildroot/package/imagemagick/imagemagick.hash b/buildroot/package/imagemagick/imagemagick.hash
index 9d5a39567..e89aa557c 100644
--- a/buildroot/package/imagemagick/imagemagick.hash
+++ b/buildroot/package/imagemagick/imagemagick.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 e7c1b19923bb97ed456c78b63b3259b809ebc8e3967c6d086450370c67eedf06  7.0.7-39.tar.gz
-sha256 2318cc05bbd2c25c1b2d13af1aadccc45b9cf6f94757421ae59a3c8ea9064f1c  LICENSE
+sha256 2a1ca5f9c38e6596a5ee9fdbbaebba1d21b57618e892c72c8e4e63ced571af40  7.0.8-42.tar.gz
+sha256 5b47db932754743460eba7a226aea85b63e3408d3c7affb4d0117f70c9594ded  LICENSE
diff --git a/buildroot/package/imagemagick/imagemagick.mk b/buildroot/package/imagemagick/imagemagick.mk
index 72482267c..5ea79bed4 100644
--- a/buildroot/package/imagemagick/imagemagick.mk
+++ b/buildroot/package/imagemagick/imagemagick.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMAGEMAGICK_VERSION = 7.0.7-39
+IMAGEMAGICK_VERSION = 7.0.8-42
 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz
 IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive
 IMAGEMAGICK_LICENSE = Apache-2.0
@@ -40,6 +40,14 @@ IMAGEMAGICK_CONF_OPTS = \
 
 IMAGEMAGICK_DEPENDENCIES = host-pkgconf
 
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+# Like postgreSQL, imagemagick does not build against uClibc with
+# locales enabled, due to an uClibc bug, see
+# http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html
+# so overwrite automatic detection and disable locale support
+IMAGEMAGICK_CONF_ENV += ac_cv_func_newlocale=no
+endif
+
 ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
 IMAGEMAGICK_CONF_OPTS += --with-fontconfig
 IMAGEMAGICK_DEPENDENCIES += fontconfig
@@ -113,11 +121,11 @@ else
 IMAGEMAGICK_CONF_OPTS += --without-lzma
 endif
 
-ifeq ($(BR2_PACKAGE_FFTW),y)
+ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y)
 # configure script misdetects these leading to build errors
 IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes
 IMAGEMAGICK_CONF_OPTS += --with-fftw
-IMAGEMAGICK_DEPENDENCIES += fftw
+IMAGEMAGICK_DEPENDENCIES += fftw-double
 else
 IMAGEMAGICK_CONF_OPTS += --without-fftw
 endif
diff --git a/buildroot/package/inadyn/inadyn.hash b/buildroot/package/inadyn/inadyn.hash
index 742b6f226..2691ba0ef 100644
--- a/buildroot/package/inadyn/inadyn.hash
+++ b/buildroot/package/inadyn/inadyn.hash
@@ -1,5 +1,5 @@
-# From https://github.com/troglobit/inadyn/releases/download/v2.3/inadyn-2.3.tar.xz.md5
-md5 63efb284b7f3f389c01bad19ee28407e  inadyn-2.3.tar.xz
+# From https://github.com/troglobit/inadyn/releases/download/v2.5/inadyn-2.5.tar.xz.md5
+md5 8a864d5186e54d24de2d7554fc01b3ec  inadyn-2.5.tar.xz
 # Locally computed
-sha256 4a98b80d8565b9e4cb32b19b7a8b06a22a7d9a6f4f03a5298a8d441b6187c760  inadyn-2.3.tar.xz
+sha256 4a9ad208671f62912428413da0282450b2d2c4da38f3c95c4ac975d048c41fcd  inadyn-2.5.tar.xz
 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/buildroot/package/inadyn/inadyn.mk b/buildroot/package/inadyn/inadyn.mk
index 0b1f82dae..96a37d476 100644
--- a/buildroot/package/inadyn/inadyn.mk
+++ b/buildroot/package/inadyn/inadyn.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-INADYN_VERSION = 2.3
+INADYN_VERSION = 2.5
 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION)
 INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz
 INADYN_LICENSE = GPL-2.0+
diff --git a/buildroot/package/initscripts/init.d/S20urandom b/buildroot/package/initscripts/init.d/S20urandom
old mode 100755
new mode 100644
diff --git a/buildroot/package/input-event-daemon/S99input-event-daemon b/buildroot/package/input-event-daemon/S99input-event-daemon
old mode 100755
new mode 100644
diff --git a/buildroot/package/intel-gmmlib/Config.in b/buildroot/package/intel-gmmlib/Config.in
new file mode 100644
index 000000000..9d5fbd9ca
--- /dev/null
+++ b/buildroot/package/intel-gmmlib/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_INTEL_GMMLIB
+	bool "intel-gmmlib"
+	depends on BR2_x86_64
+	depends on !BR2_STATIC_LIBS
+	help
+	  The Intel(R) Graphics Memory Management Library provides
+	  device specific and buffer management for the Intel(R)
+	  Graphics Compute Runtime for OpenCL(TM) and the Intel(R)
+	  Media Driver for VAAPI.
+
+	  https://github.com/intel/gmmlib
+
+comment "intel-gmmlib needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
diff --git a/buildroot/package/intel-gmmlib/intel-gmmlib.hash b/buildroot/package/intel-gmmlib/intel-gmmlib.hash
new file mode 100644
index 000000000..d54abd2a4
--- /dev/null
+++ b/buildroot/package/intel-gmmlib/intel-gmmlib.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 7970a8ae4e16efb98f38fbbc0346eea03227fc4462a9bd8e8077277cc3430a84  intel-gmmlib-18.4.1.tar.gz
+sha256 b61d639c5d84ec710ffcf5600ac92f8a4ace66670c1f9bd921f3bde671d36033  LICENSE.md
diff --git a/buildroot/package/intel-gmmlib/intel-gmmlib.mk b/buildroot/package/intel-gmmlib/intel-gmmlib.mk
new file mode 100644
index 000000000..4d8908659
--- /dev/null
+++ b/buildroot/package/intel-gmmlib/intel-gmmlib.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# intel-gmmlib
+#
+################################################################################
+
+INTEL_GMMLIB_VERSION = 18.4.1
+INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive
+INTEL_GMMLIB_LICENSE = MIT
+INTEL_GMMLIB_LICENSE_FILES = LICENSE.md
+
+INTEL_GMMLIB_INSTALL_STAGING = YES
+INTEL_GMMLIB_SUPPORTS_IN_SOURCE_BUILD = NO
+
+INTEL_GMMLIB_CONF_OPTS = -DRUN_TEST_SUITE=OFF
+
+$(eval $(cmake-package))
diff --git a/buildroot/package/intel-microcode/Config.in b/buildroot/package/intel-microcode/Config.in
index 495ebd727..4a45aa1ef 100644
--- a/buildroot/package/intel-microcode/Config.in
+++ b/buildroot/package/intel-microcode/Config.in
@@ -5,3 +5,14 @@ config BR2_PACKAGE_INTEL_MICROCODE
 	  This package provides an Intel microcode data file that can be
 	  used to correct processor errors. The iucode-tool package and
 	  proper kernel support are required to upload the microcode.
+
+	  https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files
+
+config BR2_PACKAGE_INTEL_MICROCODE_INSTALL_TARGET
+	bool "install microcode files to /lib/firmware in target"
+	default y
+	depends on BR2_PACKAGE_INTEL_MICROCODE
+	help
+	  Select this option to have the microcode files installed to
+	  /lib/firmware/intel-ucode in the target root filesystem, in
+	  addition to the images directory.
diff --git a/buildroot/package/intel-microcode/intel-microcode.hash b/buildroot/package/intel-microcode/intel-microcode.hash
index 999b27299..257cc85c4 100644
--- a/buildroot/package/intel-microcode/intel-microcode.hash
+++ b/buildroot/package/intel-microcode/intel-microcode.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779  microcode-20180312.tgz
-sha256 6d4deb65ca688d930e188bf93f78430f134097b161e6df4a2ef00728e14965e3  license.txt
+sha256 9e67903a5b62b51f5e031b59a8046d3dff226834d79899799943803481a55d20  intel-microcode-microcode-20190514a.tar.gz
+sha256 1f8bf63fc2b1b486c507b98ff7d283c7eb58c7945746b94188a310d6787cbee5  license
diff --git a/buildroot/package/intel-microcode/intel-microcode.mk b/buildroot/package/intel-microcode/intel-microcode.mk
index e3134b640..dacb619a1 100644
--- a/buildroot/package/intel-microcode/intel-microcode.mk
+++ b/buildroot/package/intel-microcode/intel-microcode.mk
@@ -4,23 +4,27 @@
 #
 ################################################################################
 
-INTEL_MICROCODE_VERSION = 20180312
-INTEL_MICROCODE_SOURCE = microcode-$(INTEL_MICROCODE_VERSION).tgz
-INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/27591/eng
-INTEL_MICROCODE_STRIP_COMPONENTS = 0
+INTEL_MICROCODE_VERSION = microcode-20190514a
+INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,$(INTEL_MICROCODE_VERSION))
 INTEL_MICROCODE_LICENSE = PROPRIETARY
-INTEL_MICROCODE_LICENSE_FILES = license.txt
+INTEL_MICROCODE_LICENSE_FILES = license
 INTEL_MICROCODE_REDISTRIBUTE = NO
+INTEL_MICROCODE_INSTALL_IMAGES = YES
 
-define INTEL_MICROCODE_EXTRACT_LICENSE
-	head -n 33 $(@D)/microcode.dat > $(@D)/license.txt
+define INTEL_MICROCODE_INSTALL_IMAGES_CMDS
+	mkdir -p $(BINARIES_DIR)/intel-ucode
+	$(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \
+		$(@D)/intel-ucode/*
 endef
 
-INTEL_MICROCODE_POST_EXTRACT_HOOKS += INTEL_MICROCODE_EXTRACT_LICENSE
-
+ifeq ($(BR2_PACKAGE_INTEL_MICROCODE_INSTALL_TARGET),y)
 define INTEL_MICROCODE_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0644 $(@D)/microcode.dat \
-		$(TARGET_DIR)/usr/share/misc/intel-microcode.dat
+	mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode
+	$(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \
+		$(@D)/intel-ucode/*
 endef
+else
+INTEL_MICROCODE_INSTALL_TARGET = NO
+endif
 
 $(eval $(generic-package))
diff --git a/buildroot/package/iozone/iozone.hash b/buildroot/package/iozone/iozone.hash
index 8f552ba3f..2a027317f 100644
--- a/buildroot/package/iozone/iozone.hash
+++ b/buildroot/package/iozone/iozone.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	2733feb63c96f77177c68f3d938f2294d5394d8554b2767c45cbe138b2f3ae30	iozone3_482.tar
+sha256	eeaf16cfbee095b16e4934180c6c7438539629489ce42ef4ace48feb23916b12	iozone3_483.tar
diff --git a/buildroot/package/iozone/iozone.mk b/buildroot/package/iozone/iozone.mk
index 05b3973fa..903d2a188 100644
--- a/buildroot/package/iozone/iozone.mk
+++ b/buildroot/package/iozone/iozone.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IOZONE_VERSION = 3_482
+IOZONE_VERSION = 3_483
 IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar
 IOZONE_SITE = http://www.iozone.org/src/current
 IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED)
diff --git a/buildroot/package/iperf/iperf.hash b/buildroot/package/iperf/iperf.hash
index 3540c6e93..bce46c691 100644
--- a/buildroot/package/iperf/iperf.hash
+++ b/buildroot/package/iperf/iperf.hash
@@ -1,5 +1,6 @@
 # From https://sourceforge.net/projects/iperf2/files/
-sha1	909b469bbbc38508cd268e334a6ec319c3116f15	iperf-2.0.12.tar.gz
+sha1	0c7625c61087b9e6866421abb8bb533658b40a8d	iperf-2.0.13.tar.gz
+
 # Locally computed:
-sha256  367f651fb1264b13f6518e41b8a7e08ce3e41b2a1c80e99ff0347561eed32646  iperf-2.0.12.tar.gz
+sha256  c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad  iperf-2.0.13.tar.gz
 sha256  5f9f5c4feca3347c3b3c0ada8b16b4e6b698aac4e6f016a24adf61a5915336d1  COPYING
diff --git a/buildroot/package/iperf/iperf.mk b/buildroot/package/iperf/iperf.mk
index c712de61e..7088b0f15 100644
--- a/buildroot/package/iperf/iperf.mk
+++ b/buildroot/package/iperf/iperf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IPERF_VERSION = 2.0.12
+IPERF_VERSION = 2.0.13
 IPERF_SITE = http://downloads.sourceforge.net/project/iperf2
 IPERF_LICENSE = MIT-like
 IPERF_LICENSE_FILES = COPYING
diff --git a/buildroot/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch b/buildroot/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch
new file mode 100644
index 000000000..d43f22e27
--- /dev/null
+++ b/buildroot/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch
@@ -0,0 +1,108 @@
+From 1ad09f56d461e78ad83c77b654fb65467a68388b Mon Sep 17 00:00:00 2001
+From: Dennis Schridde 
+Date: Wed, 30 Nov 2016 17:33:00 +0100
+Subject: [PATCH] ID:461 - OpenSSL 1.1 compatibility - "error: storage size
+ of 'ctx' isn't known"
+
+In OpenSSL 1.1 EVP_CIPHER_CTX became opaque, cf. `man 3ssl EVP_EncryptInit`
+
+Fixes: ID:461
+
+Upstream: https://github.com/ipmitool/ipmitool/commit/b57487e360916ab3eaa50aa6d021c73b6337a4a0
+
+Signed-off-by: Matthew Weber 
+---
+ src/plugins/lanplus/lanplus_crypt_impl.c | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
+index d5fac37..3c0df23 100644
+--- a/src/plugins/lanplus/lanplus_crypt_impl.c
++++ b/src/plugins/lanplus/lanplus_crypt_impl.c
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX* ctx;
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +239,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX* ctx;
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +266,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +277,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +290,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
+ 		}
+ 	}
+ 
+-- 
+1.9.1
+
diff --git a/buildroot/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch b/buildroot/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch
new file mode 100644
index 000000000..7ff27bdab
--- /dev/null
+++ b/buildroot/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch
@@ -0,0 +1,40 @@
+From ccc85e4fd67423e770901ec59975e84b07eed883 Mon Sep 17 00:00:00 2001
+From: Zdenek Styblik 
+Date: Sun, 15 Jan 2017 15:11:25 +0100
+Subject: [PATCH] ID:461 - Make compiler happier about changes related to
+ OpenSSL 1.1
+
+Complaint was that ctx isn't initialized.
+
+Upstream: https://github.com/ipmitool/ipmitool/commit/77fe5635037ebaf411cae46cf5045ca819b5c145
+
+Signed-off-by: Matthew Weber 
+---
+ src/plugins/lanplus/lanplus_crypt_impl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
+index 3c0df23..d12d0e3 100644
+--- a/src/plugins/lanplus/lanplus_crypt_impl.c
++++ b/src/plugins/lanplus/lanplus_crypt_impl.c
+@@ -164,7 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX* ctx;
++	EVP_CIPHER_CTX *ctx = NULL;
+ 	EVP_CIPHER_CTX_init(ctx);
+ 	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
+ 	EVP_CIPHER_CTX_set_padding(ctx, 0);
+@@ -239,7 +239,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX* ctx;
++	EVP_CIPHER_CTX *ctx = NULL;
+ 	EVP_CIPHER_CTX_init(ctx);
+ 	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
+ 	EVP_CIPHER_CTX_set_padding(ctx, 0);
+-- 
+1.9.1
+
diff --git a/buildroot/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch b/buildroot/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch
new file mode 100644
index 000000000..aabcc62d3
--- /dev/null
+++ b/buildroot/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch
@@ -0,0 +1,57 @@
+From 72df3eadb27161a292f35b1d97178f70f41e50f6 Mon Sep 17 00:00:00 2001
+From: Zdenek Styblik 
+Date: Sun, 12 Mar 2017 14:00:35 +0100
+Subject: [PATCH] ID:480 - ipmitool coredumps in EVP_CIPHER_CTX_init
+
+IPMI tool coredumps due to changes introduced in ID:461. This shouldn't be
+surprise as a NULL pointer is passed to init. Commit addresses this issue by
+calling EVP_CIPHER_CTX_new() instead of EVP_CIPHER_CTX_init(), which is
+deprecated, and by checking return value of call to former function.
+
+Upstream: https://github.com/ipmitool/ipmitool/commit/f004b4b7197fc83e7d47ec8cbcaefffa9a922717
+
+Signed-off-by: Matthew Weber 
+---
+ src/plugins/lanplus/lanplus_crypt_impl.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
+index d12d0e3..0e330c1 100644
+--- a/src/plugins/lanplus/lanplus_crypt_impl.c
++++ b/src/plugins/lanplus/lanplus_crypt_impl.c
+@@ -165,10 +165,13 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 							uint32_t        * bytes_written)
+ {
+ 	EVP_CIPHER_CTX *ctx = NULL;
+-	EVP_CIPHER_CTX_init(ctx);
++	ctx = EVP_CIPHER_CTX_new();
++	if (ctx == NULL) {
++		*bytes_written = 0;
++		return;
++	}
+ 	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
+ 	EVP_CIPHER_CTX_set_padding(ctx, 0);
+-	
+ 
+ 	*bytes_written = 0;
+ 
+@@ -240,11 +243,14 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 							uint32_t        * bytes_written)
+ {
+ 	EVP_CIPHER_CTX *ctx = NULL;
+-	EVP_CIPHER_CTX_init(ctx);
++	ctx = EVP_CIPHER_CTX_new();
++	if (ctx == NULL) {
++		*bytes_written = 0;
++		return;
++	}
+ 	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
+ 	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+-
+ 	if (verbose >= 5)
+ 	{
+ 		printbuf(iv,  16, "decrypting with this IV");
+-- 
+1.9.1
+
diff --git a/buildroot/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch b/buildroot/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch
new file mode 100644
index 000000000..b3ce96507
--- /dev/null
+++ b/buildroot/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch
@@ -0,0 +1,148 @@
+From d9d6e0bff831da03f4448f0cdb82fc3d143662c8 Mon Sep 17 00:00:00 2001
+From: Holger Liebig 
+Date: Tue, 4 Apr 2017 20:43:05 +0200
+Subject: [PATCH] ID:480 - Call EVP_CIPHER_CTX_free() instead of
+ EVP_CIPHER_CTX_cleanup()
+
+Call EVP_CIPHER_CTX_free() instead of EVP_CIPHER_CTX_cleanup() to fix memory
+leak.
+
+Upstream: https://github.com/ipmitool/ipmitool/commit/1664902525a1c3771b4d8b3ccab7ea1ba6b2bdd1
+
+Signed-off-by: Matthew Weber 
+---
+ src/plugins/lanplus/lanplus_crypt_impl.c | 44 +++++++++++++++++---------------
+ 1 file changed, 23 insertions(+), 21 deletions(-)
+
+diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
+index 0e330c1..9652a5e 100644
+--- a/src/plugins/lanplus/lanplus_crypt_impl.c
++++ b/src/plugins/lanplus/lanplus_crypt_impl.c
+@@ -165,13 +165,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 							uint32_t        * bytes_written)
+ {
+ 	EVP_CIPHER_CTX *ctx = NULL;
+-	ctx = EVP_CIPHER_CTX_new();
+-	if (ctx == NULL) {
+-		*bytes_written = 0;
+-		return;
+-	}
+-	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 	*bytes_written = 0;
+ 
+@@ -185,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 		printbuf(input, input_length, "encrypting this data");
+ 	}
+ 
++	ctx = EVP_CIPHER_CTX_new();
++	if (ctx == NULL) {
++		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
++		return;
++	}
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 	/*
+ 	 * The default implementation adds a whole block of padding if the input
+@@ -198,7 +199,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+-		return;
+ 	}
+ 	else
+ 	{
+@@ -206,16 +206,17 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 
+ 		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
++			/* Error */
+ 			*bytes_written = 0;
+-			return; /* Error */
+ 		}
+ 		else
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(ctx);
+ 		}
+ 	}
++	/* performs cleanup and free */
++	EVP_CIPHER_CTX_free(ctx);
+ }
+ 
+ 
+@@ -243,13 +244,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 							uint32_t        * bytes_written)
+ {
+ 	EVP_CIPHER_CTX *ctx = NULL;
+-	ctx = EVP_CIPHER_CTX_new();
+-	if (ctx == NULL) {
+-		*bytes_written = 0;
+-		return;
+-	}
+-	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 	if (verbose >= 5)
+ 	{
+@@ -258,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 		printbuf(input, input_length, "decrypting this data");
+ 	}
+ 
+-
+ 	*bytes_written = 0;
+ 
+ 	if (input_length == 0)
+ 		return;
+ 
++	ctx = EVP_CIPHER_CTX_new();
++	if (ctx == NULL) {
++		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
++		return;
++	}
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
++
+ 	/*
+ 	 * The default implementation adds a whole block of padding if the input
+ 	 * data is perfectly aligned.  We would like to keep that from happening.
+@@ -277,7 +279,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+ 		*bytes_written = 0;
+-		return;
+ 	}
+ 	else
+ 	{
+@@ -285,20 +286,21 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 
+ 		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
++			/* Error */
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+ 			lprintf(LOG_DEBUG, "the ERR error %s", buffer);
+ 			lprintf(LOG_DEBUG, "ERROR: decrypt final failed");
+ 			*bytes_written = 0;
+-			return; /* Error */
+ 		}
+ 		else
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(ctx);
+ 		}
+ 	}
++	/* performs cleanup and free */
++	EVP_CIPHER_CTX_free(ctx);
+ 
+ 	if (verbose >= 5)
+ 	{
+-- 
+1.9.1
+
diff --git a/buildroot/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch b/buildroot/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch
new file mode 100644
index 000000000..87fdd0aaf
--- /dev/null
+++ b/buildroot/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch
@@ -0,0 +1,50 @@
+From fc2136969adfb926eed610b8ed0a74b2030b48ed Mon Sep 17 00:00:00 2001
+From: Rosen Penev 
+Date: Tue, 21 Aug 2018 19:29:07 -0700
+Subject: [PATCH] lanplus: Fix compile with deprecated APIs disabled.
+
+From the man page:
+
+EVP_CIPHER_CTX was made opaque in OpenSSL 1.1.0. As a result,
+EVP_CIPHER_CTX_reset() appeared and EVP_CIPHER_CTX_cleanup() disappeared.
+EVP_CIPHER_CTX_init() remains as an alias for EVP_CIPHER_CTX_reset().
+
+Upstream: https://github.com/ipmitool/ipmitool/commit/a8862d7508fb138b1c286eea958700cca63c9476
+
+Signed-off-by: Rosen Penev 
+Signed-off-by: Matthew Weber 
+---
+ src/plugins/lanplus/lanplus_crypt_impl.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
+index 9652a5e..e94401e 100644
+--- a/src/plugins/lanplus/lanplus_crypt_impl.c
++++ b/src/plugins/lanplus/lanplus_crypt_impl.c
+@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+ 		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
+ 		return;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	EVP_CIPHER_CTX_init(ctx);
++#else
++	EVP_CIPHER_CTX_reset(ctx);
++#endif
+ 	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
+ 	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+ 		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
+ 		return;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	EVP_CIPHER_CTX_init(ctx);
++#else
++	EVP_CIPHER_CTX_reset(ctx);
++#endif
+ 	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
+ 	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+-- 
+1.9.1
+
diff --git a/buildroot/package/ipmiutil/ipmiutil.mk b/buildroot/package/ipmiutil/ipmiutil.mk
index 5d8c45665..0d9a4509b 100644
--- a/buildroot/package/ipmiutil/ipmiutil.mk
+++ b/buildroot/package/ipmiutil/ipmiutil.mk
@@ -18,7 +18,7 @@ ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx)
 # tests against distro libcrypto so it might get a false positive when
 # the openssl version is old, so force it off
 # SKIP_MD2 can be used only if ALLOW_GNU is defined.
-IPMIUTIL_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DALLOW_GNU -DSKIP_MD2"
+IPMIUTIL_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DALLOW_GNU -DSKIP_MD2 -DSSL11"
 IPMIUTIL_DEPENDENCIES += openssl
 else
 IPMIUTIL_CONF_OPTS += --disable-lanplus
diff --git a/buildroot/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch b/buildroot/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch
new file mode 100644
index 000000000..b6934f5d1
--- /dev/null
+++ b/buildroot/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch
@@ -0,0 +1,39 @@
+From 9700927a008a803ac119bdf816bdc1baa69d705c Mon Sep 17 00:00:00 2001
+From: Thomas De Schampheleire 
+Date: Wed, 20 Feb 2019 15:41:51 +0100
+Subject: [PATCH] ss: fix compilation under glibc < 2.18
+
+Commit c759116a0b2b6da8df9687b0a40ac69050132c77 introduced support for
+AF_VSOCK. This define is only provided since glibc version 2.18, so
+compilation fails when using older toolchains.
+
+Provide the necessary definitions if needed.
+
+Signed-off-by: Thomas De Schampheleire 
+Signed-off-by: Stephen Hemminger 
+---
+ misc/ss.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/misc/ss.c b/misc/ss.c
+index 9e821faf..766fdc5f 100644
+--- a/misc/ss.c
++++ b/misc/ss.c
+@@ -51,6 +51,14 @@
+ #include 
+ #include 
+ 
++/* AF_VSOCK/PF_VSOCK is only provided since glibc 2.18 */
++#ifndef PF_VSOCK
++#define PF_VSOCK 40
++#endif
++#ifndef AF_VSOCK
++#define AF_VSOCK PF_VSOCK
++#endif
++
+ #define MAGIC_SEQ 123456
+ #define BUF_CHUNK (1024 * 1024)
+ #define LEN_ALIGN(x) (((x) + 1) & ~1)
+-- 
+2.19.2
+
diff --git a/buildroot/package/ipsec-tools/ipsec-tools.mk b/buildroot/package/ipsec-tools/ipsec-tools.mk
index 867227253..7ac6b5cb2 100644
--- a/buildroot/package/ipsec-tools/ipsec-tools.mk
+++ b/buildroot/package/ipsec-tools/ipsec-tools.mk
@@ -9,17 +9,14 @@ IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
 IPSEC_TOOLS_SITE = http://sourceforge.net/projects/ipsec-tools/files/ipsec-tools/$(IPSEC_TOOLS_VERSION)
 IPSEC_TOOLS_INSTALL_STAGING = YES
 IPSEC_TOOLS_MAKE = $(MAKE1)
-IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex host-bison
+IPSEC_TOOLS_DEPENDENCIES = openssl flex host-pkgconf host-flex host-bison
 # we patch configure.ac
 IPSEC_TOOLS_AUTORECONF = YES
 
 # configure hardcodes -Werror, so override CFLAGS on make invocation
 IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)'
 
-# openssl uses zlib, so we need to explicitly link with it when static
-ifeq ($(BR2_STATIC_LIBS),y)
-IPSEC_TOOLS_CONF_ENV += LIBS=-lz
-endif
+IPSEC_TOOLS_CONF_ENV = LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 
 IPSEC_TOOLS_CONF_OPTS = \
 	  --without-libpam \
diff --git a/buildroot/package/ipset/ipset.hash b/buildroot/package/ipset/ipset.hash
index f41111c02..46e285b1e 100644
--- a/buildroot/package/ipset/ipset.hash
+++ b/buildroot/package/ipset/ipset.hash
@@ -1,6 +1,6 @@
-# From http://ftp.netfilter.org/pub/ipset/ipset-6.38.tar.bz2.md5sum.txt
-md5 0e5d9c85f6b78e7dff0c996e2900574b  ipset-6.38.tar.bz2
+# From http://ipset.netfilter.org/ipset-7.1.tar.bz2.md5sum.txt
+md5 72b477d1ce076d681b0799f88280f2f3  ipset-7.1.tar.bz2
 # Calculated based on the hash above
-sha256 ceef625ba31fe0aaa422926c7231a819de0b07644c02c17ebdd3022a29e3e244  ipset-6.38.tar.bz2
+sha256 7b5eb3b93205c20cdc39e3fc8b6e5f7bb214bf79a7c0c00729dd4a31ce16adc4  ipset-7.1.tar.bz2
 # Locally calculated
 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
diff --git a/buildroot/package/ipset/ipset.mk b/buildroot/package/ipset/ipset.mk
index 3ec944894..542afc963 100644
--- a/buildroot/package/ipset/ipset.mk
+++ b/buildroot/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IPSET_VERSION = 6.38
+IPSET_VERSION = 7.1
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkgconf
diff --git a/buildroot/package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch b/buildroot/package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch
new file mode 100644
index 000000000..37c6f96af
--- /dev/null
+++ b/buildroot/package/iptables/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch
@@ -0,0 +1,45 @@
+From 51d374ba41ae4f1bb851228c06b030b83dd2092f Mon Sep 17 00:00:00 2001
+From: Baruch Siach 
+Date: Tue, 13 Nov 2018 19:22:08 +0200
+Subject: [PATCH] ebtables: vlan: fix userspace/kernel headers collision
+
+Build with musl libc fails because of conflicting struct ethhdr
+definitions:
+
+In file included from .../sysroot/usr/include/net/ethernet.h:10:0,
+                 from ../iptables/nft-bridge.h:8,
+                 from libebt_vlan.c:18:
+.../sysroot/usr/include/netinet/if_ether.h:107:8: error: redefinition of ‘struct ethhdr’
+ struct ethhdr {
+        ^~~~~~
+In file included from libebt_vlan.c:16:0:
+.../sysroot/usr/include/linux/if_ether.h:160:8: note: originally defined here
+ struct ethhdr {
+        ^~~~~~
+
+Include the userspace header first for the definition suppression logic
+to do the right thing.
+
+Signed-off-by: Baruch Siach 
+Signed-off-by: Pablo Neira Ayuso 
+---
+Upstream status: commit 51d374ba41ae
+
+ extensions/libebt_vlan.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extensions/libebt_vlan.c b/extensions/libebt_vlan.c
+index 4a2eb7126895..be269c6cdb4c 100644
+--- a/extensions/libebt_vlan.c
++++ b/extensions/libebt_vlan.c
+@@ -12,6 +12,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include "iptables/nft.h"
+-- 
+2.19.1
+
diff --git a/buildroot/package/iptables/0001-extensions-libxt_bpf-Fix-build-with-old-kernel-versi.patch b/buildroot/package/iptables/0001-extensions-libxt_bpf-Fix-build-with-old-kernel-versi.patch
deleted file mode 100644
index 966cbe31a..000000000
--- a/buildroot/package/iptables/0001-extensions-libxt_bpf-Fix-build-with-old-kernel-versi.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5beb1582d13d3bfdd0d2b277f5f3154b2fbf4a8e Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens 
-Date: Tue, 27 Feb 2018 16:56:55 +0100
-Subject: [PATCH] extensions: libxt_bpf: Fix build with old kernel versions
-
-In kernel 3.18 the union bpf_attr does not have a pathname attribute and
-BPF_OBJ_GET is also not defined in these versions.
-This was added in Linux commit b2197755b263 ("bpf: add support for
-persistent maps/progs"). Check for the BPF_FS_MAGIC define which was
-also added in this Linux commit and only activate this code in case we
-find that define.
-
-This fixes a build problem with Linux 3.18.
-Netfilter bug: #1231
-
-Fixes: f17f9ace8a8 ("extensions: libxt_bpf: support ebpf pinned objects")
-Signed-off-by: Hauke Mehrtens 
-Signed-off-by: Pablo Neira Ayuso 
-Signed-off-by: Baruch Siach 
----
-Patch status: upstream commit 5beb1582d13d
-
- extensions/libxt_bpf.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/extensions/libxt_bpf.c b/extensions/libxt_bpf.c
-index 9510c190f315..92958247c756 100644
---- a/extensions/libxt_bpf.c
-+++ b/extensions/libxt_bpf.c
-@@ -22,6 +22,7 @@
- #include 
- #endif
- 
-+#include 
- #include 
- 
- #define BCODE_FILE_MAX_LEN_B	1024
-@@ -62,7 +63,7 @@ static const struct xt_option_entry bpf_opts_v1[] = {
- 
- static int bpf_obj_get(const char *filepath)
- {
--#if defined HAVE_LINUX_BPF_H && defined __NR_bpf
-+#if defined HAVE_LINUX_BPF_H && defined __NR_bpf && defined BPF_FS_MAGIC
- 	union bpf_attr attr;
- 
- 	memset(&attr, 0, sizeof(attr));
--- 
-2.16.1
-
diff --git a/buildroot/package/iptables/0002-xtables-monitor-fix-build-with-older-glibc.patch b/buildroot/package/iptables/0002-xtables-monitor-fix-build-with-older-glibc.patch
new file mode 100644
index 000000000..18dbc28f9
--- /dev/null
+++ b/buildroot/package/iptables/0002-xtables-monitor-fix-build-with-older-glibc.patch
@@ -0,0 +1,77 @@
+From 7c8791edac3e74f6ce0bf21f98bc820db8e55e62 Mon Sep 17 00:00:00 2001
+From: Baruch Siach 
+Date: Fri, 16 Nov 2018 07:23:32 +0200
+Subject: [PATCH] xtables-monitor: fix build with older glibc
+
+glibc older than 2.19 only expose BSD style fields of struct tcphdr when
+_BSD_SOURCE is define. Current glibc however, warn that _BSD_SOURCE is
+deprecated. Migrate to the GNU style of tcphdr fields to make the code
+compatible with any glibc version.
+
+Fix the following build failure:
+
+xtables-monitor.c: In function 'trace_print_packet':
+xtables-monitor.c:406:43: error: 'const struct tcphdr' has no member named 'th_sport'
+    printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport));
+                                           ^
+xtables-monitor.c:406:66: error: 'const struct tcphdr' has no member named 'th_dport'
+    printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport));
+                                                                  ^
+...
+
+Signed-off-by: Baruch Siach 
+Signed-off-by: Florian Westphal 
+---
+Upstream status: commit 7c8791edac3e74
+
+ iptables/xtables-monitor.c | 30 ++++++++++++++----------------
+ 1 file changed, 14 insertions(+), 16 deletions(-)
+
+diff --git a/iptables/xtables-monitor.c b/iptables/xtables-monitor.c
+index 3b1ca777a28a..5d1611122df5 100644
+--- a/iptables/xtables-monitor.c
++++ b/iptables/xtables-monitor.c
+@@ -403,26 +403,24 @@ static void trace_print_packet(const struct nftnl_trace *nlt, struct cb_arg *arg
+ 		case IPPROTO_UDP:
+ 			if (len < 4)
+ 				break;
+-			printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport));
++			printf("SPORT=%d DPORT=%d ", ntohs(tcph->source), ntohs(tcph->dest));
+ 			break;
+ 		case IPPROTO_TCP:
+ 			if (len < sizeof(*tcph))
+ 				break;
+-			printf("SPORT=%d DPORT=%d ", ntohs(tcph->th_sport), ntohs(tcph->th_dport));
+-			if (tcph->th_flags & (TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG)) {
+-				if (tcph->th_flags & TH_SYN)
+-					printf("SYN ");
+-				if (tcph->th_flags & TH_ACK)
+-					printf("ACK ");
+-				if (tcph->th_flags & TH_FIN)
+-					printf("FIN ");
+-				if (tcph->th_flags & TH_RST)
+-					printf("RST ");
+-				if (tcph->th_flags & TH_PUSH)
+-					printf("PSH ");
+-				if (tcph->th_flags & TH_URG)
+-					printf("URG ");
+-			}
++			printf("SPORT=%d DPORT=%d ", ntohs(tcph->source), ntohs(tcph->dest));
++			if (tcph->syn)
++				printf("SYN ");
++			if (tcph->ack)
++				printf("ACK ");
++			if (tcph->fin)
++				printf("FIN ");
++			if (tcph->rst)
++				printf("RST ");
++			if (tcph->psh)
++				printf("PSH ");
++			if (tcph->urg)
++				printf("URG ");
+ 			break;
+ 		default:
+ 			break;
+-- 
+2.19.1
+
diff --git a/buildroot/package/iptables/0003-include-fix-build-with-kernel-headers-before-4.2.patch b/buildroot/package/iptables/0003-include-fix-build-with-kernel-headers-before-4.2.patch
new file mode 100644
index 000000000..c5cd6437f
--- /dev/null
+++ b/buildroot/package/iptables/0003-include-fix-build-with-kernel-headers-before-4.2.patch
@@ -0,0 +1,51 @@
+From 8d9d7e4b9ef4c6e6abab2cf35c747d7ca36824bd Mon Sep 17 00:00:00 2001
+From: Baruch Siach 
+Date: Fri, 16 Nov 2018 09:30:33 +0200
+Subject: [PATCH] include: fix build with kernel headers before 4.2
+
+Commit 672accf1530 (include: update kernel netfilter header files)
+updated linux/netfilter.h and brought with it the update from kernel
+commit a263653ed798 (netfilter: don't pull include/linux/netfilter.h
+from netns headers). This triggers conflict of headers that is fixed in
+kernel commit 279c6c7fa64f (api: fix compatibility of linux/in.h with
+netinet/in.h) included in kernel version 4.2. For earlier kernel headers
+we need a workaround that prevents the headers conflict.
+
+Fixes the following build failure:
+
+In file included from .../sysroot/usr/include/netinet/ip.h:25:0,
+                 from ../include/libiptc/ipt_kernel_headers.h:8,
+                 from ../include/libiptc/libiptc.h:6,
+                 from libip4tc.c:29:
+.../sysroot/usr/include/linux/in.h:26:3: error: redeclaration of enumerator ‘IPPROTO_IP’
+   IPPROTO_IP = 0,  /* Dummy protocol for TCP  */
+   ^
+.../sysroot/usr/include/netinet/in.h:33:5: note: previous definition of ‘IPPROTO_IP’ was here
+     IPPROTO_IP = 0,    /* Dummy protocol for TCP.  */
+     ^~~~~~~~~~
+
+Signed-off-by: Baruch Siach 
+Signed-off-by: Florian Westphal 
+---
+Upstream status: commit 8d9d7e4b9ef4c6
+
+ include/linux/netfilter.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
+index c3f087ac680c..bacf8cd92116 100644
+--- a/include/linux/netfilter.h
++++ b/include/linux/netfilter.h
+@@ -3,7 +3,9 @@
+ 
+ #include 
+ 
++#ifndef _NETINET_IN_H
+ #include 
++#endif
+ #include 
+ #include 
+ 
+-- 
+2.19.1
+
diff --git a/buildroot/package/iptables/0004-xtables-monitor-fix-build-with-musl-libc.patch b/buildroot/package/iptables/0004-xtables-monitor-fix-build-with-musl-libc.patch
new file mode 100644
index 000000000..0b6358b25
--- /dev/null
+++ b/buildroot/package/iptables/0004-xtables-monitor-fix-build-with-musl-libc.patch
@@ -0,0 +1,44 @@
+From 90b0d3abfc0b4150b198eb17080d75acc5838a59 Mon Sep 17 00:00:00 2001
+From: Baruch Siach 
+Date: Sat, 17 Nov 2018 22:20:08 +0200
+Subject: [PATCH] xtables-monitor: fix build with musl libc
+
+Commit 7c8791edac3 ("xtables-monitor: fix build with older glibc")
+changed the code to use GNU style tcphdr fields. Unfortunately, musl
+libc requires _GNU_SOURCE definition to expose these fields.
+
+Fix the following build failure:
+
+xtables-monitor.c: In function ‘trace_print_packet’:
+xtables-monitor.c:406:43: error: ‘const struct tcphdr’ has no member named ‘source’
+    printf("SPORT=%d DPORT=%d ", ntohs(tcph->source), ntohs(tcph->dest));
+                                           ^~
+xtables-monitor.c:406:64: error: ‘const struct tcphdr’ has no member named ‘dest’
+    printf("SPORT=%d DPORT=%d ", ntohs(tcph->source), ntohs(tcph->dest));
+                                                                ^~
+...
+
+Cc: Florian Westphal 
+Signed-off-by: Baruch Siach 
+Signed-off-by: Florian Westphal 
+---
+Upstream status: commit 90b0d3abfc0b
+
+ iptables/xtables-monitor.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/iptables/xtables-monitor.c b/iptables/xtables-monitor.c
+index 5d1611122df5..f835c5e503e0 100644
+--- a/iptables/xtables-monitor.c
++++ b/iptables/xtables-monitor.c
+@@ -9,6 +9,7 @@
+  * This software has been sponsored by Sophos Astaro 
+  */
+ 
++#define _GNU_SOURCE
+ #include 
+ #include 
+ #include 
+-- 
+2.19.1
+
diff --git a/buildroot/package/iptables/0005-include-extend-the-headers-conflict-workaround-to-in.patch b/buildroot/package/iptables/0005-include-extend-the-headers-conflict-workaround-to-in.patch
new file mode 100644
index 000000000..6b1ffbd63
--- /dev/null
+++ b/buildroot/package/iptables/0005-include-extend-the-headers-conflict-workaround-to-in.patch
@@ -0,0 +1,37 @@
+From 23dee088cd54aae94f1b71046f2ab2b206eedd42 Mon Sep 17 00:00:00 2001
+Message-Id: <23dee088cd54aae94f1b71046f2ab2b206eedd42.1543092537.git.baruch@tkos.co.il>
+From: Baruch Siach 
+Date: Sat, 24 Nov 2018 22:33:37 +0200
+Subject: [PATCH] include: extend the headers conflict workaround to in6.h
+
+Commit 8d9d7e4b9ef ("include: fix build with kernel headers before 4.2")
+introduced a kernel/user headers conflict workaround that allows build
+of iptables with kernel headers older than 4.2. This minor extension
+allows build with kernel headers older than 3.12, which is the version
+that introduced explicit IP headers synchronization.
+
+Cc: Florian Westphal 
+Signed-off-by: Baruch Siach 
+---
+Upstream status: https://www.spinics.net/lists/netfilter-devel/msg57029.html
+
+ include/linux/netfilter.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
+index bacf8cd92116..042d8b1478e0 100644
+--- a/include/linux/netfilter.h
++++ b/include/linux/netfilter.h
+@@ -5,8 +5,8 @@
+ 
+ #ifndef _NETINET_IN_H
+ #include 
+-#endif
+ #include 
++#endif
+ #include 
+ 
+ /* Responses from hook functions. */
+-- 
+2.19.1
+
diff --git a/buildroot/package/iptables/iptables.hash b/buildroot/package/iptables/iptables.hash
index 8b191797f..d84bd3af9 100644
--- a/buildroot/package/iptables/iptables.hash
+++ b/buildroot/package/iptables/iptables.hash
@@ -1,3 +1,4 @@
-# From ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.2.tar.bz2.{md5sum,sha1sum}
-md5	7d2b7847e4aa8832a18437b8a4c1873d	iptables-1.6.2.tar.bz2
-sha1	6279effbf8f2c7ff53d19ae13308f8a6e6a60dd9	iptables-1.6.2.tar.bz2
+# From https://netfilter.org/projects/iptables/downloads.html
+sha256 a3778b50ed1a3256f9ca975de82c2204e508001fc2471238c8c97f3d1c4c12af  iptables-1.8.2.tar.bz2
+# Locally calculated
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/buildroot/package/iptables/iptables.mk b/buildroot/package/iptables/iptables.mk
index 49a537f60..54494937a 100644
--- a/buildroot/package/iptables/iptables.mk
+++ b/buildroot/package/iptables/iptables.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-IPTABLES_VERSION = 1.6.2
+IPTABLES_VERSION = 1.8.2
 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
-IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
+IPTABLES_SITE = https://netfilter.org/projects/iptables/files
 IPTABLES_INSTALL_STAGING = YES
 IPTABLES_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
diff --git a/buildroot/package/irqbalance/irqbalance.hash b/buildroot/package/irqbalance/irqbalance.hash
index 9bbbc7e4f..dfe14c900 100644
--- a/buildroot/package/irqbalance/irqbalance.hash
+++ b/buildroot/package/irqbalance/irqbalance.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 62de71510a2496fcf027efb0b288dd48e53e9efc931fa573c95580cad6264d07  irqbalance-v1.4.0.tar.gz
+sha256 3318eddc03782cfdad22b20eff18eaf378c498c5de286e8cbaa5521ddf4f810b  irqbalance-v1.5.0.tar.gz
 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
diff --git a/buildroot/package/irqbalance/irqbalance.mk b/buildroot/package/irqbalance/irqbalance.mk
index c7676e13c..063b02bb6 100644
--- a/buildroot/package/irqbalance/irqbalance.mk
+++ b/buildroot/package/irqbalance/irqbalance.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IRQBALANCE_VERSION = v1.4.0
+IRQBALANCE_VERSION = v1.5.0
 IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,$(IRQBALANCE_VERSION))
 IRQBALANCE_LICENSE = GPL-2.0
 IRQBALANCE_LICENSE_FILES = COPYING
diff --git a/buildroot/package/iucode-tool/Config.in b/buildroot/package/iucode-tool/Config.in
index d81dabb19..f9f2521a4 100644
--- a/buildroot/package/iucode-tool/Config.in
+++ b/buildroot/package/iucode-tool/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_IUCODE_TOOL
 	bool "iucode-tool"
 	depends on BR2_x86_64 || BR2_i386
 	select BR2_PACKAGE_INTEL_MICROCODE
+	select BR2_PACKAGE_INTEL_MICROCODE_INSTALL_TARGET
 	select BR2_PACKAGE_ARGP_STANDALONE \
 	       if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	help
diff --git a/buildroot/package/iucode-tool/S00iucode-tool b/buildroot/package/iucode-tool/S00iucode-tool
index 0c1e409de..393c903b4 100644
--- a/buildroot/package/iucode-tool/S00iucode-tool
+++ b/buildroot/package/iucode-tool/S00iucode-tool
@@ -3,21 +3,26 @@
 # Upload microcode into the processor.
 #
 
-microcode_file="/usr/share/misc/intel-microcode.dat"
+MICROCODE_DIR="/lib/firmware/intel-ucode"
+
+start() {
+	printf 'Starting iucode-tool: '
+	/usr/sbin/iucode_tool -q -k "$MICROCODE_DIR"
+	status="$?"
+	if [ "$status" = 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
 
 case "$1" in
-  start)
-	echo "Starting iucode-tool:"
-	/usr/sbin/iucode_tool -k $microcode_file
-	echo "done"
-	;;
-  stop)
-	;;
-  restart|reload)
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart}"
-	exit 1
+	start)
+		start;;
+	stop|restart|reload)
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
 esac
-
-exit $?
diff --git a/buildroot/package/iucode-tool/iucode-tool.hash b/buildroot/package/iucode-tool/iucode-tool.hash
index 1dab8de97..6d8fb635d 100644
--- a/buildroot/package/iucode-tool/iucode-tool.hash
+++ b/buildroot/package/iucode-tool/iucode-tool.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 9810daf925b8a9ca244adc4e1916bcab65601c9ebe87e91c2281f78055982971  iucode-tool_2.2.tar.xz
+sha256 12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95  iucode-tool_2.3.1.tar.xz
 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/buildroot/package/iucode-tool/iucode-tool.mk b/buildroot/package/iucode-tool/iucode-tool.mk
index 38f9da438..e900888d7 100644
--- a/buildroot/package/iucode-tool/iucode-tool.mk
+++ b/buildroot/package/iucode-tool/iucode-tool.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IUCODE_TOOL_VERSION = 2.2
+IUCODE_TOOL_VERSION = 2.3.1
 IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz
 IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/master
 ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
diff --git a/buildroot/package/iwd/Config.in b/buildroot/package/iwd/Config.in
new file mode 100644
index 000000000..c790f3dba
--- /dev/null
+++ b/buildroot/package/iwd/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_IWD
+	bool "iwd"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell
+	depends on !BR2_STATIC_LIBS # ell
+	depends on BR2_USE_WCHAR # ell
+	select BR2_PACKAGE_ELL
+	help
+	  iNet Wireless daemon (iwd)
+
+	  https://iwd.wiki.kernel.org/
+
+comment "iwd needs a toolchain w/ dynamic library, wchar"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell
+	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
diff --git a/buildroot/package/iwd/iwd.hash b/buildroot/package/iwd/iwd.hash
new file mode 100644
index 000000000..d8eefc064
--- /dev/null
+++ b/buildroot/package/iwd/iwd.hash
@@ -0,0 +1,5 @@
+# Locally computed
+sha256 e416bd549474b2940b0e43ac680795fbafe2b4965fe6a977cd4c1caa1a05e897 iwd-0.13.tar.gz
+
+# License files
+sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
diff --git a/buildroot/package/iwd/iwd.mk b/buildroot/package/iwd/iwd.mk
new file mode 100644
index 000000000..63736947c
--- /dev/null
+++ b/buildroot/package/iwd/iwd.mk
@@ -0,0 +1,47 @@
+################################################################################
+#
+# iwd
+#
+################################################################################
+
+IWD_VERSION = 0.13
+IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git
+IWD_SITE_METHOD = git
+IWD_LICENSE = LGPL-2.1+
+IWD_LICENSE_FILES = COPYING
+# sources from git, no configure script provided
+IWD_AUTORECONF = YES
+
+IWD_CONF_OPTS = --enable-external-ell
+IWD_DEPENDENCIES = ell
+
+# autoreconf requires an existing build-aux directory
+define IWD_MKDIR_BUILD_AUX
+	mkdir -p $(@D)/build-aux
+endef
+IWD_POST_PATCH_HOOKS += IWD_MKDIR_BUILD_AUX
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+IWD_CONF_OPTS += --enable-dbus-policy --with-dbus-datadir=/usr/share
+IWD_DEPENDENCIES += dbus
+else
+IWD_CONF_OPTS += --disable-dbus-policy
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+# iwd client depends on readline (GPL-3.0+)
+IWD_LICENSE := $(IWD_LICENSE), GPL-3.0+ (client)
+IWD_CONF_OPTS += --enable-client
+IWD_DEPENDENCIES += readline
+else
+IWD_CONF_OPTS += --disable-client
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+IWD_CONF_OPTS += --enable-systemd-service
+IWD_DEPENDENCIES += systemd
+else
+IWD_CONF_OPTS += --disable-systemd-service
+endif
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/jansson/jansson.hash b/buildroot/package/jansson/jansson.hash
index e169b229c..5baec1968 100644
--- a/buildroot/package/jansson/jansson.hash
+++ b/buildroot/package/jansson/jansson.hash
@@ -1,3 +1,3 @@
 # Locally calculated after checking pgp signature
-sha256	6e85f42dabe49a7831dbdd6d30dca8a966956b51a9a50ed534b82afc3fa5b2f4	jansson-2.11.tar.gz
-sha256	3034b2319f8c053995e8c8abf11b76418a3a8836cd769e5b3f0b6b13bfa00ec4	LICENSE
+sha256	5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c7027d2c9	jansson-2.12.tar.gz
+sha256	f0a0c95c64e9f49ec4cbfac8e7fee06823c85ee8ba4af5d57aaabb372347adc2	LICENSE
diff --git a/buildroot/package/jansson/jansson.mk b/buildroot/package/jansson/jansson.mk
index 920008757..b53381d46 100644
--- a/buildroot/package/jansson/jansson.mk
+++ b/buildroot/package/jansson/jansson.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JANSSON_VERSION = 2.11
+JANSSON_VERSION = 2.12
 JANSSON_SITE = http://www.digip.org/jansson/releases
 JANSSON_LICENSE = MIT
 JANSSON_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/janus-gateway/Config.in b/buildroot/package/janus-gateway/Config.in
index 94c00cd34..6eac763f7 100644
--- a/buildroot/package/janus-gateway/Config.in
+++ b/buildroot/package/janus-gateway/Config.in
@@ -67,11 +67,12 @@ comment "MQTT transport needs a toolchain w/ threads and dynamic library support
 
 config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ
 	bool "RabbitMQ"
+	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_RABBITMQ_C
 
-comment "RabbitMQ transport needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "RabbitMQ transport needs a toolchain w/ dynamic library, threads"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_JANUS_GATEWAY_REST
 	bool "REST (HTTP/HTTPS)"
diff --git a/buildroot/package/janus-gateway/janus-gateway.hash b/buildroot/package/janus-gateway/janus-gateway.hash
index f84ed8b6d..9b13e0f0f 100644
--- a/buildroot/package/janus-gateway/janus-gateway.hash
+++ b/buildroot/package/janus-gateway/janus-gateway.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 35cbbd5e7b7067e3a0b5ba221ea845814e5b59c733302f88fea80bcf98ce416f janus-gateway-v0.2.6.tar.gz
+sha256 c9c3b741a5d9f956845d5094c211690178cc0d630a7b23b870437c88a7e4ed3b janus-gateway-v0.5.0.tar.gz
 sha256 0a884af515b4593503f6f0c9b424db3945bd77eaa2644d25f45eb93a412b3c19 COPYING
diff --git a/buildroot/package/janus-gateway/janus-gateway.mk b/buildroot/package/janus-gateway/janus-gateway.mk
index 261fc2520..cea06b754 100644
--- a/buildroot/package/janus-gateway/janus-gateway.mk
+++ b/buildroot/package/janus-gateway/janus-gateway.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JANUS_GATEWAY_VERSION = v0.2.6
+JANUS_GATEWAY_VERSION = v0.5.0
 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION))
 JANUS_GATEWAY_LICENSE = GPL-3.0
 JANUS_GATEWAY_LICENSE_FILES = COPYING
diff --git a/buildroot/package/jasper/jasper.mk b/buildroot/package/jasper/jasper.mk
index b544a7c1c..31fded779 100644
--- a/buildroot/package/jasper/jasper.mk
+++ b/buildroot/package/jasper/jasper.mk
@@ -25,4 +25,12 @@ else
 JASPER_CONF_OPTS += -DJAS_ENABLE_LIBJPEG=OFF
 endif
 
+JASPER_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+JASPER_CFLAGS += -O0
+endif
+
+JASPER_CONF_OPTS += -DCMAKE_C_FLAGS="$(JASPER_CFLAGS)"
+
 $(eval $(cmake-package))
diff --git a/buildroot/package/jemalloc/Config.in b/buildroot/package/jemalloc/Config.in
index c3fd8e34b..edb582d20 100644
--- a/buildroot/package/jemalloc/Config.in
+++ b/buildroot/package/jemalloc/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS
 	default y if BR2_arm || BR2_armeb
 	default y if BR2_aarch64 || BR2_aarch64_be
 	default y if BR2_i386 || BR2_x86_64
-	default y if BR2_mips || BR2_mipsel
+	default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	default y if BR2_sparc64
 	default y if BR2_powerpc
 	default y if BR2_sh4 || BR2sh4eb || BR2_sh4a || BR2_sh4aeb
diff --git a/buildroot/package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch b/buildroot/package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch
deleted file mode 100644
index 87f9c4838..000000000
--- a/buildroot/package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f8c7732e24502c06739944f9a721c9d84a50319d Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Sun, 26 Aug 2018 19:11:55 +0200
-Subject: [PATCH] fix install of binaries with a static only library
-
-Define CMAKE_INSTALL_RPATH only if ENABLE_SHARED is set otherwise the
-following error is raised:
-
-CMake Error at cmake_install.cmake:73 (file):
-  file RPATH_CHANGE could not write new RPATH:
-
-    /usr/lib
-
-  to the file:
-
-    /home/fabrice/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/bin/rdjpgcom
-
-  No valid ELF RPATH or RUNPATH entry exists in the file;
-
-Signed-off-by: Fabrice Fontaine 
-[Upstream status: https://github.com/libjpeg-turbo/libjpeg-turbo/pull/273]
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1719522..862ab11 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -109,7 +109,9 @@ endif()
- 
- include(cmakescripts/GNUInstallDirs.cmake)
- 
-+if(ENABLE_SHARED)
- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
-+endif()
- 
- macro(report_directory var)
-   if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
--- 
-2.14.1
-
diff --git a/buildroot/package/jpeg-turbo/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch b/buildroot/package/jpeg-turbo/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch
new file mode 100644
index 000000000..a10fcf62a
--- /dev/null
+++ b/buildroot/package/jpeg-turbo/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch
@@ -0,0 +1,51 @@
+From 3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3 Mon Sep 17 00:00:00 2001
+From: DRC 
+Date: Tue, 1 Jan 2019 18:57:36 -0600
+Subject: [PATCH] tjLoadImage(): Fix int overflow/segfault w/big BMP
+
+Fixes #304
+
+[baruch: drop the ChangeLog.md hunk]
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit 3d9c64e9f8aa
+
+ ChangeLog.md | 4 ++++
+ turbojpeg.c  | 9 ++++++---
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/turbojpeg.c b/turbojpeg.c
+index 90a9ce6a0be8..3f7cd640677f 100644
+--- a/turbojpeg.c
++++ b/turbojpeg.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C)2009-2018 D. R. Commander.  All Rights Reserved.
++ * Copyright (C)2009-2019 D. R. Commander.  All Rights Reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions are met:
+@@ -1960,7 +1960,8 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width,
+                                      int align, int *height, int *pixelFormat,
+                                      int flags)
+ {
+-  int retval = 0, tempc, pitch;
++  int retval = 0, tempc;
++  size_t pitch;
+   tjhandle handle = NULL;
+   tjinstance *this;
+   j_compress_ptr cinfo = NULL;
+@@ -2013,7 +2014,9 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width,
+   *pixelFormat = cs2pf[cinfo->in_color_space];
+ 
+   pitch = PAD((*width) * tjPixelSize[*pixelFormat], align);
+-  if ((dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL)
++  if ((unsigned long long)pitch * (unsigned long long)(*height) >
++      (unsigned long long)((size_t)-1) ||
++      (dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL)
+     _throwg("tjLoadImage(): Memory allocation failure");
+ 
+   if (setjmp(this->jerr.setjmp_buffer)) {
+-- 
+2.20.1
+
diff --git a/buildroot/package/jpeg-turbo/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch b/buildroot/package/jpeg-turbo/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch
new file mode 100644
index 000000000..3e4e5bd08
--- /dev/null
+++ b/buildroot/package/jpeg-turbo/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch
@@ -0,0 +1,39 @@
+From f8cca819a4fb42aafa5f70df43c45e8c416d716f Mon Sep 17 00:00:00 2001
+From: DRC 
+Date: Tue, 1 Jan 2019 20:32:40 -0600
+Subject: [PATCH] wrbmp.c: Don't allow quantization w/ non-RGB CS
+
+If cinfo->quantize_colors == 1, then jpeg_calc_output_dimensions() will
+set cinfo->output_components to 1, and if cinfo->out_color_space is not
+RGB (or extended RGB), hilarity will ensue.
+
+Fixes #305
+
+[baruch: drop the ChangeLog.md hunk]
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit f8cca819a4
+
+ ChangeLog.md | 4 ++++
+ wrbmp.c      | 5 +++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/wrbmp.c b/wrbmp.c
+index 4bf81426b0ef..239f64eb3c3f 100644
+--- a/wrbmp.c
++++ b/wrbmp.c
+@@ -502,8 +502,9 @@ jinit_write_bmp(j_decompress_ptr cinfo, boolean is_os2,
+       dest->pub.put_pixel_rows = put_gray_rows;
+     else
+       dest->pub.put_pixel_rows = put_pixel_rows;
+-  } else if (cinfo->out_color_space == JCS_RGB565 ||
+-             cinfo->out_color_space == JCS_CMYK) {
++  } else if (!cinfo->quantize_colors &&
++             (cinfo->out_color_space == JCS_RGB565 ||
++              cinfo->out_color_space == JCS_CMYK)) {
+     dest->pub.put_pixel_rows = put_pixel_rows;
+   } else {
+     ERREXIT(cinfo, JERR_BMP_COLORSPACE);
+-- 
+2.20.1
+
diff --git a/buildroot/package/jpeg-turbo/jpeg-turbo.hash b/buildroot/package/jpeg-turbo/jpeg-turbo.hash
index f0fc5396e..1779324c5 100644
--- a/buildroot/package/jpeg-turbo/jpeg-turbo.hash
+++ b/buildroot/package/jpeg-turbo/jpeg-turbo.hash
@@ -1,7 +1,7 @@
-# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.0/
-sha1 fe49aea935617748c21ecbe46c986d6c1b98f39b  libjpeg-turbo-2.0.0.tar.gz
-md5 b12a3fcf1d078db38410f27718a91b83  libjpeg-turbo-2.0.0.tar.gz
+# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.1/
+sha1 7ea4a288bccbb5a2d5bfad5fb328d4a839853f4e  libjpeg-turbo-2.0.1.tar.gz
+md5 1b05a66aa9b006fd04ed29f408e68f46  libjpeg-turbo-2.0.1.tar.gz
 # Locally computed
-sha256 778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868  libjpeg-turbo-2.0.0.tar.gz
+sha256 e5f86cec31df1d39596e0cca619ab1b01f99025a27dafdfc97a30f3a12f866ff  libjpeg-turbo-2.0.1.tar.gz
 sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e  LICENSE.md
 sha256 82fece2bff2669c476495f0fe70096b154e8bc5b40916a64e99836d9a01c3110  README.ijg
diff --git a/buildroot/package/jpeg-turbo/jpeg-turbo.mk b/buildroot/package/jpeg-turbo/jpeg-turbo.mk
index 1807cc294..b848b6689 100644
--- a/buildroot/package/jpeg-turbo/jpeg-turbo.mk
+++ b/buildroot/package/jpeg-turbo/jpeg-turbo.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JPEG_TURBO_VERSION = 2.0.0
+JPEG_TURBO_VERSION = 2.0.1
 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
 JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
 JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD)
diff --git a/buildroot/package/jq/jq.hash b/buildroot/package/jq/jq.hash
index 2cd640563..449619b02 100644
--- a/buildroot/package/jq/jq.hash
+++ b/buildroot/package/jq/jq.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256  c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c  jq-1.5.tar.gz
+sha256  5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72  jq-1.6.tar.gz
+sha256  111136aebcbfa68b6b0084e582b30e981da76adcff84eab6f9be32a1f38c5bf1  COPYING
diff --git a/buildroot/package/jq/jq.mk b/buildroot/package/jq/jq.mk
index 79629faa5..aebe8c86e 100644
--- a/buildroot/package/jq/jq.mk
+++ b/buildroot/package/jq/jq.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JQ_VERSION = 1.5
+JQ_VERSION = 1.6
 JQ_SITE = https://github.com/stedolan/jq/releases/download/jq-$(JQ_VERSION)
 JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation)
 JQ_LICENSE_FILES = COPYING
@@ -17,8 +17,8 @@ JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE"
 HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99 -D_GNU_SOURCE"
 
 # jq explicitly enables maintainer mode, which we don't need/want
-JQ_CONF_OPTS += --disable-maintainer-mode
-HOST_JQ_CONF_OPTS += --disable-maintainer-mode
+JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
+HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash
index 4b9adf73c..cff01db74 100644
--- a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash
+++ b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	e8fffa6cbdb3c15ecdff32eebf958b6c686bc188da8ad5c6489462d16f83ae54	json-v3.1.2.tar.gz
+sha256	e0b1fc6cc6ca05706cce99118a87aca5248bd9db3113e703023d23f044995c1d	json-v3.5.0.tar.gz
 sha256	7b875bb7a4e28abb7956ea821b4b7d88ff6a2a4fabf261c3993730a365ec56dd	LICENSE.MIT
diff --git a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk
index e547c0787..86399fd60 100644
--- a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk
+++ b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JSON_FOR_MODERN_CPP_VERSION = v3.1.2
+JSON_FOR_MODERN_CPP_VERSION = v3.5.0
 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz
 JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,$(JSON_FOR_MODERN_CPP_VERSION))
 JSON_FOR_MODERN_CPP_LICENSE = MIT
diff --git a/buildroot/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch b/buildroot/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch
new file mode 100644
index 000000000..4402b48a8
--- /dev/null
+++ b/buildroot/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch
@@ -0,0 +1,61 @@
+From 7d4856e213f349bcd97b3644b01d6170b226de16 Mon Sep 17 00:00:00 2001
+From: Quentin Armitage 
+Date: Tue, 20 Nov 2018 17:24:58 +0000
+Subject: [PATCH] Rename TIMER_MAX to TIMER_MAXIMUM
+
+ulibC defines TIMER_MAX, so to avoid naming conflict rename it.
+
+This issue was reported by Paul Gildea  who also
+provided the patch.
+
+Signed-off-by: Quentin Armitage 
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/acassen/keepalived/commit/7d4856e213f349bcd97b3644b01d6170b226de16]
+---
+ lib/parser.c | 8 ++++----
+ lib/parser.h | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/parser.c b/lib/parser.c
+index 1d53595c0..cc9b644e2 100644
+--- a/lib/parser.c
++++ b/lib/parser.c
+@@ -1915,20 +1915,20 @@ read_timer(vector_t *strvec, size_t index, unsigned long *res, unsigned long min
+ #endif
+ 
+ 	if (!max_time)
+-		max_time = TIMER_MAX;
++		max_time = TIMER_MAXIMUM;
+ 
+ 	errno = 0;
+ 	timer = strtoul(vector_slot(strvec, index), &endptr, 10);
+-	*res = (timer > TIMER_MAX ? TIMER_MAX : timer) * TIMER_HZ;
++	*res = (timer > TIMER_MAXIMUM ? TIMER_MAXIMUM : timer) * TIMER_HZ;
+ 
+ 	if (FMT_STR_VSLOT(strvec, index)[0] == '-')
+ 		report_config_error(CONFIG_INVALID_NUMBER, "%snegative number '%s'", warn, FMT_STR_VSLOT(strvec, index));
+ 	else if (*endptr)
+ 		report_config_error(CONFIG_INVALID_NUMBER, "%sinvalid number '%s'", warn, FMT_STR_VSLOT(strvec, index));
+-	else if (errno == ERANGE || timer > TIMER_MAX)
++	else if (errno == ERANGE || timer > TIMER_MAXIMUM)
+ 		report_config_error(CONFIG_INVALID_NUMBER, "%snumber '%s' outside timer range", warn, FMT_STR_VSLOT(strvec, index));
+ 	else if (timer < min_time || timer > max_time)
+-		report_config_error(CONFIG_INVALID_NUMBER, "number '%s' outside range [%ld, %ld]", FMT_STR_VSLOT(strvec, index), min_time, max_time ? max_time : TIMER_MAX);
++		report_config_error(CONFIG_INVALID_NUMBER, "number '%s' outside range [%ld, %ld]", FMT_STR_VSLOT(strvec, index), min_time, max_time ? max_time : TIMER_MAXIMUM);
+ 	else
+ 		return true;
+ 
+diff --git a/lib/parser.h b/lib/parser.h
+index 88a74474a..291aa8ffe 100644
+--- a/lib/parser.h
++++ b/lib/parser.h
+@@ -38,7 +38,7 @@
+ #define MAXBUF	1024
+ 
+ /* Maximum time read_timer can return */
+-#define TIMER_MAX (ULONG_MAX / TIMER_HZ)
++#define TIMER_MAXIMUM (ULONG_MAX / TIMER_HZ)
+ 
+ /* Configuration test errors. These should be in decreasing order of severity */
+ typedef enum {
diff --git a/buildroot/package/keepalived/0001-configure.ac-do-not-force-PIE.patch b/buildroot/package/keepalived/0001-configure.ac-do-not-force-PIE.patch
deleted file mode 100644
index b51a4e334..000000000
--- a/buildroot/package/keepalived/0001-configure.ac-do-not-force-PIE.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4da31a615412e15f7658d21770708e8084be149c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Wed, 4 Apr 2018 22:29:45 +0200
-Subject: [PATCH] configure.ac: do not force PIE
-
-PIE is not necessarily supported on all architectures, so leave it up
-to the user to pass the appropriate CFLAGS/LDFLAGS if he wants to use
-PIE.
-
-This fixes the build on the m68k and Microblaze architecture:
-
-  http://autobuild.buildroot.net/results/a536f5947b3b70fdaecad1af5542572c504ad046/
-  http://autobuild.buildroot.net/results/0ffbf1e8d181c9463847a5b2be6f9baa18face24/
-
-Signed-off-by: Thomas Petazzoni 
-Upstream-status: https://github.com/acassen/keepalived/pull/830
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c344f07e..06545c91 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -233,8 +233,8 @@ AC_SUBST(ARFLAGS)
- # AC_PROG_LIBTOOL
- 
- KA_CPPFLAGS="$kernelinc"
--KA_CFLAGS="-Wall -Wunused -Wstrict-prototypes -Wextra -g -O2 -fPIE -D_GNU_SOURCE"
--KA_LDFLAGS="-pie"
-+KA_CFLAGS="-Wall -Wunused -Wstrict-prototypes -Wextra -g -O2 -D_GNU_SOURCE"
-+KA_LDFLAGS=""
- KA_LIBS=
- NEED_LIBDL=No
- #KA_LIBTOOLFLAGS =
--- 
-2.14.3
-
diff --git a/buildroot/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch b/buildroot/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch
new file mode 100644
index 000000000..76c88a76b
--- /dev/null
+++ b/buildroot/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch
@@ -0,0 +1,38 @@
+From e4dd33f16fe56d09c8d59d1254a4ed1d8e9bb29c Mon Sep 17 00:00:00 2001
+From: Quentin Armitage 
+Date: Thu, 6 Dec 2018 12:16:08 +0000
+Subject: [PATCH] Fix order of include files in configure COLLISION test
+
+Since Linux 4.4.11 (commit 1575c09) including linux/if.h after
+net/if.h works, whereas until glibc fix their headers including
+net/if.h after linux/if.h causes compiler redefinition errors.
+
+Unfortunately the test for the collision was done the wrong way
+round, as identified in issue #1079. The patch included in the
+issue report corrects the order of inclusion of the header files.
+
+What we should do is ensure that glibc header files are included
+before Linux header files, so that at least if kernel headers from
+4.4.11 onwards are used, the conflict will not occur.
+
+Signed-off-by: Quentin Armitage 
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from: https://github.com/acassen/keepalived/commit/e4dd33f16fe56d09c8d59d1254a4ed1d8e9bb29c]
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7a2e8ce1..9badcc62 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1349,8 +1349,8 @@ AC_MSG_CHECKING([for linux/if.h and net/if.h namespace collision])
+ SAV_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $kernelinc"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+-    #include 
+     #include 
++    #include 
+   ]])],
+   [
+     AC_MSG_RESULT([no])
diff --git a/buildroot/package/keepalived/Config.in b/buildroot/package/keepalived/Config.in
index 0140e62ae..c71821545 100644
--- a/buildroot/package/keepalived/Config.in
+++ b/buildroot/package/keepalived/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_KEEPALIVED
 	depends on !BR2_STATIC_LIBS # uses libdl
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_POPT
 	help
 	  The main goal of the keepalived project is to add a strong &
 	  robust keepalive facility to the Linux Virtual Server
diff --git a/buildroot/package/keepalived/keepalived.hash b/buildroot/package/keepalived/keepalived.hash
index ed7d2fb0a..3ad3e6e6a 100644
--- a/buildroot/package/keepalived/keepalived.hash
+++ b/buildroot/package/keepalived/keepalived.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	4e2d7cc01a6ee29a3955f5c622d47704ba7d9dd758189f15e9def016a2d1faa3  keepalived-1.4.2.tar.gz
+sha256	40e0e55afed9ca313d621a9c5878579696fafb5504dab521aadaf20ba6e7f597  keepalived-2.0.10.tar.gz
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/buildroot/package/keepalived/keepalived.mk b/buildroot/package/keepalived/keepalived.mk
index e8a280a19..4f6db0172 100644
--- a/buildroot/package/keepalived/keepalived.mk
+++ b/buildroot/package/keepalived/keepalived.mk
@@ -4,14 +4,28 @@
 #
 ################################################################################
 
-KEEPALIVED_VERSION = 1.4.2
+KEEPALIVED_VERSION = 2.0.10
 KEEPALIVED_SITE = http://www.keepalived.org/software
-KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt
+KEEPALIVED_DEPENDENCIES = host-pkgconf openssl
 KEEPALIVED_LICENSE = GPL-2.0+
 KEEPALIVED_LICENSE_FILES = COPYING
-# 0001-configure.ac-do-not-force-PIE.patch
+KEEPALIVED_CONF_OPTS = --disable-hardening
+# We're patching configure.ac
 KEEPALIVED_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_JSON_C),y)
+KEEPALIVED_DEPENDENCIES += json-c
+KEEPALIVED_CONF_OPTS += --enable-json
+else
+KEEPALIVED_CONF_OPTS += --disable-json
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+KEEPALIVED_DEPENDENCIES += libglib2
+KEEPALIVED_CONF_OPTS += --enable-dbus
+else
 KEEPALIVED_CONF_OPTS += --disable-dbus
+endif
 
 ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_PACKAGE_LIBNFNETLINK),yy)
 KEEPALIVED_DEPENDENCIES += libnl libnfnetlink
diff --git a/buildroot/package/kexec/Config.in b/buildroot/package/kexec/Config.in
index c8cdea566..410e503d9 100644
--- a/buildroot/package/kexec/Config.in
+++ b/buildroot/package/kexec/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_KEXEC
 	bool "kexec"
 	depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
 		BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \
-		BR2_powerpc || BR2_sh4 || BR2_sh4a || BR2_aarch64
+		BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
+		BR2_sh4 || BR2_sh4a || BR2_aarch64
 	help
 	  Kexec is a user space utility for loading another kernel
 	  and asking the currently running kernel to do something with
diff --git a/buildroot/package/kexec/kexec.hash b/buildroot/package/kexec/kexec.hash
index 24294909e..f87692b68 100644
--- a/buildroot/package/kexec/kexec.hash
+++ b/buildroot/package/kexec/kexec.hash
@@ -1,4 +1,4 @@
 # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc
-sha256 504c816b769da573167b63f3b6d4fce3740f231c98d8db0c4fda47a4b90482a9 kexec-tools-2.0.17.tar.xz
+sha256 f020f07341977eb512663e301c2de60c6589e141467c16a8efd58243c0b2b238 kexec-tools-2.0.18.tar.xz
 # locally calculated
 sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING
diff --git a/buildroot/package/kexec/kexec.mk b/buildroot/package/kexec/kexec.mk
index b0f4367dd..b011c0b4e 100644
--- a/buildroot/package/kexec/kexec.mk
+++ b/buildroot/package/kexec/kexec.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KEXEC_VERSION = 2.0.17
+KEXEC_VERSION = 2.0.18
 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
 KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
 KEXEC_LICENSE = GPL-2.0
diff --git a/buildroot/package/keyutils/0001-fix-install-rule.patch b/buildroot/package/keyutils/0001-fix-install-rule.patch
index 3670d28e6..26545716c 100644
--- a/buildroot/package/keyutils/0001-fix-install-rule.patch
+++ b/buildroot/package/keyutils/0001-fix-install-rule.patch
@@ -6,15 +6,17 @@ the host library.
 Based on the former patch by Yann E. MORIN.
 
 Signed-off-by: Vicente Olivert Riera 
+[baruch: update for 1.6]
+Signed-off-by: Baruch Siach 
 
 --- keyutils-1.5.9/Makefile.orig	2014-09-22 16:13:41.593562765 +0100
 +++ keyutils-1.5.9/Makefile	2014-09-22 16:14:05.377963952 +0100
-@@ -168,7 +168,7 @@ ifeq ($(NO_SOLIB),0)
+@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0)
  	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
  	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
  	mkdir -p $(DESTDIR)$(USRLIBDIR)
 -	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
 +	$(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
- endif
- 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
- 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
+ 	sed \
+ 	-e 's,@VERSION\@,$(VERSION),g' \
+ 	-e 's,@prefix\@,$(PREFIX),g' \
diff --git a/buildroot/package/keyutils/0003-Add-missing-limits.h-include.patch b/buildroot/package/keyutils/0003-Add-missing-limits.h-include.patch
deleted file mode 100644
index 45c84398f..000000000
--- a/buildroot/package/keyutils/0003-Add-missing-limits.h-include.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b2c6d3744dca029560d0d5e780f16561f8eeed53 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Sun, 12 Jul 2015 16:22:14 +0200
-Subject: [PATCH] Add missing  include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-key.dns_resolver.c uses ‘UINT_MAX’ and ‘ULONG_MAX’, but forgets to
-include , which causes build failure with certain C
-libraries (notably the musl C library).
-
-Signed-off-by: Thomas Petazzoni 
----
- key.dns_resolver.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/key.dns_resolver.c b/key.dns_resolver.c
-index c2a9fe5..d41e219 100644
---- a/key.dns_resolver.c
-+++ b/key.dns_resolver.c
-@@ -56,6 +56,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- static const char *DNS_PARSE_VERSION = "1.0";
- static const char prog[] = "key.dns_resolver";
--- 
-2.4.5
-
diff --git a/buildroot/package/keyutils/keyutils.hash b/buildroot/package/keyutils/keyutils.hash
index b14b7bec1..d6781628c 100644
--- a/buildroot/package/keyutils/keyutils.hash
+++ b/buildroot/package/keyutils/keyutils.hash
@@ -1,2 +1,4 @@
 # Locally computed
-sha256 115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6  keyutils-1.5.10.tar.bz2
+sha256 d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115  keyutils-1.6.tar.bz2
+sha256 f46409d4822b2457b39bbd0e7881eecb396130eb8320b7748fa7e9488970aa6d  LICENCE.GPL
+sha256 0d15593e3a8ad90917f8509b5ac1e4b5e5d196434a68029aa9dc0858a4a4c521  LICENCE.LGPL
diff --git a/buildroot/package/keyutils/keyutils.mk b/buildroot/package/keyutils/keyutils.mk
index 048b6894d..c8de3a0df 100644
--- a/buildroot/package/keyutils/keyutils.mk
+++ b/buildroot/package/keyutils/keyutils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KEYUTILS_VERSION = 1.5.10
+KEYUTILS_VERSION = 1.6
 KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
 KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
 KEYUTILS_LICENSE = GPL-2.0+, LGPL-2.1+
diff --git a/buildroot/package/kf5/Config.in b/buildroot/package/kf5/Config.in
index 075b24626..2e50bce49 100644
--- a/buildroot/package/kf5/Config.in
+++ b/buildroot/package/kf5/Config.in
@@ -8,6 +8,7 @@ menuconfig BR2_PACKAGE_KF5
 
 if BR2_PACKAGE_KF5
 source "package/kf5/kf5-extra-cmake-modules/Config.in"
+source "package/kf5/kf5-kcoreaddons/Config.in"
 source "package/kf5/kf5-modemmanager-qt/Config.in"
 source "package/kf5/kf5-networkmanager-qt/Config.in"
 endif
diff --git a/buildroot/package/kf5/kf5-kcoreaddons/Config.in b/buildroot/package/kf5/kf5-kcoreaddons/Config.in
new file mode 100644
index 000000000..88fda03ee
--- /dev/null
+++ b/buildroot/package/kf5/kf5-kcoreaddons/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_KF5_KCOREADDONS
+	bool "kf5-kcoreaddons"
+	select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES
+	select BR2_PACKAGE_QT5TOOLS
+	select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS
+	help
+	  KF5 is a set of Qt framework addons, extending Qt in
+	  various ways, not only restricted in helping integration
+	  in KDE.
+
+	  This package contains KCoreAddons, a set of classes built
+	  on top of QtCore to perform various tasks.
+
+	  https://api.kde.org/frameworks/kcoreaddons/html/index.html
diff --git a/buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
new file mode 100644
index 000000000..0cd8dcfc1
--- /dev/null
+++ b/buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz
+sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
diff --git a/buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
new file mode 100644
index 000000000..ea6aac4ec
--- /dev/null
+++ b/buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# kf5-kcoreaddons
+#
+################################################################################
+
+KF5_KCOREADDONS_VERSION = $(KF5_VERSION)
+KF5_KCOREADDONS_SITE = $(KF5_SITE)
+KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz
+KF5_KCOREADDONS_LICENSE = LGPL-2.1
+KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB
+
+KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools
+KF5_KCOREADDONS_INSTALL_STAGING = YES
+
+KF5_KCOREADDONS_CXXFLAGS = $(TARGET_CXXFLAGS)
+KF5_KCOREADDONS_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCOREADDONS_CXXFLAGS)"
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+KF5_KCOREADDONS_CXXFLAGS += -latomic
+endif
+
+$(eval $(cmake-package))
diff --git a/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk
index 9bbeeaa76..20fbc102c 100644
--- a/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk
+++ b/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk
@@ -13,4 +13,9 @@ KF5_MODEMMANAGER_QT_LICENSE_FILE = COPYING.LIB
 KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base
 KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES
 
+# Uses __atomic_fetch_add_4
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+KF5_MODEMMANAGER_QT_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
+endif
+
 $(eval $(cmake-package))
diff --git a/buildroot/package/kismet/kismet.mk b/buildroot/package/kismet/kismet.mk
index cee814b52..d3946d65f 100644
--- a/buildroot/package/kismet/kismet.mk
+++ b/buildroot/package/kismet/kismet.mk
@@ -15,6 +15,14 @@ KISMET_LICENSE_FILES = debian/copyright
 # We touch configure.in:
 KISMET_AUTORECONF = YES
 
+KISMET_CXXFLAGS = $(TARGET_CXXFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+KISMET_CXXFLAGS += -O0
+endif
+
+KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)"
+
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 KISMET_DEPENDENCIES += libcap
 endif
diff --git a/buildroot/package/kmod/kmod.mk b/buildroot/package/kmod/kmod.mk
index c165ea302..ea5d29113 100644
--- a/buildroot/package/kmod/kmod.mk
+++ b/buildroot/package/kmod/kmod.mk
@@ -28,6 +28,10 @@ KMOD_CONF_OPTS = --disable-static --enable-shared
 KMOD_CONF_OPTS += --disable-manpages
 HOST_KMOD_CONF_OPTS = --disable-manpages
 
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+KMOD_CONF_OPTS += --with-bashcompletiondir=/usr/share/bash-completion/completions
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 KMOD_DEPENDENCIES += zlib
 KMOD_CONF_OPTS += --with-zlib
diff --git a/buildroot/package/kmsxx/kmsxx.mk b/buildroot/package/kmsxx/kmsxx.mk
index dc0f8c17d..c664d5236 100644
--- a/buildroot/package/kmsxx/kmsxx.mk
+++ b/buildroot/package/kmsxx/kmsxx.mk
@@ -12,12 +12,6 @@ KMSXX_INSTALL_STAGING = YES
 KMSXX_DEPENDENCIES = libdrm host-pkgconf
 KMSXX_CONF_OPTS = -DKMSXX_ENABLE_PYTHON=OFF
 
-# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
-ifeq ($(BR2_m68k_cf),y)
-KMSXX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
-endif
-
 ifeq ($(BR2_PACKAGE_KMSXX_INSTALL_TESTS),y)
 KMSXX_TESTS = \
 	fbtest kmsblank kmscapture \
diff --git a/buildroot/package/kodi/Config.in b/buildroot/package/kodi/Config.in
index e84f5c401..279b4ead0 100644
--- a/buildroot/package/kodi/Config.in
+++ b/buildroot/package/kodi/Config.in
@@ -15,21 +15,35 @@ comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, t
 		|| !BR2_PACKAGE_PYTHON \
 		|| BR2_PACKAGE_PYTHON_PYC_ONLY
 
-config BR2_PACKAGE_KODI_EGL_GLES
+config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
+	bool
+
+config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_AML
 	bool
 	default y
-	depends on BR2_PACKAGE_HAS_LIBEGL
-	depends on BR2_PACKAGE_HAS_LIBGLES
-	depends on !BR2_PACKAGE_KODI_GL_EGL # prefer GL if available
+	depends on BR2_PACKAGE_LIBAMCODEC
+	depends on BR2_PACKAGE_ODROID_MALI
+	select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
 
-config BR2_PACKAGE_KODI_GL_EGL
+config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI
+	bool
+	default y
+	# List of valid CPUs can be found here:
+	# https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L12
+	depends on BR2_arm1176jzf_s || BR2_cortex_a7 || BR2_cortex_a53
+	depends on BR2_PACKAGE_RPI_USERLAND
+	select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
+
+config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL
 	bool
 	default y
 	depends on BR2_PACKAGE_HAS_LIBEGL
 	depends on BR2_PACKAGE_HAS_LIBGL
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
 
-comment "kodi needs an OpenGL EGL with either an openGL or an OpenGL ES backend"
-	depends on !BR2_PACKAGE_KODI_GL_EGL && !BR2_PACKAGE_KODI_EGL_GLES
+comment "kodi needs an OpenGL EGL backend with OpenGL support"
+	depends on !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
 
 menuconfig BR2_PACKAGE_KODI
 	bool "kodi"
@@ -38,10 +52,10 @@ menuconfig BR2_PACKAGE_KODI
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_TOOLCHAIN_USES_MUSL
-	depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL_EGL
 	depends on BR2_USE_WCHAR
 	depends on !BR2_STATIC_LIBS # gnutls, python and others
 	depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
 	depends on BR2_PACKAGE_PYTHON
 	depends on !BR2_PACKAGE_PYTHON_PYC_ONLY
 	select BR2_NEEDS_HOST_JAVA
@@ -55,7 +69,6 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_LIBCROSSGUID
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBFRIBIDI
-	select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL_EGL
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBPLIST
 	select BR2_PACKAGE_LIBSAMPLERATE
@@ -77,8 +90,6 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_TAGLIB
 	select BR2_PACKAGE_TINYXML
-	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL_EGL
-	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL_EGL
 	select BR2_PACKAGE_YAJL
 	select BR2_PACKAGE_ZLIB
 	select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
@@ -187,6 +198,27 @@ config BR2_PACKAGE_KODI_NONFREE
 	  Enable components with non-free licenses. This option
 	  currently only controls support for RAR archives.
 
+choice
+	prompt "platform"
+	default BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
+
+config BR2_PACKAGE_KODI_PLATFORM_AML
+	bool "AMLogic"
+	depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_AML
+
+config BR2_PACKAGE_KODI_PLATFORM_RBPI
+	bool "Raspberry Pi"
+	depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI
+
+config BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
+	bool "X11/OpenGL"
+	depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_LIBGLU
+	select BR2_PACKAGE_XLIB_LIBXRANDR
+
+endchoice
+
 config BR2_PACKAGE_KODI_PULSEAUDIO
 	bool "pulseaudio"
 	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
@@ -237,25 +269,23 @@ config BR2_PACKAGE_KODI_LIBUSB
 
 config BR2_PACKAGE_KODI_LIBVA
 	bool "va"
-	depends on BR2_PACKAGE_KODI_GL_EGL
-	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
 	select BR2_PACKAGE_LIBVA
 	help
 	  Enable libva support.
 
-comment "libva support needs X.org with an openGL backend"
-	depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_KODI_GL_EGL
+comment "libva support needs platform 'X11/OpenGL'"
+	depends on !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
 
 config BR2_PACKAGE_KODI_LIBVDPAU
 	bool "vdpau"
-	depends on BR2_PACKAGE_KODI_GL_EGL
-	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
 	select BR2_PACKAGE_LIBVDPAU
 	help
 	  Enable libvdpau support.
 
-comment "libvdpau support needs X.org with an openGL backend"
-	depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_KODI_GL_EGL
+comment "libvdpau support needs platform 'X11/OpenGL'"
+	depends on !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
 
 config BR2_PACKAGE_KODI_UPNP
 	bool "upnp"
diff --git a/buildroot/package/kodi/S50kodi b/buildroot/package/kodi/S50kodi
old mode 100755
new mode 100644
diff --git a/buildroot/package/kodi/kodi.mk b/buildroot/package/kodi/kodi.mk
index 8d2430ea5..590af15b7 100644
--- a/buildroot/package/kodi/kodi.mk
+++ b/buildroot/package/kodi/kodi.mk
@@ -82,9 +82,7 @@ ifeq ($(BR2_ENABLE_LOCALE),)
 KODI_DEPENDENCIES += libiconv
 endif
 
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
-KODI_DEPENDENCIES += rpi-userland
+ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y)
 # These CPU-specific options are only used on rbpi:
 # https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L13
 ifeq ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y)
@@ -165,6 +163,39 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 KODI_CXX_FLAGS += -latomic
 endif
 
+ifeq ($(BR2_PACKAGE_KODI_PLATFORM_AML),y)
+KODI_CONF_OPTS += -DENABLE_AML=ON -DENABLE_OPENGLES=ON
+# The following line can be removed when bumping to 18.0-Leia,
+# see upstream PR 13425
+KODI_CXX_FLAGS += -DMESA_EGL_NO_X11_HEADERS
+KODI_DEPENDENCIES += libamcodec odroid-mali
+else
+KODI_CONF_OPTS += -DENABLE_AML=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y)
+KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi -DENABLE_OPENGLES=ON
+KODI_DEPENDENCIES += rpi-userland
+else
+# Kodi considers "rpbi" and "linux" as two separate platforms. The
+# below options, defined in
+# project/cmake/scripts/linux/ArchSetup.cmake are only valid for the
+# "linux" platforms. The "rpbi" platform has a different set of
+# options, defined in project/cmake/scripts/rbpi/
+KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL),y)
+KODI_CONF_OPTS += \
+	-DENABLE_OPENGL=ON \
+	-DENABLE_OPENGLES=OFF \
+	-DENABLE_X11=ON
+KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \
+	xlib_libXrandr libdrm
+else
+KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_KODI_MYSQL),y)
 KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=ON
 KODI_DEPENDENCIES += mysql
@@ -180,24 +211,6 @@ else
 KODI_CONF_OPTS += -DENABLE_NONFREE=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
-KODI_DEPENDENCIES += rpi-userland
-else
-# Kodi considers "rpbi" and "linux" as two separate platforms. The
-# below options, defined in
-# project/cmake/scripts/linux/ArchSetup.cmake are only valid for the
-# "linux" platforms. The "rpbi" platform has a different set of
-# options, defined in project/cmake/scripts/rbpi/
-KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF
-ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)
-KODI_CONF_OPTS += -DENABLE_AML=ON
-KODI_DEPENDENCIES += libamcodec
-else
-KODI_CONF_OPTS += -DENABLE_AML=OFF
-endif
-endif
-
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 KODI_CONF_OPTS += -DENABLE_UDEV=ON
 KODI_DEPENDENCIES += udev
@@ -250,24 +263,6 @@ else
 KODI_CONF_OPTS += -DENABLE_ALSA=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_KODI_GL_EGL),y)
-KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \
-	xlib_libXrandr libdrm
-KODI_CONF_OPTS += -DENABLE_OPENGL=ON -DENABLE_X11=ON -DENABLE_OPENGLES=OFF
-else
-KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
-endif
-
-ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
-KODI_DEPENDENCIES += libegl libgles
-KODI_CONF_OPTS += \
-	-DENABLE_OPENGLES=ON
-KODI_C_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`
-KODI_CXX_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`
-else
-KODI_CONF_OPTS += -DENABLE_OPENGLES=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_KODI_LIBMICROHTTPD),y)
 KODI_CONF_OPTS += -DENABLE_MICROHTTPD=ON
 KODI_DEPENDENCIES += libmicrohttpd
diff --git a/buildroot/package/lbase64/Config.in b/buildroot/package/lbase64/Config.in
index 34ef943aa..c836ffb5e 100644
--- a/buildroot/package/lbase64/Config.in
+++ b/buildroot/package/lbase64/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LBASE64
 	bool "lbase64"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  A base64 library for Lua
 
diff --git a/buildroot/package/lcdapi/lcdapi.mk b/buildroot/package/lcdapi/lcdapi.mk
index f7c71dfd3..b27abcdbf 100644
--- a/buildroot/package/lcdapi/lcdapi.mk
+++ b/buildroot/package/lcdapi/lcdapi.mk
@@ -11,12 +11,6 @@ LCDAPI_LICENSE_FILES = COPYING
 LCDAPI_AUTORECONF = YES
 LCDAPI_INSTALL_STAGING = YES
 
-# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
-ifeq ($(BR2_m68k_cf),y)
-LCDAPI_CONF_OPTS += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
-endif
-
 define LCDAPI_CREATE_M4_DIR
 	mkdir -p $(@D)/m4
 endef
diff --git a/buildroot/package/leptonica/leptonica.hash b/buildroot/package/leptonica/leptonica.hash
index 54fe8785d..14c750c2c 100644
--- a/buildroot/package/leptonica/leptonica.hash
+++ b/buildroot/package/leptonica/leptonica.hash
@@ -1,3 +1,3 @@
 # locally computed hash
-sha256 5e9a33b7ce33ab39fb03cee5a7ec353b044670176303265d7c64d51539616857  leptonica-1.76.0.tar.gz
+sha256 dd7990ab6b6824b0cfed70920824d37b47184240f98db4085f7dbf1250cd4899  leptonica-1.77.0.tar.gz
 sha256 ca0ac11c7c0acad9599d54990942cc11c9f6d9b569f1a360d774a628819c3518  leptonica-license.txt
diff --git a/buildroot/package/leptonica/leptonica.mk b/buildroot/package/leptonica/leptonica.mk
index 5e37f939b..7c6fa12bb 100644
--- a/buildroot/package/leptonica/leptonica.mk
+++ b/buildroot/package/leptonica/leptonica.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LEPTONICA_VERSION = 1.76.0
+LEPTONICA_VERSION = 1.77.0
 LEPTONICA_SITE = http://www.leptonica.org/source
 LEPTONICA_LICENSE = BSD-2-Clause
 LEPTONICA_LICENSE_FILES = leptonica-license.txt
diff --git a/buildroot/package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch b/buildroot/package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch
new file mode 100644
index 000000000..dce06ec72
--- /dev/null
+++ b/buildroot/package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch
@@ -0,0 +1,52 @@
+From 6ed1b57ef6bcee0d497c181730710b2b0fafbfb3 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= 
+Date: Fri, 31 Aug 2018 12:23:46 -0400
+Subject: [PATCH] Generate position independant code for static library
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Currently, only shared libraries are using the PIC flag.
+
+Generalize this flag for static libraries in order to let them linkable
+by dynamic libraries.
+
+Fixes:
+
+	/home/gportay/src/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-amd-linux-gnu/6.2.0/../../../../x86_64-amd-linux-gnu/bin/ld: /home/gportay/src/buildroot/output/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libmemenv.a(memenv.o): relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC
+	/home/gportay/src/buildroot/output/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libmemenv.a: error adding symbols: Bad value
+	collect2: error: ld returned 1 exit status
+
+Upstream-Status: Inappropriate [upstream has migrated to cmake]
+Signed-off-by: Gaël PORTAY 
+---
+ build_detect_platform | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/build_detect_platform b/build_detect_platform
+index d2a20ce..4839444 100755
+--- a/build_detect_platform
++++ b/build_detect_platform
+@@ -55,8 +55,8 @@ fi
+ 
+ COMMON_FLAGS=
+ CROSS_COMPILE=
+-PLATFORM_CCFLAGS=
+-PLATFORM_CXXFLAGS=
++PLATFORM_CCFLAGS="-fPIC"
++PLATFORM_CXXFLAGS="-fPIC"
+ PLATFORM_LDFLAGS=
+ PLATFORM_LIBS=
+ PLATFORM_SHARED_EXT="so"
+@@ -197,7 +197,7 @@ else
+ EOF
+     if [ "$?" = 0 ]; then
+         COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX -DLEVELDB_ATOMIC_PRESENT"
+-        PLATFORM_CXXFLAGS="-std=c++0x"
++        PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS -std=c++0x"
+     else
+         COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
+     fi
+-- 
+2.18.0
+
diff --git a/buildroot/package/leveldb/0003-fix-parallel-build.patch b/buildroot/package/leveldb/0003-fix-parallel-build.patch
deleted file mode 100644
index 8aafbc2e0..000000000
--- a/buildroot/package/leveldb/0003-fix-parallel-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 293e1b08317567b2e479d24530986676ae4d2221 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Mon, 8 Oct 2018 23:08:19 +0200
-Subject: [PATCH] fix parallel build
-
-Build of leveldb sometimes fails on:
-Fatal error: can't create out-shared/db/db_bench.o: No such file or directory
-
-Fix this, by creating $(SHARED_OUTDIR) before building
-(SHARED_OUTDIR)/db/db_bench.o
-
-Fixes:
- - http://autobuild.buildroot.net/results/945bb8096c1f98f307161a6def5a9f7f25b2454a
-
-Signed-off-by: Fabrice Fontaine 
-[Upstream status: not upstreamable as upstream switched to cmake]
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index f7cc7d7..edb56a5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -386,7 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/write_batch_test.cc $(STATIC_LIBOBJECTS) $(
- $(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS)
- 	$(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS)
- 
--$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL)
-+$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR) $(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL)
- 	$(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS)
- 
- .PHONY: run-shared
--- 
-2.17.1
-
diff --git a/buildroot/package/leveldb/leveldb.mk b/buildroot/package/leveldb/leveldb.mk
index 54942a0f2..6078cd496 100644
--- a/buildroot/package/leveldb/leveldb.mk
+++ b/buildroot/package/leveldb/leveldb.mk
@@ -17,18 +17,20 @@ LEVELDB_MAKE_ARGS += SHARED_LIBS= SHARED_PROGRAMS=
 endif
 
 define LEVELDB_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) \
 		$(LEVELDB_MAKE_ARGS) -C $(@D)
 endef
 
 define LEVELDB_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) \
+	$(TARGET_MAKE_ENV) $(MAKE1) \
 		INSTALL_ROOT=$(STAGING_DIR) INSTALL_PREFIX=/usr \
 		$(LEVELDB_MAKE_ARGS) -C $(@D) install
+	$(INSTALL) -D -m 0644 $(@D)/out-static/libmemenv.a $(STAGING_DIR)/usr/lib/libmemenv.a
+	$(INSTALL) -D -m 0644 $(@D)/helpers/memenv/memenv.h $(STAGING_DIR)/usr/include/helpers/memenv/memenv.h
 endef
 
 define LEVELDB_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) \
+	$(TARGET_MAKE_ENV) $(MAKE1) \
 		INSTALL_ROOT=$(TARGET_DIR) INSTALL_PREFIX=/usr \
 		$(LEVELDB_MAKE_ARGS) -C $(@D) install
 endef
diff --git a/buildroot/package/libarchive/0001-Avoid-a-double-free-when-a-window-size-of-0-is-speci.patch b/buildroot/package/libarchive/0001-Avoid-a-double-free-when-a-window-size-of-0-is-speci.patch
new file mode 100644
index 000000000..76096f7a4
--- /dev/null
+++ b/buildroot/package/libarchive/0001-Avoid-a-double-free-when-a-window-size-of-0-is-speci.patch
@@ -0,0 +1,40 @@
+From 021efa522ad729ff0f5806c4ce53e4a6cc1daa31 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens 
+Date: Tue, 20 Nov 2018 17:56:29 +1100
+Subject: [PATCH] Avoid a double-free when a window size of 0 is specified
+
+new_size can be 0 with a malicious or corrupted RAR archive.
+
+realloc(area, 0) is equivalent to free(area), so the region would
+be free()d here and the free()d again in the cleanup function.
+
+Found with a setup running AFL, afl-rb, and qsym.
+---
+ libarchive/archive_read_support_format_rar.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+[for import into Buildroot]
+Signed-off-by: Thomas De Schampheleire 
+Upstream-status: backport
+
+CVE-2018-1000877
+
+diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
+index 23452222..6f419c27 100644
+--- a/libarchive/archive_read_support_format_rar.c
++++ b/libarchive/archive_read_support_format_rar.c
+@@ -2300,6 +2300,11 @@ parse_codes(struct archive_read *a)
+       new_size = DICTIONARY_MAX_SIZE;
+     else
+       new_size = rar_fls((unsigned int)rar->unp_size) << 1;
++    if (new_size == 0) {
++      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++                        "Zero window size is invalid.");
++      return (ARCHIVE_FATAL);
++    }
+     new_window = realloc(rar->lzss.window, new_size);
+     if (new_window == NULL) {
+       archive_set_error(&a->archive, ENOMEM,
+-- 
+2.19.2
+
diff --git a/buildroot/package/libarchive/0002-rar-file-split-across-multi-part-archives-must-match.patch b/buildroot/package/libarchive/0002-rar-file-split-across-multi-part-archives-must-match.patch
new file mode 100644
index 000000000..4bf68d61d
--- /dev/null
+++ b/buildroot/package/libarchive/0002-rar-file-split-across-multi-part-archives-must-match.patch
@@ -0,0 +1,81 @@
+From bfcfe6f04ed20db2504db8a254d1f40a1d84eb28 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens 
+Date: Tue, 4 Dec 2018 00:55:22 +1100
+Subject: [PATCH] rar: file split across multi-part archives must match
+
+Fuzzing uncovered some UAF and memory overrun bugs where a file in a
+single file archive reported that it was split across multiple
+volumes. This was caused by ppmd7 operations calling
+rar_br_fillup. This would invoke rar_read_ahead, which would in some
+situations invoke archive_read_format_rar_read_header.  That would
+check the new file name against the old file name, and if they didn't
+match up it would free the ppmd7 buffer and allocate a new
+one. However, because the ppmd7 decoder wasn't actually done with the
+buffer, it would continue to used the freed buffer. Both reads and
+writes to the freed region can be observed.
+
+This is quite tricky to solve: once the buffer has been freed it is
+too late, as the ppmd7 decoder functions almost universally assume
+success - there's no way for ppmd_read to signal error, nor are there
+good ways for functions like Range_Normalise to propagate them. So we
+can't detect after the fact that we're in an invalid state - e.g. by
+checking rar->cursor, we have to prevent ourselves from ever ending up
+there. So, when we are in the dangerous part or rar_read_ahead that
+assumes a valid split, we set a flag force read_header to either go
+down the path for split files or bail. This means that the ppmd7
+decoder keeps a valid buffer and just runs out of data.
+
+Found with a combination of AFL, afl-rb and qsym.
+---
+ libarchive/archive_read_support_format_rar.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+[for import into Buildroot]
+Signed-off-by: Thomas De Schampheleire 
+Upstream-status: backport
+
+CVE-2018-1000878
+
+diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
+index 6f419c27..a8cc5c94 100644
+--- a/libarchive/archive_read_support_format_rar.c
++++ b/libarchive/archive_read_support_format_rar.c
+@@ -258,6 +258,7 @@ struct rar
+   struct data_block_offsets *dbo;
+   unsigned int cursor;
+   unsigned int nodes;
++  char filename_must_match;
+ 
+   /* LZSS members */
+   struct huffman_code maincode;
+@@ -1560,6 +1561,12 @@ read_header(struct archive_read *a, struct archive_entry *entry,
+     }
+     return ret;
+   }
++  else if (rar->filename_must_match)
++  {
++    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++      "Mismatch of file parts split across multi-volume archive");
++    return (ARCHIVE_FATAL);
++  }
+ 
+   rar->filename_save = (char*)realloc(rar->filename_save,
+                                       filename_size + 1);
+@@ -2933,12 +2940,14 @@ rar_read_ahead(struct archive_read *a, size_t min, ssize_t *avail)
+     else if (*avail == 0 && rar->main_flags & MHD_VOLUME &&
+       rar->file_flags & FHD_SPLIT_AFTER)
+     {
++      rar->filename_must_match = 1;
+       ret = archive_read_format_rar_read_header(a, a->entry);
+       if (ret == (ARCHIVE_EOF))
+       {
+         rar->has_endarc_header = 1;
+         ret = archive_read_format_rar_read_header(a, a->entry);
+       }
++      rar->filename_must_match = 0;
+       if (ret != (ARCHIVE_OK))
+         return NULL;
+       return rar_read_ahead(a, min, avail);
+-- 
+2.19.2
+
diff --git a/buildroot/package/libarchive/0003-Skip-0-length-ACL-fields.patch b/buildroot/package/libarchive/0003-Skip-0-length-ACL-fields.patch
new file mode 100644
index 000000000..796bfbdeb
--- /dev/null
+++ b/buildroot/package/libarchive/0003-Skip-0-length-ACL-fields.patch
@@ -0,0 +1,52 @@
+From 15bf44fd2c1ad0e3fd87048b3fcc90c4dcff1175 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens 
+Date: Tue, 4 Dec 2018 14:29:42 +1100
+Subject: [PATCH] Skip 0-length ACL fields
+
+Currently, it is possible to create an archive that crashes bsdtar
+with a malformed ACL:
+
+Program received signal SIGSEGV, Segmentation fault.
+archive_acl_from_text_l (acl=, text=0x7e2e92 "", want_type=, sc=) at libarchive/archive_acl.c:1726
+1726				switch (*s) {
+(gdb) p n
+$1 = 1
+(gdb) p field[n]
+$2 = {start = 0x0, end = 0x0}
+
+Stop this by checking that the length is not zero before beginning
+the switch statement.
+
+I am pretty sure this is the bug mentioned in the qsym paper [1],
+and I was able to replicate it with a qsym + AFL + afl-rb setup.
+
+[1] https://www.usenix.org/conference/usenixsecurity18/presentation/yun
+---
+ libarchive/archive_acl.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+[for import into Buildroot]
+Signed-off-by: Thomas De Schampheleire 
+Upstream-status: backport
+
+CVE-2018-1000879
+
+diff --git a/libarchive/archive_acl.c b/libarchive/archive_acl.c
+index 512beee1..7beeee86 100644
+--- a/libarchive/archive_acl.c
++++ b/libarchive/archive_acl.c
+@@ -1723,6 +1723,11 @@ archive_acl_from_text_l(struct archive_acl *acl, const char *text,
+ 			st = field[n].start + 1;
+ 			len = field[n].end - field[n].start;
+ 
++			if (len == 0) {
++				ret = ARCHIVE_WARN;
++				continue;
++			}
++
+ 			switch (*s) {
+ 			case 'u':
+ 				if (len == 1 || (len == 4
+-- 
+2.19.2
+
diff --git a/buildroot/package/libarchive/0004-warc-consume-data-once-read.patch b/buildroot/package/libarchive/0004-warc-consume-data-once-read.patch
new file mode 100644
index 000000000..f07d6c08c
--- /dev/null
+++ b/buildroot/package/libarchive/0004-warc-consume-data-once-read.patch
@@ -0,0 +1,46 @@
+From 9c84b7426660c09c18cc349f6d70b5f8168b5680 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens 
+Date: Tue, 4 Dec 2018 16:33:42 +1100
+Subject: [PATCH] warc: consume data once read
+
+The warc decoder only used read ahead, it wouldn't actually consume
+data that had previously been printed. This means that if you specify
+an invalid content length, it will just reprint the same data over
+and over and over again until it hits the desired length.
+
+This means that a WARC resource with e.g.
+Content-Length: 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666665
+but only a few hundred bytes of data, causes a quasi-infinite loop.
+
+Consume data in subsequent calls to _warc_read.
+
+Found with an AFL + afl-rb + qsym setup.
+---
+ libarchive/archive_read_support_format_warc.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+[for import into Buildroot]
+Signed-off-by: Thomas De Schampheleire 
+Upstream-status: backport
+
+CVE-2018-1000880
+
+diff --git a/libarchive/archive_read_support_format_warc.c b/libarchive/archive_read_support_format_warc.c
+index e8753853..e8fc8428 100644
+--- a/libarchive/archive_read_support_format_warc.c
++++ b/libarchive/archive_read_support_format_warc.c
+@@ -386,6 +386,11 @@ _warc_read(struct archive_read *a, const void **buf, size_t *bsz, int64_t *off)
+ 		return (ARCHIVE_EOF);
+ 	}
+ 
++	if (w->unconsumed) {
++		__archive_read_consume(a, w->unconsumed);
++		w->unconsumed = 0U;
++	}
++
+ 	rab = __archive_read_ahead(a, 1U, &nrd);
+ 	if (nrd < 0) {
+ 		*bsz = 0U;
+-- 
+2.19.2
+
diff --git a/buildroot/package/libarchive/0005-iso9660-Fail-when-expected-Rockridge-extensions-is-m.patch b/buildroot/package/libarchive/0005-iso9660-Fail-when-expected-Rockridge-extensions-is-m.patch
new file mode 100644
index 000000000..bd36ce4b5
--- /dev/null
+++ b/buildroot/package/libarchive/0005-iso9660-Fail-when-expected-Rockridge-extensions-is-m.patch
@@ -0,0 +1,62 @@
+From 8312eaa576014cd9b965012af51bc1f967b12423 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens 
+Date: Tue, 1 Jan 2019 17:10:49 +1100
+Subject: [PATCH] iso9660: Fail when expected Rockridge extensions is missing
+
+A corrupted or malicious ISO9660 image can cause read_CE() to loop
+forever.
+
+read_CE() calls parse_rockridge(), expecting a Rockridge extension
+to be read. However, parse_rockridge() is structured as a while
+loop starting with a sanity check, and if the sanity check fails
+before the loop has run, the function returns ARCHIVE_OK without
+advancing the position in the file. This causes read_CE() to retry
+indefinitely.
+
+Make parse_rockridge() return ARCHIVE_WARN if it didn't read an
+extension. As someone with no real knowledge of the format, this
+seems more apt than ARCHIVE_FATAL, but both the call-sites escalate
+it to a fatal error immediately anyway.
+
+Found with a combination of AFL, afl-rb (FairFuzz) and qsym.
+
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit 8312eaa57601
+
+ libarchive/archive_read_support_format_iso9660.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
+index 28acfefbba8a..bad8f1dfef3a 100644
+--- a/libarchive/archive_read_support_format_iso9660.c
++++ b/libarchive/archive_read_support_format_iso9660.c
+@@ -2102,6 +2102,7 @@ parse_rockridge(struct archive_read *a, struct file_info *file,
+     const unsigned char *p, const unsigned char *end)
+ {
+ 	struct iso9660 *iso9660;
++	int entry_seen = 0;
+ 
+ 	iso9660 = (struct iso9660 *)(a->format->data);
+ 
+@@ -2257,8 +2258,16 @@ parse_rockridge(struct archive_read *a, struct file_info *file,
+ 		}
+ 
+ 		p += p[2];
++		entry_seen = 1;
++	}
++
++	if (entry_seen)
++		return (ARCHIVE_OK);
++	else {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++				  "Tried to parse Rockridge extensions, but none found");
++		return (ARCHIVE_WARN);
+ 	}
+-	return (ARCHIVE_OK);
+ }
+ 
+ static int
+-- 
+2.20.1
+
diff --git a/buildroot/package/libarchive/0006-7zip-fix-crash-when-parsing-certain-archives.patch b/buildroot/package/libarchive/0006-7zip-fix-crash-when-parsing-certain-archives.patch
new file mode 100644
index 000000000..bad33d952
--- /dev/null
+++ b/buildroot/package/libarchive/0006-7zip-fix-crash-when-parsing-certain-archives.patch
@@ -0,0 +1,62 @@
+From 65a23f5dbee4497064e9bb467f81138a62b0dae1 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens 
+Date: Tue, 1 Jan 2019 16:01:40 +1100
+Subject: [PATCH] 7zip: fix crash when parsing certain archives
+
+Fuzzing with CRCs disabled revealed that a call to get_uncompressed_data()
+would sometimes fail to return at least 'minimum' bytes. This can cause
+the crc32() invocation in header_bytes to read off into invalid memory.
+
+A specially crafted archive can use this to cause a crash.
+
+An ASAN trace is below, but ASAN is not required - an uninstrumented
+binary will also crash.
+
+==7719==ERROR: AddressSanitizer: SEGV on unknown address 0x631000040000 (pc 0x7fbdb3b3ec1d bp 0x7ffe77a51310 sp 0x7ffe77a51150 T0)
+==7719==The signal is caused by a READ memory access.
+    #0 0x7fbdb3b3ec1c in crc32_z (/lib/x86_64-linux-gnu/libz.so.1+0x2c1c)
+    #1 0x84f5eb in header_bytes (/tmp/libarchive/bsdtar+0x84f5eb)
+    #2 0x856156 in read_Header (/tmp/libarchive/bsdtar+0x856156)
+    #3 0x84e134 in slurp_central_directory (/tmp/libarchive/bsdtar+0x84e134)
+    #4 0x849690 in archive_read_format_7zip_read_header (/tmp/libarchive/bsdtar+0x849690)
+    #5 0x5713b7 in _archive_read_next_header2 (/tmp/libarchive/bsdtar+0x5713b7)
+    #6 0x570e63 in _archive_read_next_header (/tmp/libarchive/bsdtar+0x570e63)
+    #7 0x6f08bd in archive_read_next_header (/tmp/libarchive/bsdtar+0x6f08bd)
+    #8 0x52373f in read_archive (/tmp/libarchive/bsdtar+0x52373f)
+    #9 0x5257be in tar_mode_x (/tmp/libarchive/bsdtar+0x5257be)
+    #10 0x51daeb in main (/tmp/libarchive/bsdtar+0x51daeb)
+    #11 0x7fbdb27cab96 in __libc_start_main /build/glibc-OTsEL5/glibc-2.27/csu/../csu/libc-start.c:310
+    #12 0x41dd09 in _start (/tmp/libarchive/bsdtar+0x41dd09)
+
+This was primarly done with afl and FairFuzz. Some early corpus entries
+may have been generated by qsym.
+
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit 65a23f5dbee
+
+ libarchive/archive_read_support_format_7zip.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
+index bccbf896603b..b6d1505d372e 100644
+--- a/libarchive/archive_read_support_format_7zip.c
++++ b/libarchive/archive_read_support_format_7zip.c
+@@ -2964,13 +2964,7 @@ get_uncompressed_data(struct archive_read *a, const void **buff, size_t size,
+ 	if (zip->codec == _7Z_COPY && zip->codec2 == (unsigned long)-1) {
+ 		/* Copy mode. */
+ 
+-		/*
+-		 * Note: '1' here is a performance optimization.
+-		 * Recall that the decompression layer returns a count of
+-		 * available bytes; asking for more than that forces the
+-		 * decompressor to combine reads by copying data.
+-		 */
+-		*buff = __archive_read_ahead(a, 1, &bytes_avail);
++		*buff = __archive_read_ahead(a, minimum, &bytes_avail);
+ 		if (bytes_avail <= 0) {
+ 			archive_set_error(&a->archive,
+ 			    ARCHIVE_ERRNO_FILE_FORMAT,
+-- 
+2.20.1
+
diff --git a/buildroot/package/libasplib/libasplib.mk b/buildroot/package/libasplib/libasplib.mk
index e13945c6f..5da85abe0 100644
--- a/buildroot/package/libasplib/libasplib.mk
+++ b/buildroot/package/libasplib/libasplib.mk
@@ -18,12 +18,4 @@ LIBASPLIB_CONF_OPTS = \
 	-DBUILD_SIGNALS=ON \
 	-DBUILD_TIMER=ON
 
-# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
-ifeq ($(BR2_m68k_cf),y)
-LIBASPLIB_CXXFLAGS += -fno-dwarf2-cfi-asm
-endif
-
-LIBASPLIB_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(LIBASPLIB_CXXFLAGS)"
-
 $(eval $(cmake-package))
diff --git a/buildroot/package/libassuan/libassuan.hash b/buildroot/package/libassuan/libassuan.hash
index 2e80cfa4e..4878a692c 100644
--- a/buildroot/package/libassuan/libassuan.hash
+++ b/buildroot/package/libassuan/libassuan.hash
@@ -1,7 +1,8 @@
 # From https://www.gnupg.org/download/integrity_check.html
-sha1 c8432695bf1daa914a92f51e911881ed93d50604  libassuan-2.5.1.tar.bz2
+sha1 fb66bc1e8971d48ac9dbacd1cdaf6487a3e77375  libassuan-2.5.2.tar.bz2
 # Locally calculated after checking signature
-# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2.sig
-sha256 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449  libassuan-2.5.1.tar.bz2
+# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.2.tar.bz2.sig
+# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
+sha256 986b1bf277e375f7a960450fbb8ffbd45294d06598916ad4ebf79aee0cb788e7  libassuan-2.5.2.tar.bz2
 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING.LIB
 sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7  COPYING
diff --git a/buildroot/package/libassuan/libassuan.mk b/buildroot/package/libassuan/libassuan.mk
index 4dc8f70d1..1e4467b36 100644
--- a/buildroot/package/libassuan/libassuan.mk
+++ b/buildroot/package/libassuan/libassuan.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBASSUAN_VERSION = 2.5.1
+LIBASSUAN_VERSION = 2.5.2
 LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan
 LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2
 LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc)
diff --git a/buildroot/package/libb64/0001-Integer-overflows.patch b/buildroot/package/libb64/0001-Integer-overflows.patch
new file mode 100644
index 000000000..0e3e08b14
--- /dev/null
+++ b/buildroot/package/libb64/0001-Integer-overflows.patch
@@ -0,0 +1,73 @@
+Fix integer overflows. Will not work on compilers with unsigned char
+as the default.
+
+Fetched from: https://sources.debian.org/patches/libb64/1.2-5/
+
+Combined "integer overflows.diff" and "off by one.diff" and adapted
+for version 1.2.1.
+
+Signed-off-by: Mikael Eliasson 
+
+diff --git a/src/cdecode.c b/src/cdecode.c
+index a6c0a42..45da4e1 100644
+--- a/src/cdecode.c
++++ b/src/cdecode.c
+@@ -9,10 +9,11 @@ For details, see http://sourceforge.net/projects/libb64
+ 
+ int base64_decode_value(char value_in)
+ {
+-	static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
++	static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+ 	static const char decoding_size = sizeof(decoding);
++	if (value_in < 43) return -1;
+ 	value_in -= 43;
+-	if (value_in < 0 || value_in >= decoding_size) return -1;
++	if (value_in >= decoding_size) return -1;
+ 	return decoding[(int)value_in];
+ }
+ 
+@@ -26,7 +27,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
+ {
+ 	const char* codechar = code_in;
+ 	char* plainchar = plaintext_out;
+-	char fragment;
++	int fragment;
+ 	
+ 	*plainchar = state_in->plainchar;
+ 	
+@@ -42,7 +43,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
+ 					state_in->plainchar = *plainchar;
+ 					return plainchar - plaintext_out;
+ 				}
+-				fragment = (char)base64_decode_value(*codechar++);
++				fragment = base64_decode_value(*codechar++);
+ 			} while (fragment < 0);
+ 			*plainchar    = (fragment & 0x03f) << 2;
+ 	case step_b:
+@@ -53,7 +54,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
+ 					state_in->plainchar = *plainchar;
+ 					return plainchar - plaintext_out;
+ 				}
+-				fragment = (char)base64_decode_value(*codechar++);
++				fragment = base64_decode_value(*codechar++);
+ 			} while (fragment < 0);
+ 			*plainchar++ |= (fragment & 0x030) >> 4;
+ 			*plainchar    = (fragment & 0x00f) << 4;
+@@ -65,7 +66,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
+ 					state_in->plainchar = *plainchar;
+ 					return plainchar - plaintext_out;
+ 				}
+-				fragment = (char)base64_decode_value(*codechar++);
++				fragment = base64_decode_value(*codechar++);
+ 			} while (fragment < 0);
+ 			*plainchar++ |= (fragment & 0x03c) >> 2;
+ 			*plainchar    = (fragment & 0x003) << 6;
+@@ -77,7 +78,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
+ 					state_in->plainchar = *plainchar;
+ 					return plainchar - plaintext_out;
+ 				}
+-				fragment = (char)base64_decode_value(*codechar++);
++				fragment = base64_decode_value(*codechar++);
+ 			} while (fragment < 0);
+ 			*plainchar++   |= (fragment & 0x03f);
+ 		}
diff --git a/buildroot/package/libb64/0002-Initialize-C++-objects.patch b/buildroot/package/libb64/0002-Initialize-C++-objects.patch
new file mode 100644
index 000000000..1556f889d
--- /dev/null
+++ b/buildroot/package/libb64/0002-Initialize-C++-objects.patch
@@ -0,0 +1,38 @@
+Fixes uninitialized C++ encoder and decoder _state variable bug.
+
+Fetched from: https://sources.debian.org/patches/libb64/1.2-5/
+
+initialize-coder-state.diff patch without modifications.
+
+Signed-off-by: Mikael Eliasson 
+
+diff --git a/include/b64/decode.h b/include/b64/decode.h
+index 12b16ea..d3f7d60 100644
+--- a/include/b64/decode.h
++++ b/include/b64/decode.h
+@@ -24,7 +24,9 @@ namespace base64
+ 
+ 		decoder(int buffersize_in = BUFFERSIZE)
+ 		: _buffersize(buffersize_in)
+-		{}
++		{
++			base64_init_decodestate(&_state);
++		}
+ 
+ 		int decode(char value_in)
+ 		{
+diff --git a/include/b64/encode.h b/include/b64/encode.h
+index 5d807d9..49aafdc 100644
+--- a/include/b64/encode.h
++++ b/include/b64/encode.h
+@@ -24,7 +24,9 @@ namespace base64
+ 
+ 		encoder(int buffersize_in = BUFFERSIZE)
+ 		: _buffersize(buffersize_in)
+-		{}
++		{
++			base64_init_encodestate(&_state);
++		}
+ 
+ 		int encode(char value_in)
+ 		{
diff --git a/buildroot/package/libcpprestsdk/libcpprestsdk.hash b/buildroot/package/libcpprestsdk/libcpprestsdk.hash
index b8c5d5430..331db664b 100644
--- a/buildroot/package/libcpprestsdk/libcpprestsdk.hash
+++ b/buildroot/package/libcpprestsdk/libcpprestsdk.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 cf4d57bdcc1ce53f1d228156620dd87af95cbff109d85c81e8be01d0bb58fd25	libcpprestsdk-v2.10.5.tar.gz
+sha256 55e1521fb7b7c9b2f4f2065c5fb47e249227f15299257ee6f1a0c942a4057f4f	libcpprestsdk-v2.10.10.tar.gz
 sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97	license.txt
diff --git a/buildroot/package/libcpprestsdk/libcpprestsdk.mk b/buildroot/package/libcpprestsdk/libcpprestsdk.mk
index 14526e7de..a03e6d250 100644
--- a/buildroot/package/libcpprestsdk/libcpprestsdk.mk
+++ b/buildroot/package/libcpprestsdk/libcpprestsdk.mk
@@ -4,12 +4,16 @@
 #
 ################################################################################
 
-LIBCPPRESTSDK_VERSION = v2.10.5
+LIBCPPRESTSDK_VERSION = v2.10.10
 LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION))
 LIBCPPRESTSDK_LICENSE = MIT
 LIBCPPRESTSDK_LICENSE_FILES = license.txt
 LIBCPPRESTSDK_SUBDIR = Release
 LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib
-LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF
+LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON -DBUILD_SAMPLES=OFF
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+LIBCPPRESTSDK_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
+endif
 
 $(eval $(cmake-package))
diff --git a/buildroot/package/libcurl/Config.in b/buildroot/package/libcurl/Config.in
index 21c2ee2b7..9c62539e4 100644
--- a/buildroot/package/libcurl/Config.in
+++ b/buildroot/package/libcurl/Config.in
@@ -19,4 +19,36 @@ config BR2_PACKAGE_LIBCURL_VERBOSE
 	help
 	  Enable verbose text strings
 
+config BR2_PACKAGE_LIBCURL_TLS_SUPPORT
+	bool
+	default y if BR2_PACKAGE_OPENSSL
+	default y if BR2_PACKAGE_GNUTLS
+	default y if BR2_PACKAGE_LIBNSS
+	default y if BR2_PACKAGE_MBEDTLS
+
+choice
+	prompt "SSL/TLS library to use"
+	depends on BR2_PACKAGE_LIBCURL_TLS_SUPPORT
+
+config BR2_PACKAGE_LIBCURL_OPENSSL
+	bool "OpenSSL"
+	depends on BR2_PACKAGE_OPENSSL
+
+config BR2_PACKAGE_LIBCURL_GNUTLS
+	bool "GnuTLS"
+	depends on BR2_PACKAGE_GNUTLS
+
+config BR2_PACKAGE_LIBCURL_LIBNSS
+	bool "NSS"
+	depends on BR2_PACKAGE_LIBNSS
+
+config BR2_PACKAGE_LIBCURL_MBEDTLS
+	bool "mbed TLS"
+	depends on BR2_PACKAGE_MBEDTLS
+
+endchoice
+
+comment "A TLS library is needed for SSL/TLS support"
+	depends on !BR2_PACKAGE_LIBCURL_TLS_SUPPORT
+
 endif
diff --git a/buildroot/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash
index 432943538..f5e90e0aa 100644
--- a/buildroot/package/libcurl/libcurl.hash
+++ b/buildroot/package/libcurl/libcurl.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://curl.haxx.se/download/curl-7.62.0.tar.xz.asc
+# https://curl.haxx.se/download/curl-7.65.1.tar.xz.asc
 # with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
-sha256 dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1  curl-7.62.0.tar.xz
-sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095  COPYING
+sha256 f6c22074877f235aebc7c53057dbc7ee82358f8ae58bfb767e955c18c859a77a  curl-7.65.1.tar.xz
+sha256 8c8824f50e73a021f5dde1fccbf69685939247399a33a32abab1fa448c9ddabb  COPYING
diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk
index 8a5ab6dea..abf7c0bf5 100644
--- a/buildroot/package/libcurl/libcurl.mk
+++ b/buildroot/package/libcurl/libcurl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCURL_VERSION = 7.62.0
+LIBCURL_VERSION = 7.65.1
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
 LIBCURL_SITE = https://curl.haxx.se/download
 LIBCURL_DEPENDENCIES = host-pkgconf \
@@ -19,7 +19,8 @@ LIBCURL_INSTALL_STAGING = YES
 # probably almost never used. See
 # http://curl.haxx.se/docs/manpage.html#--ntlm.
 LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \
-	--enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug
+	--enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug \
+	--without-polarssl
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 LIBCURL_CONF_OPTS += --enable-threaded-resolver
@@ -35,7 +36,7 @@ endif
 
 LIBCURL_CONFIG_SCRIPTS = curl-config
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y)
 LIBCURL_DEPENDENCIES += openssl
 # configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up
 # native stuff during the rest of configure when target == host.
@@ -44,20 +45,31 @@ LIBCURL_DEPENDENCIES += openssl
 LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)/lib:/usr/lib
 LIBCURL_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr \
 	--with-ca-path=/etc/ssl/certs
-else ifeq ($(BR2_PACKAGE_GNUTLS),y)
+else
+LIBCURL_CONF_OPTS += --without-ssl
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL_GNUTLS),y)
 LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr \
 	--with-ca-fallback
 LIBCURL_DEPENDENCIES += gnutls
-else ifeq ($(BR2_PACKAGE_LIBNSS),y)
+else
+LIBCURL_CONF_OPTS += --without-gnutls
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL_LIBNSS),y)
 LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr
 LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`"
 LIBCURL_DEPENDENCIES += libnss
-else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+else
+LIBCURL_CONF_OPTS += --without-nss
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL_MBEDTLS),y)
 LIBCURL_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr
 LIBCURL_DEPENDENCIES += mbedtls
 else
-LIBCURL_CONF_OPTS += --without-ssl --without-gnutls \
-	--without-polarssl --without-nss --without-mbedtls
+LIBCURL_CONF_OPTS += --without-mbedtls
 endif
 
 ifeq ($(BR2_PACKAGE_C_ARES),y)
@@ -99,7 +111,7 @@ endif
 define LIBCURL_FIX_DOT_PC
 	printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in
 endef
-LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_OPENSSL),LIBCURL_FIX_DOT_PC)
+LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_LIBCURL_OPENSSL),LIBCURL_FIX_DOT_PC)
 
 ifeq ($(BR2_PACKAGE_CURL),)
 define LIBCURL_TARGET_CLEANUP
diff --git a/buildroot/package/libdrm/Config.in b/buildroot/package/libdrm/Config.in
index 581f92196..3cb0e02a4 100644
--- a/buildroot/package/libdrm/Config.in
+++ b/buildroot/package/libdrm/Config.in
@@ -36,6 +36,7 @@ config BR2_PACKAGE_LIBDRM_RADEON
 
 config BR2_PACKAGE_LIBDRM_AMDGPU
 	bool "amdgpu"
+	depends on BR2_USE_MMU # fork()
 	depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
 	select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
 	help
diff --git a/buildroot/package/libdrm/libdrm.hash b/buildroot/package/libdrm/libdrm.hash
index 78b3ef75a..301866c8b 100644
--- a/buildroot/package/libdrm/libdrm.hash
+++ b/buildroot/package/libdrm/libdrm.hash
@@ -1,5 +1,5 @@
-# From https://lists.freedesktop.org/archives/dri-devel/2018-October/193244.html
-md5 f296d87272b1befeada3bb135751ab3d  libdrm-2.4.96.tar.bz2
-sha1 51eb4c248a437b3f200bd1cd84461d3e0b60d71e  libdrm-2.4.96.tar.bz2
-sha256 0d561acf7bb4cc59dc82415100e6c1a44860e8c380e00f9592923e3cd08db393  libdrm-2.4.96.tar.bz2
-sha512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b  libdrm-2.4.96.tar.bz2
+# From https://lists.freedesktop.org/archives/dri-devel/2019-January/204447.html
+md5 acef22d0c62c89692348c2dd5591393e  libdrm-2.4.97.tar.bz2
+sha1 7635bec769a17edd140282fa2c46838c4a44bc91  libdrm-2.4.97.tar.bz2
+sha256 77d0ccda3e10d6593398edb70b1566bfe1a23a39bd3da98ace2147692eadd123  libdrm-2.4.97.tar.bz2
+sha512 3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed  libdrm-2.4.97.tar.bz2
diff --git a/buildroot/package/libdrm/libdrm.mk b/buildroot/package/libdrm/libdrm.mk
index 18ef9cdd2..cc7350c10 100644
--- a/buildroot/package/libdrm/libdrm.mk
+++ b/buildroot/package/libdrm/libdrm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBDRM_VERSION = 2.4.96
+LIBDRM_VERSION = 2.4.97
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = https://dri.freedesktop.org/libdrm
 LIBDRM_LICENSE = MIT
@@ -115,6 +115,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBDRM_INSTALL_TESTS),y)
 LIBDRM_CONF_OPTS += --enable-install-test-programs
+ifeq ($(BR2_PACKAGE_CUNIT),y)
+LIBDRM_DEPENDENCIES += cunit
+endif
 endif
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/libeastl/Config.in b/buildroot/package/libeastl/Config.in
new file mode 100644
index 000000000..760943451
--- /dev/null
+++ b/buildroot/package/libeastl/Config.in
@@ -0,0 +1,27 @@
+config BR2_PACKAGE_LIBEASTL_ARCH_SUPPORTS
+	bool
+	default y if BR2_i386
+	default y if BR2_x86_64
+	default y if BR2_aarch64
+	default y if BR2_powerpc
+	default y if BR2_powerpc64
+
+config BR2_PACKAGE_LIBEASTL
+	bool "libeastl"
+	depends on BR2_PACKAGE_LIBEASTL_ARCH_SUPPORTS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
+	help
+	  EASTL stands for Electronic Arts Standard Template
+	  Library. EASTL stands for Electronic Arts Standard Template
+	  Library. It is a C++ template library of containers,
+	  algorithms, and iterators useful for runtime and tool
+	  development across multiple platforms.  It is an extensive
+	  and robust implementation that has an emphasis on high
+	  performance.
+
+	  https://github.com/electronicarts/EASTL
+
+comment "libeastl needs a toolchain w/ C++, gcc >= 4.9"
+	depends on BR2_PACKAGE_LIBEASTL_ARCH_SUPPORTS
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_INSTALL_LIBSTDCPP
diff --git a/buildroot/package/libeastl/libeastl.hash b/buildroot/package/libeastl/libeastl.hash
new file mode 100644
index 000000000..2d8367c02
--- /dev/null
+++ b/buildroot/package/libeastl/libeastl.hash
@@ -0,0 +1,2 @@
+sha256 9b3484553812b3ec3bad0857f7f675499c81f7cf4ac87e5f3b2acbe72e3a878a  libeastl-45469730d641868ce05433fff2e199510c7d45c3.tar.gz
+sha256 82c0243a1a62b8af01dab3bce6ed2b0852604bd508b85a561ba7d32480e598e3  LICENSE
diff --git a/buildroot/package/libeastl/libeastl.mk b/buildroot/package/libeastl/libeastl.mk
new file mode 100644
index 000000000..0559dd856
--- /dev/null
+++ b/buildroot/package/libeastl/libeastl.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libeastl
+#
+################################################################################
+
+LIBEASTL_VERSION = 45469730d641868ce05433fff2e199510c7d45c3
+LIBEASTL_SITE = $(call github,electronicarts,EASTL,$(LIBEASTL_VERSION))
+LIBEASTL_LICENSE = BSD-3-Clause
+LIBEASTL_LICENSE_FILES = LICENSE
+LIBEASTL_INSTALL_STAGING = YES
+
+$(eval $(cmake-package))
diff --git a/buildroot/package/libfreefare/libfreefare.mk b/buildroot/package/libfreefare/libfreefare.mk
index 13e6f2ad5..16f15b34e 100644
--- a/buildroot/package/libfreefare/libfreefare.mk
+++ b/buildroot/package/libfreefare/libfreefare.mk
@@ -9,13 +9,9 @@ LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2
 # Do not use the github helper here, the generated tarball is *NOT*
 # the same as the one uploaded by upstream for the release.
 LIBFREEFARE_SITE = https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-$(LIBFREEFARE_VERSION)
-LIBFREEFARE_DEPENDENCIES = libnfc openssl
+LIBFREEFARE_DEPENDENCIES = host-pkgconf libnfc openssl
 LIBFREEFARE_LICENSE = LGPL-3.0+ with exception
 LIBFREEFARE_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_STATIC_LIBS),y)
-# openssl needs zlib even if the libfreefare example itself doesn't
-LIBFREEFARE_CONF_ENV += LIBS='-lz'
-endif
+LIBFREEFARE_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/libftdi1/0004-cmake-find-swig.patch b/buildroot/package/libftdi1/0004-cmake-find-swig.patch
new file mode 100644
index 000000000..cf787a680
--- /dev/null
+++ b/buildroot/package/libftdi1/0004-cmake-find-swig.patch
@@ -0,0 +1,29 @@
+From fcda9c6a208d3a7fe651ef661b2eb6e462a89c17 Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz 
+Date: Tue, 31 Jul 2018 17:44:57 -0300
+Subject: [PATCH] CMake: use find_package (SWIG) for cmake >= 3.0.0
+
+There's a workaround for a bug (fixed in cmake 3.0.0) that does not
+work in CMake 3.12.  Only use the workaround with cmake < 3.0.0.
+
+Signed-off-by: Eneas U de Queiroz 
+[Mark: patch retrieved and updated from
+http://developer.intra2net.com/git/?p=libftdi;a=commit;h=fcda9c6a208d3a7fe651ef661b2eb6e462a89c17]
+Signed-off-by: Mark Corbin 
+[Update patch to make it work with cmake < 3.7:
+http://developer.intra2net.com/mailarchive/html/libftdi/2019/msg00009.html]
+Signed-off-by: Fabrice Fontaine 
+---
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index 31ef1c6..eefc344 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -3,7 +3,7 @@ option ( LINK_PYTHON_LIBRARY "Link against python libraries" ON )
+ 
+ if ( PYTHON_BINDINGS )
+   # workaround for cmake bug #0013449
+-  if ( NOT DEFINED CMAKE_FIND_ROOT_PATH )
++  if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
+     find_package ( SWIG )
+   else ()
+     find_program ( SWIG_EXECUTABLE NAMES swig2.0 swig )
diff --git a/buildroot/package/libftdi1/libftdi1.mk b/buildroot/package/libftdi1/libftdi1.mk
index c45c83a71..014dd8401 100644
--- a/buildroot/package/libftdi1/libftdi1.mk
+++ b/buildroot/package/libftdi1/libftdi1.mk
@@ -11,6 +11,7 @@ LIBFTDI1_INSTALL_STAGING = YES
 LIBFTDI1_DEPENDENCIES = libusb
 LIBFTDI1_LICENSE = LGPL-2.0 (libftdi1), GPL-2.0 with exception (ftdipp1)
 LIBFTDI1_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LIB
+LIBFTDI1_CONFIG_SCRIPTS = libftdi1-config
 LIBFTDI1_CONF_OPTS = -DDOCUMENTATION=OFF -DEXAMPLES=OFF
 
 ifeq ($(BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1),y)
diff --git a/buildroot/package/libfuse/libfuse.hash b/buildroot/package/libfuse/libfuse.hash
index 3d1b97307..f52232594 100644
--- a/buildroot/package/libfuse/libfuse.hash
+++ b/buildroot/package/libfuse/libfuse.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	5e84f81d8dd527ea74f39b6bc001c874c02bad6871d7a9b0c14efb57430eafe3	fuse-2.9.8.tar.gz
+sha256	d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5	fuse-2.9.9.tar.gz
 
 # Hash for license files:
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYING
diff --git a/buildroot/package/libfuse/libfuse.mk b/buildroot/package/libfuse/libfuse.mk
index e8a79a316..074dc5988 100644
--- a/buildroot/package/libfuse/libfuse.mk
+++ b/buildroot/package/libfuse/libfuse.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFUSE_VERSION = 2.9.8
+LIBFUSE_VERSION = 2.9.9
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION)
 LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1
@@ -14,11 +14,29 @@ LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 LIBFUSE_CONF_OPTS = \
 	--disable-example \
 	--enable-lib \
-	--enable-util
+	--enable-util \
+	UDEV_RULES_PATH=/lib/udev/rules.d
+
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+define LIBFUSE_INSTALL_UDEV
+	mkdir -p $(TARGET_DIR)/lib/udev/rules.d
+	cp $(STAGING_DIR)/lib/udev/rules.d/*-fuse.rules $(TARGET_DIR)/lib/udev/rules.d
+endef
+
+LIBFUSE_POST_INSTALL_TARGET_HOOKS += LIBFUSE_INSTALL_UDEV
+endif
 
 define LIBFUSE_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/
 	cp -dpf $(STAGING_DIR)/usr/lib/libfuse.so* $(TARGET_DIR)/usr/lib/
 endef
 
+define LIBFUSE_DEVICES
+	/dev/fuse  c  666  0  0  10  229  0  0  -
+endef
+
+define LIBFUSE_PERMISSIONS
+	/usr/bin/fusermount f 4755 0 0 - - - - -
+endef
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch b/buildroot/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch
new file mode 100644
index 000000000..02efc972d
--- /dev/null
+++ b/buildroot/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch
@@ -0,0 +1,1863 @@
+From 850660e11ab302961aaf5ef336ed02451ade9f5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= 
+Date: Thu, 21 Sep 2017 12:50:21 +0200
+Subject: [PATCH] Embed the license texts in LICENSE like on Mono repo
+
+Remove the MPL-1.1.html file.
+
+Upstream: ad0fb6f0a5e3e11f7e474456d53cc660f7808aed
+Signed-off-by: Thomas Petazzoni 
+---
+ LICENSE      | 980 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ MPL-1.1.html | 840 -------------------------------------------
+ Makefile.am  |   2 +-
+ 3 files changed, 981 insertions(+), 841 deletions(-)
+ delete mode 100644 MPL-1.1.html
+
+diff --git a/LICENSE b/LICENSE
+index f5b62b7..b3164bb 100644
+--- a/LICENSE
++++ b/LICENSE
+@@ -2,3 +2,983 @@ Libgdiplus is licensed under the terms of the GNU Library GPL or the
+ Mozilla Public License 1.1.
+ 
+ 
++The Licenses
++============
++
++### GNU Library GPL
++
++                  GNU LESSER GENERAL PUBLIC LICENSE
++                       Version 2.1, February 1999
++
++ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
++ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++[This is the first released version of the Lesser GPL.  It also counts
++ as the successor of the GNU Library Public License, version 2, hence
++ the version number 2.1.]
++
++                            Preamble
++
++  The licenses for most software are designed to take away your
++freedom to share and change it.  By contrast, the GNU General Public
++Licenses are intended to guarantee your freedom to share and change
++free software--to make sure the software is free for all its users.
++
++  This license, the Lesser General Public License, applies to some
++specially designated software packages--typically libraries--of the
++Free Software Foundation and other authors who decide to use it.  You
++can use it too, but we suggest you first think carefully about whether
++this license or the ordinary General Public License is the better
++strategy to use in any particular case, based on the explanations below.
++
++  When we speak of free software, we are referring to freedom of use,
++not price.  Our General Public Licenses are designed to make sure that
++you have the freedom to distribute copies of free software (and charge
++for this service if you wish); that you receive source code or can get
++it if you want it; that you can change the software and use pieces of
++it in new free programs; and that you are informed that you can do
++these things.
++
++  To protect your rights, we need to make restrictions that forbid
++distributors to deny you these rights or to ask you to surrender these
++rights.  These restrictions translate to certain responsibilities for
++you if you distribute copies of the library or if you modify it.
++
++  For example, if you distribute copies of the library, whether gratis
++or for a fee, you must give the recipients all the rights that we gave
++you.  You must make sure that they, too, receive or can get the source
++code.  If you link other code with the library, you must provide
++complete object files to the recipients, so that they can relink them
++with the library after making changes to the library and recompiling
++it.  And you must show them these terms so they know their rights.
++
++  We protect your rights with a two-step method: (1) we copyright the
++library, and (2) we offer you this license, which gives you legal
++permission to copy, distribute and/or modify the library.
++
++  To protect each distributor, we want to make it very clear that
++there is no warranty for the free library.  Also, if the library is
++modified by someone else and passed on, the recipients should know
++that what they have is not the original version, so that the original
++author's reputation will not be affected by problems that might be
++introduced by others.
++
++  Finally, software patents pose a constant threat to the existence of
++any free program.  We wish to make sure that a company cannot
++effectively restrict the users of a free program by obtaining a
++restrictive license from a patent holder.  Therefore, we insist that
++any patent license obtained for a version of the library must be
++consistent with the full freedom of use specified in this license.
++
++  Most GNU software, including some libraries, is covered by the
++ordinary GNU General Public License.  This license, the GNU Lesser
++General Public License, applies to certain designated libraries, and
++is quite different from the ordinary General Public License.  We use
++this license for certain libraries in order to permit linking those
++libraries into non-free programs.
++
++  When a program is linked with a library, whether statically or using
++a shared library, the combination of the two is legally speaking a
++combined work, a derivative of the original library.  The ordinary
++General Public License therefore permits such linking only if the
++entire combination fits its criteria of freedom.  The Lesser General
++Public License permits more lax criteria for linking other code with
++the library.
++
++  We call this license the "Lesser" General Public License because it
++does Less to protect the user's freedom than the ordinary General
++Public License.  It also provides other free software developers Less
++of an advantage over competing non-free programs.  These disadvantages
++are the reason we use the ordinary General Public License for many
++libraries.  However, the Lesser license provides advantages in certain
++special circumstances.
++
++  For example, on rare occasions, there may be a special need to
++encourage the widest possible use of a certain library, so that it becomes
++a de-facto standard.  To achieve this, non-free programs must be
++allowed to use the library.  A more frequent case is that a free
++library does the same job as widely used non-free libraries.  In this
++case, there is little to gain by limiting the free library to free
++software only, so we use the Lesser General Public License.
++
++  In other cases, permission to use a particular library in non-free
++programs enables a greater number of people to use a large body of
++free software.  For example, permission to use the GNU C Library in
++non-free programs enables many more people to use the whole GNU
++operating system, as well as its variant, the GNU/Linux operating
++system.
++
++  Although the Lesser General Public License is Less protective of the
++users' freedom, it does ensure that the user of a program that is
++linked with the Library has the freedom and the wherewithal to run
++that program using a modified version of the Library.
++
++  The precise terms and conditions for copying, distribution and
++modification follow.  Pay close attention to the difference between a
++"work based on the library" and a "work that uses the library".  The
++former contains code derived from the library, whereas the latter must
++be combined with the library in order to run.
++
++                  GNU LESSER GENERAL PUBLIC LICENSE
++   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++  0. This License Agreement applies to any software library or other
++program which contains a notice placed by the copyright holder or
++other authorized party saying it may be distributed under the terms of
++this Lesser General Public License (also called "this License").
++Each licensee is addressed as "you".
++
++  A "library" means a collection of software functions and/or data
++prepared so as to be conveniently linked with application programs
++(which use some of those functions and data) to form executables.
++
++  The "Library", below, refers to any such software library or work
++which has been distributed under these terms.  A "work based on the
++Library" means either the Library or any derivative work under
++copyright law: that is to say, a work containing the Library or a
++portion of it, either verbatim or with modifications and/or translated
++straightforwardly into another language.  (Hereinafter, translation is
++included without limitation in the term "modification".)
++
++  "Source code" for a work means the preferred form of the work for
++making modifications to it.  For a library, complete source code means
++all the source code for all modules it contains, plus any associated
++interface definition files, plus the scripts used to control compilation
++and installation of the library.
++
++  Activities other than copying, distribution and modification are not
++covered by this License; they are outside its scope.  The act of
++running a program using the Library is not restricted, and output from
++such a program is covered only if its contents constitute a work based
++on the Library (independent of the use of the Library in a tool for
++writing it).  Whether that is true depends on what the Library does
++and what the program that uses the Library does.
++
++  1. You may copy and distribute verbatim copies of the Library's
++complete source code as you receive it, in any medium, provided that
++you conspicuously and appropriately publish on each copy an
++appropriate copyright notice and disclaimer of warranty; keep intact
++all the notices that refer to this License and to the absence of any
++warranty; and distribute a copy of this License along with the
++Library.
++
++  You may charge a fee for the physical act of transferring a copy,
++and you may at your option offer warranty protection in exchange for a
++fee.
++
++  2. You may modify your copy or copies of the Library or any portion
++of it, thus forming a work based on the Library, and copy and
++distribute such modifications or work under the terms of Section 1
++above, provided that you also meet all of these conditions:
++
++    a) The modified work must itself be a software library.
++
++    b) You must cause the files modified to carry prominent notices
++    stating that you changed the files and the date of any change.
++
++    c) You must cause the whole of the work to be licensed at no
++    charge to all third parties under the terms of this License.
++
++    d) If a facility in the modified Library refers to a function or a
++    table of data to be supplied by an application program that uses
++    the facility, other than as an argument passed when the facility
++    is invoked, then you must make a good faith effort to ensure that,
++    in the event an application does not supply such function or
++    table, the facility still operates, and performs whatever part of
++    its purpose remains meaningful.
++
++    (For example, a function in a library to compute square roots has
++    a purpose that is entirely well-defined independent of the
++    application.  Therefore, Subsection 2d requires that any
++    application-supplied function or table used by this function must
++    be optional: if the application does not supply it, the square
++    root function must still compute square roots.)
++
++These requirements apply to the modified work as a whole.  If
++identifiable sections of that work are not derived from the Library,
++and can be reasonably considered independent and separate works in
++themselves, then this License, and its terms, do not apply to those
++sections when you distribute them as separate works.  But when you
++distribute the same sections as part of a whole which is a work based
++on the Library, the distribution of the whole must be on the terms of
++this License, whose permissions for other licensees extend to the
++entire whole, and thus to each and every part regardless of who wrote
++it.
++
++Thus, it is not the intent of this section to claim rights or contest
++your rights to work written entirely by you; rather, the intent is to
++exercise the right to control the distribution of derivative or
++collective works based on the Library.
++
++In addition, mere aggregation of another work not based on the Library
++with the Library (or with a work based on the Library) on a volume of
++a storage or distribution medium does not bring the other work under
++the scope of this License.
++
++  3. You may opt to apply the terms of the ordinary GNU General Public
++License instead of this License to a given copy of the Library.  To do
++this, you must alter all the notices that refer to this License, so
++that they refer to the ordinary GNU General Public License, version 2,
++instead of to this License.  (If a newer version than version 2 of the
++ordinary GNU General Public License has appeared, then you can specify
++that version instead if you wish.)  Do not make any other change in
++these notices.
++
++  Once this change is made in a given copy, it is irreversible for
++that copy, so the ordinary GNU General Public License applies to all
++subsequent copies and derivative works made from that copy.
++
++  This option is useful when you wish to copy part of the code of
++the Library into a program that is not a library.
++
++  4. You may copy and distribute the Library (or a portion or
++derivative of it, under Section 2) in object code or executable form
++under the terms of Sections 1 and 2 above provided that you accompany
++it with the complete corresponding machine-readable source code, which
++must be distributed under the terms of Sections 1 and 2 above on a
++medium customarily used for software interchange.
++
++  If distribution of object code is made by offering access to copy
++from a designated place, then offering equivalent access to copy the
++source code from the same place satisfies the requirement to
++distribute the source code, even though third parties are not
++compelled to copy the source along with the object code.
++
++  5. A program that contains no derivative of any portion of the
++Library, but is designed to work with the Library by being compiled or
++linked with it, is called a "work that uses the Library".  Such a
++work, in isolation, is not a derivative work of the Library, and
++therefore falls outside the scope of this License.
++
++  However, linking a "work that uses the Library" with the Library
++creates an executable that is a derivative of the Library (because it
++contains portions of the Library), rather than a "work that uses the
++library".  The executable is therefore covered by this License.
++Section 6 states terms for distribution of such executables.
++
++  When a "work that uses the Library" uses material from a header file
++that is part of the Library, the object code for the work may be a
++derivative work of the Library even though the source code is not.
++Whether this is true is especially significant if the work can be
++linked without the Library, or if the work is itself a library.  The
++threshold for this to be true is not precisely defined by law.
++
++  If such an object file uses only numerical parameters, data
++structure layouts and accessors, and small macros and small inline
++functions (ten lines or less in length), then the use of the object
++file is unrestricted, regardless of whether it is legally a derivative
++work.  (Executables containing this object code plus portions of the
++Library will still fall under Section 6.)
++
++  Otherwise, if the work is a derivative of the Library, you may
++distribute the object code for the work under the terms of Section 6.
++Any executables containing that work also fall under Section 6,
++whether or not they are linked directly with the Library itself.
++
++  6. As an exception to the Sections above, you may also combine or
++link a "work that uses the Library" with the Library to produce a
++work containing portions of the Library, and distribute that work
++under terms of your choice, provided that the terms permit
++modification of the work for the customer's own use and reverse
++engineering for debugging such modifications.
++
++  You must give prominent notice with each copy of the work that the
++Library is used in it and that the Library and its use are covered by
++this License.  You must supply a copy of this License.  If the work
++during execution displays copyright notices, you must include the
++copyright notice for the Library among them, as well as a reference
++directing the user to the copy of this License.  Also, you must do one
++of these things:
++
++    a) Accompany the work with the complete corresponding
++    machine-readable source code for the Library including whatever
++    changes were used in the work (which must be distributed under
++    Sections 1 and 2 above); and, if the work is an executable linked
++    with the Library, with the complete machine-readable "work that
++    uses the Library", as object code and/or source code, so that the
++    user can modify the Library and then relink to produce a modified
++    executable containing the modified Library.  (It is understood
++    that the user who changes the contents of definitions files in the
++    Library will not necessarily be able to recompile the application
++    to use the modified definitions.)
++
++    b) Use a suitable shared library mechanism for linking with the
++    Library.  A suitable mechanism is one that (1) uses at run time a
++    copy of the library already present on the user's computer system,
++    rather than copying library functions into the executable, and (2)
++    will operate properly with a modified version of the library, if
++    the user installs one, as long as the modified version is
++    interface-compatible with the version that the work was made with.
++
++    c) Accompany the work with a written offer, valid for at
++    least three years, to give the same user the materials
++    specified in Subsection 6a, above, for a charge no more
++    than the cost of performing this distribution.
++
++    d) If distribution of the work is made by offering access to copy
++    from a designated place, offer equivalent access to copy the above
++    specified materials from the same place.
++
++    e) Verify that the user has already received a copy of these
++    materials or that you have already sent this user a copy.
++
++  For an executable, the required form of the "work that uses the
++Library" must include any data and utility programs needed for
++reproducing the executable from it.  However, as a special exception,
++the materials to be distributed need not include anything that is
++normally distributed (in either source or binary form) with the major
++components (compiler, kernel, and so on) of the operating system on
++which the executable runs, unless that component itself accompanies
++the executable.
++
++  It may happen that this requirement contradicts the license
++restrictions of other proprietary libraries that do not normally
++accompany the operating system.  Such a contradiction means you cannot
++use both them and the Library together in an executable that you
++distribute.
++
++  7. You may place library facilities that are a work based on the
++Library side-by-side in a single library together with other library
++facilities not covered by this License, and distribute such a combined
++library, provided that the separate distribution of the work based on
++the Library and of the other library facilities is otherwise
++permitted, and provided that you do these two things:
++
++    a) Accompany the combined library with a copy of the same work
++    based on the Library, uncombined with any other library
++    facilities.  This must be distributed under the terms of the
++    Sections above.
++
++    b) Give prominent notice with the combined library of the fact
++    that part of it is a work based on the Library, and explaining
++    where to find the accompanying uncombined form of the same work.
++
++  8. You may not copy, modify, sublicense, link with, or distribute
++the Library except as expressly provided under this License.  Any
++attempt otherwise to copy, modify, sublicense, link with, or
++distribute the Library is void, and will automatically terminate your
++rights under this License.  However, parties who have received copies,
++or rights, from you under this License will not have their licenses
++terminated so long as such parties remain in full compliance.
++
++  9. You are not required to accept this License, since you have not
++signed it.  However, nothing else grants you permission to modify or
++distribute the Library or its derivative works.  These actions are
++prohibited by law if you do not accept this License.  Therefore, by
++modifying or distributing the Library (or any work based on the
++Library), you indicate your acceptance of this License to do so, and
++all its terms and conditions for copying, distributing or modifying
++the Library or works based on it.
++
++  10. Each time you redistribute the Library (or any work based on the
++Library), the recipient automatically receives a license from the
++original licensor to copy, distribute, link with or modify the Library
++subject to these terms and conditions.  You may not impose any further
++restrictions on the recipients' exercise of the rights granted herein.
++You are not responsible for enforcing compliance by third parties with
++this License.
++
++  11. If, as a consequence of a court judgment or allegation of patent
++infringement or for any other reason (not limited to patent issues),
++conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License.  If you cannot
++distribute so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you
++may not distribute the Library at all.  For example, if a patent
++license would not permit royalty-free redistribution of the Library by
++all those who receive copies directly or indirectly through you, then
++the only way you could satisfy both it and this License would be to
++refrain entirely from distribution of the Library.
++
++If any portion of this section is held invalid or unenforceable under any
++particular circumstance, the balance of the section is intended to apply,
++and the section as a whole is intended to apply in other circumstances.
++
++It is not the purpose of this section to induce you to infringe any
++patents or other property right claims or to contest validity of any
++such claims; this section has the sole purpose of protecting the
++integrity of the free software distribution system which is
++implemented by public license practices.  Many people have made
++generous contributions to the wide range of software distributed
++through that system in reliance on consistent application of that
++system; it is up to the author/donor to decide if he or she is willing
++to distribute software through any other system and a licensee cannot
++impose that choice.
++
++This section is intended to make thoroughly clear what is believed to
++be a consequence of the rest of this License.
++
++  12. If the distribution and/or use of the Library is restricted in
++certain countries either by patents or by copyrighted interfaces, the
++original copyright holder who places the Library under this License may add
++an explicit geographical distribution limitation excluding those countries,
++so that distribution is permitted only in or among countries not thus
++excluded.  In such case, this License incorporates the limitation as if
++written in the body of this License.
++
++  13. The Free Software Foundation may publish revised and/or new
++versions of the Lesser General Public License from time to time.
++Such new versions will be similar in spirit to the present version,
++but may differ in detail to address new problems or concerns.
++
++Each version is given a distinguishing version number.  If the Library
++specifies a version number of this License which applies to it and
++"any later version", you have the option of following the terms and
++conditions either of that version or of any later version published by
++the Free Software Foundation.  If the Library does not specify a
++license version number, you may choose any version ever published by
++the Free Software Foundation.
++
++  14. If you wish to incorporate parts of the Library into other free
++programs whose distribution conditions are incompatible with these,
++write to the author to ask for permission.  For software which is
++copyrighted by the Free Software Foundation, write to the Free
++Software Foundation; we sometimes make exceptions for this.  Our
++decision will be guided by the two goals of preserving the free status
++of all derivatives of our free software and of promoting the sharing
++and reuse of software generally.
++
++                            NO WARRANTY
++
++  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
++WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
++EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
++OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
++KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
++LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
++THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
++WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
++AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
++FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
++CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
++LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
++RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
++FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
++SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
++DAMAGES.
++
++                     END OF TERMS AND CONDITIONS
++
++           How to Apply These Terms to Your New Libraries
++
++  If you develop a new library, and you want it to be of the greatest
++possible use to the public, we recommend making it free software that
++everyone can redistribute and change.  You can do so by permitting
++redistribution under these terms (or, alternatively, under the terms of the
++ordinary General Public License).
++
++  To apply these terms, attach the following notices to the library.  It is
++safest to attach them to the start of each source file to most effectively
++convey the exclusion of warranty; and each file should have at least the
++"copyright" line and a pointer to where the full notice is found.
++
++    
++    Copyright (C)   
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
++
++Also add information on how to contact you by electronic and paper mail.
++
++You should also get your employer (if you work as a programmer) or your
++school, if any, to sign a "copyright disclaimer" for the library, if
++necessary.  Here is a sample; alter the names:
++
++  Yoyodyne, Inc., hereby disclaims all copyright interest in the
++  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
++
++  , 1 April 1990
++  Ty Coon, President of Vice
++
++That's all there is to it!
++
++
++### Mozilla Public License 1.1
++
++                          MOZILLA PUBLIC LICENSE
++                                Version 1.1
++
++                              ---------------
++
++1. Definitions.
++
++     1.0.1. "Commercial Use" means distribution or otherwise making the
++     Covered Code available to a third party.
++
++     1.1. "Contributor" means each entity that creates or contributes to
++     the creation of Modifications.
++
++     1.2. "Contributor Version" means the combination of the Original
++     Code, prior Modifications used by a Contributor, and the Modifications
++     made by that particular Contributor.
++
++     1.3. "Covered Code" means the Original Code or Modifications or the
++     combination of the Original Code and Modifications, in each case
++     including portions thereof.
++
++     1.4. "Electronic Distribution Mechanism" means a mechanism generally
++     accepted in the software development community for the electronic
++     transfer of data.
++
++     1.5. "Executable" means Covered Code in any form other than Source
++     Code.
++
++     1.6. "Initial Developer" means the individual or entity identified
++     as the Initial Developer in the Source Code notice required by Exhibit
++     A.
++
++     1.7. "Larger Work" means a work which combines Covered Code or
++     portions thereof with code not governed by the terms of this License.
++
++     1.8. "License" means this document.
++
++     1.8.1. "Licensable" means having the right to grant, to the maximum
++     extent possible, whether at the time of the initial grant or
++     subsequently acquired, any and all of the rights conveyed herein.
++
++     1.9. "Modifications" means any addition to or deletion from the
++     substance or structure of either the Original Code or any previous
++     Modifications. When Covered Code is released as a series of files, a
++     Modification is:
++          A. Any addition to or deletion from the contents of a file
++          containing Original Code or previous Modifications.
++
++          B. Any new file that contains any part of the Original Code or
++          previous Modifications.
++
++     1.10. "Original Code" means Source Code of computer software code
++     which is described in the Source Code notice required by Exhibit A as
++     Original Code, and which, at the time of its release under this
++     License is not already Covered Code governed by this License.
++
++     1.10.1. "Patent Claims" means any patent claim(s), now owned or
++     hereafter acquired, including without limitation,  method, process,
++     and apparatus claims, in any patent Licensable by grantor.
++
++     1.11. "Source Code" means the preferred form of the Covered Code for
++     making modifications to it, including all modules it contains, plus
++     any associated interface definition files, scripts used to control
++     compilation and installation of an Executable, or source code
++     differential comparisons against either the Original Code or another
++     well known, available Covered Code of the Contributor's choice. The
++     Source Code can be in a compressed or archival form, provided the
++     appropriate decompression or de-archiving software is widely available
++     for no charge.
++
++     1.12. "You" (or "Your")  means an individual or a legal entity
++     exercising rights under, and complying with all of the terms of, this
++     License or a future version of this License issued under Section 6.1.
++     For legal entities, "You" includes any entity which controls, is
++     controlled by, or is under common control with You. For purposes of
++     this definition, "control" means (a) the power, direct or indirect,
++     to cause the direction or management of such entity, whether by
++     contract or otherwise, or (b) ownership of more than fifty percent
++     (50%) of the outstanding shares or beneficial ownership of such
++     entity.
++
++2. Source Code License.
++
++     2.1. The Initial Developer Grant.
++     The Initial Developer hereby grants You a world-wide, royalty-free,
++     non-exclusive license, subject to third party intellectual property
++     claims:
++          (a)  under intellectual property rights (other than patent or
++          trademark) Licensable by Initial Developer to use, reproduce,
++          modify, display, perform, sublicense and distribute the Original
++          Code (or portions thereof) with or without Modifications, and/or
++          as part of a Larger Work; and
++
++          (b) under Patents Claims infringed by the making, using or
++          selling of Original Code, to make, have made, use, practice,
++          sell, and offer for sale, and/or otherwise dispose of the
++          Original Code (or portions thereof).
++
++          (c) the licenses granted in this Section 2.1(a) and (b) are
++          effective on the date Initial Developer first distributes
++          Original Code under the terms of this License.
++
++          (d) Notwithstanding Section 2.1(b) above, no patent license is
++          granted: 1) for code that You delete from the Original Code; 2)
++          separate from the Original Code;  or 3) for infringements caused
++          by: i) the modification of the Original Code or ii) the
++          combination of the Original Code with other software or devices.
++
++     2.2. Contributor Grant.
++     Subject to third party intellectual property claims, each Contributor
++     hereby grants You a world-wide, royalty-free, non-exclusive license
++
++          (a)  under intellectual property rights (other than patent or
++          trademark) Licensable by Contributor, to use, reproduce, modify,
++          display, perform, sublicense and distribute the Modifications
++          created by such Contributor (or portions thereof) either on an
++          unmodified basis, with other Modifications, as Covered Code
++          and/or as part of a Larger Work; and
++
++          (b) under Patent Claims infringed by the making, using, or
++          selling of  Modifications made by that Contributor either alone
++          and/or in combination with its Contributor Version (or portions
++          of such combination), to make, use, sell, offer for sale, have
++          made, and/or otherwise dispose of: 1) Modifications made by that
++          Contributor (or portions thereof); and 2) the combination of
++          Modifications made by that Contributor with its Contributor
++          Version (or portions of such combination).
++
++          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
++          effective on the date Contributor first makes Commercial Use of
++          the Covered Code.
++
++          (d)    Notwithstanding Section 2.2(b) above, no patent license is
++          granted: 1) for any code that Contributor has deleted from the
++          Contributor Version; 2)  separate from the Contributor Version;
++          3)  for infringements caused by: i) third party modifications of
++          Contributor Version or ii)  the combination of Modifications made
++          by that Contributor with other software  (except as part of the
++          Contributor Version) or other devices; or 4) under Patent Claims
++          infringed by Covered Code in the absence of Modifications made by
++          that Contributor.
++
++3. Distribution Obligations.
++
++     3.1. Application of License.
++     The Modifications which You create or to which You contribute are
++     governed by the terms of this License, including without limitation
++     Section 2.2. The Source Code version of Covered Code may be
++     distributed only under the terms of this License or a future version
++     of this License released under Section 6.1, and You must include a
++     copy of this License with every copy of the Source Code You
++     distribute. You may not offer or impose any terms on any Source Code
++     version that alters or restricts the applicable version of this
++     License or the recipients' rights hereunder. However, You may include
++     an additional document offering the additional rights described in
++     Section 3.5.
++
++     3.2. Availability of Source Code.
++     Any Modification which You create or to which You contribute must be
++     made available in Source Code form under the terms of this License
++     either on the same media as an Executable version or via an accepted
++     Electronic Distribution Mechanism to anyone to whom you made an
++     Executable version available; and if made available via Electronic
++     Distribution Mechanism, must remain available for at least twelve (12)
++     months after the date it initially became available, or at least six
++     (6) months after a subsequent version of that particular Modification
++     has been made available to such recipients. You are responsible for
++     ensuring that the Source Code version remains available even if the
++     Electronic Distribution Mechanism is maintained by a third party.
++
++     3.3. Description of Modifications.
++     You must cause all Covered Code to which You contribute to contain a
++     file documenting the changes You made to create that Covered Code and
++     the date of any change. You must include a prominent statement that
++     the Modification is derived, directly or indirectly, from Original
++     Code provided by the Initial Developer and including the name of the
++     Initial Developer in (a) the Source Code, and (b) in any notice in an
++     Executable version or related documentation in which You describe the
++     origin or ownership of the Covered Code.
++
++     3.4. Intellectual Property Matters
++          (a) Third Party Claims.
++          If Contributor has knowledge that a license under a third party's
++          intellectual property rights is required to exercise the rights
++          granted by such Contributor under Sections 2.1 or 2.2,
++          Contributor must include a text file with the Source Code
++          distribution titled "LEGAL" which describes the claim and the
++          party making the claim in sufficient detail that a recipient will
++          know whom to contact. If Contributor obtains such knowledge after
++          the Modification is made available as described in Section 3.2,
++          Contributor shall promptly modify the LEGAL file in all copies
++          Contributor makes available thereafter and shall take other steps
++          (such as notifying appropriate mailing lists or newsgroups)
++          reasonably calculated to inform those who received the Covered
++          Code that new knowledge has been obtained.
++
++          (b) Contributor APIs.
++          If Contributor's Modifications include an application programming
++          interface and Contributor has knowledge of patent licenses which
++          are reasonably necessary to implement that API, Contributor must
++          also include this information in the LEGAL file.
++
++               (c)    Representations.
++          Contributor represents that, except as disclosed pursuant to
++          Section 3.4(a) above, Contributor believes that Contributor's
++          Modifications are Contributor's original creation(s) and/or
++          Contributor has sufficient rights to grant the rights conveyed by
++          this License.
++
++     3.5. Required Notices.
++     You must duplicate the notice in Exhibit A in each file of the Source
++     Code.  If it is not possible to put such notice in a particular Source
++     Code file due to its structure, then You must include such notice in a
++     location (such as a relevant directory) where a user would be likely
++     to look for such a notice.  If You created one or more Modification(s)
++     You may add your name as a Contributor to the notice described in
++     Exhibit A.  You must also duplicate this License in any documentation
++     for the Source Code where You describe recipients' rights or ownership
++     rights relating to Covered Code.  You may choose to offer, and to
++     charge a fee for, warranty, support, indemnity or liability
++     obligations to one or more recipients of Covered Code. However, You
++     may do so only on Your own behalf, and not on behalf of the Initial
++     Developer or any Contributor. You must make it absolutely clear than
++     any such warranty, support, indemnity or liability obligation is
++     offered by You alone, and You hereby agree to indemnify the Initial
++     Developer and every Contributor for any liability incurred by the
++     Initial Developer or such Contributor as a result of warranty,
++     support, indemnity or liability terms You offer.
++
++     3.6. Distribution of Executable Versions.
++     You may distribute Covered Code in Executable form only if the
++     requirements of Section 3.1-3.5 have been met for that Covered Code,
++     and if You include a notice stating that the Source Code version of
++     the Covered Code is available under the terms of this License,
++     including a description of how and where You have fulfilled the
++     obligations of Section 3.2. The notice must be conspicuously included
++     in any notice in an Executable version, related documentation or
++     collateral in which You describe recipients' rights relating to the
++     Covered Code. You may distribute the Executable version of Covered
++     Code or ownership rights under a license of Your choice, which may
++     contain terms different from this License, provided that You are in
++     compliance with the terms of this License and that the license for the
++     Executable version does not attempt to limit or alter the recipient's
++     rights in the Source Code version from the rights set forth in this
++     License. If You distribute the Executable version under a different
++     license You must make it absolutely clear that any terms which differ
++     from this License are offered by You alone, not by the Initial
++     Developer or any Contributor. You hereby agree to indemnify the
++     Initial Developer and every Contributor for any liability incurred by
++     the Initial Developer or such Contributor as a result of any such
++     terms You offer.
++
++     3.7. Larger Works.
++     You may create a Larger Work by combining Covered Code with other code
++     not governed by the terms of this License and distribute the Larger
++     Work as a single product. In such a case, You must make sure the
++     requirements of this License are fulfilled for the Covered Code.
++
++4. Inability to Comply Due to Statute or Regulation.
++
++     If it is impossible for You to comply with any of the terms of this
++     License with respect to some or all of the Covered Code due to
++     statute, judicial order, or regulation then You must: (a) comply with
++     the terms of this License to the maximum extent possible; and (b)
++     describe the limitations and the code they affect. Such description
++     must be included in the LEGAL file described in Section 3.4 and must
++     be included with all distributions of the Source Code. Except to the
++     extent prohibited by statute or regulation, such description must be
++     sufficiently detailed for a recipient of ordinary skill to be able to
++     understand it.
++
++5. Application of this License.
++
++     This License applies to code to which the Initial Developer has
++     attached the notice in Exhibit A and to related Covered Code.
++
++6. Versions of the License.
++
++     6.1. New Versions.
++     Netscape Communications Corporation ("Netscape") may publish revised
++     and/or new versions of the License from time to time. Each version
++     will be given a distinguishing version number.
++
++     6.2. Effect of New Versions.
++     Once Covered Code has been published under a particular version of the
++     License, You may always continue to use it under the terms of that
++     version. You may also choose to use such Covered Code under the terms
++     of any subsequent version of the License published by Netscape. No one
++     other than Netscape has the right to modify the terms applicable to
++     Covered Code created under this License.
++
++     6.3. Derivative Works.
++     If You create or use a modified version of this License (which you may
++     only do in order to apply it to code which is not already Covered Code
++     governed by this License), You must (a) rename Your license so that
++     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
++     "MPL", "NPL" or any confusingly similar phrase do not appear in your
++     license (except to note that your license differs from this License)
++     and (b) otherwise make it clear that Your version of the license
++     contains terms which differ from the Mozilla Public License and
++     Netscape Public License. (Filling in the name of the Initial
++     Developer, Original Code or Contributor in the notice described in
++     Exhibit A shall not of themselves be deemed to be modifications of
++     this License.)
++
++7. DISCLAIMER OF WARRANTY.
++
++     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
++     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
++     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
++     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
++     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
++     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
++     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
++     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
++     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
++     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
++
++8. TERMINATION.
++
++     8.1.  This License and the rights granted hereunder will terminate
++     automatically if You fail to comply with terms herein and fail to cure
++     such breach within 30 days of becoming aware of the breach. All
++     sublicenses to the Covered Code which are properly granted shall
++     survive any termination of this License. Provisions which, by their
++     nature, must remain in effect beyond the termination of this License
++     shall survive.
++
++     8.2.  If You initiate litigation by asserting a patent infringement
++     claim (excluding declatory judgment actions) against Initial Developer
++     or a Contributor (the Initial Developer or Contributor against whom
++     You file such action is referred to as "Participant")  alleging that:
++
++     (a)  such Participant's Contributor Version directly or indirectly
++     infringes any patent, then any and all rights granted by such
++     Participant to You under Sections 2.1 and/or 2.2 of this License
++     shall, upon 60 days notice from Participant terminate prospectively,
++     unless if within 60 days after receipt of notice You either: (i)
++     agree in writing to pay Participant a mutually agreeable reasonable
++     royalty for Your past and future use of Modifications made by such
++     Participant, or (ii) withdraw Your litigation claim with respect to
++     the Contributor Version against such Participant.  If within 60 days
++     of notice, a reasonable royalty and payment arrangement are not
++     mutually agreed upon in writing by the parties or the litigation claim
++     is not withdrawn, the rights granted by Participant to You under
++     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
++     the 60 day notice period specified above.
++
++     (b)  any software, hardware, or device, other than such Participant's
++     Contributor Version, directly or indirectly infringes any patent, then
++     any rights granted to You by such Participant under Sections 2.1(b)
++     and 2.2(b) are revoked effective as of the date You first made, used,
++     sold, distributed, or had made, Modifications made by that
++     Participant.
++
++     8.3.  If You assert a patent infringement claim against Participant
++     alleging that such Participant's Contributor Version directly or
++     indirectly infringes any patent where such claim is resolved (such as
++     by license or settlement) prior to the initiation of patent
++     infringement litigation, then the reasonable value of the licenses
++     granted by such Participant under Sections 2.1 or 2.2 shall be taken
++     into account in determining the amount or value of any payment or
++     license.
++
++     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
++     all end user license agreements (excluding distributors and resellers)
++     which have been validly granted by You or any distributor hereunder
++     prior to termination shall survive termination.
++
++9. LIMITATION OF LIABILITY.
++
++     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
++     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
++     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
++     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
++     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
++     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
++     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
++     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
++     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
++     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
++     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
++     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
++     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
++     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
++
++10. U.S. GOVERNMENT END USERS.
++
++     The Covered Code is a "commercial item," as that term is defined in
++     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
++     software" and "commercial computer software documentation," as such
++     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
++     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
++     all U.S. Government End Users acquire Covered Code with only those
++     rights set forth herein.
++
++11. MISCELLANEOUS.
++
++     This License represents the complete agreement concerning subject
++     matter hereof. If any provision of this License is held to be
++     unenforceable, such provision shall be reformed only to the extent
++     necessary to make it enforceable. This License shall be governed by
++     California law provisions (except to the extent applicable law, if
++     any, provides otherwise), excluding its conflict-of-law provisions.
++     With respect to disputes in which at least one party is a citizen of,
++     or an entity chartered or registered to do business in the United
++     States of America, any litigation relating to this License shall be
++     subject to the jurisdiction of the Federal Courts of the Northern
++     District of California, with venue lying in Santa Clara County,
++     California, with the losing party responsible for costs, including
++     without limitation, court costs and reasonable attorneys' fees and
++     expenses. The application of the United Nations Convention on
++     Contracts for the International Sale of Goods is expressly excluded.
++     Any law or regulation which provides that the language of a contract
++     shall be construed against the drafter shall not apply to this
++     License.
++
++12. RESPONSIBILITY FOR CLAIMS.
++
++     As between Initial Developer and the Contributors, each party is
++     responsible for claims and damages arising, directly or indirectly,
++     out of its utilization of rights under this License and You agree to
++     work with Initial Developer and Contributors to distribute such
++     responsibility on an equitable basis. Nothing herein is intended or
++     shall be deemed to constitute any admission of liability.
++
++13. MULTIPLE-LICENSED CODE.
++
++     Initial Developer may designate portions of the Covered Code as
++     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
++     Developer permits you to utilize portions of the Covered Code under
++     Your choice of the NPL or the alternative licenses, if any, specified
++     by the Initial Developer in the file described in Exhibit A.
++
++EXHIBIT A -Mozilla Public License.
++
++     ``The contents of this file are subject to the Mozilla Public License
++     Version 1.1 (the "License"); you may not use this file except in
++     compliance with the License. You may obtain a copy of the License at
++     http://www.mozilla.org/MPL/
++
++     Software distributed under the License is distributed on an "AS IS"
++     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
++     License for the specific language governing rights and limitations
++     under the License.
++
++     The Original Code is ______________________________________.
++
++     The Initial Developer of the Original Code is ________________________.
++     Portions created by ______________________ are Copyright (C) ______
++     _______________________. All Rights Reserved.
++
++     Contributor(s): ______________________________________.
++
++     Alternatively, the contents of this file may be used under the terms
++     of the _____ license (the  "[___] License"), in which case the
++     provisions of [______] License are applicable instead of those
++     above.  If you wish to allow use of your version of this file only
++     under the terms of the [____] License and not to allow others to use
++     your version of this file under the MPL, indicate your decision by
++     deleting  the provisions above and replace  them with the notice and
++     other provisions required by the [___] License.  If you do not delete
++     the provisions above, a recipient may use your version of this file
++     under either the MPL or the [___] License."
++
++     [NOTE: The text of this Exhibit A may differ slightly from the text of
++     the notices in the Source Code files of the Original Code. You should
++     use the text of this Exhibit A rather than the text found in the
++     Original Code Source Code for Your Modifications.]
+diff --git a/MPL-1.1.html b/MPL-1.1.html
+deleted file mode 100644
+index 7729f6c..0000000
+--- a/MPL-1.1.html
++++ /dev/null
+@@ -1,840 +0,0 @@
+-
+-
+-
+-
+-
+-
+-   
+-
+-   
+-
+-   Mozilla Public License version 1.1
+-
+-
+-
+-
+-
+-
+-
+-
            MOZILLA PUBLIC LICENSE
+-
+-
            Version 1.1
+-
+-
            
+-
+-
            
+-
+-
+-
+-
            1. Definitions.
+-
+-
+-
              1.0.1. "Commercial Use" means distribution or otherwise making
+-
+-the Covered Code available to a third party.
+-
+-
+-
              1.1. ''Contributor'' means each entity that creates or contributes
+-
+-to the creation of Modifications.
+-
+-
+-
              1.2. ''Contributor Version'' means the combination of the Original
+-
+-Code, prior Modifications used by a Contributor, and the Modifications
+-
+-made by that particular Contributor.
+-
+-
+-
              1.3. ''Covered Code'' means the Original Code or Modifications
+-
+-or the combination of the Original Code and Modifications, in each case
+-
+-including portions thereof.
+-
+-
+-
              1.4. ''Electronic Distribution Mechanism'' means a mechanism
+-
+-generally accepted in the software development community for the electronic
+-
+-transfer of data.
+-
+-
+-
              1.5. ''Executable'' means Covered Code in any form other than
+-
+-Source Code.
+-
+-
+-
              1.6. ''Initial Developer'' means the individual or entity identified
+-
+-as the Initial Developer in the Source Code notice required by Exhibit
+-
+-A.
+-
+-
+-
              1.7. ''Larger Work'' means a work which combines Covered Code
+-
+-or portions thereof with code not governed by the terms of this License.
+-
+-
+-
              1.8. ''License'' means this document.
+-
+-
+-
              1.8.1. "Licensable" means having the right to grant, to the maximum
+-
+-extent possible, whether at the time of the initial grant or subsequently
+-
+-acquired, any and all of the rights conveyed herein.
+-
+-
+-
              1.9. ''Modifications'' means any addition to or deletion from
+-
+-the substance or structure of either the Original Code or any previous
+-
+-Modifications. When Covered Code is released as a series of files, a Modification
+-
+-is:
+-
+-
                A. Any addition to or deletion from the contents of a file containing
+-
+-Original Code or previous Modifications.
+-
+-
                B. Any new file that contains any part of the Original Code or
+-
+-previous Modifications.
+-
+-
                 
              
+-
+-
+-1.10. ''Original Code'' means Source Code of computer software code
+-
+-which is described in the Source Code notice required by Exhibit A
+-
+-as Original Code, and which, at the time of its release under this License
+-
+-is not already Covered Code governed by this License.
+-
+-
+-
              1.10.1. "Patent Claims" means any patent claim(s), now owned
+-
+-or hereafter acquired, including without limitation,  method, process,
+-
+-and apparatus claims, in any patent Licensable by grantor.
+-
+-
+-
              1.11. ''Source Code'' means the preferred form of the Covered
+-
+-Code for making modifications to it, including all modules it contains,
+-
+-plus any associated interface definition files, scripts used to control
+-
+-compilation and installation of an Executable, or source code differential
+-
+-comparisons against either the Original Code or another well known, available
+-
+-Covered Code of the Contributor's choice. The Source Code can be in a compressed
+-
+-or archival form, provided the appropriate decompression or de-archiving
+-
+-software is widely available for no charge.
+-
+-
+-
              1.12. "You'' (or "Your")  means an individual or a legal
+-
+-entity exercising rights under, and complying with all of the terms of,
+-
+-this License or a future version of this License issued under Section 6.1.
+-
+-For legal entities, "You'' includes any entity which controls, is controlled
+-
+-by, or is under common control with You. For purposes of this definition,
+-
+-"control'' means (a) the power, direct or indirect, to cause the direction
+-
+-or management of such entity, whether by contract or otherwise, or (b)
+-
+-ownership of more than fifty percent (50%) of the outstanding shares or
+-
+-beneficial ownership of such entity.
            
+-
+-
+-2. Source Code License.
+-
+-
+-
              2.1. The Initial Developer Grant.
+-
+-
              The Initial Developer hereby grants You a world-wide, royalty-free,
+-
+-non-exclusive license, subject to third party intellectual property claims:
+-
+-
                (a)  under intellectual property rights (other than
+-
+-patent or trademark) Licensable by Initial Developer to use, reproduce,
+-
+-modify, display, perform, sublicense and distribute the Original Code (or
+-
+-portions thereof) with or without Modifications, and/or as part of a Larger
+-
+-Work; and
+-
+-
                (b) under Patents Claims infringed by the making, using or selling
+-
+-of Original Code, to make, have made, use, practice, sell, and offer for
+-
+-sale, and/or otherwise dispose of the Original Code (or portions thereof).
+-
+-
                  
+-
+-
                     
                  
+-
+-
                
+-
+-(c) the licenses granted in this Section 2.1(a) and (b) are effective
+-
+-on the date Initial Developer first distributes Original Code under the
+-
+-terms of this License.
+-
+-
                (d) Notwithstanding Section 2.1(b) above, no patent license is
+-
+-granted: 1) for code that You delete from the Original Code; 2) separate
+-
+-from the Original Code;  or 3) for infringements caused by: i) the
+-
+-modification of the Original Code or ii) the combination of the Original
+-
+-Code with other software or devices.
+-
+-
                 
              
+-
+-
+-2.2. Contributor Grant.
+-
+-
              Subject to third party intellectual property claims, each Contributor
+-
+-hereby grants You a world-wide, royalty-free, non-exclusive license
+-
+-
                 
+-
+-
                (a)  under intellectual property rights (other than
+-
+-patent or trademark) Licensable by Contributor, to use, reproduce, modify,
+-
+-display, perform, sublicense and distribute the Modifications created by
+-
+-such Contributor (or portions thereof) either on an unmodified basis, with
+-
+-other Modifications, as Covered Code and/or as part of a Larger Work; and
+-
+-
                (b) under Patent Claims infringed by the making, using, or selling
+-
+-of  Modifications made by that Contributor either alone and/or in
+-
+-combination with its Contributor Version (or portions of such combination),
+-
+-to make, use, sell, offer for sale, have made, and/or otherwise dispose
+-
+-of: 1) Modifications made by that Contributor (or portions thereof); and
+-
+-2) the combination of  Modifications made by that Contributor with
+-
+-its Contributor Version (or portions of such combination).
+-
+-
                (c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
+-
+-on the date Contributor first makes Commercial Use of the Covered Code.
+-
+-
                (d)    Notwithstanding Section 2.2(b) above, no
+-
+-patent license is granted: 1) for any code that Contributor has deleted
+-
+-from the Contributor Version; 2)  separate from the Contributor Version; 
+-
+-3)  for infringements caused by: i) third party modifications of Contributor
+-
+-Version or ii)  the combination of Modifications made by that Contributor
+-
+-with other software  (except as part of the Contributor Version) or
+-
+-other devices; or 4) under Patent Claims infringed by Covered Code in the
+-
+-absence of Modifications made by that Contributor.
              
+-
+-
            
+-
+-
+-
+-
+-

            3. Distribution Obligations.
+-
+-
+-
              3.1. Application of License.
+-
+-
              The Modifications which You create or to which You contribute are governed
+-
+-by the terms of this License, including without limitation Section 2.2.
+-
+-The Source Code version of Covered Code may be distributed only under the
+-
+-terms of this License or a future version of this License released under
+-
+-Section 6.1, and You must include a copy of this License with every
+-
+-copy of the Source Code You distribute. You may not offer or impose any
+-
+-terms on any Source Code version that alters or restricts the applicable
+-
+-version of this License or the recipients' rights hereunder. However, You
+-
+-may include an additional document offering the additional rights described
+-
+-in Section 3.5.
+-
+-
+-
              3.2. Availability of Source Code.
+-
+-
              Any Modification which You create or to which You contribute must be
+-
+-made available in Source Code form under the terms of this License either
+-
+-on the same media as an Executable version or via an accepted Electronic
+-
+-Distribution Mechanism to anyone to whom you made an Executable version
+-
+-available; and if made available via Electronic Distribution Mechanism,
+-
+-must remain available for at least twelve (12) months after the date it
+-
+-initially became available, or at least six (6) months after a subsequent
+-
+-version of that particular Modification has been made available to such
+-
+-recipients. You are responsible for ensuring that the Source Code version
+-
+-remains available even if the Electronic Distribution Mechanism is maintained
+-
+-by a third party.
+-
+-
+-
              3.3. Description of Modifications.
+-
+-
              You must cause all Covered Code to which You contribute to contain
+-
+-a file documenting the changes You made to create that Covered Code and
+-
+-the date of any change. You must include a prominent statement that the
+-
+-Modification is derived, directly or indirectly, from Original Code provided
+-
+-by the Initial Developer and including the name of the Initial Developer
+-
+-in (a) the Source Code, and (b) in any notice in an Executable version
+-
+-or related documentation in which You describe the origin or ownership
+-
+-of the Covered Code.
+-
+-
+-
              3.4. Intellectual Property Matters
+-
+-
                (a) Third Party Claims.
+-
+-
                If Contributor has knowledge that a license under a third party's intellectual
+-
+-property rights is required to exercise the rights granted by such Contributor
+-
+-under Sections 2.1 or 2.2, Contributor must include a text file with the
+-
+-Source Code distribution titled "LEGAL'' which describes the claim and
+-
+-the party making the claim in sufficient detail that a recipient will know
+-
+-whom to contact. If Contributor obtains such knowledge after the Modification
+-
+-is made available as described in Section 3.2, Contributor shall promptly
+-
+-modify the LEGAL file in all copies Contributor makes available thereafter
+-
+-and shall take other steps (such as notifying appropriate mailing lists
+-
+-or newsgroups) reasonably calculated to inform those who received the Covered
+-
+-Code that new knowledge has been obtained.
+-
+-
                (b) Contributor APIs.
+-
+-
                If Contributor's Modifications include an application programming interface
+-
+-and Contributor has knowledge of patent licenses which are reasonably necessary
+-
+-to implement that API, Contributor must also include this information in
+-
+-the LEGAL file.
+-
+-
                 
              
+-
+-          (c)   
+-
+-Representations.
+-
+-
                Contributor represents that, except as disclosed pursuant to Section
+-
+-3.4(a) above, Contributor believes that Contributor's Modifications are
+-
+-Contributor's original creation(s) and/or Contributor has sufficient rights
+-
+-to grant the rights conveyed by this License.
              
+-
+-
+-
+-
+-

              3.5. Required Notices.
+-
+-
              You must duplicate the notice in Exhibit A in each file of the
+-
+-Source Code.  If it is not possible to put such notice in a particular
+-
+-Source Code file due to its structure, then You must include such notice
+-
+-in a location (such as a relevant directory) where a user would be likely
+-
+-to look for such a notice.  If You created one or more Modification(s)
+-
+-You may add your name as a Contributor to the notice described in Exhibit
+-
+-A.  You must also duplicate this License in any documentation
+-
+-for the Source Code where You describe recipients' rights or ownership
+-
+-rights relating to Covered Code.  You may choose to offer, and to
+-
+-charge a fee for, warranty, support, indemnity or liability obligations
+-
+-to one or more recipients of Covered Code. However, You may do so only
+-
+-on Your own behalf, and not on behalf of the Initial Developer or any Contributor.
+-
+-You must make it absolutely clear than any such warranty, support, indemnity
+-
+-or liability obligation is offered by You alone, and You hereby agree to
+-
+-indemnify the Initial Developer and every Contributor for any liability
+-
+-incurred by the Initial Developer or such Contributor as a result of warranty,
+-
+-support, indemnity or liability terms You offer.
+-
+-
+-
              3.6. Distribution of Executable Versions.
+-
+-
              You may distribute Covered Code in Executable form only if the requirements
+-
+-of Section 3.1-3.5 have been met for that Covered Code, and if You
+-
+-include a notice stating that the Source Code version of the Covered Code
+-
+-is available under the terms of this License, including a description of
+-
+-how and where You have fulfilled the obligations of Section 3.2.
+-
+-The notice must be conspicuously included in any notice in an Executable
+-
+-version, related documentation or collateral in which You describe recipients'
+-
+-rights relating to the Covered Code. You may distribute the Executable
+-
+-version of Covered Code or ownership rights under a license of Your choice,
+-
+-which may contain terms different from this License, provided that You
+-
+-are in compliance with the terms of this License and that the license for
+-
+-the Executable version does not attempt to limit or alter the recipient's
+-
+-rights in the Source Code version from the rights set forth in this License.
+-
+-If You distribute the Executable version under a different license You
+-
+-must make it absolutely clear that any terms which differ from this License
+-
+-are offered by You alone, not by the Initial Developer or any Contributor.
+-
+-You hereby agree to indemnify the Initial Developer and every Contributor
+-
+-for any liability incurred by the Initial Developer or such Contributor
+-
+-as a result of any such terms You offer.
+-
+-
+-
              3.7. Larger Works.
+-
+-
              You may create a Larger Work by combining Covered Code with other code
+-
+-not governed by the terms of this License and distribute the Larger Work
+-
+-as a single product. In such a case, You must make sure the requirements
+-
+-of this License are fulfilled for the Covered Code.
            
+-
+-
+-4. Inability to Comply Due to Statute or Regulation.
+-
+-
              If it is impossible for You to comply with any of the terms of this
+-
+-License with respect to some or all of the Covered Code due to statute,
+-
+-judicial order, or regulation then You must: (a) comply with the terms
+-
+-of this License to the maximum extent possible; and (b) describe the limitations
+-
+-and the code they affect. Such description must be included in the LEGAL
+-
+-file described in Section 3.4 and must be included with all distributions
+-
+-of the Source Code. Except to the extent prohibited by statute or regulation,
+-
+-such description must be sufficiently detailed for a recipient of ordinary
+-
+-skill to be able to understand it.
            
+-
+-
+-5. Application of this License.
+-
+-
              This License applies to code to which the Initial Developer has attached
+-
+-the notice in Exhibit A and to related Covered Code.
            
+-
+-
+-6. Versions of the License.
+-
+-
+-
              6.1. New Versions.
+-
+-
              Netscape Communications Corporation (''Netscape'') may publish revised
+-
+-and/or new versions of the License from time to time. Each version will
+-
+-be given a distinguishing version number.
+-
+-
+-
              6.2. Effect of New Versions.
+-
+-
              Once Covered Code has been published under a particular version of
+-
+-the License, You may always continue to use it under the terms of that
+-
+-version. You may also choose to use such Covered Code under the terms of
+-
+-any subsequent version of the License published by Netscape. No one other
+-
+-than Netscape has the right to modify the terms applicable to Covered Code
+-
+-created under this License.
+-
+-
+-
              6.3. Derivative Works.
+-
+-
              If You create or use a modified version of this License (which you
+-
+-may only do in order to apply it to code which is not already Covered Code
+-
+-governed by this License), You must (a) rename Your license so that the
+-
+-phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL''
+-
+-or any confusingly similar phrase do not appear in your license (except
+-
+-to note that your license differs from this License) and (b) otherwise
+-
+-make it clear that Your version of the license contains terms which differ
+-
+-from the Mozilla Public License and Netscape Public License. (Filling in
+-
+-the name of the Initial Developer, Original Code or Contributor in the
+-
+-notice described in Exhibit A shall not of themselves be deemed
+-
+-to be modifications of this License.)
            
+-
+-
+-7. DISCLAIMER OF WARRANTY.
+-
+-
              COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT
+-
+-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
+-
+-WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT
+-
+-FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY
+-
+-AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE
+-
+-PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER
+-
+-CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.
+-
+-THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.
+-
+-NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
            
+-
+-
+-8. TERMINATION.
+-
+-
+-
              8.1.  This License and the rights granted hereunder will
+-
+-terminate automatically if You fail to comply with terms herein and fail
+-
+-to cure such breach within 30 days of becoming aware of the breach. All
+-
+-sublicenses to the Covered Code which are properly granted shall survive
+-
+-any termination of this License. Provisions which, by their nature, must
+-
+-remain in effect beyond the termination of this License shall survive.
+-
+-
+-
              8.2.  If You initiate litigation by asserting a patent infringement
+-
+-claim (excluding declatory judgment actions) against Initial Developer
+-
+-or a Contributor (the Initial Developer or Contributor against whom You
+-
+-file such action is referred to as "Participant")  alleging that:
+-
+-
              (a)  such Participant's Contributor Version directly or
+-
+-indirectly infringes any patent, then any and all rights granted by such
+-
+-Participant to You under Sections 2.1 and/or 2.2 of this License shall,
+-
+-upon 60 days notice from Participant terminate prospectively, unless if
+-
+-within 60 days after receipt of notice You either: (i)  agree in writing
+-
+-to pay Participant a mutually agreeable reasonable royalty for Your past
+-
+-and future use of Modifications made by such Participant, or (ii) withdraw
+-
+-Your litigation claim with respect to the Contributor Version against such
+-
+-Participant.  If within 60 days of notice, a reasonable royalty and
+-
+-payment arrangement are not mutually agreed upon in writing by the parties
+-
+-or the litigation claim is not withdrawn, the rights granted by Participant
+-
+-to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration
+-
+-of the 60 day notice period specified above.
+-
+-
              (b)  any software, hardware, or device, other than such
+-
+-Participant's Contributor Version, directly or indirectly infringes any
+-
+-patent, then any rights granted to You by such Participant under Sections
+-
+-2.1(b) and 2.2(b) are revoked effective as of the date You first made,
+-
+-used, sold, distributed, or had made, Modifications made by that Participant.
+-
+-
+-
              8.3.  If You assert a patent infringement claim against
+-
+-Participant alleging that such Participant's Contributor Version directly
+-
+-or indirectly infringes any patent where such claim is resolved (such as
+-
+-by license or settlement) prior to the initiation of patent infringement
+-
+-litigation, then the reasonable value of the licenses granted by such Participant
+-
+-under Sections 2.1 or 2.2 shall be taken into account in determining the
+-
+-amount or value of any payment or license.
+-
+-
+-
              8.4.  In the event of termination under Sections 8.1 or
+-
+-8.2 above,  all end user license agreements (excluding distributors
+-
+-and resellers) which have been validly granted by You or any distributor
+-
+-hereunder prior to termination shall survive termination.
            
+-
+-
+-9. LIMITATION OF LIABILITY.
+-
+-
              UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+-
+-NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
+-
+-ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER
+-
+-OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL,
+-
+-INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+-
+-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE
+-
+-OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN
+-
+-IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.
+-
+-THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR
+-
+-PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE
+-
+-LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+-
+-OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
+-
+-AND LIMITATION MAY NOT APPLY TO YOU.
            
+-
+-
+-10. U.S. GOVERNMENT END USERS.
+-
+-
              The Covered Code is a ''commercial item,'' as that term is defined
+-
+-in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software''
+-
+-and ''commercial computer software documentation,'' as such terms are used
+-
+-in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
+-
+-48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
+-
+-End Users acquire Covered Code with only those rights set forth herein.
            
+-
+-
+-11. MISCELLANEOUS.
+-
+-
              This License represents the complete agreement concerning subject matter
+-
+-hereof. If any provision of this License is held to be unenforceable, such
+-
+-provision shall be reformed only to the extent necessary to make it enforceable.
+-
+-This License shall be governed by California law provisions (except to
+-
+-the extent applicable law, if any, provides otherwise), excluding its conflict-of-law
+-
+-provisions. With respect to disputes in which at least one party is a citizen
+-
+-of, or an entity chartered or registered to do business in the United States
+-
+-of America, any litigation relating to this License shall be subject to
+-
+-the jurisdiction of the Federal Courts of the Northern District of California,
+-
+-with venue lying in Santa Clara County, California, with the losing party
+-
+-responsible for costs, including without limitation, court costs and reasonable
+-
+-attorneys' fees and expenses. The application of the United Nations Convention
+-
+-on Contracts for the International Sale of Goods is expressly excluded.
+-
+-Any law or regulation which provides that the language of a contract shall
+-
+-be construed against the drafter shall not apply to this License.
            
+-
+-
+-12. RESPONSIBILITY FOR CLAIMS.
+-
+-
              As between Initial Developer and the Contributors, each party is responsible
+-
+-for claims and damages arising, directly or indirectly, out of its utilization
+-
+-of rights under this License and You agree to work with Initial Developer
+-
+-and Contributors to distribute such responsibility on an equitable basis.
+-
+-Nothing herein is intended or shall be deemed to constitute any admission
+-
+-of liability.
            
+-
+-
+-13. MULTIPLE-LICENSED CODE.
+-
+-
              Initial Developer may designate portions of the Covered Code as “Multiple-Licensed”. 
+-
+-“Multiple-Licensed” means that the Initial Developer permits you to utilize
+-
+-portions of the Covered Code under Your choice of the MPL or the alternative
+-
+-licenses, if any, specified by the Initial Developer in the file described
+-
+-in Exhibit A.
            
+-
+-
+-
+-
+-

            EXHIBIT A -Mozilla Public License.
+-
+-
              ``The contents of this file are subject to the Mozilla Public License
+-
+-Version 1.1 (the "License"); you may not use this file except in compliance
+-
+-with the License. You may obtain a copy of the License at
+-
+-
              http://www.mozilla.org/MPL/
+-
+-
              Software distributed under the License is distributed on an "AS IS"
+-
+-basis, WITHOUT WARRANTY OF
+-
+-
              ANY KIND, either express or implied. See the License for the specific
+-
+-language governing rights and
+-
+-
              limitations under the License.
+-
+-
              The Original Code is ______________________________________.
+-
+-
              The Initial Developer of the Original Code is ________________________.
+-
+-Portions created by
+-
+-
               ______________________ are Copyright (C) ______ _______________________.
+-
+-All Rights
+-
+-
              Reserved.
+-
+-
              Contributor(s): ______________________________________.
+-
+-
              Alternatively, the contents of this file may be used under the terms
+-
+-of the _____ license (the  “[___] License”), in which case the provisions
+-
+-of [______] License are applicable  instead of those above. 
+-
+-If you wish to allow use of your version of this file only under the terms
+-
+-of the [____] License and not to allow others to use your version of this
+-
+-file under the MPL, indicate your decision by deleting  the provisions
+-
+-above and replace  them with the notice and other provisions required
+-
+-by the [___] License.  If you do not delete the provisions above,
+-
+-a recipient may use your version of this file under either the MPL or the
+-
+-[___] License."
+-
+-
              [NOTE: The text of this Exhibit A may differ slightly from the text
+-
+-of the notices in the Source Code files of the Original Code. You should
+-
+-use the text of this Exhibit A rather than the text found in the Original
+-
+-Code Source Code for Your Modifications.]
+-
+-
              
+-
+-
+-
+-
+-
+diff --git a/Makefile.am b/Makefile.am
+index bb89e98..34a01d3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,4 +7,4 @@ pkgconfig_DATA= libgdiplus.pc
+ 
+ DISTCLEANFILES= libgdiplus.pc
+ 
+-EXTRA_DIST = libgdiplus.pc.in LICENSE MPL-1.1.html
++EXTRA_DIST = libgdiplus.pc.in LICENSE
+-- 
+2.19.2
+
diff --git a/buildroot/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch b/buildroot/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch
new file mode 100644
index 000000000..3ddfe7c37
--- /dev/null
+++ b/buildroot/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch
@@ -0,0 +1,1018 @@
+From 7ac3970c792ffbbf53e4168e086fae33fab39ce3 Mon Sep 17 00:00:00 2001
+From: Frederik Carlier 
+Date: Tue, 17 Jul 2018 23:24:51 +0200
+Subject: [PATCH] Update LICENSE to match the headers of the source files
+
+Upstream: 947e525d1025200623f686d8efe4c0094c5d2380
+Signed-off-by: Thomas Petazzoni 
+---
+ LICENSE | 998 +-------------------------------------------------------
+ 1 file changed, 14 insertions(+), 984 deletions(-)
+
+diff --git a/LICENSE b/LICENSE
+index b3164bb..2342cc9 100644
+--- a/LICENSE
++++ b/LICENSE
+@@ -1,984 +1,14 @@
+-Libgdiplus is licensed under the terms of the GNU Library GPL or the
+-Mozilla Public License 1.1.
+-
+-
+-The Licenses
+-============
+-
+-### GNU Library GPL
+-
+-                  GNU LESSER GENERAL PUBLIC LICENSE
+-                       Version 2.1, February 1999
+-
+- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+- Everyone is permitted to copy and distribute verbatim copies
+- of this license document, but changing it is not allowed.
+-
+-[This is the first released version of the Lesser GPL.  It also counts
+- as the successor of the GNU Library Public License, version 2, hence
+- the version number 2.1.]
+-
+-                            Preamble
+-
+-  The licenses for most software are designed to take away your
+-freedom to share and change it.  By contrast, the GNU General Public
+-Licenses are intended to guarantee your freedom to share and change
+-free software--to make sure the software is free for all its users.
+-
+-  This license, the Lesser General Public License, applies to some
+-specially designated software packages--typically libraries--of the
+-Free Software Foundation and other authors who decide to use it.  You
+-can use it too, but we suggest you first think carefully about whether
+-this license or the ordinary General Public License is the better
+-strategy to use in any particular case, based on the explanations below.
+-
+-  When we speak of free software, we are referring to freedom of use,
+-not price.  Our General Public Licenses are designed to make sure that
+-you have the freedom to distribute copies of free software (and charge
+-for this service if you wish); that you receive source code or can get
+-it if you want it; that you can change the software and use pieces of
+-it in new free programs; and that you are informed that you can do
+-these things.
+-
+-  To protect your rights, we need to make restrictions that forbid
+-distributors to deny you these rights or to ask you to surrender these
+-rights.  These restrictions translate to certain responsibilities for
+-you if you distribute copies of the library or if you modify it.
+-
+-  For example, if you distribute copies of the library, whether gratis
+-or for a fee, you must give the recipients all the rights that we gave
+-you.  You must make sure that they, too, receive or can get the source
+-code.  If you link other code with the library, you must provide
+-complete object files to the recipients, so that they can relink them
+-with the library after making changes to the library and recompiling
+-it.  And you must show them these terms so they know their rights.
+-
+-  We protect your rights with a two-step method: (1) we copyright the
+-library, and (2) we offer you this license, which gives you legal
+-permission to copy, distribute and/or modify the library.
+-
+-  To protect each distributor, we want to make it very clear that
+-there is no warranty for the free library.  Also, if the library is
+-modified by someone else and passed on, the recipients should know
+-that what they have is not the original version, so that the original
+-author's reputation will not be affected by problems that might be
+-introduced by others.
+-
+-  Finally, software patents pose a constant threat to the existence of
+-any free program.  We wish to make sure that a company cannot
+-effectively restrict the users of a free program by obtaining a
+-restrictive license from a patent holder.  Therefore, we insist that
+-any patent license obtained for a version of the library must be
+-consistent with the full freedom of use specified in this license.
+-
+-  Most GNU software, including some libraries, is covered by the
+-ordinary GNU General Public License.  This license, the GNU Lesser
+-General Public License, applies to certain designated libraries, and
+-is quite different from the ordinary General Public License.  We use
+-this license for certain libraries in order to permit linking those
+-libraries into non-free programs.
+-
+-  When a program is linked with a library, whether statically or using
+-a shared library, the combination of the two is legally speaking a
+-combined work, a derivative of the original library.  The ordinary
+-General Public License therefore permits such linking only if the
+-entire combination fits its criteria of freedom.  The Lesser General
+-Public License permits more lax criteria for linking other code with
+-the library.
+-
+-  We call this license the "Lesser" General Public License because it
+-does Less to protect the user's freedom than the ordinary General
+-Public License.  It also provides other free software developers Less
+-of an advantage over competing non-free programs.  These disadvantages
+-are the reason we use the ordinary General Public License for many
+-libraries.  However, the Lesser license provides advantages in certain
+-special circumstances.
+-
+-  For example, on rare occasions, there may be a special need to
+-encourage the widest possible use of a certain library, so that it becomes
+-a de-facto standard.  To achieve this, non-free programs must be
+-allowed to use the library.  A more frequent case is that a free
+-library does the same job as widely used non-free libraries.  In this
+-case, there is little to gain by limiting the free library to free
+-software only, so we use the Lesser General Public License.
+-
+-  In other cases, permission to use a particular library in non-free
+-programs enables a greater number of people to use a large body of
+-free software.  For example, permission to use the GNU C Library in
+-non-free programs enables many more people to use the whole GNU
+-operating system, as well as its variant, the GNU/Linux operating
+-system.
+-
+-  Although the Lesser General Public License is Less protective of the
+-users' freedom, it does ensure that the user of a program that is
+-linked with the Library has the freedom and the wherewithal to run
+-that program using a modified version of the Library.
+-
+-  The precise terms and conditions for copying, distribution and
+-modification follow.  Pay close attention to the difference between a
+-"work based on the library" and a "work that uses the library".  The
+-former contains code derived from the library, whereas the latter must
+-be combined with the library in order to run.
+-
+-                  GNU LESSER GENERAL PUBLIC LICENSE
+-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+-
+-  0. This License Agreement applies to any software library or other
+-program which contains a notice placed by the copyright holder or
+-other authorized party saying it may be distributed under the terms of
+-this Lesser General Public License (also called "this License").
+-Each licensee is addressed as "you".
+-
+-  A "library" means a collection of software functions and/or data
+-prepared so as to be conveniently linked with application programs
+-(which use some of those functions and data) to form executables.
+-
+-  The "Library", below, refers to any such software library or work
+-which has been distributed under these terms.  A "work based on the
+-Library" means either the Library or any derivative work under
+-copyright law: that is to say, a work containing the Library or a
+-portion of it, either verbatim or with modifications and/or translated
+-straightforwardly into another language.  (Hereinafter, translation is
+-included without limitation in the term "modification".)
+-
+-  "Source code" for a work means the preferred form of the work for
+-making modifications to it.  For a library, complete source code means
+-all the source code for all modules it contains, plus any associated
+-interface definition files, plus the scripts used to control compilation
+-and installation of the library.
+-
+-  Activities other than copying, distribution and modification are not
+-covered by this License; they are outside its scope.  The act of
+-running a program using the Library is not restricted, and output from
+-such a program is covered only if its contents constitute a work based
+-on the Library (independent of the use of the Library in a tool for
+-writing it).  Whether that is true depends on what the Library does
+-and what the program that uses the Library does.
+-
+-  1. You may copy and distribute verbatim copies of the Library's
+-complete source code as you receive it, in any medium, provided that
+-you conspicuously and appropriately publish on each copy an
+-appropriate copyright notice and disclaimer of warranty; keep intact
+-all the notices that refer to this License and to the absence of any
+-warranty; and distribute a copy of this License along with the
+-Library.
+-
+-  You may charge a fee for the physical act of transferring a copy,
+-and you may at your option offer warranty protection in exchange for a
+-fee.
+-
+-  2. You may modify your copy or copies of the Library or any portion
+-of it, thus forming a work based on the Library, and copy and
+-distribute such modifications or work under the terms of Section 1
+-above, provided that you also meet all of these conditions:
+-
+-    a) The modified work must itself be a software library.
+-
+-    b) You must cause the files modified to carry prominent notices
+-    stating that you changed the files and the date of any change.
+-
+-    c) You must cause the whole of the work to be licensed at no
+-    charge to all third parties under the terms of this License.
+-
+-    d) If a facility in the modified Library refers to a function or a
+-    table of data to be supplied by an application program that uses
+-    the facility, other than as an argument passed when the facility
+-    is invoked, then you must make a good faith effort to ensure that,
+-    in the event an application does not supply such function or
+-    table, the facility still operates, and performs whatever part of
+-    its purpose remains meaningful.
+-
+-    (For example, a function in a library to compute square roots has
+-    a purpose that is entirely well-defined independent of the
+-    application.  Therefore, Subsection 2d requires that any
+-    application-supplied function or table used by this function must
+-    be optional: if the application does not supply it, the square
+-    root function must still compute square roots.)
+-
+-These requirements apply to the modified work as a whole.  If
+-identifiable sections of that work are not derived from the Library,
+-and can be reasonably considered independent and separate works in
+-themselves, then this License, and its terms, do not apply to those
+-sections when you distribute them as separate works.  But when you
+-distribute the same sections as part of a whole which is a work based
+-on the Library, the distribution of the whole must be on the terms of
+-this License, whose permissions for other licensees extend to the
+-entire whole, and thus to each and every part regardless of who wrote
+-it.
+-
+-Thus, it is not the intent of this section to claim rights or contest
+-your rights to work written entirely by you; rather, the intent is to
+-exercise the right to control the distribution of derivative or
+-collective works based on the Library.
+-
+-In addition, mere aggregation of another work not based on the Library
+-with the Library (or with a work based on the Library) on a volume of
+-a storage or distribution medium does not bring the other work under
+-the scope of this License.
+-
+-  3. You may opt to apply the terms of the ordinary GNU General Public
+-License instead of this License to a given copy of the Library.  To do
+-this, you must alter all the notices that refer to this License, so
+-that they refer to the ordinary GNU General Public License, version 2,
+-instead of to this License.  (If a newer version than version 2 of the
+-ordinary GNU General Public License has appeared, then you can specify
+-that version instead if you wish.)  Do not make any other change in
+-these notices.
+-
+-  Once this change is made in a given copy, it is irreversible for
+-that copy, so the ordinary GNU General Public License applies to all
+-subsequent copies and derivative works made from that copy.
+-
+-  This option is useful when you wish to copy part of the code of
+-the Library into a program that is not a library.
+-
+-  4. You may copy and distribute the Library (or a portion or
+-derivative of it, under Section 2) in object code or executable form
+-under the terms of Sections 1 and 2 above provided that you accompany
+-it with the complete corresponding machine-readable source code, which
+-must be distributed under the terms of Sections 1 and 2 above on a
+-medium customarily used for software interchange.
+-
+-  If distribution of object code is made by offering access to copy
+-from a designated place, then offering equivalent access to copy the
+-source code from the same place satisfies the requirement to
+-distribute the source code, even though third parties are not
+-compelled to copy the source along with the object code.
+-
+-  5. A program that contains no derivative of any portion of the
+-Library, but is designed to work with the Library by being compiled or
+-linked with it, is called a "work that uses the Library".  Such a
+-work, in isolation, is not a derivative work of the Library, and
+-therefore falls outside the scope of this License.
+-
+-  However, linking a "work that uses the Library" with the Library
+-creates an executable that is a derivative of the Library (because it
+-contains portions of the Library), rather than a "work that uses the
+-library".  The executable is therefore covered by this License.
+-Section 6 states terms for distribution of such executables.
+-
+-  When a "work that uses the Library" uses material from a header file
+-that is part of the Library, the object code for the work may be a
+-derivative work of the Library even though the source code is not.
+-Whether this is true is especially significant if the work can be
+-linked without the Library, or if the work is itself a library.  The
+-threshold for this to be true is not precisely defined by law.
+-
+-  If such an object file uses only numerical parameters, data
+-structure layouts and accessors, and small macros and small inline
+-functions (ten lines or less in length), then the use of the object
+-file is unrestricted, regardless of whether it is legally a derivative
+-work.  (Executables containing this object code plus portions of the
+-Library will still fall under Section 6.)
+-
+-  Otherwise, if the work is a derivative of the Library, you may
+-distribute the object code for the work under the terms of Section 6.
+-Any executables containing that work also fall under Section 6,
+-whether or not they are linked directly with the Library itself.
+-
+-  6. As an exception to the Sections above, you may also combine or
+-link a "work that uses the Library" with the Library to produce a
+-work containing portions of the Library, and distribute that work
+-under terms of your choice, provided that the terms permit
+-modification of the work for the customer's own use and reverse
+-engineering for debugging such modifications.
+-
+-  You must give prominent notice with each copy of the work that the
+-Library is used in it and that the Library and its use are covered by
+-this License.  You must supply a copy of this License.  If the work
+-during execution displays copyright notices, you must include the
+-copyright notice for the Library among them, as well as a reference
+-directing the user to the copy of this License.  Also, you must do one
+-of these things:
+-
+-    a) Accompany the work with the complete corresponding
+-    machine-readable source code for the Library including whatever
+-    changes were used in the work (which must be distributed under
+-    Sections 1 and 2 above); and, if the work is an executable linked
+-    with the Library, with the complete machine-readable "work that
+-    uses the Library", as object code and/or source code, so that the
+-    user can modify the Library and then relink to produce a modified
+-    executable containing the modified Library.  (It is understood
+-    that the user who changes the contents of definitions files in the
+-    Library will not necessarily be able to recompile the application
+-    to use the modified definitions.)
+-
+-    b) Use a suitable shared library mechanism for linking with the
+-    Library.  A suitable mechanism is one that (1) uses at run time a
+-    copy of the library already present on the user's computer system,
+-    rather than copying library functions into the executable, and (2)
+-    will operate properly with a modified version of the library, if
+-    the user installs one, as long as the modified version is
+-    interface-compatible with the version that the work was made with.
+-
+-    c) Accompany the work with a written offer, valid for at
+-    least three years, to give the same user the materials
+-    specified in Subsection 6a, above, for a charge no more
+-    than the cost of performing this distribution.
+-
+-    d) If distribution of the work is made by offering access to copy
+-    from a designated place, offer equivalent access to copy the above
+-    specified materials from the same place.
+-
+-    e) Verify that the user has already received a copy of these
+-    materials or that you have already sent this user a copy.
+-
+-  For an executable, the required form of the "work that uses the
+-Library" must include any data and utility programs needed for
+-reproducing the executable from it.  However, as a special exception,
+-the materials to be distributed need not include anything that is
+-normally distributed (in either source or binary form) with the major
+-components (compiler, kernel, and so on) of the operating system on
+-which the executable runs, unless that component itself accompanies
+-the executable.
+-
+-  It may happen that this requirement contradicts the license
+-restrictions of other proprietary libraries that do not normally
+-accompany the operating system.  Such a contradiction means you cannot
+-use both them and the Library together in an executable that you
+-distribute.
+-
+-  7. You may place library facilities that are a work based on the
+-Library side-by-side in a single library together with other library
+-facilities not covered by this License, and distribute such a combined
+-library, provided that the separate distribution of the work based on
+-the Library and of the other library facilities is otherwise
+-permitted, and provided that you do these two things:
+-
+-    a) Accompany the combined library with a copy of the same work
+-    based on the Library, uncombined with any other library
+-    facilities.  This must be distributed under the terms of the
+-    Sections above.
+-
+-    b) Give prominent notice with the combined library of the fact
+-    that part of it is a work based on the Library, and explaining
+-    where to find the accompanying uncombined form of the same work.
+-
+-  8. You may not copy, modify, sublicense, link with, or distribute
+-the Library except as expressly provided under this License.  Any
+-attempt otherwise to copy, modify, sublicense, link with, or
+-distribute the Library is void, and will automatically terminate your
+-rights under this License.  However, parties who have received copies,
+-or rights, from you under this License will not have their licenses
+-terminated so long as such parties remain in full compliance.
+-
+-  9. You are not required to accept this License, since you have not
+-signed it.  However, nothing else grants you permission to modify or
+-distribute the Library or its derivative works.  These actions are
+-prohibited by law if you do not accept this License.  Therefore, by
+-modifying or distributing the Library (or any work based on the
+-Library), you indicate your acceptance of this License to do so, and
+-all its terms and conditions for copying, distributing or modifying
+-the Library or works based on it.
+-
+-  10. Each time you redistribute the Library (or any work based on the
+-Library), the recipient automatically receives a license from the
+-original licensor to copy, distribute, link with or modify the Library
+-subject to these terms and conditions.  You may not impose any further
+-restrictions on the recipients' exercise of the rights granted herein.
+-You are not responsible for enforcing compliance by third parties with
+-this License.
+-
+-  11. If, as a consequence of a court judgment or allegation of patent
+-infringement or for any other reason (not limited to patent issues),
+-conditions are imposed on you (whether by court order, agreement or
+-otherwise) that contradict the conditions of this License, they do not
+-excuse you from the conditions of this License.  If you cannot
+-distribute so as to satisfy simultaneously your obligations under this
+-License and any other pertinent obligations, then as a consequence you
+-may not distribute the Library at all.  For example, if a patent
+-license would not permit royalty-free redistribution of the Library by
+-all those who receive copies directly or indirectly through you, then
+-the only way you could satisfy both it and this License would be to
+-refrain entirely from distribution of the Library.
+-
+-If any portion of this section is held invalid or unenforceable under any
+-particular circumstance, the balance of the section is intended to apply,
+-and the section as a whole is intended to apply in other circumstances.
+-
+-It is not the purpose of this section to induce you to infringe any
+-patents or other property right claims or to contest validity of any
+-such claims; this section has the sole purpose of protecting the
+-integrity of the free software distribution system which is
+-implemented by public license practices.  Many people have made
+-generous contributions to the wide range of software distributed
+-through that system in reliance on consistent application of that
+-system; it is up to the author/donor to decide if he or she is willing
+-to distribute software through any other system and a licensee cannot
+-impose that choice.
+-
+-This section is intended to make thoroughly clear what is believed to
+-be a consequence of the rest of this License.
+-
+-  12. If the distribution and/or use of the Library is restricted in
+-certain countries either by patents or by copyrighted interfaces, the
+-original copyright holder who places the Library under this License may add
+-an explicit geographical distribution limitation excluding those countries,
+-so that distribution is permitted only in or among countries not thus
+-excluded.  In such case, this License incorporates the limitation as if
+-written in the body of this License.
+-
+-  13. The Free Software Foundation may publish revised and/or new
+-versions of the Lesser General Public License from time to time.
+-Such new versions will be similar in spirit to the present version,
+-but may differ in detail to address new problems or concerns.
+-
+-Each version is given a distinguishing version number.  If the Library
+-specifies a version number of this License which applies to it and
+-"any later version", you have the option of following the terms and
+-conditions either of that version or of any later version published by
+-the Free Software Foundation.  If the Library does not specify a
+-license version number, you may choose any version ever published by
+-the Free Software Foundation.
+-
+-  14. If you wish to incorporate parts of the Library into other free
+-programs whose distribution conditions are incompatible with these,
+-write to the author to ask for permission.  For software which is
+-copyrighted by the Free Software Foundation, write to the Free
+-Software Foundation; we sometimes make exceptions for this.  Our
+-decision will be guided by the two goals of preserving the free status
+-of all derivatives of our free software and of promoting the sharing
+-and reuse of software generally.
+-
+-                            NO WARRANTY
+-
+-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+-
+-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+-DAMAGES.
+-
+-                     END OF TERMS AND CONDITIONS
+-
+-           How to Apply These Terms to Your New Libraries
+-
+-  If you develop a new library, and you want it to be of the greatest
+-possible use to the public, we recommend making it free software that
+-everyone can redistribute and change.  You can do so by permitting
+-redistribution under these terms (or, alternatively, under the terms of the
+-ordinary General Public License).
+-
+-  To apply these terms, attach the following notices to the library.  It is
+-safest to attach them to the start of each source file to most effectively
+-convey the exclusion of warranty; and each file should have at least the
+-"copyright" line and a pointer to where the full notice is found.
+-
+-    
+-    Copyright (C)   
+-
+-    This library is free software; you can redistribute it and/or
+-    modify it under the terms of the GNU Lesser General Public
+-    License as published by the Free Software Foundation; either
+-    version 2.1 of the License, or (at your option) any later version.
+-
+-    This library is distributed in the hope that it will be useful,
+-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-    Lesser General Public License for more details.
+-
+-    You should have received a copy of the GNU Lesser General Public
+-    License along with this library; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-
+-Also add information on how to contact you by electronic and paper mail.
+-
+-You should also get your employer (if you work as a programmer) or your
+-school, if any, to sign a "copyright disclaimer" for the library, if
+-necessary.  Here is a sample; alter the names:
+-
+-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+-
+-  , 1 April 1990
+-  Ty Coon, President of Vice
+-
+-That's all there is to it!
+-
+-
+-### Mozilla Public License 1.1
+-
+-                          MOZILLA PUBLIC LICENSE
+-                                Version 1.1
+-
+-                              ---------------
+-
+-1. Definitions.
+-
+-     1.0.1. "Commercial Use" means distribution or otherwise making the
+-     Covered Code available to a third party.
+-
+-     1.1. "Contributor" means each entity that creates or contributes to
+-     the creation of Modifications.
+-
+-     1.2. "Contributor Version" means the combination of the Original
+-     Code, prior Modifications used by a Contributor, and the Modifications
+-     made by that particular Contributor.
+-
+-     1.3. "Covered Code" means the Original Code or Modifications or the
+-     combination of the Original Code and Modifications, in each case
+-     including portions thereof.
+-
+-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+-     accepted in the software development community for the electronic
+-     transfer of data.
+-
+-     1.5. "Executable" means Covered Code in any form other than Source
+-     Code.
+-
+-     1.6. "Initial Developer" means the individual or entity identified
+-     as the Initial Developer in the Source Code notice required by Exhibit
+-     A.
+-
+-     1.7. "Larger Work" means a work which combines Covered Code or
+-     portions thereof with code not governed by the terms of this License.
+-
+-     1.8. "License" means this document.
+-
+-     1.8.1. "Licensable" means having the right to grant, to the maximum
+-     extent possible, whether at the time of the initial grant or
+-     subsequently acquired, any and all of the rights conveyed herein.
+-
+-     1.9. "Modifications" means any addition to or deletion from the
+-     substance or structure of either the Original Code or any previous
+-     Modifications. When Covered Code is released as a series of files, a
+-     Modification is:
+-          A. Any addition to or deletion from the contents of a file
+-          containing Original Code or previous Modifications.
+-
+-          B. Any new file that contains any part of the Original Code or
+-          previous Modifications.
+-
+-     1.10. "Original Code" means Source Code of computer software code
+-     which is described in the Source Code notice required by Exhibit A as
+-     Original Code, and which, at the time of its release under this
+-     License is not already Covered Code governed by this License.
+-
+-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+-     hereafter acquired, including without limitation,  method, process,
+-     and apparatus claims, in any patent Licensable by grantor.
+-
+-     1.11. "Source Code" means the preferred form of the Covered Code for
+-     making modifications to it, including all modules it contains, plus
+-     any associated interface definition files, scripts used to control
+-     compilation and installation of an Executable, or source code
+-     differential comparisons against either the Original Code or another
+-     well known, available Covered Code of the Contributor's choice. The
+-     Source Code can be in a compressed or archival form, provided the
+-     appropriate decompression or de-archiving software is widely available
+-     for no charge.
+-
+-     1.12. "You" (or "Your")  means an individual or a legal entity
+-     exercising rights under, and complying with all of the terms of, this
+-     License or a future version of this License issued under Section 6.1.
+-     For legal entities, "You" includes any entity which controls, is
+-     controlled by, or is under common control with You. For purposes of
+-     this definition, "control" means (a) the power, direct or indirect,
+-     to cause the direction or management of such entity, whether by
+-     contract or otherwise, or (b) ownership of more than fifty percent
+-     (50%) of the outstanding shares or beneficial ownership of such
+-     entity.
+-
+-2. Source Code License.
+-
+-     2.1. The Initial Developer Grant.
+-     The Initial Developer hereby grants You a world-wide, royalty-free,
+-     non-exclusive license, subject to third party intellectual property
+-     claims:
+-          (a)  under intellectual property rights (other than patent or
+-          trademark) Licensable by Initial Developer to use, reproduce,
+-          modify, display, perform, sublicense and distribute the Original
+-          Code (or portions thereof) with or without Modifications, and/or
+-          as part of a Larger Work; and
+-
+-          (b) under Patents Claims infringed by the making, using or
+-          selling of Original Code, to make, have made, use, practice,
+-          sell, and offer for sale, and/or otherwise dispose of the
+-          Original Code (or portions thereof).
+-
+-          (c) the licenses granted in this Section 2.1(a) and (b) are
+-          effective on the date Initial Developer first distributes
+-          Original Code under the terms of this License.
+-
+-          (d) Notwithstanding Section 2.1(b) above, no patent license is
+-          granted: 1) for code that You delete from the Original Code; 2)
+-          separate from the Original Code;  or 3) for infringements caused
+-          by: i) the modification of the Original Code or ii) the
+-          combination of the Original Code with other software or devices.
+-
+-     2.2. Contributor Grant.
+-     Subject to third party intellectual property claims, each Contributor
+-     hereby grants You a world-wide, royalty-free, non-exclusive license
+-
+-          (a)  under intellectual property rights (other than patent or
+-          trademark) Licensable by Contributor, to use, reproduce, modify,
+-          display, perform, sublicense and distribute the Modifications
+-          created by such Contributor (or portions thereof) either on an
+-          unmodified basis, with other Modifications, as Covered Code
+-          and/or as part of a Larger Work; and
+-
+-          (b) under Patent Claims infringed by the making, using, or
+-          selling of  Modifications made by that Contributor either alone
+-          and/or in combination with its Contributor Version (or portions
+-          of such combination), to make, use, sell, offer for sale, have
+-          made, and/or otherwise dispose of: 1) Modifications made by that
+-          Contributor (or portions thereof); and 2) the combination of
+-          Modifications made by that Contributor with its Contributor
+-          Version (or portions of such combination).
+-
+-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+-          effective on the date Contributor first makes Commercial Use of
+-          the Covered Code.
+-
+-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+-          granted: 1) for any code that Contributor has deleted from the
+-          Contributor Version; 2)  separate from the Contributor Version;
+-          3)  for infringements caused by: i) third party modifications of
+-          Contributor Version or ii)  the combination of Modifications made
+-          by that Contributor with other software  (except as part of the
+-          Contributor Version) or other devices; or 4) under Patent Claims
+-          infringed by Covered Code in the absence of Modifications made by
+-          that Contributor.
+-
+-3. Distribution Obligations.
+-
+-     3.1. Application of License.
+-     The Modifications which You create or to which You contribute are
+-     governed by the terms of this License, including without limitation
+-     Section 2.2. The Source Code version of Covered Code may be
+-     distributed only under the terms of this License or a future version
+-     of this License released under Section 6.1, and You must include a
+-     copy of this License with every copy of the Source Code You
+-     distribute. You may not offer or impose any terms on any Source Code
+-     version that alters or restricts the applicable version of this
+-     License or the recipients' rights hereunder. However, You may include
+-     an additional document offering the additional rights described in
+-     Section 3.5.
+-
+-     3.2. Availability of Source Code.
+-     Any Modification which You create or to which You contribute must be
+-     made available in Source Code form under the terms of this License
+-     either on the same media as an Executable version or via an accepted
+-     Electronic Distribution Mechanism to anyone to whom you made an
+-     Executable version available; and if made available via Electronic
+-     Distribution Mechanism, must remain available for at least twelve (12)
+-     months after the date it initially became available, or at least six
+-     (6) months after a subsequent version of that particular Modification
+-     has been made available to such recipients. You are responsible for
+-     ensuring that the Source Code version remains available even if the
+-     Electronic Distribution Mechanism is maintained by a third party.
+-
+-     3.3. Description of Modifications.
+-     You must cause all Covered Code to which You contribute to contain a
+-     file documenting the changes You made to create that Covered Code and
+-     the date of any change. You must include a prominent statement that
+-     the Modification is derived, directly or indirectly, from Original
+-     Code provided by the Initial Developer and including the name of the
+-     Initial Developer in (a) the Source Code, and (b) in any notice in an
+-     Executable version or related documentation in which You describe the
+-     origin or ownership of the Covered Code.
+-
+-     3.4. Intellectual Property Matters
+-          (a) Third Party Claims.
+-          If Contributor has knowledge that a license under a third party's
+-          intellectual property rights is required to exercise the rights
+-          granted by such Contributor under Sections 2.1 or 2.2,
+-          Contributor must include a text file with the Source Code
+-          distribution titled "LEGAL" which describes the claim and the
+-          party making the claim in sufficient detail that a recipient will
+-          know whom to contact. If Contributor obtains such knowledge after
+-          the Modification is made available as described in Section 3.2,
+-          Contributor shall promptly modify the LEGAL file in all copies
+-          Contributor makes available thereafter and shall take other steps
+-          (such as notifying appropriate mailing lists or newsgroups)
+-          reasonably calculated to inform those who received the Covered
+-          Code that new knowledge has been obtained.
+-
+-          (b) Contributor APIs.
+-          If Contributor's Modifications include an application programming
+-          interface and Contributor has knowledge of patent licenses which
+-          are reasonably necessary to implement that API, Contributor must
+-          also include this information in the LEGAL file.
+-
+-               (c)    Representations.
+-          Contributor represents that, except as disclosed pursuant to
+-          Section 3.4(a) above, Contributor believes that Contributor's
+-          Modifications are Contributor's original creation(s) and/or
+-          Contributor has sufficient rights to grant the rights conveyed by
+-          this License.
+-
+-     3.5. Required Notices.
+-     You must duplicate the notice in Exhibit A in each file of the Source
+-     Code.  If it is not possible to put such notice in a particular Source
+-     Code file due to its structure, then You must include such notice in a
+-     location (such as a relevant directory) where a user would be likely
+-     to look for such a notice.  If You created one or more Modification(s)
+-     You may add your name as a Contributor to the notice described in
+-     Exhibit A.  You must also duplicate this License in any documentation
+-     for the Source Code where You describe recipients' rights or ownership
+-     rights relating to Covered Code.  You may choose to offer, and to
+-     charge a fee for, warranty, support, indemnity or liability
+-     obligations to one or more recipients of Covered Code. However, You
+-     may do so only on Your own behalf, and not on behalf of the Initial
+-     Developer or any Contributor. You must make it absolutely clear than
+-     any such warranty, support, indemnity or liability obligation is
+-     offered by You alone, and You hereby agree to indemnify the Initial
+-     Developer and every Contributor for any liability incurred by the
+-     Initial Developer or such Contributor as a result of warranty,
+-     support, indemnity or liability terms You offer.
+-
+-     3.6. Distribution of Executable Versions.
+-     You may distribute Covered Code in Executable form only if the
+-     requirements of Section 3.1-3.5 have been met for that Covered Code,
+-     and if You include a notice stating that the Source Code version of
+-     the Covered Code is available under the terms of this License,
+-     including a description of how and where You have fulfilled the
+-     obligations of Section 3.2. The notice must be conspicuously included
+-     in any notice in an Executable version, related documentation or
+-     collateral in which You describe recipients' rights relating to the
+-     Covered Code. You may distribute the Executable version of Covered
+-     Code or ownership rights under a license of Your choice, which may
+-     contain terms different from this License, provided that You are in
+-     compliance with the terms of this License and that the license for the
+-     Executable version does not attempt to limit or alter the recipient's
+-     rights in the Source Code version from the rights set forth in this
+-     License. If You distribute the Executable version under a different
+-     license You must make it absolutely clear that any terms which differ
+-     from this License are offered by You alone, not by the Initial
+-     Developer or any Contributor. You hereby agree to indemnify the
+-     Initial Developer and every Contributor for any liability incurred by
+-     the Initial Developer or such Contributor as a result of any such
+-     terms You offer.
+-
+-     3.7. Larger Works.
+-     You may create a Larger Work by combining Covered Code with other code
+-     not governed by the terms of this License and distribute the Larger
+-     Work as a single product. In such a case, You must make sure the
+-     requirements of this License are fulfilled for the Covered Code.
+-
+-4. Inability to Comply Due to Statute or Regulation.
+-
+-     If it is impossible for You to comply with any of the terms of this
+-     License with respect to some or all of the Covered Code due to
+-     statute, judicial order, or regulation then You must: (a) comply with
+-     the terms of this License to the maximum extent possible; and (b)
+-     describe the limitations and the code they affect. Such description
+-     must be included in the LEGAL file described in Section 3.4 and must
+-     be included with all distributions of the Source Code. Except to the
+-     extent prohibited by statute or regulation, such description must be
+-     sufficiently detailed for a recipient of ordinary skill to be able to
+-     understand it.
+-
+-5. Application of this License.
+-
+-     This License applies to code to which the Initial Developer has
+-     attached the notice in Exhibit A and to related Covered Code.
+-
+-6. Versions of the License.
+-
+-     6.1. New Versions.
+-     Netscape Communications Corporation ("Netscape") may publish revised
+-     and/or new versions of the License from time to time. Each version
+-     will be given a distinguishing version number.
+-
+-     6.2. Effect of New Versions.
+-     Once Covered Code has been published under a particular version of the
+-     License, You may always continue to use it under the terms of that
+-     version. You may also choose to use such Covered Code under the terms
+-     of any subsequent version of the License published by Netscape. No one
+-     other than Netscape has the right to modify the terms applicable to
+-     Covered Code created under this License.
+-
+-     6.3. Derivative Works.
+-     If You create or use a modified version of this License (which you may
+-     only do in order to apply it to code which is not already Covered Code
+-     governed by this License), You must (a) rename Your license so that
+-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+-     license (except to note that your license differs from this License)
+-     and (b) otherwise make it clear that Your version of the license
+-     contains terms which differ from the Mozilla Public License and
+-     Netscape Public License. (Filling in the name of the Initial
+-     Developer, Original Code or Contributor in the notice described in
+-     Exhibit A shall not of themselves be deemed to be modifications of
+-     this License.)
+-
+-7. DISCLAIMER OF WARRANTY.
+-
+-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+-
+-8. TERMINATION.
+-
+-     8.1.  This License and the rights granted hereunder will terminate
+-     automatically if You fail to comply with terms herein and fail to cure
+-     such breach within 30 days of becoming aware of the breach. All
+-     sublicenses to the Covered Code which are properly granted shall
+-     survive any termination of this License. Provisions which, by their
+-     nature, must remain in effect beyond the termination of this License
+-     shall survive.
+-
+-     8.2.  If You initiate litigation by asserting a patent infringement
+-     claim (excluding declatory judgment actions) against Initial Developer
+-     or a Contributor (the Initial Developer or Contributor against whom
+-     You file such action is referred to as "Participant")  alleging that:
+-
+-     (a)  such Participant's Contributor Version directly or indirectly
+-     infringes any patent, then any and all rights granted by such
+-     Participant to You under Sections 2.1 and/or 2.2 of this License
+-     shall, upon 60 days notice from Participant terminate prospectively,
+-     unless if within 60 days after receipt of notice You either: (i)
+-     agree in writing to pay Participant a mutually agreeable reasonable
+-     royalty for Your past and future use of Modifications made by such
+-     Participant, or (ii) withdraw Your litigation claim with respect to
+-     the Contributor Version against such Participant.  If within 60 days
+-     of notice, a reasonable royalty and payment arrangement are not
+-     mutually agreed upon in writing by the parties or the litigation claim
+-     is not withdrawn, the rights granted by Participant to You under
+-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+-     the 60 day notice period specified above.
+-
+-     (b)  any software, hardware, or device, other than such Participant's
+-     Contributor Version, directly or indirectly infringes any patent, then
+-     any rights granted to You by such Participant under Sections 2.1(b)
+-     and 2.2(b) are revoked effective as of the date You first made, used,
+-     sold, distributed, or had made, Modifications made by that
+-     Participant.
+-
+-     8.3.  If You assert a patent infringement claim against Participant
+-     alleging that such Participant's Contributor Version directly or
+-     indirectly infringes any patent where such claim is resolved (such as
+-     by license or settlement) prior to the initiation of patent
+-     infringement litigation, then the reasonable value of the licenses
+-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+-     into account in determining the amount or value of any payment or
+-     license.
+-
+-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+-     all end user license agreements (excluding distributors and resellers)
+-     which have been validly granted by You or any distributor hereunder
+-     prior to termination shall survive termination.
+-
+-9. LIMITATION OF LIABILITY.
+-
+-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+-
+-10. U.S. GOVERNMENT END USERS.
+-
+-     The Covered Code is a "commercial item," as that term is defined in
+-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+-     software" and "commercial computer software documentation," as such
+-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+-     all U.S. Government End Users acquire Covered Code with only those
+-     rights set forth herein.
+-
+-11. MISCELLANEOUS.
+-
+-     This License represents the complete agreement concerning subject
+-     matter hereof. If any provision of this License is held to be
+-     unenforceable, such provision shall be reformed only to the extent
+-     necessary to make it enforceable. This License shall be governed by
+-     California law provisions (except to the extent applicable law, if
+-     any, provides otherwise), excluding its conflict-of-law provisions.
+-     With respect to disputes in which at least one party is a citizen of,
+-     or an entity chartered or registered to do business in the United
+-     States of America, any litigation relating to this License shall be
+-     subject to the jurisdiction of the Federal Courts of the Northern
+-     District of California, with venue lying in Santa Clara County,
+-     California, with the losing party responsible for costs, including
+-     without limitation, court costs and reasonable attorneys' fees and
+-     expenses. The application of the United Nations Convention on
+-     Contracts for the International Sale of Goods is expressly excluded.
+-     Any law or regulation which provides that the language of a contract
+-     shall be construed against the drafter shall not apply to this
+-     License.
+-
+-12. RESPONSIBILITY FOR CLAIMS.
+-
+-     As between Initial Developer and the Contributors, each party is
+-     responsible for claims and damages arising, directly or indirectly,
+-     out of its utilization of rights under this License and You agree to
+-     work with Initial Developer and Contributors to distribute such
+-     responsibility on an equitable basis. Nothing herein is intended or
+-     shall be deemed to constitute any admission of liability.
+-
+-13. MULTIPLE-LICENSED CODE.
+-
+-     Initial Developer may designate portions of the Covered Code as
+-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+-     Developer permits you to utilize portions of the Covered Code under
+-     Your choice of the NPL or the alternative licenses, if any, specified
+-     by the Initial Developer in the file described in Exhibit A.
+-
+-EXHIBIT A -Mozilla Public License.
+-
+-     ``The contents of this file are subject to the Mozilla Public License
+-     Version 1.1 (the "License"); you may not use this file except in
+-     compliance with the License. You may obtain a copy of the License at
+-     http://www.mozilla.org/MPL/
+-
+-     Software distributed under the License is distributed on an "AS IS"
+-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+-     License for the specific language governing rights and limitations
+-     under the License.
+-
+-     The Original Code is ______________________________________.
+-
+-     The Initial Developer of the Original Code is ________________________.
+-     Portions created by ______________________ are Copyright (C) ______
+-     _______________________. All Rights Reserved.
+-
+-     Contributor(s): ______________________________________.
+-
+-     Alternatively, the contents of this file may be used under the terms
+-     of the _____ license (the  "[___] License"), in which case the
+-     provisions of [______] License are applicable instead of those
+-     above.  If you wish to allow use of your version of this file only
+-     under the terms of the [____] License and not to allow others to use
+-     your version of this file under the MPL, indicate your decision by
+-     deleting  the provisions above and replace  them with the notice and
+-     other provisions required by the [___] License.  If you do not delete
+-     the provisions above, a recipient may use your version of this file
+-     under either the MPL or the [___] License."
+-
+-     [NOTE: The text of this Exhibit A may differ slightly from the text of
+-     the notices in the Source Code files of the Original Code. You should
+-     use the text of this Exhibit A rather than the text found in the
+-     Original Code Source Code for Your Modifications.]
++Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
++and associated documentation files (the "Software"), to deal in the Software without restriction, 
++including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
++and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, 
++subject to the following conditions:
++ 
++The above copyright notice and this permission notice shall be included in all copies or substantial 
++portions of the Software.
++ 
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT 
++NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
++IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
++WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
++OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+\ No newline at end of file
+-- 
+2.19.2
+
diff --git a/buildroot/package/libgdiplus/libgdiplus.hash b/buildroot/package/libgdiplus/libgdiplus.hash
index 740fefd98..d89b352d2 100644
--- a/buildroot/package/libgdiplus/libgdiplus.hash
+++ b/buildroot/package/libgdiplus/libgdiplus.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256 ce31da0c6952c8fd160813dfa9bf4a9a871bfe7284e9e3abff9a8ee689acfe58 libgdiplus-5.4.tar.gz
+sha256 6a75e4a476695cd6a1475fd6b989423ecf73978fd757673669771d8a6e13f756 libgdiplus-5.6.tar.gz
+sha256 81317bf837e02a116dc20b032fa1d0cbf9ec357621f141ff2c2daf26c17cbb5d LICENSE
diff --git a/buildroot/package/libgdiplus/libgdiplus.mk b/buildroot/package/libgdiplus/libgdiplus.mk
index eb1858574..d120f6a31 100644
--- a/buildroot/package/libgdiplus/libgdiplus.mk
+++ b/buildroot/package/libgdiplus/libgdiplus.mk
@@ -4,15 +4,11 @@
 #
 ################################################################################
 
-LIBGDIPLUS_VERSION = 5.4
+LIBGDIPLUS_VERSION = 5.6
 LIBGDIPLUS_SITE = $(call github,mono,libgdiplus,$(LIBGDIPLUS_VERSION))
 
-# Although there is a LICENSE file thas specifies LGPL or MPL-1.1,
-# looks like it is incorrect. The actual source files specify that
-# they're licensed under MIT, and so does the COPYING file (and they
-# all predate the addition of the LICENSE file).
 LIBGDIPLUS_LICENSE = MIT
-LIBGDIPLUS_LICENSE_FILES = COPYING src/carbon-private.h
+LIBGDIPLUS_LICENSE_FILES = LICENSE
 
 LIBGDIPLUS_INSTALL_STAGING = YES
 
diff --git a/buildroot/package/libgeotiff/0003-libgeotiff-configure.ac-do-not-check-for-C.patch b/buildroot/package/libgeotiff/0003-libgeotiff-configure.ac-do-not-check-for-C.patch
new file mode 100644
index 000000000..68082dd02
--- /dev/null
+++ b/buildroot/package/libgeotiff/0003-libgeotiff-configure.ac-do-not-check-for-C.patch
@@ -0,0 +1,65 @@
+From edc9ec69b43c27955ee4f24db2e6808bb1a8974d Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 3 Feb 2019 23:20:43 +0100
+Subject: [PATCH] libgeotiff/configure.ac: do not check for C++
+
+Do not check for C++ compiler as libgeotiff is written in C otherwise
+build will fail on toolchains without a working C++ compiler:
+
+checking how to run the C++ preprocessor... /lib/cpp
+configure: error: in `/data/buildroot/buildroot-test/instance-1/output/build/libgeotiff-1.4.2':
+configure: error: C++ preprocessor "/lib/cpp" fails sanity check
+
+Fixes:
+ - http://autobuild.buildroot.org/results/72f1c5c1b8fc337a1cff4b280abe99afd65f945b
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/OSGeo/libgeotiff/pull/9]
+---
+ libgeotiff/configure.ac | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a334416..4ebbd6f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,8 +25,6 @@ dnl #########################################################################
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ AC_PROG_CC
+-AC_PROG_CXX
+-AC_PROG_CXXCPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+@@ -46,7 +44,6 @@ dnl #########################################################################
+ m4_define([debug_default],[no])
+ 
+ CFLAGS="$CFLAGS"
+-CXXFLAGS="$CXXFLAGS"
+ 
+ dnl We want to honor the users wishes with regard to linking.
+ LIBS="$LDFLAGS $LIBS"
+@@ -82,11 +79,9 @@ AC_MSG_CHECKING([for debug enabled])
+ 
+ if test "x$enable_debug" = "xyes"; then
+     CFLAGS="$CFLAGS -g -DDEBUG -Wall"
+-    CXXFLAGS="$CXXFLAGS -g -DDEBUG -Wall"
+     AC_MSG_RESULT(yes)
+ else
+     CFLAGS="$CFLAGS -O3 -DNDEBUG"
+-    CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG"
+     AC_MSG_RESULT(no)
+ fi
+ 
+@@ -367,7 +362,6 @@ LOC_MSG()
+ LOC_MSG([  Version..................: ${RELEASE_VERSION}])
+ LOC_MSG([  Installation directory...: ${prefix}])
+ LOC_MSG([  C compiler...............: ${CC} ${CFLAGS}])
+-LOC_MSG([  C++ compiler.............: ${CXX} ${CXXFLAGS}])
+ 
+ LOC_MSG([  Debugging support........: ${enable_debug}])
+ LOC_MSG()
+-- 
+2.14.1
+
diff --git a/buildroot/package/libgeotiff/libgeotiff.hash b/buildroot/package/libgeotiff/libgeotiff.hash
index a2b16ac0b..08e8e0678 100644
--- a/buildroot/package/libgeotiff/libgeotiff.hash
+++ b/buildroot/package/libgeotiff/libgeotiff.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 ad87048adb91167b07f34974a8e53e4ec356494c29f1748de95252e8f81a5e6e libgeotiff-1.4.2.tar.gz
+sha256 b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265 libgeotiff-1.4.3.tar.gz
 sha256 16b83cf7c3bbfd20bffa768b9bfdb16506ca50f5c140a9f3431e740b155359c1 LICENSE
diff --git a/buildroot/package/libgeotiff/libgeotiff.mk b/buildroot/package/libgeotiff/libgeotiff.mk
index a1f234b33..a4606bc30 100644
--- a/buildroot/package/libgeotiff/libgeotiff.mk
+++ b/buildroot/package/libgeotiff/libgeotiff.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGEOTIFF_VERSION = 1.4.2
+LIBGEOTIFF_VERSION = 1.4.3
 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
 LIBGEOTIFF_LICENSE = X11-style, public domain
 LIBGEOTIFF_LICENSE_FILES = LICENSE
@@ -26,4 +26,11 @@ else
 LIBGEOTIFF_CONF_OPTS += --without-jpeg
 endif
 
+ifeq ($(BR2_PACKAGE_PROJ),y)
+LIBGEOTIFF_DEPENDENCIES += proj
+LIBGEOTIFF_CONF_OPTS += --with-proj=$(STAGING_DIR)/usr
+else
+LIBGEOTIFF_CONF_OPTS += --without-proj
+endif
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch b/buildroot/package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch
new file mode 100644
index 000000000..800d3609d
--- /dev/null
+++ b/buildroot/package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch
@@ -0,0 +1,73 @@
+From 79492bb914e419c54298ba6324e3d595e51c16c3 Mon Sep 17 00:00:00 2001
+From: Ernestas Kulik 
+Date: Tue, 29 Jan 2019 09:50:46 +0100
+Subject: [PATCH] gdbus: Avoid printing null strings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This mostly affects the 2.56 branch, but, given that GCC 9 is being
+stricter about passing null string pointers to printf-like functions, it
+might make sense to proactively fix such calls.
+
+gdbusauth.c: In function '_g_dbus_auth_run_server':
+gdbusauth.c:1302:11: error: '%s' directive argument is null
+[-Werror=format-overflow=]
+ 1302 |           debug_print ("SERVER: WaitingForBegin, read '%s'",
+ line);
+       |
+
+gdbusmessage.c: In function ‘g_dbus_message_to_blob’:
+gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
+ 2730 |       tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
+      |
+
+Signed-off-by: Grzegorz Blach 
+---
+ gio/gdbusauth.c    | 2 +-
+ gio/gdbusmessage.c | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
+index 1f8ea8057..752ec23fc 100644
+--- a/gio/gdbusauth.c
++++ b/gio/gdbusauth.c
+@@ -1272,9 +1272,9 @@ _g_dbus_auth_run_server (GDBusAuth              *auth,
+                                                     &line_length,
+                                                     cancellable,
+                                                     error);
+-          debug_print ("SERVER: WaitingForBegin, read '%s'", line);
+           if (line == NULL)
+             goto out;
++          debug_print ("SERVER: WaitingForBegin, read '%s'", line);
+           if (g_strcmp0 (line, "BEGIN") == 0)
+             {
+               /* YAY, done! */
+diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
+index 3221b925d..3a1a1f9e9 100644
+--- a/gio/gdbusmessage.c
++++ b/gio/gdbusmessage.c
+@@ -2731,7 +2731,6 @@ g_dbus_message_to_blob (GDBusMessage          *message,
+   if (message->body != NULL)
+     {
+       gchar *tupled_signature_str;
+-      tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
+       if (signature == NULL)
+         {
+           g_set_error (error,
+@@ -2739,10 +2738,10 @@ g_dbus_message_to_blob (GDBusMessage          *message,
+                        G_IO_ERROR_INVALID_ARGUMENT,
+                        _("Message body has signature “%s†but there is no signature header"),
+                        signature_str);
+-          g_free (tupled_signature_str);
+           goto out;
+         }
+-      else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
++      tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
++      if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
+         {
+           g_set_error (error,
+                        G_IO_ERROR,
+--
+2.21.0
+
diff --git a/buildroot/package/libglib2/0003-gobject-fix-compilation-with-gcc-4.7.patch b/buildroot/package/libglib2/0003-gobject-fix-compilation-with-gcc-4.7.patch
deleted file mode 100644
index fc672513e..000000000
--- a/buildroot/package/libglib2/0003-gobject-fix-compilation-with-gcc-4.7.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a2b27c0d038ad76cc8016999f8788245da97e946 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Tue, 10 Apr 2018 19:18:57 +0200
-Subject: [PATCH] gobject: fix compilation with gcc <= 4.7
-
-On gcc 4.7, we got the following error:
-
-i686-nptl-linux-gnu-gcc --version
-> i686-nptl-linux-gnu-gcc (crosstool-NG 1.20.0) 4.7.4
-> $ echo '#include ' | i686-nptl-linux-gnu-gcc -x c -I
-staging/usr/include/glib-2.0 -I staging/usr/lib/glib-2.0/include -Wall
--Werror -c - -o /tmp/foo.o
-> In file included from
-staging/usr/include/glib-2.0/gobject/gbinding.h:29:0,
->                  from staging/usr/include/glib-2.0/glib-object.h:23,
->                  from :1:
-> staging/usr/include/glib-2.0/gobject/gobject.h: In function
-'g_set_object':
-> staging/usr/include/glib-2.0/gobject/gobject.h:725:5: error: value
-computed is not used [-Werror=unused-value]
-> cc1: all warnings being treated as errors
-
-This error has been added by commit 3fae39a5d742afe73741f5fd7aa24e3ae8182f06
-So enable the new g_set_object definition only if gcc >= 4.8
-
-Fixes:
- - http://autobuild.buildroot.net/results/b29a2f868438a2210873ea72f491db63175848be
-
-Signed-off-by: Fabrice Fontaine 
-Upstream-status: https://bugzilla.gnome.org/show_bug.cgi?id=795138
----
- gobject/gobject.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gobject/gobject.h b/gobject/gobject.h
-index 9830663ce..838046fe0 100644
---- a/gobject/gobject.h
-+++ b/gobject/gobject.h
-@@ -507,7 +507,7 @@ GLIB_AVAILABLE_IN_ALL
- void        g_object_remove_weak_pointer      (GObject        *object, 
-                                                gpointer       *weak_pointer_location);
- 
--#if defined(__GNUC__) && !defined(__cplusplus) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56
-+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56
- /* Make reference APIs type safe with macros */
- #define g_object_ref(Obj)      ((__typeof__(Obj)) (g_object_ref) (Obj))
- #define g_object_ref_sink(Obj) ((__typeof__(Obj)) (g_object_ref_sink) (Obj))
--- 
-2.14.1
-
diff --git a/buildroot/package/libglib2/0005-gio-fix-compilation-without-F_-S-G-ETPIPE_SZ.patch b/buildroot/package/libglib2/0005-gio-fix-compilation-without-F_-S-G-ETPIPE_SZ.patch
deleted file mode 100644
index 032f4851c..000000000
--- a/buildroot/package/libglib2/0005-gio-fix-compilation-without-F_-S-G-ETPIPE_SZ.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0beb62f564072f3585762c9c55fe894485993b62 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Tue, 10 Apr 2018 18:55:11 +0200
-Subject: [PATCH] gio: fix compilation without F_{S,G}ETPIPE_SZ
-
-Commit a5778ef7c51044147fe470ea1707dd297f44f880 broke compilation on
-architectures without F_SETPIPE_SZ and F_GETPIPE_SZ such as or1k.
-If those variables are undefined, put back previous behavior, buffer
-size set to 1024 * 64
-
-Fixes:
- - http://autobuild.buildroot.net/results/398490e07343a931b25ca6ab5c90a75d7a073e9f
-
-(Modified by Philip Withnall  to add an
-explanatory comment.)
-
-Signed-off-by: Fabrice Fontaine 
-
-https://bugzilla.gnome.org/show_bug.cgi?id=795133
----
- gio/gfile.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gio/gfile.c b/gio/gfile.c
-index 334ad8ec3..a67aad383 100644
---- a/gio/gfile.c
-+++ b/gio/gfile.c
-@@ -3012,6 +3012,7 @@ splice_stream_with_progress (GInputStream           *in,
-   if (!g_unix_open_pipe (buffer, FD_CLOEXEC, error))
-     return FALSE;
- 
-+#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
-   /* Try a 1MiB buffer for improved throughput. If that fails, use the default
-    * pipe size. See: https://bugzilla.gnome.org/791457 */
-   buffer_size = fcntl (buffer[1], F_SETPIPE_SZ, 1024 * 1024);
-@@ -3029,6 +3030,13 @@ splice_stream_with_progress (GInputStream           *in,
-           goto out;
-         }
-     }
-+#else
-+  /* If #F_GETPIPE_SZ isn’t available, assume we’re on Linux < 2.6.35,
-+   * but ≥ 2.6.11, meaning the pipe capacity is 64KiB. Ignore the possibility of
-+   * running on Linux < 2.6.11 (where the capacity was the system page size,
-+   * typically 4KiB) because it’s ancient. See pipe(7). */
-+  buffer_size = 1024 * 64;
-+#endif
- 
-   g_assert (buffer_size > 0);
- 
--- 
-2.13.0
-
diff --git a/buildroot/package/libglib2/libglib2.hash b/buildroot/package/libglib2/libglib2.hash
index 7ce031aa8..faa01ef56 100644
--- a/buildroot/package/libglib2/libglib2.hash
+++ b/buildroot/package/libglib2/libglib2.hash
@@ -1,4 +1,4 @@
-# https://download.gnome.org/sources/glib/2.56/glib-2.56.1.sha256sum
-sha256  40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d  glib-2.56.1.tar.xz
+# https://download.gnome.org/sources/glib/2.56/glib-2.56.4.sha256sum
+sha256  27f703d125efb07f8a743666b580df0b4095c59fc8750e8890132c91d437504c  glib-2.56.4.tar.xz
 # License files, locally calculated
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
diff --git a/buildroot/package/libglib2/libglib2.mk b/buildroot/package/libglib2/libglib2.mk
index 67db5ac35..63bfec32d 100644
--- a/buildroot/package/libglib2/libglib2.mk
+++ b/buildroot/package/libglib2/libglib2.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBGLIB2_VERSION_MAJOR = 2.56
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 LIBGLIB2_LICENSE = LGPL-2.1+
@@ -112,9 +112,14 @@ HOST_LIBGLIB2_DEPENDENCIES = \
 	host-util-linux \
 	host-zlib
 
+# We explicitly specify a giomodule-dir to avoid having a value
+# containing ${libdir} in gio-2.0.pc. Indeed, a value depending on
+# ${libdir} would be prefixed by the sysroot by pkg-config, causing a
+# bogus installation path once combined with $(DESTDIR).
 LIBGLIB2_CONF_OPTS = \
 	--with-pcre=system \
-	--disable-compile-warnings
+	--disable-compile-warnings \
+	--with-gio-module-dir=/usr/lib/gio/modules
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
 LIBGLIB2_DEPENDENCIES += libiconv
@@ -132,6 +137,13 @@ LIBGLIB2_CONF_OPTS += --with-libiconv=gnu
 LIBGLIB2_DEPENDENCIES += libiconv
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
+LIBGLIB2_CONF_OPTS += --enable-selinux
+LIBGLIB2_DEPENDENCIES += libselinux
+else
+LIBGLIB2_CONF_OPTS += --disable-selinux
+endif
+
 # Purge gdb-related files
 ifneq ($(BR2_PACKAGE_GDB),y)
 define LIBGLIB2_REMOVE_GDB_FILES
diff --git a/buildroot/package/libglu/libglu.mk b/buildroot/package/libglu/libglu.mk
index 0e5242f85..604045c22 100644
--- a/buildroot/package/libglu/libglu.mk
+++ b/buildroot/package/libglu/libglu.mk
@@ -10,7 +10,7 @@ LIBGLU_SOURCE = glu-$(LIBGLU_VERSION).tar.gz
 LIBGLU_LICENSE = SGI-B-2.0
 LIBGLU_LICENSE_FILES = include/GL/glu.h
 LIBGLU_INSTALL_STAGING = YES
-# upstream does not distribute a autoconf´ed configure script
+# upstream does not distribute a autoconf'ed configure script
 LIBGLU_AUTORECONF = YES
 LIBGLU_DEPENDENCIES = libgl host-pkgconf
 
diff --git a/buildroot/package/libgpg-error/Config.in b/buildroot/package/libgpg-error/Config.in
index 0659a834b..dbb554989 100644
--- a/buildroot/package/libgpg-error/Config.in
+++ b/buildroot/package/libgpg-error/Config.in
@@ -48,5 +48,5 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG
 		if BR2_sparc
 	default "sparc64-unknown-linux-gnu" \
 		if BR2_sparc64
-	default "x86_64-pc-linux-gnu" \
+	default "x86_64-unknown-linux-gnu" \
 		if BR2_x86_64
diff --git a/buildroot/package/libgpg-error/libgpg-error.hash b/buildroot/package/libgpg-error/libgpg-error.hash
index 93593b141..b18ab7e6b 100644
--- a/buildroot/package/libgpg-error/libgpg-error.hash
+++ b/buildroot/package/libgpg-error/libgpg-error.hash
@@ -1,7 +1,7 @@
 # Locally calculated after checking pgp signature
-# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.32.tar.bz2.sig
+# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.33.tar.bz2.sig
 # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
-sha256 c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca  libgpg-error-1.32.tar.bz2
+sha256 5d38826656e746c936e7742d9cde072b50baa3c4c49daa168a56813612bf03ff  libgpg-error-1.33.tar.bz2
 # Locally calculated
 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING.LIB
diff --git a/buildroot/package/libgpg-error/libgpg-error.mk b/buildroot/package/libgpg-error/libgpg-error.mk
index ef817c7cc..d26d92fb0 100644
--- a/buildroot/package/libgpg-error/libgpg-error.mk
+++ b/buildroot/package/libgpg-error/libgpg-error.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGPG_ERROR_VERSION = 1.32
+LIBGPG_ERROR_VERSION = 1.33
 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error
 LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+
@@ -12,14 +12,7 @@ LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB
 LIBGPG_ERROR_INSTALL_STAGING = YES
 LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
 LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
-
-define LIBGPG_ERROR_FIX_CROSS_COMPILATION
-	cd $(@D)/src/syscfg && \
-	ln -s lock-obj-pub.$(call qstrip, $(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG)).h \
-		lock-obj-pub.$(GNU_TARGET_NAME).h
-endef
-LIBGPG_ERROR_PRE_CONFIGURE_HOOKS += LIBGPG_ERROR_FIX_CROSS_COMPILATION
-
-LIBGPG_ERROR_CONF_OPTS = --disable-tests
+LIBGPG_ERROR_CONF_OPTS = --disable-tests \
+		--host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG)
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/libgpiod/libgpiod.hash b/buildroot/package/libgpiod/libgpiod.hash
index 318a107ad..e68ebdb8c 100644
--- a/buildroot/package/libgpiod/libgpiod.hash
+++ b/buildroot/package/libgpiod/libgpiod.hash
@@ -1,4 +1,4 @@
 # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc
-sha256 b6b9079c933f7c8524815437937dda6b795a16141bca202a9eec70ba5844b5ba  libgpiod-1.2.tar.xz
+sha256 736d8b511ad247c2acb01b592f2bbe5e757e14e1d8347b2d80683081ab4b31b8  libgpiod-1.2.1.tar.xz
 # Hash for license file
 sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed  COPYING
diff --git a/buildroot/package/libgpiod/libgpiod.mk b/buildroot/package/libgpiod/libgpiod.mk
index 545526515..c46ffa871 100644
--- a/buildroot/package/libgpiod/libgpiod.mk
+++ b/buildroot/package/libgpiod/libgpiod.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGPIOD_VERSION = 1.2
+LIBGPIOD_VERSION = 1.2.1
 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz
 LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod
 LIBGPIOD_LICENSE = LGPL-2.1+
diff --git a/buildroot/package/libgtk3/libgtk3.mk b/buildroot/package/libgtk3/libgtk3.mk
index 1b85d00aa..bdf820de3 100644
--- a/buildroot/package/libgtk3/libgtk3.mk
+++ b/buildroot/package/libgtk3/libgtk3.mk
@@ -151,8 +151,8 @@ HOST_LIBGTK3_DEPENDENCIES = \
 	host-librsvg
 
 HOST_LIBGTK3_CFLAGS = \
-	`$(HOST_DIR)/bin/pkgconf --cflags --libs gdk-pixbuf-2.0` \
-	`$(HOST_DIR)/bin/pkgconf --cflags --libs gio-2.0`
+	`$(HOST_MAKE_ENV) $(PKG_CONFIG_HOST_BINARY) --cflags --libs gdk-pixbuf-2.0` \
+	`$(HOST_MAKE_ENV) $(PKG_CONFIG_HOST_BINARY) --cflags --libs gio-2.0`
 
 define HOST_LIBGTK3_CONFIGURE_CMDS
 	echo "#define GETTEXT_PACKAGE \"gtk30\"" >> $(@D)/gtk/config.h
diff --git a/buildroot/package/libhttpparser/libhttpparser.hash b/buildroot/package/libhttpparser/libhttpparser.hash
index acbf3787f..b7df9ca60 100644
--- a/buildroot/package/libhttpparser/libhttpparser.hash
+++ b/buildroot/package/libhttpparser/libhttpparser.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 51615f68b8d67eadfd2482decc63b3e55d749ce0055502bbb5b0032726d22d96  libhttpparser-v2.8.1.tar.gz
+sha256 ef26268c54c8084d17654ba2ed5140bffeffd2a040a895ffb22a6cca3f6c613f  libhttpparser-v2.9.0.tar.gz
 sha256 79e6ba8b687cb54786207342b9b6fcee0ac10218453ed9009b84d949b2233cc0  LICENSE-MIT
diff --git a/buildroot/package/libhttpparser/libhttpparser.mk b/buildroot/package/libhttpparser/libhttpparser.mk
index 502ab75b8..8c0afe280 100644
--- a/buildroot/package/libhttpparser/libhttpparser.mk
+++ b/buildroot/package/libhttpparser/libhttpparser.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBHTTPPARSER_VERSION = v2.8.1
+LIBHTTPPARSER_VERSION = v2.9.0
 LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION))
 LIBHTTPPARSER_INSTALL_STAGING = YES
 LIBHTTPPARSER_LICENSE = MIT
diff --git a/buildroot/package/libid3tag/id3tag.pc b/buildroot/package/libid3tag/id3tag.pc
new file mode 100644
index 000000000..63d09eee8
--- /dev/null
+++ b/buildroot/package/libid3tag/id3tag.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: id3tag
+Description: ID3 tag reading library
+Version: 0.15.1b
+Requires:
+Libs: -L${libdir} -lid3tag
+Libs.private: -lz
+Cflags: -I${includedir}
diff --git a/buildroot/package/libid3tag/libid3tag.mk b/buildroot/package/libid3tag/libid3tag.mk
index 402e154ae..3ec145725 100644
--- a/buildroot/package/libid3tag/libid3tag.mk
+++ b/buildroot/package/libid3tag/libid3tag.mk
@@ -15,4 +15,11 @@ LIBID3TAG_DEPENDENCIES = zlib
 # is able to properly behave in the face of a missing C++ compiler.
 LIBID3TAG_AUTORECONF = YES
 
+define LIBID3TAG_INSTALL_STAGING_PC
+	$(INSTALL) -D package/libid3tag/id3tag.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/id3tag.pc
+endef
+
+LIBID3TAG_POST_INSTALL_STAGING_HOOKS += LIBID3TAG_INSTALL_STAGING_PC
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/libidn2/libidn2.hash b/buildroot/package/libidn2/libidn2.hash
index 4afb634e8..300cedb47 100644
--- a/buildroot/package/libidn2/libidn2.hash
+++ b/buildroot/package/libidn2/libidn2.hash
@@ -1,8 +1,8 @@
 # Calculated locally after checking signature
-sha256	53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8	libidn2-2.0.5.tar.gz
+sha256	032398dbaa9537af43f51a8d94e967e3718848547b1b2a4eb3138b20cad11d32	libidn2-2.1.0.tar.gz
 
 # Hash for license files:
-sha256	4fa501e804195b4136c9cec4bc510365b8cbaf4bc075d6401a77ae0213370457	COPYING
+sha256	73483f797a83373fca1b968c11785b98c4fc4803cdc7d3210811ca8b075d6d76	COPYING
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYINGv2
 sha256	da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768	COPYING.LESSERv3
 sha256	01d621eef165cf4d3d3dbb737aa0699178d94c6f18cf87e9dde6db3ca7790f46	COPYING.unicode
diff --git a/buildroot/package/libidn2/libidn2.mk b/buildroot/package/libidn2/libidn2.mk
index 8e01fba1c..7112553fe 100644
--- a/buildroot/package/libidn2/libidn2.mk
+++ b/buildroot/package/libidn2/libidn2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBIDN2_VERSION = 2.0.5
+LIBIDN2_VERSION = 2.1.0
 LIBIDN2_SITE = $(BR2_GNU_MIRROR)/libidn
 LIBIDN2_LICENSE := GPL-2.0+ or LGPL-3.0+ (library)
 LIBIDN2_LICENSE_FILES = COPYING COPYINGv2 COPYING.LESSERv3 COPYING.unicode
diff --git a/buildroot/package/libiio/libiio.hash b/buildroot/package/libiio/libiio.hash
index fbb4bccb9..800b2ee8f 100644
--- a/buildroot/package/libiio/libiio.hash
+++ b/buildroot/package/libiio/libiio.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 12063db7a9366aa00bfd789db30afaddb29686bc29b3ce1e5d4adfe1c3b42527  libiio-0.14.tar.gz
+sha256 a729f8ff48137ad271a3e2951f322b35c1bf2ec075b488d75c8bd071c693fd19  libiio-0.15.tar.gz
 sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b  COPYING.txt
diff --git a/buildroot/package/libiio/libiio.mk b/buildroot/package/libiio/libiio.mk
index d2376bca3..2371a7106 100644
--- a/buildroot/package/libiio/libiio.mk
+++ b/buildroot/package/libiio/libiio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBIIO_VERSION = 0.14
+LIBIIO_VERSION = 0.15
 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION))
 LIBIIO_INSTALL_STAGING = YES
 LIBIIO_LICENSE = LGPL-2.1+
diff --git a/buildroot/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch b/buildroot/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch
new file mode 100644
index 000000000..c9a0652e4
--- /dev/null
+++ b/buildroot/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch
@@ -0,0 +1,49 @@
+From 57383dc900e76e65ce5e5dc95f776e086100344d Mon Sep 17 00:00:00 2001
+From: Peter Seiderer 
+Date: Sat, 12 Jan 2019 10:22:38 +0100
+Subject: [PATCH] meson.build: enable CPP include check only in case CPP
+ compiler is available
+
+Drop hard meson C++/CPP dependency, only needed for the build-time
+header inclusion test, build the test only in case C++/CPP compiler
+is available.
+
+Signed-off-by: Peter Seiderer 
+---
+ meson.build | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a9c7c185..8183822e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,4 +1,4 @@
+-project('libinput', 'c', 'cpp',
++project('libinput', 'c',
+ 	version : '1.12.5',
+ 	license : 'MIT/Expat',
+ 	default_options : [ 'c_std=gnu99', 'warning_level=2' ],
+@@ -641,12 +641,14 @@ executable('test-build-linker',
+ 	   include_directories : [includes_src, includes_include],
+ 	   dependencies : [ dep_libinput, dep_libinput_util ],
+ 	   install : false)
+-# test including from C++
+-executable('test-build-cxx',
+-	   'test/build-cxx.cc',
+-	   dependencies : [dep_udev],
+-	   include_directories : [includes_src, includes_include],
+-	   install : false)
++# test including from C++ (in case CPP compiler is available)
++if add_languages('cpp', required: false)
++	executable('test-build-cxx',
++		   'test/build-cxx.cc',
++		   dependencies : [dep_udev],
++		   include_directories : [includes_src, includes_include],
++		   install : false)
++endif
+ 
+ # This is the test suite runner, we allow disabling that one because of
+ # dependencies
+-- 
+2.20.1
+
diff --git a/buildroot/package/libinput/libinput.hash b/buildroot/package/libinput/libinput.hash
index 4e64568ca..3ca3fd677 100644
--- a/buildroot/package/libinput/libinput.hash
+++ b/buildroot/package/libinput/libinput.hash
@@ -1,5 +1,8 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2017-September/034949.html
-md5  e94e9aa765da9533c23b80b440638de9  libinput-1.8.2.tar.xz
-sha1 1c55462eb598b91c9c360f31170a408fb8d38d22  libinput-1.8.2.tar.xz
-sha256 013518ee0adb2287e6e1f08412efba2137320738cadb5399b783738f04cbab38  libinput-1.8.2.tar.xz
-sha512 555a7680cc8aaf62c5370a865f3aff0a933d42d94a3d8861c072666b02c9e1be45ea39de9a749a9575cdfb613b6150e412e18559d94d4919f21ca4680a3c76a7  libinput-1.8.2.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2019-January/039804.html
+md5  40dcc044443c9314537f605b6f30bf17 libinput-1.12.5.tar.xz
+sha1 7c0b75e8cf2f1747fb8ae69300acabd46f7a7f0d libinput-1.12.5.tar.xz
+sha256 7d4b6831010ef3bf69df4b41170047fa4325edef8ff5d2d28e78281af0687123 libinput-1.12.5.tar.xz
+sha512 9365b91b3ac2c4ff0f9927913242afac7677979682dd7b541001b13d09d7982acd854f6d348101cfa4b0854c6a92b4c683f62593a97870e32ae3d607eaeae3ff libinput-1.12.5.tar.xz
+
+# License files
+sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING
diff --git a/buildroot/package/libinput/libinput.mk b/buildroot/package/libinput/libinput.mk
index f904b796b..bc4cc8982 100644
--- a/buildroot/package/libinput/libinput.mk
+++ b/buildroot/package/libinput/libinput.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBINPUT_VERSION = 1.8.2
+LIBINPUT_VERSION = 1.12.5
 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
 LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
 LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev
@@ -12,13 +12,13 @@ LIBINPUT_INSTALL_STAGING = YES
 LIBINPUT_LICENSE = MIT
 LIBINPUT_LICENSE_FILES = COPYING
 # Tests need fork, so just disable them everywhere.
-LIBINPUT_CONF_OPTS = --disable-tests --disable-libwacom
+LIBINPUT_CONF_OPTS = -Dtests=false -Dlibwacom=false -Ddocumentation=false
 
 ifeq ($(BR2_PACKAGE_LIBGTK3),y)
-LIBINPUT_CONF_OPTS += --enable-debug-gui
+LIBINPUT_CONF_OPTS += -Ddebug-gui=true
 LIBINPUT_DEPENDENCIES += libgtk3
 else
-LIBINPUT_CONF_OPTS += --disable-debug-gui
+LIBINPUT_CONF_OPTS += -Ddebug-gui=false
 endif
 
-$(eval $(autotools-package))
+$(eval $(meson-package))
diff --git a/buildroot/package/libiscsi/libiscsi.mk b/buildroot/package/libiscsi/libiscsi.mk
index a34069d7b..2b26a1427 100644
--- a/buildroot/package/libiscsi/libiscsi.mk
+++ b/buildroot/package/libiscsi/libiscsi.mk
@@ -11,6 +11,10 @@ LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
 LIBISCSI_INSTALL_STAGING = YES
 LIBISCSI_AUTORECONF = YES
 
+ifeq ($(BR2_PACKAGE_CUNIT),y)
+LIBISCSI_DEPENDENCIES += cunit
+endif
+
 LIBISCSI_CONF_OPTS = --disable-werror --disable-manpages
 
 # We need to create the m4 directory to make autoreconf work properly.
diff --git a/buildroot/package/libite/libite.hash b/buildroot/package/libite/libite.hash
index 7ef9dca57..aac01fd36 100644
--- a/buildroot/package/libite/libite.hash
+++ b/buildroot/package/libite/libite.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256 39a4c12af30a38a813fac7c8d7512efb3692f910eba9c697a50ce0203e039dad  libite-v2.0.1.tar.gz
+sha256 bd5d08066f3e53cc8967beb6f0620286aad7a24d49fb730caa1c6d09a26bb705  libite-v2.0.2.tar.gz
 sha256 0e97ab27b60e20a7ddb8e9638189ad159124e51d2c12e12735b05423df224da5  LICENSE
 sha256 9e0fb98d251dddf5ba81a355f6b4d89835ec53bc5d7f5fcd2c866b54ec5ccec8  src/chomp.c
 sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d  src/pidfile.c
diff --git a/buildroot/package/libite/libite.mk b/buildroot/package/libite/libite.mk
index a128953c7..bcda5f3f0 100644
--- a/buildroot/package/libite/libite.mk
+++ b/buildroot/package/libite/libite.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBITE_VERSION = v2.0.1
+LIBITE_VERSION = v2.0.2
 LIBITE_SITE = $(call github,troglobit,libite,$(LIBITE_VERSION))
 LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause
 LIBITE_LICENSE_FILES = LICENSE src/chomp.c src/pidfile.c
diff --git a/buildroot/package/libkcapi/0001-apps-kcapi-hasher.c-fix-build-with-gcc-8.2.x.patch b/buildroot/package/libkcapi/0001-apps-kcapi-hasher.c-fix-build-with-gcc-8.2.x.patch
new file mode 100644
index 000000000..a4c352d30
--- /dev/null
+++ b/buildroot/package/libkcapi/0001-apps-kcapi-hasher.c-fix-build-with-gcc-8.2.x.patch
@@ -0,0 +1,54 @@
+From dcb02c1639c2ff05938c01eaa41286a2e2f8d698 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 20 Jan 2019 20:04:13 +0100
+Subject: [PATCH] apps/kcapi-hasher.c: fix build with gcc 8.2.x
+
+Fixes:
+ - http://autobuild.buildroot.org/results/8355bc42238e885f7f11ed3d9d37fc55ebdead2b
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/smuellerDD/libkcapi/pull/76]
+---
+ apps/kcapi-hasher.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/apps/kcapi-hasher.c b/apps/kcapi-hasher.c
+index d6be685..7172b12 100644
+--- a/apps/kcapi-hasher.c
++++ b/apps/kcapi-hasher.c
+@@ -357,16 +357,20 @@ out:
+ }
+ 
+ /*
+- * GCC v8.1.0 introduced -Wstringop-truncation but it is not smart enough to
+- * find that cursor string will be NULL-terminated after all paste() calls and
+- * warns with:
++ * GCC v8.1.0 introduced -Wstringop-truncation and GCC v8.2.0 introduced
++ * -Wstringop-overflow but it is not smart enough to find that cursor string
++ * will be NULL-terminated after all paste() calls and warns with:
+  * error: 'strncpy' destination unchanged after copying no bytes [-Werror=stringop-truncation]
+  * error: 'strncpy' output truncated before terminating nul copying 5 bytes from a string of the same length [-Werror=stringop-truncation]
++ * error: 'strncpy' specified bound depends on the length of the source argument [-Werror=stringop-overflow=]
+  */
+ #pragma GCC diagnostic push
+ #if GCC_VERSION >= 80100
+ #pragma GCC diagnostic ignored "-Wstringop-truncation"
+ #endif
++#if GCC_VERSION >= 80200
++#pragma GCC diagnostic ignored "-Wstringop-overflow"
++#endif
+ static char *paste(char *dst, const char *src, size_t size)
+ {
+ 	strncpy(dst, src, size);
+@@ -417,7 +421,7 @@ static char *get_hmac_file(const char *filename, const char *checkdir)
+ 	strncpy(cursor, "\0", 1);
+ 	return checkfile;
+ }
+-#pragma GCC diagnostic pop /* -Wstringop-truncation */
++#pragma GCC diagnostic pop /* -Wstringop-truncation -Wstringop-overflow */
+ 
+ static int hash_files(const struct hash_params *params,
+ 		      char *filenames[], uint32_t files,
+-- 
+2.14.1
+
diff --git a/buildroot/package/libkcapi/libkcapi.hash b/buildroot/package/libkcapi/libkcapi.hash
index b340ea84b..a9b42bf6e 100644
--- a/buildroot/package/libkcapi/libkcapi.hash
+++ b/buildroot/package/libkcapi/libkcapi.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256 19c044310eda0bf5403fae8df2eeffcfef33b67cb5b01def5f440d41ff16b55f	libkcapi-1.1.3.tar.xz
-sha256 b0336f8f07a6abf8b0a59d961f53601d7c4a7c09a8137805b730a34a976039f8	COPYING
+sha256 9197f35aca270f97c544fe94dab379b44a2879a07eb78acd5d02c55924902763	libkcapi-1.1.4.tar.xz
+sha256 c6b8402a68999b0f84560ab43cdf60f9ff33c4a9a8ced6a40db9d3b787ba5b4a	COPYING
 sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4	COPYING.gplv2
 sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239	COPYING.bsd
diff --git a/buildroot/package/libkcapi/libkcapi.mk b/buildroot/package/libkcapi/libkcapi.mk
index 9edf0394d..48d34ffc4 100644
--- a/buildroot/package/libkcapi/libkcapi.mk
+++ b/buildroot/package/libkcapi/libkcapi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBKCAPI_VERSION = 1.1.3
+LIBKCAPI_VERSION = 1.1.4
 LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz
 LIBKCAPI_SITE = http://www.chronox.de/libkcapi
 LIBKCAPI_AUTORECONF = YES
diff --git a/buildroot/package/libkrb5/libkrb5.hash b/buildroot/package/libkrb5/libkrb5.hash
index 2980947fa..733c6c9d6 100644
--- a/buildroot/package/libkrb5/libkrb5.hash
+++ b/buildroot/package/libkrb5/libkrb5.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	214ffe394e3ad0c730564074ec44f1da119159d94281bbec541dc29168d21117	krb5-1.16.1.tar.gz
+sha256	9f721e1fe593c219174740c71de514c7228a97d23eb7be7597b2ae14e487f027	krb5-1.16.2.tar.gz
 
 # Hash for license file:
 sha256	58534f00ed877fd32936fcab094f49d399aeef7716393204d8028c4b89050c82	NOTICE
diff --git a/buildroot/package/libkrb5/libkrb5.mk b/buildroot/package/libkrb5/libkrb5.mk
index d9d7160ae..56345416a 100644
--- a/buildroot/package/libkrb5/libkrb5.mk
+++ b/buildroot/package/libkrb5/libkrb5.mk
@@ -5,13 +5,13 @@
 ################################################################################
 
 LIBKRB5_VERSION_MAJOR = 1.16
-LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).1
+LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).2
 LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR)
 LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz
 LIBKRB5_SUBDIR = src
 LIBKRB5_LICENSE = MIT
 LIBKRB5_LICENSE_FILES = NOTICE
-LIBKRB5_DEPENDENCIES = host-bison
+LIBKRB5_DEPENDENCIES = host-bison $(TARGET_NLS_DEPENDENCIES)
 LIBKRB5_INSTALL_STAGING = YES
 
 # The configure script uses AC_TRY_RUN tests to check for those values,
@@ -20,7 +20,8 @@ LIBKRB5_INSTALL_STAGING = YES
 LIBKRB5_CONF_ENV = \
 	ac_cv_printf_positional=yes \
 	ac_cv_func_regcomp=yes \
-	krb5_cv_attr_constructor_destructor=yes,yes
+	krb5_cv_attr_constructor_destructor=yes,yes \
+	LIBS=$(TARGET_NLS_LIBS)
 
 # Never use the host packages
 LIBKRB5_CONF_OPTS = \
diff --git a/buildroot/package/libmad/0006-configure-ac-automake-foreign.patch b/buildroot/package/libmad/0006-configure-ac-automake-foreign.patch
new file mode 100644
index 000000000..828ad0c15
--- /dev/null
+++ b/buildroot/package/libmad/0006-configure-ac-automake-foreign.patch
@@ -0,0 +1,16 @@
+configure.ac: don't require GNU-specific files when running automake
+
+Signed-off-by: Fabrice Fontaine 
+
+diff -ur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b-orig/configure.ac	2019-01-17 21:24:52.259194527 +0100
++++ libmad-0.15.1b/configure.ac	2019-01-17 21:25:32.779481058 +0100
+@@ -26,7 +26,7 @@
+ 
+ AC_CONFIG_SRCDIR([decoder.h])
+ 
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ 
+ AM_CONFIG_HEADER([config.h])
+ 
diff --git a/buildroot/package/libmad/libmad.mk b/buildroot/package/libmad/libmad.mk
index 7175eaa30..108c4f641 100644
--- a/buildroot/package/libmad/libmad.mk
+++ b/buildroot/package/libmad/libmad.mk
@@ -13,17 +13,15 @@ LIBMAD_LICENSE_FILES = COPYING
 LIBMAD_PATCH = \
 	https://sources.debian.net/data/main/libm/libmad/0.15.1b-8/debian/patches/frame_length.diff
 
-define LIBMAD_PREVENT_AUTOMAKE
-	# Prevent automake from running.
-	(cd $(@D); touch -c config* aclocal.m4 Makefile*);
-endef
+# Force autoreconf to be able to use a more recent libtool script, that
+# is able to properly behave in the face of a missing C++ compiler.
+LIBMAD_AUTORECONF = YES
 
 define LIBMAD_INSTALL_STAGING_PC
 	$(INSTALL) -D package/libmad/mad.pc \
 		$(STAGING_DIR)/usr/lib/pkgconfig/mad.pc
 endef
 
-LIBMAD_POST_PATCH_HOOKS += LIBMAD_PREVENT_AUTOMAKE
 LIBMAD_POST_INSTALL_STAGING_HOOKS += LIBMAD_INSTALL_STAGING_PC
 
 LIBMAD_CONF_OPTS = \
diff --git a/buildroot/package/libmbim/libmbim.hash b/buildroot/package/libmbim/libmbim.hash
index 9734181a3..9e8629f34 100644
--- a/buildroot/package/libmbim/libmbim.hash
+++ b/buildroot/package/libmbim/libmbim.hash
@@ -1,4 +1,4 @@
 # Locally computed:
-sha256  c8ca50beeddd4b43309df5b698917268303bf176cea58fe4fe53d5bf0e93fac2  libmbim-1.16.0.tar.xz
+sha256  6cf40128d83d087946a7d8577e735526202e034d52f90047735329609097b282  libmbim-1.18.0.tar.xz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
diff --git a/buildroot/package/libmbim/libmbim.mk b/buildroot/package/libmbim/libmbim.mk
index 169cdc1dc..748d21553 100644
--- a/buildroot/package/libmbim/libmbim.mk
+++ b/buildroot/package/libmbim/libmbim.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBMBIM_VERSION = 1.16.0
-LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
+LIBMBIM_VERSION = 1.18.0
+LIBMBIM_SITE = https://www.freedesktop.org/software/libmbim
 LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
 LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
 LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB
diff --git a/buildroot/package/libmediaart/Config.in b/buildroot/package/libmediaart/Config.in
index e07367739..c11d6f49d 100644
--- a/buildroot/package/libmediaart/Config.in
+++ b/buildroot/package/libmediaart/Config.in
@@ -32,12 +32,11 @@ config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
 
 config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
 	bool "Qt"
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE_GUI
 
-comment "Qt backend depends on Qt or Qt5"
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
+comment "Qt backend depends on Qt5"
+	depends on !BR2_PACKAGE_QT5
 
 endchoice
 
diff --git a/buildroot/package/libmediaart/libmediaart.mk b/buildroot/package/libmediaart/libmediaart.mk
index f64210c26..a81542ac6 100644
--- a/buildroot/package/libmediaart/libmediaart.mk
+++ b/buildroot/package/libmediaart/libmediaart.mk
@@ -25,9 +25,7 @@ else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 endif
-LIBMEDIAART_DEPENDENCIES += \
-	$(if $(BR2_PACKAGE_QT),qt) \
-	$(if $(BR2_PACKAGE_QT5),qt5base)
+LIBMEDIAART_DEPENDENCIES += qt5base
 LIBMEDIAART_CONF_OPTS += \
 	--disable-gdkpixbuf \
 	--enable-qt
diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.hash b/buildroot/package/libmicrohttpd/libmicrohttpd.hash
index e534e8e80..d54d2bbc1 100644
--- a/buildroot/package/libmicrohttpd/libmicrohttpd.hash
+++ b/buildroot/package/libmicrohttpd/libmicrohttpd.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 9b9ccd7d0b11b0e179f1f58dc2caa3e0c62c8609e1e1dc7dcaadf941b67d923c  libmicrohttpd-0.9.59.tar.gz
+sha256 cd0e5d3f95a9e55ef7cdf4d0530e997ba00b8411af9149d9287db785d729c471  libmicrohttpd-0.9.60.tar.gz
 sha256 70e12e2a60151b9ed1a4c94a5ffeb99cd086fa94542b5a92fec581506e8d3121  COPYING
diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.mk b/buildroot/package/libmicrohttpd/libmicrohttpd.mk
index d5c6366d8..fd7c37085 100644
--- a/buildroot/package/libmicrohttpd/libmicrohttpd.mk
+++ b/buildroot/package/libmicrohttpd/libmicrohttpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBMICROHTTPD_VERSION = 0.9.59
+LIBMICROHTTPD_VERSION = 0.9.60
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_LICENSE_FILES = COPYING
 LIBMICROHTTPD_INSTALL_STAGING = YES
diff --git a/buildroot/package/libnfs/0002-libnfs.c-include-time.h-in-libnfs.c.patch b/buildroot/package/libnfs/0002-libnfs.c-include-time.h-in-libnfs.c.patch
new file mode 100644
index 000000000..34e584017
--- /dev/null
+++ b/buildroot/package/libnfs/0002-libnfs.c-include-time.h-in-libnfs.c.patch
@@ -0,0 +1,35 @@
+From b56bd3d99f67a3273fec3c0c5d9560413465a1db Mon Sep 17 00:00:00 2001
+From: Anna Lyons 
+Date: Thu, 12 Jul 2018 17:45:23 +1000
+Subject: [PATCH] libnfs.c: include  in libnfs.c
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+time() is used in this file, which is from time.h. Fixes a warning.
+
+Note, that building with musl breaks otherwise, as it is more strict regarding
+missing header inclusions.
+
+Backported from: 794a29f01f8e5961adc5c79d5ba5ac1062877e6c
+
+Signed-off-by: Jörg Krause 
+---
+ lib/libnfs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/libnfs.c b/lib/libnfs.c
+index d89d84d..43c17b9 100755
+--- a/lib/libnfs.c
++++ b/lib/libnfs.c
+@@ -70,6 +70,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include "slist.h"
+ #include "libnfs.h"
+ #include "libnfs-raw.h"
+-- 
+2.19.1
+
diff --git a/buildroot/package/libnfs/libnfs.hash b/buildroot/package/libnfs/libnfs.hash
index 2bd8caf25..0e4dc6fbc 100644
--- a/buildroot/package/libnfs/libnfs.hash
+++ b/buildroot/package/libnfs/libnfs.hash
@@ -1,6 +1,6 @@
 # Locally calculated
-sha256 7ea6cd8fa6c461d01091e584d424d28e137d23ff4b65b95d01a3fd0ef95d120e  libnfs-libnfs-2.0.0.tar.gz
-sha256 2d152e3a2f31ef0fe14d4908377277f8215fb5c82ec9329d1eed081c845fc85f  COPYING
+sha256 445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5  libnfs-libnfs-3.0.0.tar.gz
+sha256 edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5  COPYING
 sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1  LICENCE-BSD.txt
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  LICENCE-LGPL-2.1.txt
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENCE-GPL-3.txt
diff --git a/buildroot/package/libnfs/libnfs.mk b/buildroot/package/libnfs/libnfs.mk
index 0cf07d214..3a84e0aaf 100644
--- a/buildroot/package/libnfs/libnfs.mk
+++ b/buildroot/package/libnfs/libnfs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNFS_VERSION = libnfs-2.0.0
+LIBNFS_VERSION = libnfs-3.0.0
 LIBNFS_SITE = $(call github,sahlberg,libnfs,$(LIBNFS_VERSION))
 LIBNFS_INSTALL_STAGING = YES
 LIBNFS_AUTORECONF = YES
diff --git a/buildroot/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch b/buildroot/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch
index 1062f2b01..213aab79e 100644
--- a/buildroot/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch
+++ b/buildroot/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch
@@ -1,4 +1,4 @@
-From a51cdce6fd271a5cc393c5e56996846d9c453d6a Mon Sep 17 00:00:00 2001
+From 90a0152c224fa90f648b27187859bd84f6426e1b Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Thu, 2 Jun 2016 23:03:27 -0300
 Subject: [PATCH] Rename xfree() to libnftnl_xfree() to avoid symbol naming
@@ -22,31 +22,33 @@ libnftnl_xfree().
 Signed-off-by: Thomas Petazzoni 
 [Gustavo: update for version 1.0.7]
 Signed-off-by: Gustavo Zacarias 
-[baruch: update for version 1.0.9]
+[baruch: update for versions 1.0.9, 1.1.2]
 Signed-off-by: Baruch Siach 
 ---
- include/utils.h      |  2 +-
- src/chain.c          | 36 ++++++++++++++++++------------------
- src/common.c         |  2 +-
- src/expr.c           |  4 ++--
- src/expr/data_reg.c  |  2 +-
- src/expr/dynset.c    |  2 +-
- src/expr/immediate.c |  2 +-
- src/expr/log.c       |  6 +++---
- src/expr/lookup.c    |  2 +-
- src/expr/match.c     |  6 +++---
- src/expr/target.c    |  6 +++---
- src/gen.c            |  2 +-
- src/object.c         | 14 +++++++-------
- src/rule.c           | 32 ++++++++++++++++----------------
- src/ruleset.c        |  2 +-
- src/set.c            | 28 ++++++++++++++--------------
- src/set_elem.c       | 28 ++++++++++++++--------------
- src/table.c          | 14 +++++++-------
- src/trace.c          | 14 +++++++-------
- src/udata.c          |  2 +-
- src/utils.c          |  2 +-
- 21 files changed, 104 insertions(+), 104 deletions(-)
+ include/utils.h         |  2 +-
+ src/chain.c             | 36 ++++++++++++++++++------------------
+ src/common.c            |  2 +-
+ src/expr.c              |  4 ++--
+ src/expr/data_reg.c     |  2 +-
+ src/expr/dynset.c       |  2 +-
+ src/expr/flow_offload.c |  2 +-
+ src/expr/immediate.c    |  2 +-
+ src/expr/log.c          |  6 +++---
+ src/expr/lookup.c       |  2 +-
+ src/expr/match.c        |  6 +++---
+ src/expr/target.c       |  6 +++---
+ src/flowtable.c         | 32 ++++++++++++++++----------------
+ src/gen.c               |  2 +-
+ src/object.c            | 14 +++++++-------
+ src/rule.c              | 32 ++++++++++++++++----------------
+ src/ruleset.c           |  2 +-
+ src/set.c               | 28 ++++++++++++++--------------
+ src/set_elem.c          | 28 ++++++++++++++--------------
+ src/table.c             | 14 +++++++-------
+ src/trace.c             | 14 +++++++-------
+ src/udata.c             |  2 +-
+ src/utils.c             |  2 +-
+ 23 files changed, 121 insertions(+), 121 deletions(-)
 
 diff --git a/include/utils.h b/include/utils.h
 index 3cc659652fe2..820556715013 100644
@@ -62,7 +64,7 @@ index 3cc659652fe2..820556715013 100644
  #define div_round_up(n, d)	(((n) + (d) - 1) / (d))
  
 diff --git a/src/chain.c b/src/chain.c
-index eff518680873..03033bbcb93b 100644
+index 01d62c84f140..93e193955934 100644
 --- a/src/chain.c
 +++ b/src/chain.c
 @@ -97,14 +97,14 @@ EXPORT_SYMBOL(nftnl_chain_free);
@@ -176,7 +178,7 @@ index eff518680873..03033bbcb93b 100644
  		c->type = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TYPE]));
  		if (!c->type)
  			return -1;
-@@ -902,7 +902,7 @@ void nftnl_chain_list_free(struct nftnl_chain_list *list)
+@@ -711,7 +711,7 @@ void nftnl_chain_list_free(struct nftnl_chain_list *list)
  		list_del(&r->head);
  		nftnl_chain_free(r);
  	}
@@ -185,7 +187,7 @@ index eff518680873..03033bbcb93b 100644
  }
  
  EXPORT_SYMBOL(nftnl_chain_list_is_empty);
-@@ -988,5 +988,5 @@ struct nftnl_chain *nftnl_chain_list_iter_next(struct nftnl_chain_list_iter *ite
+@@ -797,5 +797,5 @@ struct nftnl_chain *nftnl_chain_list_iter_next(struct nftnl_chain_list_iter *ite
  EXPORT_SYMBOL(nftnl_chain_list_iter_destroy);
  void nftnl_chain_list_iter_destroy(struct nftnl_chain_list_iter *iter)
  {
@@ -193,7 +195,7 @@ index eff518680873..03033bbcb93b 100644
 +	nftnl_xfree(iter);
  }
 diff --git a/src/common.c b/src/common.c
-index 561c95439114..d0124134ea29 100644
+index feb13b2aa836..de7e9d08b9e2 100644
 --- a/src/common.c
 +++ b/src/common.c
 @@ -68,7 +68,7 @@ struct nftnl_parse_err *nftnl_parse_err_alloc(void)
@@ -206,7 +208,7 @@ index 561c95439114..d0124134ea29 100644
  
  EXPORT_SYMBOL(nftnl_parse_perror);
 diff --git a/src/expr.c b/src/expr.c
-index 62565e046996..97f16275f44f 100644
+index 80c4c36a9bd7..f5e44cd16349 100644
 --- a/src/expr.c
 +++ b/src/expr.c
 @@ -51,7 +51,7 @@ void nftnl_expr_free(const struct nftnl_expr *expr)
@@ -218,7 +220,7 @@ index 62565e046996..97f16275f44f 100644
  }
  
  EXPORT_SYMBOL(nftnl_expr_is_set);
-@@ -270,7 +270,7 @@ struct nftnl_expr *nftnl_expr_parse(struct nlattr *attr)
+@@ -260,7 +260,7 @@ struct nftnl_expr *nftnl_expr_parse(struct nlattr *attr)
  	return expr;
  
  err2:
@@ -228,10 +230,10 @@ index 62565e046996..97f16275f44f 100644
  	return NULL;
  }
 diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
-index 1b28b291617b..8c7abdb91d21 100644
+index 67165feb931f..c6f3cec48caf 100644
 --- a/src/expr/data_reg.c
 +++ b/src/expr/data_reg.c
-@@ -379,7 +379,7 @@ void nftnl_free_verdict(const union nftnl_data_reg *data)
+@@ -225,7 +225,7 @@ void nftnl_free_verdict(const union nftnl_data_reg *data)
  	switch(data->verdict) {
  	case NFT_JUMP:
  	case NFT_GOTO:
@@ -241,10 +243,10 @@ index 1b28b291617b..8c7abdb91d21 100644
  	default:
  		break;
 diff --git a/src/expr/dynset.c b/src/expr/dynset.c
-index 160d0e15c151..614124d841c7 100644
+index 68115ba50c94..4e8093b7e9db 100644
 --- a/src/expr/dynset.c
 +++ b/src/expr/dynset.c
-@@ -330,7 +330,7 @@ static void nftnl_expr_dynset_free(const struct nftnl_expr *e)
+@@ -276,7 +276,7 @@ static void nftnl_expr_dynset_free(const struct nftnl_expr *e)
  {
  	struct nftnl_expr_dynset *dynset = nftnl_expr_data(e);
  
@@ -252,9 +254,22 @@ index 160d0e15c151..614124d841c7 100644
 +	nftnl_xfree(dynset->set_name);
  }
  
- static bool nftnl_expr_dynset_cmp(const struct nftnl_expr *e1,
+ struct expr_ops expr_ops_dynset = {
+diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c
+index 6ccec9a13396..877ad072ba53 100644
+--- a/src/expr/flow_offload.c
++++ b/src/expr/flow_offload.c
+@@ -122,7 +122,7 @@ static void nftnl_expr_flow_free(const struct nftnl_expr *e)
+ {
+ 	struct nftnl_expr_flow *flow = nftnl_expr_data(e);
+ 
+-	xfree(flow->table_name);
++	nftnl_xfree(flow->table_name);
+ }
+ 
+ struct expr_ops expr_ops_flow = {
 diff --git a/src/expr/immediate.c b/src/expr/immediate.c
-index b0570bd539a4..6a0732c38ebd 100644
+index 47106ae86675..b0289f9397fb 100644
 --- a/src/expr/immediate.c
 +++ b/src/expr/immediate.c
 @@ -44,7 +44,7 @@ nftnl_expr_immediate_set(struct nftnl_expr *e, uint16_t type,
@@ -267,7 +282,7 @@ index b0570bd539a4..6a0732c38ebd 100644
  		imm->data.chain = strdup(data);
  		if (!imm->data.chain)
 diff --git a/src/expr/log.c b/src/expr/log.c
-index 86d965136cd4..0624a7712237 100644
+index bbe43d2dc6bc..a5952ce10ccc 100644
 --- a/src/expr/log.c
 +++ b/src/expr/log.c
 @@ -39,7 +39,7 @@ static int nftnl_expr_log_set(struct nftnl_expr *e, uint16_t type,
@@ -288,7 +303,7 @@ index 86d965136cd4..0624a7712237 100644
  
  		log->prefix = strdup(mnl_attr_get_str(tb[NFTA_LOG_PREFIX]));
  		if (!log->prefix)
-@@ -317,7 +317,7 @@ static void nftnl_expr_log_free(const struct nftnl_expr *e)
+@@ -255,7 +255,7 @@ static void nftnl_expr_log_free(const struct nftnl_expr *e)
  {
  	struct nftnl_expr_log *log = nftnl_expr_data(e);
  
@@ -296,12 +311,12 @@ index 86d965136cd4..0624a7712237 100644
 +	nftnl_xfree(log->prefix);
  }
  
- static bool nftnl_expr_log_cmp(const struct nftnl_expr *e1,
+ struct expr_ops expr_ops_log = {
 diff --git a/src/expr/lookup.c b/src/expr/lookup.c
-index 5fcb81f3a7a2..45f5dfefd33f 100644
+index a495ac0fdcfc..4fce24288c57 100644
 --- a/src/expr/lookup.c
 +++ b/src/expr/lookup.c
-@@ -258,7 +258,7 @@ static void nftnl_expr_lookup_free(const struct nftnl_expr *e)
+@@ -209,7 +209,7 @@ static void nftnl_expr_lookup_free(const struct nftnl_expr *e)
  {
  	struct nftnl_expr_lookup *lookup = nftnl_expr_data(e);
  
@@ -309,9 +324,9 @@ index 5fcb81f3a7a2..45f5dfefd33f 100644
 +	nftnl_xfree(lookup->set_name);
  }
  
- static bool nftnl_expr_lookup_cmp(const struct nftnl_expr *e1,
+ struct expr_ops expr_ops_lookup = {
 diff --git a/src/expr/match.c b/src/expr/match.c
-index dd09e1e85192..09e35c528aca 100644
+index 4fa74b2da893..7ee706753b68 100644
 --- a/src/expr/match.c
 +++ b/src/expr/match.c
 @@ -50,7 +50,7 @@ nftnl_expr_match_set(struct nftnl_expr *e, uint16_t type,
@@ -332,7 +347,7 @@ index dd09e1e85192..09e35c528aca 100644
  
  		match_data = calloc(1, len);
  		if (match_data == NULL)
-@@ -217,7 +217,7 @@ static void nftnl_expr_match_free(const struct nftnl_expr *e)
+@@ -186,7 +186,7 @@ static void nftnl_expr_match_free(const struct nftnl_expr *e)
  {
  	struct nftnl_expr_match *match = nftnl_expr_data(e);
  
@@ -340,9 +355,9 @@ index dd09e1e85192..09e35c528aca 100644
 +	nftnl_xfree(match->data);
  }
  
- static bool nftnl_expr_match_cmp(const struct nftnl_expr *e1,
+ struct expr_ops expr_ops_match = {
 diff --git a/src/expr/target.c b/src/expr/target.c
-index ed4bf7df6328..5e28925debeb 100644
+index 91000386704a..5d0763edf63f 100644
 --- a/src/expr/target.c
 +++ b/src/expr/target.c
 @@ -50,7 +50,7 @@ nftnl_expr_target_set(struct nftnl_expr *e, uint16_t type,
@@ -363,7 +378,7 @@ index ed4bf7df6328..5e28925debeb 100644
  
  		target_data = calloc(1, len);
  		if (target_data == NULL)
-@@ -217,7 +217,7 @@ static void nftnl_expr_target_free(const struct nftnl_expr *e)
+@@ -186,7 +186,7 @@ static void nftnl_expr_target_free(const struct nftnl_expr *e)
  {
  	struct nftnl_expr_target *target = nftnl_expr_data(e);
  
@@ -371,9 +386,115 @@ index ed4bf7df6328..5e28925debeb 100644
 +	nftnl_xfree(target->data);
  }
  
- static bool nftnl_expr_target_cmp(const struct nftnl_expr *e1,
+ struct expr_ops expr_ops_target = {
+diff --git a/src/flowtable.c b/src/flowtable.c
+index c939306b56c4..f1b3eef48b73 100644
+--- a/src/flowtable.c
++++ b/src/flowtable.c
+@@ -45,16 +45,16 @@ void nftnl_flowtable_free(const struct nftnl_flowtable *c)
+ 	int i;
+ 
+ 	if (c->flags & (1 << NFTNL_FLOWTABLE_NAME))
+-		xfree(c->name);
++		nftnl_xfree(c->name);
+ 	if (c->flags & (1 << NFTNL_FLOWTABLE_TABLE))
+-		xfree(c->table);
++		nftnl_xfree(c->table);
+ 	if (c->flags & (1 << NFTNL_FLOWTABLE_DEVICES)) {
+ 		for (i = 0; i < c->dev_array_len; i++)
+-			xfree(c->dev_array[i]);
++			nftnl_xfree(c->dev_array[i]);
+ 
+-		xfree(c->dev_array);
++		nftnl_xfree(c->dev_array);
+ 	}
+-	xfree(c);
++	nftnl_xfree(c);
+ }
+ EXPORT_SYMBOL(nftnl_flowtable_free);
+ 
+@@ -73,10 +73,10 @@ void nftnl_flowtable_unset(struct nftnl_flowtable *c, uint16_t attr)
+ 
+ 	switch (attr) {
+ 	case NFTNL_FLOWTABLE_NAME:
+-		xfree(c->name);
++		nftnl_xfree(c->name);
+ 		break;
+ 	case NFTNL_FLOWTABLE_TABLE:
+-		xfree(c->table);
++		nftnl_xfree(c->table);
+ 		break;
+ 	case NFTNL_FLOWTABLE_HOOKNUM:
+ 	case NFTNL_FLOWTABLE_PRIO:
+@@ -86,8 +86,8 @@ void nftnl_flowtable_unset(struct nftnl_flowtable *c, uint16_t attr)
+ 		break;
+ 	case NFTNL_FLOWTABLE_DEVICES:
+ 		for (i = 0; i < c->dev_array_len; i++) {
+-			xfree(c->dev_array[i]);
+-			xfree(c->dev_array);
++			nftnl_xfree(c->dev_array[i]);
++			nftnl_xfree(c->dev_array);
+ 		}
+ 		break;
+ 	default:
+@@ -117,7 +117,7 @@ int nftnl_flowtable_set_data(struct nftnl_flowtable *c, uint16_t attr,
+ 	switch(attr) {
+ 	case NFTNL_FLOWTABLE_NAME:
+ 		if (c->flags & (1 << NFTNL_FLOWTABLE_NAME))
+-			xfree(c->name);
++			nftnl_xfree(c->name);
+ 
+ 		c->name = strdup(data);
+ 		if (!c->name)
+@@ -125,7 +125,7 @@ int nftnl_flowtable_set_data(struct nftnl_flowtable *c, uint16_t attr,
+ 		break;
+ 	case NFTNL_FLOWTABLE_TABLE:
+ 		if (c->flags & (1 << NFTNL_FLOWTABLE_TABLE))
+-			xfree(c->table);
++			nftnl_xfree(c->table);
+ 
+ 		c->table = strdup(data);
+ 		if (!c->table)
+@@ -147,8 +147,8 @@ int nftnl_flowtable_set_data(struct nftnl_flowtable *c, uint16_t attr,
+ 
+ 		if (c->flags & (1 << NFTNL_FLOWTABLE_DEVICES)) {
+ 			for (i = 0; i < c->dev_array_len; i++) {
+-				xfree(c->dev_array[i]);
+-				xfree(c->dev_array);
++				nftnl_xfree(c->dev_array[i]);
++				nftnl_xfree(c->dev_array);
+ 			}
+ 		}
+ 
+@@ -423,7 +423,7 @@ int nftnl_flowtable_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_flowtab
+ 
+ 	if (tb[NFTA_FLOWTABLE_NAME]) {
+ 		if (c->flags & (1 << NFTNL_FLOWTABLE_NAME))
+-			xfree(c->name);
++			nftnl_xfree(c->name);
+ 		c->name = strdup(mnl_attr_get_str(tb[NFTA_FLOWTABLE_NAME]));
+ 		if (!c->name)
+ 			return -1;
+@@ -431,7 +431,7 @@ int nftnl_flowtable_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_flowtab
+ 	}
+ 	if (tb[NFTA_FLOWTABLE_TABLE]) {
+ 		if (c->flags & (1 << NFTNL_FLOWTABLE_TABLE))
+-			xfree(c->table);
++			nftnl_xfree(c->table);
+ 		c->table = strdup(mnl_attr_get_str(tb[NFTA_FLOWTABLE_TABLE]));
+ 		if (!c->table)
+ 			return -1;
+@@ -635,7 +635,7 @@ void nftnl_flowtable_list_free(struct nftnl_flowtable_list *list)
+ 		list_del(&s->head);
+ 		nftnl_flowtable_free(s);
+ 	}
+-	xfree(list);
++	nftnl_xfree(list);
+ }
+ EXPORT_SYMBOL(nftnl_flowtable_list_free);
+ 
 diff --git a/src/gen.c b/src/gen.c
-index f92180c7baf6..4fe078d3832c 100644
+index 1fc909930d86..c69f6f87deae 100644
 --- a/src/gen.c
 +++ b/src/gen.c
 @@ -38,7 +38,7 @@ struct nftnl_gen *nftnl_gen_alloc(void)
@@ -386,10 +507,10 @@ index f92180c7baf6..4fe078d3832c 100644
  
  EXPORT_SYMBOL(nftnl_gen_is_set);
 diff --git a/src/object.c b/src/object.c
-index 30000f748da4..1b5965d7abdc 100644
+index e88203a82441..28e04486c76c 100644
 --- a/src/object.c
 +++ b/src/object.c
-@@ -50,11 +50,11 @@ EXPORT_SYMBOL(nftnl_obj_free);
+@@ -53,11 +53,11 @@ EXPORT_SYMBOL(nftnl_obj_free);
  void nftnl_obj_free(const struct nftnl_obj *obj)
  {
  	if (obj->flags & (1 << NFTNL_OBJ_TABLE))
@@ -404,7 +525,7 @@ index 30000f748da4..1b5965d7abdc 100644
  }
  
  EXPORT_SYMBOL(nftnl_obj_is_set);
-@@ -77,11 +77,11 @@ void nftnl_obj_set_data(struct nftnl_obj *obj, uint16_t attr,
+@@ -81,11 +81,11 @@ void nftnl_obj_set_data(struct nftnl_obj *obj, uint16_t attr,
  
  	switch (attr) {
  	case NFTNL_OBJ_TABLE:
@@ -418,7 +539,7 @@ index 30000f748da4..1b5965d7abdc 100644
  		obj->name = strdup(data);
  		break;
  	case NFTNL_OBJ_TYPE:
-@@ -523,7 +523,7 @@ void nftnl_obj_list_free(struct nftnl_obj_list *list)
+@@ -452,7 +452,7 @@ void nftnl_obj_list_free(struct nftnl_obj_list *list)
  		list_del(&r->head);
  		nftnl_obj_free(r);
  	}
@@ -427,7 +548,7 @@ index 30000f748da4..1b5965d7abdc 100644
  }
  
  EXPORT_SYMBOL(nftnl_obj_list_is_empty);
-@@ -610,5 +610,5 @@ struct nftnl_obj *nftnl_obj_list_iter_next(struct nftnl_obj_list_iter *iter)
+@@ -539,5 +539,5 @@ struct nftnl_obj *nftnl_obj_list_iter_next(struct nftnl_obj_list_iter *iter)
  EXPORT_SYMBOL(nftnl_obj_list_iter_destroy);
  void nftnl_obj_list_iter_destroy(struct nftnl_obj_list_iter *iter)
  {
@@ -435,7 +556,7 @@ index 30000f748da4..1b5965d7abdc 100644
 +	nftnl_xfree(iter);
  }
 diff --git a/src/rule.c b/src/rule.c
-index e4cba1f7a352..911f327a6f9f 100644
+index 9af8fae2a803..0fce46e5c944 100644
 --- a/src/rule.c
 +++ b/src/rule.c
 @@ -75,13 +75,13 @@ void nftnl_rule_free(const struct nftnl_rule *r)
@@ -532,7 +653,7 @@ index e4cba1f7a352..911f327a6f9f 100644
  
  		r->user.len = mnl_attr_get_payload_len(tb[NFTA_RULE_USERDATA]);
  
-@@ -910,7 +910,7 @@ struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter)
+@@ -737,7 +737,7 @@ struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter)
  EXPORT_SYMBOL(nftnl_expr_iter_destroy);
  void nftnl_expr_iter_destroy(struct nftnl_expr_iter *iter)
  {
@@ -540,8 +661,8 @@ index e4cba1f7a352..911f327a6f9f 100644
 +	nftnl_xfree(iter);
  }
  
- EXPORT_SYMBOL(nftnl_rule_cmp);
-@@ -971,7 +971,7 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list)
+ struct nftnl_rule_list {
+@@ -767,7 +767,7 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list)
  		list_del(&r->head);
  		nftnl_rule_free(r);
  	}
@@ -550,7 +671,7 @@ index e4cba1f7a352..911f327a6f9f 100644
  }
  
  EXPORT_SYMBOL(nftnl_rule_list_is_empty);
-@@ -1063,5 +1063,5 @@ struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter)
+@@ -865,5 +865,5 @@ struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter)
  EXPORT_SYMBOL(nftnl_rule_list_iter_destroy);
  void nftnl_rule_list_iter_destroy(const struct nftnl_rule_list_iter *iter)
  {
@@ -558,10 +679,10 @@ index e4cba1f7a352..911f327a6f9f 100644
 +	nftnl_xfree(iter);
  }
 diff --git a/src/ruleset.c b/src/ruleset.c
-index eb49fde582c2..1639cae68c61 100644
+index 2468bd46cd5d..16059a305309 100644
 --- a/src/ruleset.c
 +++ b/src/ruleset.c
-@@ -72,7 +72,7 @@ void nftnl_ruleset_free(const struct nftnl_ruleset *r)
+@@ -70,7 +70,7 @@ void nftnl_ruleset_free(const struct nftnl_ruleset *r)
  		nftnl_set_list_free(r->set_list);
  	if (r->flags & (1 << NFTNL_RULESET_RULELIST))
  		nftnl_rule_list_free(r->rule_list);
@@ -571,7 +692,7 @@ index eb49fde582c2..1639cae68c61 100644
  
  EXPORT_SYMBOL(nftnl_ruleset_is_set);
 diff --git a/src/set.c b/src/set.c
-index ac24eae6bb16..2b758c4ec89a 100644
+index d1bdb165ab4b..53e54715d4b8 100644
 --- a/src/set.c
 +++ b/src/set.c
 @@ -46,17 +46,17 @@ void nftnl_set_free(const struct nftnl_set *s)
@@ -607,9 +728,9 @@ index ac24eae6bb16..2b758c4ec89a 100644
 -		xfree(s->name);
 +		nftnl_xfree(s->name);
  		break;
+ 	case NFTNL_SET_HANDLE:
  	case NFTNL_SET_FLAGS:
- 	case NFTNL_SET_KEY_TYPE:
-@@ -92,7 +92,7 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr)
+@@ -93,7 +93,7 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr)
  	case NFTNL_SET_GC_INTERVAL:
  		break;
  	case NFTNL_SET_USERDATA:
@@ -618,7 +739,7 @@ index ac24eae6bb16..2b758c4ec89a 100644
  		break;
  	default:
  		return;
-@@ -125,7 +125,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
+@@ -127,7 +127,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
  	switch(attr) {
  	case NFTNL_SET_TABLE:
  		if (s->flags & (1 << NFTNL_SET_TABLE))
@@ -627,7 +748,7 @@ index ac24eae6bb16..2b758c4ec89a 100644
  
  		s->table = strdup(data);
  		if (!s->table)
-@@ -133,7 +133,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
+@@ -135,7 +135,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
  		break;
  	case NFTNL_SET_NAME:
  		if (s->flags & (1 << NFTNL_SET_NAME))
@@ -636,7 +757,7 @@ index ac24eae6bb16..2b758c4ec89a 100644
  
  		s->name = strdup(data);
  		if (!s->name)
-@@ -177,7 +177,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
+@@ -182,7 +182,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
  		break;
  	case NFTNL_SET_USERDATA:
  		if (s->flags & (1 << NFTNL_SET_USERDATA))
@@ -645,7 +766,7 @@ index ac24eae6bb16..2b758c4ec89a 100644
  
  		s->user.data = malloc(data_len);
  		if (!s->user.data)
-@@ -478,7 +478,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
+@@ -492,7 +492,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
  
  	if (tb[NFTA_SET_TABLE]) {
  		if (s->flags & (1 << NFTNL_SET_TABLE))
@@ -654,7 +775,7 @@ index ac24eae6bb16..2b758c4ec89a 100644
  		s->table = strdup(mnl_attr_get_str(tb[NFTA_SET_TABLE]));
  		if (!s->table)
  			return -1;
-@@ -486,7 +486,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
+@@ -500,7 +500,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
  	}
  	if (tb[NFTA_SET_NAME]) {
  		if (s->flags & (1 << NFTNL_SET_NAME))
@@ -663,7 +784,7 @@ index ac24eae6bb16..2b758c4ec89a 100644
  		s->name = strdup(mnl_attr_get_str(tb[NFTA_SET_NAME]));
  		if (!s->name)
  			return -1;
-@@ -982,7 +982,7 @@ void nftnl_set_list_free(struct nftnl_set_list *list)
+@@ -742,7 +742,7 @@ void nftnl_set_list_free(struct nftnl_set_list *list)
  		list_del(&s->head);
  		nftnl_set_free(s);
  	}
@@ -672,7 +793,7 @@ index ac24eae6bb16..2b758c4ec89a 100644
  }
  
  EXPORT_SYMBOL(nftnl_set_list_is_empty);
-@@ -1074,7 +1074,7 @@ struct nftnl_set *nftnl_set_list_iter_next(struct nftnl_set_list_iter *iter)
+@@ -834,7 +834,7 @@ struct nftnl_set *nftnl_set_list_iter_next(struct nftnl_set_list_iter *iter)
  EXPORT_SYMBOL(nftnl_set_list_iter_destroy);
  void nftnl_set_list_iter_destroy(const struct nftnl_set_list_iter *iter)
  {
@@ -682,7 +803,7 @@ index ac24eae6bb16..2b758c4ec89a 100644
  
  static struct nftnl_set *nftnl_set_lookup(const char *this_set_name,
 diff --git a/src/set_elem.c b/src/set_elem.c
-index e02a38791c9a..100ccda699c6 100644
+index ff983a67d62a..fac96cd368f1 100644
 --- a/src/set_elem.c
 +++ b/src/set_elem.c
 @@ -43,18 +43,18 @@ EXPORT_SYMBOL(nftnl_set_elem_free);
@@ -760,7 +881,7 @@ index e02a38791c9a..100ccda699c6 100644
  
  		s->objref = strdup(data);
  		if (!s->objref)
-@@ -431,7 +431,7 @@ static int nftnl_set_elems_parse2(struct nftnl_set *s, const struct nlattr *nest
+@@ -436,7 +436,7 @@ static int nftnl_set_elems_parse2(struct nftnl_set *s, const struct nlattr *nest
  			mnl_attr_get_payload(tb[NFTA_SET_ELEM_USERDATA]);
  
  		if (e->flags & (1 << NFTNL_RULE_USERDATA))
@@ -769,7 +890,7 @@ index e02a38791c9a..100ccda699c6 100644
  
  		e->user.len  = mnl_attr_get_payload_len(tb[NFTA_SET_ELEM_USERDATA]);
  		e->user.data = malloc(e->user.len);
-@@ -516,7 +516,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
+@@ -521,7 +521,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
  
  	if (tb[NFTA_SET_ELEM_LIST_TABLE]) {
  		if (s->flags & (1 << NFTNL_SET_TABLE))
@@ -778,7 +899,7 @@ index e02a38791c9a..100ccda699c6 100644
  		s->table =
  			strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_TABLE]));
  		if (!s->table)
-@@ -525,7 +525,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
+@@ -530,7 +530,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
  	}
  	if (tb[NFTA_SET_ELEM_LIST_SET]) {
  		if (s->flags & (1 << NFTNL_SET_NAME))
@@ -787,7 +908,7 @@ index e02a38791c9a..100ccda699c6 100644
  		s->name =
  			strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_SET]));
  		if (!s->name)
-@@ -816,7 +816,7 @@ struct nftnl_set_elem *nftnl_set_elems_iter_next(struct nftnl_set_elems_iter *it
+@@ -729,7 +729,7 @@ struct nftnl_set_elem *nftnl_set_elems_iter_next(struct nftnl_set_elems_iter *it
  EXPORT_SYMBOL(nftnl_set_elems_iter_destroy);
  void nftnl_set_elems_iter_destroy(struct nftnl_set_elems_iter *iter)
  {
@@ -797,10 +918,10 @@ index e02a38791c9a..100ccda699c6 100644
  
  static bool nftnl_attr_nest_overflow(struct nlmsghdr *nlh,
 diff --git a/src/table.c b/src/table.c
-index 7f97ca4e5807..7ac57c33021b 100644
+index 54259eec7d06..888991b1b80d 100644
 --- a/src/table.c
 +++ b/src/table.c
-@@ -46,9 +46,9 @@ EXPORT_SYMBOL(nftnl_table_free);
+@@ -47,9 +47,9 @@ EXPORT_SYMBOL(nftnl_table_free);
  void nftnl_table_free(const struct nftnl_table *t)
  {
  	if (t->flags & (1 << NFTNL_TABLE_NAME))
@@ -812,7 +933,7 @@ index 7f97ca4e5807..7ac57c33021b 100644
  }
  
  EXPORT_SYMBOL(nftnl_table_is_set);
-@@ -65,7 +65,7 @@ void nftnl_table_unset(struct nftnl_table *t, uint16_t attr)
+@@ -66,7 +66,7 @@ void nftnl_table_unset(struct nftnl_table *t, uint16_t attr)
  
  	switch (attr) {
  	case NFTNL_TABLE_NAME:
@@ -820,8 +941,8 @@ index 7f97ca4e5807..7ac57c33021b 100644
 +		nftnl_xfree(t->name);
  		break;
  	case NFTNL_TABLE_FLAGS:
- 	case NFTNL_TABLE_FAMILY:
-@@ -91,7 +91,7 @@ int nftnl_table_set_data(struct nftnl_table *t, uint16_t attr,
+ 	case NFTNL_TABLE_HANDLE:
+@@ -94,7 +94,7 @@ int nftnl_table_set_data(struct nftnl_table *t, uint16_t attr,
  	switch (attr) {
  	case NFTNL_TABLE_NAME:
  		if (t->flags & (1 << NFTNL_TABLE_NAME))
@@ -830,7 +951,7 @@ index 7f97ca4e5807..7ac57c33021b 100644
  
  		t->name = strdup(data);
  		if (!t->name)
-@@ -230,7 +230,7 @@ int nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t)
+@@ -258,7 +258,7 @@ int nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t)
  
  	if (tb[NFTA_TABLE_NAME]) {
  		if (t->flags & (1 << NFTNL_TABLE_NAME))
@@ -839,7 +960,7 @@ index 7f97ca4e5807..7ac57c33021b 100644
  		t->name = strdup(mnl_attr_get_str(tb[NFTA_TABLE_NAME]));
  		if (!t->name)
  			return -1;
-@@ -452,7 +452,7 @@ void nftnl_table_list_free(struct nftnl_table_list *list)
+@@ -395,7 +395,7 @@ void nftnl_table_list_free(struct nftnl_table_list *list)
  		list_del(&r->head);
  		nftnl_table_free(r);
  	}
@@ -848,7 +969,7 @@ index 7f97ca4e5807..7ac57c33021b 100644
  }
  
  EXPORT_SYMBOL(nftnl_table_list_is_empty);
-@@ -538,5 +538,5 @@ struct nftnl_table *nftnl_table_list_iter_next(struct nftnl_table_list_iter *ite
+@@ -481,5 +481,5 @@ struct nftnl_table *nftnl_table_list_iter_next(struct nftnl_table_list_iter *ite
  EXPORT_SYMBOL(nftnl_table_list_iter_destroy);
  void nftnl_table_list_iter_destroy(const struct nftnl_table_list_iter *iter)
  {
@@ -881,7 +1002,7 @@ index f4264377508e..8a18391d83d1 100644
  
  EXPORT_SYMBOL(nftnl_trace_is_set);
 diff --git a/src/udata.c b/src/udata.c
-index 6bd965161c43..049819304ef5 100644
+index b5a47295b40d..3b3be548036d 100644
 --- a/src/udata.c
 +++ b/src/udata.c
 @@ -33,7 +33,7 @@ struct nftnl_udata_buf *nftnl_udata_buf_alloc(uint32_t data_size)
@@ -894,10 +1015,10 @@ index 6bd965161c43..049819304ef5 100644
  
  EXPORT_SYMBOL(nftnl_udata_buf_len);
 diff --git a/src/utils.c b/src/utils.c
-index 3e449609395e..08f668f56a95 100644
+index f641bf93ec68..02e7476a0ced 100644
 --- a/src/utils.c
 +++ b/src/utils.c
-@@ -264,7 +264,7 @@ int nftnl_fprintf(FILE *fp, const void *obj, uint32_t cmd, uint32_t type,
+@@ -304,7 +304,7 @@ int nftnl_fprintf(FILE *fp, const void *obj, uint32_t cmd, uint32_t type,
  
  out:
  	if (buf != _buf)
@@ -907,5 +1028,5 @@ index 3e449609395e..08f668f56a95 100644
  	return ret;
  }
 -- 
-2.15.1
+2.19.1
 
diff --git a/buildroot/package/libnftnl/libnftnl.hash b/buildroot/package/libnftnl/libnftnl.hash
index c798dd2bb..3ecaeb8a1 100644
--- a/buildroot/package/libnftnl/libnftnl.hash
+++ b/buildroot/package/libnftnl/libnftnl.hash
@@ -1,6 +1,3 @@
 # From http://www.netfilter.org/projects/libnftnl/downloads.html
-sha1	90b70f52a26f88ab1106671e797faac21265fa6a	libnftnl-1.0.9.tar.bz2
-# Locally calculated after checking pgp signature
-# http://www.netfilter.org/projects/libnftnl/files/libnftnl-1.0.9.tar.bz2.sig
-sha256	fec1d824aee301e59a11aeaae2a2d429cb99ead81e6bafab791a4dd6569b3635	libnftnl-1.0.9.tar.bz2
+sha256	a5c7b7a6c13c9c5898b13fcb1126fefce2015d5a96d7c354b19aaa40b6aece5d 	libnftnl-1.1.2.tar.bz2
 sha256	98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24	COPYING
diff --git a/buildroot/package/libnftnl/libnftnl.mk b/buildroot/package/libnftnl/libnftnl.mk
index 8c8b3f824..b8e015baf 100644
--- a/buildroot/package/libnftnl/libnftnl.mk
+++ b/buildroot/package/libnftnl/libnftnl.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBNFTNL_VERSION = 1.0.9
-LIBNFTNL_SITE = http://netfilter.org/projects/libnftnl/files
+LIBNFTNL_VERSION = 1.1.2
+LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files
 LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2
 LIBNFTNL_LICENSE = GPL-2.0+
 LIBNFTNL_LICENSE_FILES = COPYING
diff --git a/buildroot/package/libnss/libnss.hash b/buildroot/package/libnss/libnss.hash
index 9c3cefd81..1d600f14e 100644
--- a/buildroot/package/libnss/libnss.hash
+++ b/buildroot/package/libnss/libnss.hash
@@ -1,4 +1,4 @@
-# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_39_RTM/src/SHA256SUMS
-sha256	6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b  nss-3.39.tar.gz
+# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_42_1_RTM/src/SHA256SUMS
+sha256	087db37d38fd49dfd584dd2a8b5baa7fc88de7c9bd97c0c2d5be4abcafc61fc6  nss-3.42.1.tar.gz
 # Locally calculated
 sha256	a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4  nss/COPYING
diff --git a/buildroot/package/libnss/libnss.mk b/buildroot/package/libnss/libnss.mk
index 73c9b08fd..89d614fe1 100644
--- a/buildroot/package/libnss/libnss.mk
+++ b/buildroot/package/libnss/libnss.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNSS_VERSION = 3.39
+LIBNSS_VERSION = 3.42.1
 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
 LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src
 LIBNSS_DISTDIR = dist
diff --git a/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch b/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
index 10d2b7526..f20b6f083 100644
--- a/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
+++ b/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
@@ -1,27 +1,31 @@
-From 389efb564fa1453a9da835393eec9006bfae2a52 Mon Sep 17 00:00:00 2001
+From d8f104bffb0c4acb8c5fcdf49628f7d02ed48f7f Mon Sep 17 00:00:00 2001
 From: Mike Frysinger 
 Date: Sat, 16 May 2015 18:53:51 +0200
-Subject: Dont waste time building manpages if we're not going to use em.
+Subject: [PATCH] Dont waste time building manpages if we're not going to use
+ em.
 
 Signed-off-by: Ryan Barnett 
 [Gustavo: update for parallel-build]
+
+[rebased on openssl-1.1.0h]
+Signed-off-by: Peter Seiderer 
 ---
- Makefile.org | 2 +-
+ Configurations/unix-Makefile.tmpl | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile.org b/Makefile.org
-index 60f07cc..976ceaf 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -527,7 +527,7 @@ dist:
- dist_pem_h:
- 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
+index 40cf2c3..777d9ca 100644
+--- a/Configurations/unix-Makefile.tmpl
++++ b/Configurations/unix-Makefile.tmpl
+@@ -268,7 +268,7 @@ list-tests:
+ 	@echo "Tests are not supported with your chosen Configure options"
+ 	@ : {- output_on() if !$disabled{tests}; "" -}
  
--install: install_docs install_sw
-+install: install_sw
+-install: install_sw install_ssldirs install_docs
++install: install_sw install_ssldirs
+ 
+ uninstall: uninstall_docs uninstall_sw
  
- install_sw:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
 -- 
-1.9.1
+2.16.3
 
diff --git a/buildroot/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch b/buildroot/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch
new file mode 100644
index 000000000..820c2addf
--- /dev/null
+++ b/buildroot/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch
@@ -0,0 +1,29 @@
+From b70be8c65365a8fc564226360d45adbbb29fc0af Mon Sep 17 00:00:00 2001
+From: Peter Seiderer 
+Date: Tue, 24 Oct 2017 16:58:32 +0200
+Subject: [PATCH] Reproducible build: do not leak compiler path
+
+Signed-off-by: Peter Seiderer 
+
+[Rebased on openssl-1.1.1.a]
+Signed-off-by: Peter Seiderer 
+---
+ crypto/build.info | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/crypto/build.info b/crypto/build.info
+index 2c619c6..49ca6ab 100644
+--- a/crypto/build.info
++++ b/crypto/build.info
+@@ -10,7 +10,7 @@ EXTRA=  ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \
+         ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl
+ 
+ DEPEND[cversion.o]=buildinf.h
+-GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)"
++GENERATE[buildinf.h]=../util/mkbuildinf.pl "$$(basename $(CC)) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)"
+ DEPEND[buildinf.h]=../configdata.pm
+ 
+ GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)
+-- 
+2.20.1
+
diff --git a/buildroot/package/libopenssl/0002-cryptodev-Fix-issue-with-signature-generation.patch b/buildroot/package/libopenssl/0002-cryptodev-Fix-issue-with-signature-generation.patch
deleted file mode 100644
index 47295500c..000000000
--- a/buildroot/package/libopenssl/0002-cryptodev-Fix-issue-with-signature-generation.patch
+++ /dev/null
@@ -1,450 +0,0 @@
-From 90fd7e8f1a316cda86ee442b43fcd7d5e5baeede Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias 
-Date: Sat, 16 May 2015 18:55:08 +0200
-Subject: cryptodev: Fix issue with signature generation
-
-Forward port of 0001-cryptodev-Fix-issue-with-signature-generation.patch
-from http://rt.openssl.org/Ticket/Display.html?id=2770&user=guest&pass=guest
-It was originally targetted at 1.0.2-beta3.
-
-Without this patch digest acceleration via cryptodev is broken.
-
-Signed-off-by: Gustavo Zacarias 
-Signed-off-by: Ryan Barnett 
----
- crypto/engine/eng_cryptodev.c | 195 +++++++++++++++++++++++++++++++-----------
- 1 file changed, 146 insertions(+), 49 deletions(-)
-
-diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 926d95c..7021d9a 100644
---- a/crypto/engine/eng_cryptodev.c
-+++ b/crypto/engine/eng_cryptodev.c
-@@ -2,6 +2,7 @@
-  * Copyright (c) 2002 Bob Beck 
-  * Copyright (c) 2002 Theo de Raadt
-  * Copyright (c) 2002 Markus Friedl
-+ * Copyright (c) 2012 Nikos Mavrogiannopoulos
-  * All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-@@ -72,7 +73,6 @@ struct dev_crypto_state {
-     struct session_op d_sess;
-     int d_fd;
- # ifdef USE_CRYPTODEV_DIGESTS
--    char dummy_mac_key[HASH_MAX_LEN];
-     unsigned char digest_res[HASH_MAX_LEN];
-     char *mac_data;
-     int mac_len;
-@@ -189,8 +189,10 @@ static struct {
- static struct {
-     int id;
-     int nid;
--    int keylen;
-+    int digestlen;
- } digests[] = {
-+#if 0
-+    /* HMAC is not supported */
-     {
-         CRYPTO_MD5_HMAC, NID_hmacWithMD5, 16
-     },
-@@ -198,15 +200,15 @@ static struct {
-         CRYPTO_SHA1_HMAC, NID_hmacWithSHA1, 20
-     },
-     {
--        CRYPTO_RIPEMD160_HMAC, NID_ripemd160, 16
--        /* ? */
-+        CRYPTO_SHA2_256_HMAC, NID_hmacWithSHA256, 32
-     },
-     {
--        CRYPTO_MD5_KPDK, NID_undef, 0
-+        CRYPTO_SHA2_384_HMAC, NID_hmacWithSHA384, 48
-     },
-     {
--        CRYPTO_SHA1_KPDK, NID_undef, 0
-+        CRYPTO_SHA2_512_HMAC, NID_hmacWithSHA512, 64
-     },
-+#endif
-     {
-         CRYPTO_MD5, NID_md5, 16
-     },
-@@ -214,6 +216,15 @@ static struct {
-         CRYPTO_SHA1, NID_sha1, 20
-     },
-     {
-+        CRYPTO_SHA2_256, NID_sha256, 32
-+    },
-+    {
-+        CRYPTO_SHA2_384, NID_sha384, 48
-+    },
-+    {
-+        CRYPTO_SHA2_512, NID_sha512, 64
-+    },
-+    {
-         0, NID_undef, 0
-     },
- };
-@@ -288,13 +299,14 @@ static int get_cryptodev_ciphers(const int **cnids)
-     static int nids[CRYPTO_ALGORITHM_MAX];
-     struct session_op sess;
-     int fd, i, count = 0;
-+    unsigned char fake_key[CRYPTO_CIPHER_MAX_KEY_LEN];
- 
-     if ((fd = get_dev_crypto()) < 0) {
-         *cnids = NULL;
-         return (0);
-     }
-     memset(&sess, 0, sizeof(sess));
--    sess.key = (caddr_t) "123456789abcdefghijklmno";
-+    sess.key = (void*)fake_key;
- 
-     for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
-         if (ciphers[i].nid == NID_undef)
-@@ -327,18 +339,19 @@ static int get_cryptodev_digests(const int **cnids)
-     static int nids[CRYPTO_ALGORITHM_MAX];
-     struct session_op sess;
-     int fd, i, count = 0;
-+    unsigned char fake_key[CRYPTO_CIPHER_MAX_KEY_LEN];
- 
-     if ((fd = get_dev_crypto()) < 0) {
-         *cnids = NULL;
-         return (0);
-     }
-     memset(&sess, 0, sizeof(sess));
--    sess.mackey = (caddr_t) "123456789abcdefghijklmno";
-+    sess.mackey = fake_key;
-     for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
-         if (digests[i].nid == NID_undef)
-             continue;
-         sess.mac = digests[i].id;
--        sess.mackeylen = digests[i].keylen;
-+        sess.mackeylen = 8;
-         sess.cipher = 0;
-         if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
-             ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
-@@ -424,14 +437,14 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-     cryp.ses = sess->ses;
-     cryp.flags = 0;
-     cryp.len = inl;
--    cryp.src = (caddr_t) in;
--    cryp.dst = (caddr_t) out;
-+    cryp.src = (void*) in;
-+    cryp.dst = (void*) out;
-     cryp.mac = 0;
- 
-     cryp.op = ctx->encrypt ? COP_ENCRYPT : COP_DECRYPT;
- 
-     if (ctx->cipher->iv_len) {
--        cryp.iv = (caddr_t) ctx->iv;
-+	cryp.iv = (void*) ctx->iv;
-         if (!ctx->encrypt) {
-             iiv = in + inl - ctx->cipher->iv_len;
-             memcpy(save_iv, iiv, ctx->cipher->iv_len);
-@@ -483,7 +496,7 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-     if ((state->d_fd = get_dev_crypto()) < 0)
-         return (0);
- 
--    sess->key = (caddr_t) key;
-+    sess->key = (void*)key;
-     sess->keylen = ctx->key_len;
-     sess->cipher = cipher;
- 
-@@ -749,16 +762,6 @@ static int digest_nid_to_cryptodev(int nid)
-     return (0);
- }
- 
--static int digest_key_length(int nid)
--{
--    int i;
--
--    for (i = 0; digests[i].id; i++)
--        if (digests[i].nid == nid)
--            return digests[i].keylen;
--    return (0);
--}
--
- static int cryptodev_digest_init(EVP_MD_CTX *ctx)
- {
-     struct dev_crypto_state *state = ctx->md_data;
-@@ -769,7 +772,6 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
-         printf("cryptodev_digest_init: Can't get digest \n");
-         return (0);
-     }
--
-     memset(state, 0, sizeof(struct dev_crypto_state));
- 
-     if ((state->d_fd = get_dev_crypto()) < 0) {
-@@ -777,8 +779,8 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
-         return (0);
-     }
- 
--    sess->mackey = state->dummy_mac_key;
--    sess->mackeylen = digest_key_length(ctx->digest->type);
-+    sess->mackey = NULL;
-+    sess->mackeylen = 0;
-     sess->mac = digest;
- 
-     if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) {
-@@ -794,8 +796,8 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
- static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
-                                    size_t count)
- {
--    struct crypt_op cryp;
-     struct dev_crypto_state *state = ctx->md_data;
-+    struct crypt_op cryp;
-     struct session_op *sess = &state->d_sess;
- 
-     if (!data || state->d_fd < 0) {
-@@ -804,7 +806,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
-     }
- 
-     if (!count) {
--        return (0);
-+        return (1);
-     }
- 
-     if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) {
-@@ -828,9 +830,9 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
-     cryp.ses = sess->ses;
-     cryp.flags = 0;
-     cryp.len = count;
--    cryp.src = (caddr_t) data;
-+    cryp.src = (void*) data;
-     cryp.dst = NULL;
--    cryp.mac = (caddr_t) state->digest_res;
-+    cryp.mac = (void*) state->digest_res;
-     if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
-         printf("cryptodev_digest_update: digest failed\n");
-         return (0);
-@@ -844,8 +846,6 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
-     struct dev_crypto_state *state = ctx->md_data;
-     struct session_op *sess = &state->d_sess;
- 
--    int ret = 1;
--
-     if (!md || state->d_fd < 0) {
-         printf("cryptodev_digest_final: illegal input\n");
-         return (0);
-@@ -859,7 +859,7 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
-         cryp.len = state->mac_len;
-         cryp.src = state->mac_data;
-         cryp.dst = NULL;
--        cryp.mac = (caddr_t) md;
-+	cryp.mac = (void*)md;
-         if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
-             printf("cryptodev_digest_final: digest failed\n");
-             return (0);
-@@ -870,7 +870,7 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
- 
-     memcpy(md, state->digest_res, ctx->digest->md_size);
- 
--    return (ret);
-+    return 1;
- }
- 
- static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
-@@ -921,8 +921,8 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
- 
-     digest = digest_nid_to_cryptodev(to->digest->type);
- 
--    sess->mackey = dstate->dummy_mac_key;
--    sess->mackeylen = digest_key_length(to->digest->type);
-+    sess->mackey = NULL;
-+    sess->mackeylen = 0;
-     sess->mac = digest;
- 
-     dstate->d_fd = get_dev_crypto();
-@@ -947,32 +947,116 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
- 
- const EVP_MD cryptodev_sha1 = {
-     NID_sha1,
--    NID_undef,
-+    NID_sha1WithRSAEncryption,
-     SHA_DIGEST_LENGTH,
-+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT)
-+    EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|
-+    EVP_MD_FLAG_DIGALGID_ABSENT|
-+#endif
-     EVP_MD_FLAG_ONESHOT,
-     cryptodev_digest_init,
-     cryptodev_digest_update,
-     cryptodev_digest_final,
-     cryptodev_digest_copy,
-     cryptodev_digest_cleanup,
--    EVP_PKEY_NULL_method,
-+    EVP_PKEY_RSA_method,
-     SHA_CBLOCK,
--    sizeof(struct dev_crypto_state),
-+    sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
- };
- 
--const EVP_MD cryptodev_md5 = {
-+static const EVP_MD cryptodev_sha256 = {
-+    NID_sha256,
-+    NID_sha256WithRSAEncryption,
-+    SHA256_DIGEST_LENGTH, 
-+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT)
-+    EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|
-+    EVP_MD_FLAG_DIGALGID_ABSENT|
-+#endif
-+    EVP_MD_FLAG_ONESHOT,
-+    cryptodev_digest_init,
-+    cryptodev_digest_update,
-+    cryptodev_digest_final,
-+    cryptodev_digest_copy,
-+    cryptodev_digest_cleanup,
-+    EVP_PKEY_RSA_method,
-+    SHA256_CBLOCK,
-+    sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
-+};
-+
-+static const EVP_MD cryptodev_sha224 = {
-+    NID_sha224,
-+    NID_sha224WithRSAEncryption, 
-+    SHA224_DIGEST_LENGTH, 
-+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT)
-+    EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|
-+    EVP_MD_FLAG_DIGALGID_ABSENT|
-+#endif
-+    EVP_MD_FLAG_ONESHOT,
-+    cryptodev_digest_init,
-+    cryptodev_digest_update,
-+    cryptodev_digest_final,
-+    cryptodev_digest_copy,
-+    cryptodev_digest_cleanup,
-+    EVP_PKEY_RSA_method,
-+    SHA256_CBLOCK,
-+    sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
-+};
-+
-+static const EVP_MD cryptodev_sha384 = {
-+    NID_sha384,
-+    NID_sha384WithRSAEncryption, 
-+    SHA384_DIGEST_LENGTH, 
-+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT)
-+    EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|
-+    EVP_MD_FLAG_DIGALGID_ABSENT|
-+#endif
-+    EVP_MD_FLAG_ONESHOT,
-+    cryptodev_digest_init,
-+    cryptodev_digest_update,
-+    cryptodev_digest_final,
-+    cryptodev_digest_copy,
-+    cryptodev_digest_cleanup,
-+    EVP_PKEY_RSA_method,
-+    SHA512_CBLOCK,
-+    sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
-+};
-+
-+static const EVP_MD cryptodev_sha512 = {
-+    NID_sha512,
-+    NID_sha512WithRSAEncryption, 
-+    SHA512_DIGEST_LENGTH, 
-+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT)
-+    EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|
-+    EVP_MD_FLAG_DIGALGID_ABSENT|
-+#endif
-+    EVP_MD_FLAG_ONESHOT,
-+    cryptodev_digest_init,
-+    cryptodev_digest_update,
-+    cryptodev_digest_final,
-+    cryptodev_digest_copy,
-+    cryptodev_digest_cleanup,
-+    EVP_PKEY_RSA_method,
-+    SHA512_CBLOCK,
-+    sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
-+};
-+
-+static const EVP_MD cryptodev_md5 = {
-     NID_md5,
--    NID_undef,
-+    NID_md5WithRSAEncryption,
-     16 /* MD5_DIGEST_LENGTH */ ,
-+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT)
-+    EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|
-+    EVP_MD_FLAG_DIGALGID_ABSENT|
-+#endif
-     EVP_MD_FLAG_ONESHOT,
-     cryptodev_digest_init,
-     cryptodev_digest_update,
-     cryptodev_digest_final,
-     cryptodev_digest_copy,
-     cryptodev_digest_cleanup,
--    EVP_PKEY_NULL_method,
-+    EVP_PKEY_RSA_method,
-     64 /* MD5_CBLOCK */ ,
--    sizeof(struct dev_crypto_state),
-+    sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
- };
- 
- # endif                         /* USE_CRYPTODEV_DIGESTS */
-@@ -992,6 +1076,18 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
-     case NID_sha1:
-         *digest = &cryptodev_sha1;
-         break;
-+    case NID_sha224:
-+        *digest = &cryptodev_sha224;
-+	break;
-+    case NID_sha256:
-+        *digest = &cryptodev_sha256;
-+	break;
-+    case NID_sha384:
-+        *digest = &cryptodev_sha384;
-+	break;
-+    case NID_sha512:
-+    	*digest = &cryptodev_sha512;
-+	break;
-     default:
- # endif                         /* USE_CRYPTODEV_DIGESTS */
-         *digest = NULL;
-@@ -1022,7 +1118,7 @@ static int bn2crparam(const BIGNUM *a, struct crparam *crp)
-         return (1);
-     memset(b, 0, bytes);
- 
--    crp->crp_p = (caddr_t) b;
-+    crp->crp_p = (void*) b;
-     crp->crp_nbits = bits;
- 
-     for (i = 0, j = 0; i < a->top; i++) {
-@@ -1277,7 +1373,7 @@ static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen,
-     kop.crk_op = CRK_DSA_SIGN;
- 
-     /* inputs: dgst dsa->p dsa->q dsa->g dsa->priv_key */
--    kop.crk_param[0].crp_p = (caddr_t) dgst;
-+    kop.crk_param[0].crp_p = (void*)dgst;
-     kop.crk_param[0].crp_nbits = dlen * 8;
-     if (bn2crparam(dsa->p, &kop.crk_param[1]))
-         goto err;
-@@ -1317,7 +1413,7 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
-     kop.crk_op = CRK_DSA_VERIFY;
- 
-     /* inputs: dgst dsa->p dsa->q dsa->g dsa->pub_key sig->r sig->s */
--    kop.crk_param[0].crp_p = (caddr_t) dgst;
-+    kop.crk_param[0].crp_p = (void*)dgst;
-     kop.crk_param[0].crp_nbits = dlen * 8;
-     if (bn2crparam(dsa->p, &kop.crk_param[1]))
-         goto err;
-@@ -1398,9 +1494,10 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
-         goto err;
-     kop.crk_iparams = 3;
- 
--    kop.crk_param[3].crp_p = (caddr_t) key;
--    kop.crk_param[3].crp_nbits = keylen * 8;
-+    kop.crk_param[3].crp_p = (void*) key;
-+    kop.crk_param[3].crp_nbits = keylen;
-     kop.crk_oparams = 1;
-+    dhret = keylen / 8;
- 
-     if (ioctl(fd, CIOCKEY, &kop) == -1) {
-         const DH_METHOD *meth = DH_OpenSSL();
-@@ -1470,7 +1567,7 @@ void ENGINE_load_cryptodev(void)
-     put_dev_crypto(fd);
- 
-     if (!ENGINE_set_id(engine, "cryptodev") ||
--        !ENGINE_set_name(engine, "BSD cryptodev engine") ||
-+        !ENGINE_set_name(engine, "cryptodev engine") ||
-         !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
-         !ENGINE_set_digests(engine, cryptodev_engine_digests) ||
-         !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) ||
--- 
-1.9.1
-
diff --git a/buildroot/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/buildroot/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch
new file mode 100644
index 000000000..c51a3cd68
--- /dev/null
+++ b/buildroot/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch
@@ -0,0 +1,27 @@
+From 1281ffc7959bd2070563e17a52ee4424196d885c Mon Sep 17 00:00:00 2001
+From: Patrick Havelange 
+Date: Wed, 23 Jan 2019 12:21:21 +0100
+Subject: [PATCH] Introduce the OPENSSL_NO_MADVISE to disable call to madvise()
+
+Upstream: https://github.com/openssl/openssl/pull/8089
+Signed-off-by: Patrick Havelange 
+---
+ crypto/mem_sec.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
+index 9e0f670..32c7282 100644
+--- a/crypto/mem_sec.c
++++ b/crypto/mem_sec.c
+@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize)
+     if (mlock(sh.arena, sh.arena_size) < 0)
+         ret = 2;
+ #endif
+-#ifdef MADV_DONTDUMP
++#if defined(MADV_DONTDUMP) && !defined(OPENSSL_NO_MADVISE)
+     if (madvise(sh.arena, sh.arena_size, MADV_DONTDUMP) < 0)
+         ret = 2;
+ #endif
+-- 
+2.17.1
+
diff --git a/buildroot/package/libopenssl/0003-Reproducible-build-do-not-leak-compiler-path.patch b/buildroot/package/libopenssl/0003-Reproducible-build-do-not-leak-compiler-path.patch
deleted file mode 100644
index eff72c548..000000000
--- a/buildroot/package/libopenssl/0003-Reproducible-build-do-not-leak-compiler-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 875fcad2ad84877763cba86c1265b57679b878b0 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer 
-Date: Tue, 24 Oct 2017 16:58:32 +0200
-Subject: [PATCH] Reproducible build: do not leak compiler path
-
-Signed-off-by: Peter Seiderer 
----
- crypto/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/crypto/Makefile b/crypto/Makefile
-index 7869996..7e63291 100644
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -55,7 +55,7 @@ top:
- all: shared
- 
- buildinf.h: ../Makefile
--	$(PERL) $(TOP)/util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" >buildinf.h
-+	$(PERL) $(TOP)/util/mkbuildinf.pl "$$(basename $(CC)) $(CFLAGS)" "$(PLATFORM)" >buildinf.h
- 
- x86cpuid.s:	x86cpuid.pl perlasm/x86asm.pl
- 	$(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
--- 
-2.11.0
-
diff --git a/buildroot/package/libopenssl/libopenssl.hash b/buildroot/package/libopenssl/libopenssl.hash
index 83fb8bd51..753f447ab 100644
--- a/buildroot/package/libopenssl/libopenssl.hash
+++ b/buildroot/package/libopenssl/libopenssl.hash
@@ -1,10 +1,5 @@
-# From https://www.openssl.org/source/openssl-1.0.2q.tar.gz.sha256
-sha256	5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684	openssl-1.0.2q.tar.gz
-# From https://www.openssl.org/source/openssl-1.0.2q.tar.gz.sha1
-sha1	692f5f2f1b114f8adaadaa3e7be8cce1907f38c5				openssl-1.0.2q.tar.gz
-# Locally computed
-sha256	eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9	openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-sha256	147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f	openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-sha256	30cb49489de5041841a74da9155cd4fabfbce33237262ba7cd23974314ae2956	openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-sha256	deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f	openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-sha256	c8f60f4842bbad0353f5d81620e72b168b5638ca3a0a999f5da113b22491612e	LICENSE
+# From https://www.openssl.org/source/openssl-1.1.1b.tar.gz.sha256
+sha256	f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90	openssl-1.1.1c.tar.gz
+
+# License files
+sha256	c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c	LICENSE
diff --git a/buildroot/package/libopenssl/libopenssl.mk b/buildroot/package/libopenssl/libopenssl.mk
index dc15abf66..2a7514d59 100644
--- a/buildroot/package/libopenssl/libopenssl.mk
+++ b/buildroot/package/libopenssl/libopenssl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBOPENSSL_VERSION = 1.0.2q
+LIBOPENSSL_VERSION = 1.1.1c
 LIBOPENSSL_SITE = https://www.openssl.org/source
 LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz
 LIBOPENSSL_LICENSE = OpenSSL or SSLeay
@@ -12,51 +12,74 @@ LIBOPENSSL_LICENSE_FILES = LICENSE
 LIBOPENSSL_INSTALL_STAGING = YES
 LIBOPENSSL_DEPENDENCIES = zlib
 HOST_LIBOPENSSL_DEPENDENCIES = host-zlib
-LIBOPENSSL_TARGET_ARCH = generic32
+LIBOPENSSL_TARGET_ARCH = linux-generic32
 LIBOPENSSL_CFLAGS = $(TARGET_CFLAGS)
 LIBOPENSSL_PROVIDES = openssl
-LIBOPENSSL_PATCH = \
-	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \
-	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \
-	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \
-	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
 
-# relocation truncated to fit: R_68K_GOT16O
 ifeq ($(BR2_m68k_cf),y)
+# relocation truncated to fit: R_68K_GOT16O
 LIBOPENSSL_CFLAGS += -mxgot
+# resolves an assembler "out of range error" with blake2 and sha512 algorithms
+LIBOPENSSL_CFLAGS += -DOPENSSL_SMALL_FOOTPRINT
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+LIBOPENSSL_CFLAGS += -DOPENSSL_THREADS
 endif
 
 ifeq ($(BR2_USE_MMU),)
-LIBOPENSSL_CFLAGS += -DHAVE_FORK=0
+LIBOPENSSL_CFLAGS += -DHAVE_FORK=0 -DOPENSSL_NO_MADVISE
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_CRYPTODEV),y)
-LIBOPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
 LIBOPENSSL_DEPENDENCIES += cryptodev
 endif
 
+# fixes the following build failures:
+#
+# - musl
+#   ./libcrypto.so: undefined reference to `getcontext'
+#   ./libcrypto.so: undefined reference to `setcontext'
+#   ./libcrypto.so: undefined reference to `makecontext'
+#
+# - uclibc:
+#   crypto/async/arch/../arch/async_posix.h:32:5: error: unknown type name 'ucontext_t'
+#
+
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+LIBOPENSSL_CFLAGS += -DOPENSSL_NO_ASYNC
+endif
+ifeq ($(BR2_TOOLCHAIN_HAS_UCONTEXT),)
+LIBOPENSSL_CFLAGS += -DOPENSSL_NO_ASYNC
+endif
+
+ifeq ($(BR2_STATIC_LIBS),y)
+# Use "gcc" minimalistic target to disable DSO
+LIBOPENSSL_TARGET_ARCH = gcc
+else
 # Some architectures are optimized in OpenSSL
 # Doesn't work for thumb-only (Cortex-M?)
 ifeq ($(BR2_ARM_CPU_HAS_ARM),y)
-LIBOPENSSL_TARGET_ARCH = armv4
+LIBOPENSSL_TARGET_ARCH = linux-armv4
 endif
 ifeq ($(ARCH),aarch64)
-LIBOPENSSL_TARGET_ARCH = aarch64
+LIBOPENSSL_TARGET_ARCH = linux-aarch64
 endif
 ifeq ($(ARCH),powerpc)
 # 4xx cores seem to have trouble with openssl's ASM optimizations
 ifeq ($(BR2_powerpc_401)$(BR2_powerpc_403)$(BR2_powerpc_405)$(BR2_powerpc_405fp)$(BR2_powerpc_440)$(BR2_powerpc_440fp),)
-LIBOPENSSL_TARGET_ARCH = ppc
+LIBOPENSSL_TARGET_ARCH = linux-ppc
 endif
 endif
 ifeq ($(ARCH),powerpc64)
-LIBOPENSSL_TARGET_ARCH = ppc64
+LIBOPENSSL_TARGET_ARCH = linux-ppc64
 endif
 ifeq ($(ARCH),powerpc64le)
-LIBOPENSSL_TARGET_ARCH = ppc64le
+LIBOPENSSL_TARGET_ARCH = linux-ppc64le
 endif
 ifeq ($(ARCH),x86_64)
-LIBOPENSSL_TARGET_ARCH = x86_64
+LIBOPENSSL_TARGET_ARCH = linux-x86_64
+endif
 endif
 
 define HOST_LIBOPENSSL_CONFIGURE_CMDS
@@ -65,11 +88,13 @@ define HOST_LIBOPENSSL_CONFIGURE_CMDS
 		./config \
 		--prefix=$(HOST_DIR) \
 		--openssldir=$(HOST_DIR)/etc/ssl \
-		--libdir=/lib \
+		no-tests \
+		no-fuzz-libfuzzer \
+		no-fuzz-afl \
 		shared \
 		zlib-dynamic \
 	)
-	$(SED) "s#-O[0-9]#$(HOST_CFLAGS)#" $(@D)/Makefile
+	$(SED) "s#-O[0-9s]#$(HOST_CFLAGS)#" $(@D)/Makefile
 endef
 
 define LIBOPENSSL_CONFIGURE_CMDS
@@ -77,32 +102,26 @@ define LIBOPENSSL_CONFIGURE_CMDS
 		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		./Configure \
-			linux-$(LIBOPENSSL_TARGET_ARCH) \
+			$(LIBOPENSSL_TARGET_ARCH) \
 			--prefix=/usr \
 			--openssldir=/etc/ssl \
-			--libdir=/lib \
-			$(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \
+			$(if $(BR2_TOOLCHAIN_HAS_LIBATOMIC),-latomic) \
+			$(if $(BR2_TOOLCHAIN_HAS_THREADS),-lpthread threads, no-threads) \
 			$(if $(BR2_STATIC_LIBS),no-shared,shared) \
+			$(if $(BR2_PACKAGE_HAS_CRYPTODEV),enable-devcryptoeng) \
 			no-rc5 \
 			enable-camellia \
 			enable-mdc2 \
-			enable-tlsext \
+			no-tests \
+			no-fuzz-libfuzzer \
+			no-fuzz-afl \
 			$(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \
-			$(if $(BR2_STATIC_LIBS),no-dso) \
 	)
 	$(SED) "s#-march=[-a-z0-9] ##" -e "s#-mcpu=[-a-z0-9] ##g" $(@D)/Makefile
-	$(SED) "s#-O[0-9]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile
+	$(SED) "s#-O[0-9s]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile
 	$(SED) "s# build_tests##" $(@D)/Makefile
 endef
 
-# libdl is not available in a static build, and this is not implied by no-dso
-ifeq ($(BR2_STATIC_LIBS),y)
-define LIBOPENSSL_FIXUP_STATIC_MAKEFILE
-	$(SED) 's#-ldl##g' $(@D)/Makefile
-endef
-LIBOPENSSL_POST_CONFIGURE_HOOKS += LIBOPENSSL_FIXUP_STATIC_MAKEFILE
-endif
-
 define HOST_LIBOPENSSL_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
 endef
@@ -112,7 +131,7 @@ define LIBOPENSSL_BUILD_CMDS
 endef
 
 define LIBOPENSSL_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
 endef
 
 define HOST_LIBOPENSSL_INSTALL_CMDS
@@ -120,31 +139,11 @@ define HOST_LIBOPENSSL_INSTALL_CMDS
 endef
 
 define LIBOPENSSL_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
 	rm -rf $(TARGET_DIR)/usr/lib/ssl
 	rm -f $(TARGET_DIR)/usr/bin/c_rehash
 endef
 
-# libdl has no business in a static build
-ifeq ($(BR2_STATIC_LIBS),y)
-define LIBOPENSSL_FIXUP_STATIC_PKGCONFIG
-	$(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libcrypto.pc
-	$(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libssl.pc
-	$(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/openssl.pc
-endef
-LIBOPENSSL_POST_INSTALL_STAGING_HOOKS += LIBOPENSSL_FIXUP_STATIC_PKGCONFIG
-endif
-
-ifneq ($(BR2_STATIC_LIBS),y)
-# libraries gets installed read only, so strip fails
-define LIBOPENSSL_INSTALL_FIXUPS_SHARED
-	chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so
-	for i in $(addprefix $(TARGET_DIR)/usr/lib/,libcrypto.so.* libssl.so.*); \
-	do chmod +w $$i; done
-endef
-LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_INSTALL_FIXUPS_SHARED
-endif
-
 ifeq ($(BR2_PACKAGE_PERL),)
 define LIBOPENSSL_REMOVE_PERL_SCRIPTS
 	$(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.pl,tsget}
@@ -162,7 +161,7 @@ endif
 
 ifneq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y)
 define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES
-	rm -rf $(TARGET_DIR)/usr/lib/engines
+	rm -rf $(TARGET_DIR)/usr/lib/engines-1.1
 endef
 LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES
 endif
diff --git a/buildroot/package/libopusenc/libopusenc.hash b/buildroot/package/libopusenc/libopusenc.hash
index 122e792bf..bdb4cf8fd 100644
--- a/buildroot/package/libopusenc/libopusenc.hash
+++ b/buildroot/package/libopusenc/libopusenc.hash
@@ -1,3 +1,3 @@
 # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt
-sha256  c79e95eeee43a0b965e9b2c59a243763a8f8b0a7e71441df2aa9084f6171c73a  libopusenc-0.2.tar.gz
+sha256  8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9  libopusenc-0.2.1.tar.gz
 sha256  93b17ab56b8230127fea532be0dcb4e6d71e66ab5e8ce5d6ae8785d7288b164f  COPYING
diff --git a/buildroot/package/libopusenc/libopusenc.mk b/buildroot/package/libopusenc/libopusenc.mk
index 16b83d0c4..3b4dc0e71 100644
--- a/buildroot/package/libopusenc/libopusenc.mk
+++ b/buildroot/package/libopusenc/libopusenc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBOPUSENC_VERSION = 0.2
+LIBOPUSENC_VERSION = 0.2.1
 LIBOPUSENC_SITE = https://downloads.xiph.org/releases/opus
 LIBOPUSENC_LICENSE = BSD-3-Clause
 LIBOPUSENC_LICENSE_FILES = COPYING
diff --git a/buildroot/package/libostree/libostree.hash b/buildroot/package/libostree/libostree.hash
index 35bf2caf0..ddd15b509 100644
--- a/buildroot/package/libostree/libostree.hash
+++ b/buildroot/package/libostree/libostree.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 9a3c17af133e6d381bb997473c6371ef8f048c1cfb6bd0acdb5662ede712aa5a  libostree-2018.9.tar.xz
+sha256 f263cfed75dcc9e312a874d28241e7143d8a0d8c774938f2165327bae67dbe06  libostree-2018.9.1.tar.xz
 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING
diff --git a/buildroot/package/libostree/libostree.mk b/buildroot/package/libostree/libostree.mk
index 4c841dbe4..e8cdd64d6 100644
--- a/buildroot/package/libostree/libostree.mk
+++ b/buildroot/package/libostree/libostree.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-LIBOSTREE_VERSION = 2018.9
+LIBOSTREE_VERSION_MAJOR = 2018.9
+LIBOSTREE_VERSION= $(LIBOSTREE_VERSION_MAJOR).1
 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz
-LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION)
+LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION_MAJOR)
 
 LIBOSTREE_LICENSE = LGPL-2.0+
 LIBOSTREE_LICENSE_FILES = COPYING
@@ -68,4 +69,13 @@ else
 LIBOSTREE_CONF_OPTS += --without-selinux
 endif
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+LIBOSTREE_CONF_OPTS += \
+	--with-libsystemd \
+	--with-systemdsystemunitdir=/usr/lib/systemd/system
+LIBOSTREE_DEPENDENCIES += systemd
+else
+LIBOSTREE_CONF_OPTS += --without-libsystemd
+endif
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/libpagekite/0001-configure.ac-fix-handling-of-with.patch b/buildroot/package/libpagekite/0001-configure.ac-fix-handling-of-with.patch
new file mode 100644
index 000000000..342b7d50a
--- /dev/null
+++ b/buildroot/package/libpagekite/0001-configure.ac-fix-handling-of-with.patch
@@ -0,0 +1,76 @@
+From dbb7ea56148949412b18770967022455f3e5cb63 Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" 
+Date: Fri, 16 Feb 2018 11:45:21 +0100
+Subject: [PATCH] configure.ac: fix handling of --with-*
+
+The 'action-if-given' argument of AC_ARG_WITH is executed whenever the
+--with- or --without- option is given. Setting e.g. with_tests=yes in
+that branch causes the argument '--without-tests' to *enable* the tests
+instead of disabling them.
+
+In most cases, the third and fourth argument can simply be skipped
+since they are optional. We only need them in the cases where we use a
+different variable than with_foo, or where we want to default to yes
+instead of defaulting to empty.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) 
+
+Upstream status: pull request sent:
+  https://github.com/pagekite/libpagekite/pull/49
+---
+ configure.ac | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index aa4eb9c..130752a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,18 +34,15 @@ AC_ARG_WITH(openssl,[  --with-openssl=DIR    Use optional openssl libs and inclu
+ 
+ AC_ARG_WITH(tests,
+ 	[AS_HELP_STRING([--with-tests],
+-		[Compile libpagekite unit tests])],
+-		[with_tests=yes], [])
++		[Compile libpagekite unit tests])])
+ 
+ AC_ARG_WITH(debug-traces,
+ 	[AS_HELP_STRING([--with-debug-traces],
+-		[Compile libpagekite debug function traces])],
+-		[with_debug_traces=yes], [])
++		[Compile libpagekite debug function traces])])
+ 
+ AC_ARG_WITH(debug-canaries,
+ 	[AS_HELP_STRING([--with-debug-canaries],
+-		[Compile libpagekite debug memory canaries])],
+-		[with_debug_canaries=yes], [])
++		[Compile libpagekite debug memory canaries])])
+ 
+ AC_ARG_WITH(lua,
+ 	[AS_HELP_STRING([--without-lua],
+@@ -55,7 +52,7 @@ AC_ARG_WITH(lua,
+ AC_ARG_WITH(os-libev,
+ 	[AS_HELP_STRING([--without-os-libev],
+ 		[Use embedded libev, not the OS-provided library])],
+-		[use_libev=no], [])
++		[use_libev="$withval"], [])
+ 
+ AC_ARG_WITH(ipv6,
+ 	[AS_HELP_STRING([--without-ipv6],
+@@ -70,12 +67,12 @@ AC_ARG_WITH(java,
+ AC_ARG_WITH(agpl-relay,
+ 	[AS_HELP_STRING([--with-agpl-relay],
+ 		[Compile libpagekite relay support (AGPLv3 code)])],
+-		[with_relay=yes], [with_relay=no])
++		[with_relay="$withval"], [with_relay=no])
+ 
+ AC_ARG_WITH(ds-logfmt,
+ 	[AS_HELP_STRING([--with-ds-logfmt],
+ 		[Compile libpagekite with DigitalSTROM log format.])],
+-		[with_ds_logfmt=yes], [with_ds_logfmt=no])
++		[with_ds_logfmt="$withval"], [with_ds_logfmt=no])
+ 
+ 
+ # Checks for programs.
+-- 
+2.15.1
+
diff --git a/buildroot/package/libpagekite/0002-configure.ac-use-AS_HELP_STRING-for-with-openssl.patch b/buildroot/package/libpagekite/0002-configure.ac-use-AS_HELP_STRING-for-with-openssl.patch
new file mode 100644
index 000000000..f72127b11
--- /dev/null
+++ b/buildroot/package/libpagekite/0002-configure.ac-use-AS_HELP_STRING-for-with-openssl.patch
@@ -0,0 +1,28 @@
+From cb20efae0e2ca86dd48c603b61d9c20225ebcd3d Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" 
+Date: Fri, 16 Feb 2018 12:06:28 +0100
+Subject: [PATCH] configure.ac: use AS_HELP_STRING for --with-openssl
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) 
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 130752a..4874c0b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,9 @@ use_openssl="yes"
+ use_libev="yes"
+ 
+ specialssldir=""
+-AC_ARG_WITH(openssl,[  --with-openssl=DIR    Use optional openssl libs and includes from [DIR]/lib/ and [DIR]/include/openssl/],
++AC_ARG_WITH(openssl,
++	[AS_HELP_STRING([--with-openssl=DIR],
++		[Use optional openssl libs and includes from [DIR]/lib/ and [DIR]/include/openssl/])],
+ [  case "$with_openssl" in
+   yes)
+   ;;
+-- 
+2.15.1
+
diff --git a/buildroot/package/libpagekite/0003-configure.ac-use-pkg-config-for-openssl.patch b/buildroot/package/libpagekite/0003-configure.ac-use-pkg-config-for-openssl.patch
new file mode 100644
index 000000000..b615d302b
--- /dev/null
+++ b/buildroot/package/libpagekite/0003-configure.ac-use-pkg-config-for-openssl.patch
@@ -0,0 +1,137 @@
+From 6a8b5ee14acee6c258bbaeb8b148ee0dd0d62d3d Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" 
+Date: Fri, 16 Feb 2018 15:36:59 +0100
+Subject: [PATCH] configure.ac: use pkg-config for openssl
+
+It is better to use pkg-config to detect openssl if that is possible.
+pkg-config will add e.g. -lz and -ldl when needed. If pkg-config
+fails, fall back to the old approach of detecting headers and libs.
+Some of the additional openssl support (e.g. adding -ldl) is moved
+inside the non-pkg-config path.
+
+Since AC_CHECK_LIBS adds the library found to LIBS, do the same in
+the pkg-config case. Normally the Makefile.am should instead use
+OPENSSL_LIBS where needed, but this is not done consistently.
+
+When --with-openssl=DIR is given, still perform the test (both with
+pkg-config and by checking headers and libs). I.e., remove
+$specialssldir.
+
+While we're at it, simplify the headers checks by merging them into a
+single AC_CHECK_HEADERS.
+
+Note that it is (still) not an error when openssl is not found,
+although the build will then fail.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) 
+---
+ configure.ac | 67 ++++++++++++++++++++++--------------------------------------
+ 1 file changed, 24 insertions(+), 43 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4874c0b..ccab9f4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,7 +16,6 @@ AC_CANONICAL_HOST
+ use_openssl="yes"
+ use_libev="yes"
+ 
+-specialssldir=""
+ AC_ARG_WITH(openssl,
+ 	[AS_HELP_STRING([--with-openssl=DIR],
+ 		[Use optional openssl libs and includes from [DIR]/lib/ and [DIR]/include/openssl/])],
+@@ -27,7 +26,6 @@ AC_ARG_WITH(openssl,
+     use_openssl="no"
+   ;;
+   *)
+-    specialssldir="$with_openssl"
+     LDFLAGS="$LDFLAGS -L$with_openssl/lib"
+     CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
+   ;;
+@@ -139,59 +137,42 @@ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([clock_gettime dup2 gethostbyname gettimeofday inet_ntoa malloc memmove memset select socket strcasecmp strchr strdup strerror strncasecmp strrchr uname sched_yield pthread_yield pthread_yield_np])
+ 
+-# OpenSSL requires dlopen on some platforms
+-AC_SEARCH_LIBS(dlopen, dl)
+-
+ # If they didn't specify it, we try to find it
+-if test "$use_openssl" = "yes" -a -z "$specialssldir" ; then
+-	AC_CHECK_HEADER(openssl/ssl.h,,
++if test "$use_openssl" = "yes" ; then
++	# First try pkg-config; fall back to headers/libs check
++	PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.0],
++		[LIBS="$OPENSSL_LIBS $LIBS"],
++		[AC_CHECK_HEADERS([openssl/ssl.h openssl/err.h openssl/rand.h],,
+ 			[ use_openssl="no"
+-        AC_MSG_WARN([Failed to find openssl/ssl.h so OpenSSL will not be used. 
+-	If it is installed you can try the --with-openssl=DIR argument]) ])
+-
+-	if test "$use_openssl" = "yes"; then
+-	     AC_CHECK_HEADER(openssl/err.h,,
+-	         [ use_openssl="no"
+-		     AC_MSG_WARN([Failed to find openssl/err.h so OpenSSL will not be used.
+-		      If it is installed you can try the --with-openssl=DIR argument]) ])
+-	fi
+-
+-	if test "$use_openssl" = "yes"; then
+-		   AC_CHECK_HEADER(openssl/rand.h,,
+-		       [ use_openssl="no"
+-		         AC_MSG_WARN([Failed to find openssl/rand.h so OpenSSL will not be used.
+-			  If it is installed you can try the --with-openssl=DIR argument]) ])
+-	fi
+-
+-	if test "$use_openssl" = "yes"; then
+-	 AC_CHECK_LIB(crypto, BIO_int_ctrl,
+-	   [],
+-	   [ use_openssl="no"
+-	   AC_MSG_WARN([Failed to find libcrypto so OpenSSL will not be used.
+-	    If it is installed you can try the --with-openssl=DIR argument]) ])
+-	fi
+-										     
+-	if test "$use_openssl" = "yes"; then
+-	   AC_CHECK_LIB(ssl, SSL_new,
+-	   [],
+-	   [ use_openssl="no"
+-	   AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used. 
++        		  AC_MSG_WARN([Failed to find openssl headers so OpenSSL will not be used. 
+ If it is installed you can try the --with-openssl=DIR argument]) ])
+-	fi
++		 if test "$use_openssl" = "yes"; then
++			AC_CHECK_LIB(crypto, BIO_int_ctrl, [],
++			[ use_openssl="no"
++			  AC_MSG_WARN([Failed to find libcrypto so OpenSSL will not be used.
++If it is installed you can try the --with-openssl=DIR argument]) ])
++		 fi
++		 if test "$use_openssl" = "yes"; then
++			AC_CHECK_LIB(ssl, SSL_new, [],
++			[ use_openssl="no"
++			  AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used.
++If it is installed you can try the --with-openssl=DIR argument]) ])
++		 fi
++		 if test "$use_openssl" = "yes"; then
++			# OpenSSL requires dlopen on some platforms
++			AC_SEARCH_LIBS(dlopen, dl)
++			OPENSSL_LIBS="-lssl -lcrypto"
++		fi])
+ fi
+ 
+-OPENSSL_CFLAGS=""
+-OPENSSL_LIBS=""
+ if test "$use_openssl" = "yes"; then
+   AC_DEFINE([HAVE_OPENSSL], [1], [Define to 1 if you have OpenSSL.])
+-  OPENSSL_LIBS="-lssl -lcrypto"
+   # Define in Makefile also.
+   HAVE_OPENSSL=yes
+-  AC_SUBST(HAVE_OPENSSL)
+ fi
+ AC_SUBST([OPENSSL_CFLAGS])
+ AC_SUBST([OPENSSL_LIBS])
+-
++AC_SUBST([HAVE_OPENSSL])
+ 
+ 
+ LIBEV_CFLAGS=""
+-- 
+2.15.1
+
diff --git a/buildroot/package/libpagekite/Config.in b/buildroot/package/libpagekite/Config.in
new file mode 100644
index 000000000..0ecf4f97e
--- /dev/null
+++ b/buildroot/package/libpagekite/Config.in
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_LIBPAGEKITE
+	bool "libpagekite"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBEV
+	select BR2_PACKAGE_OPENSSL
+	help
+	  PageKite is a protocol for dynamic, tunneled reverse proxying
+	  of arbitrary TCP byte streams. It is particularly well suited
+	  for making a HTTP server on a device without a public IP
+	  address visible to the wider Internet, but can also be used
+	  for a variety of other things, including SSH access.
+
+	  libpagekite is a tight, fast implementation of the PageKite
+	  protocol in C, suitable for high-performance or embedded
+	  applications.
+
+	  In addition to the libpagekite library, this package installs
+	  the pagekitec, sshkite and httpkite tools.
+
+	  https://pagekite.net
+	  https://github.com/pagekite/libpagekite
+
+comment "libpagekite needs a toolchain with threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/buildroot/package/libpagekite/libpagekite.hash b/buildroot/package/libpagekite/libpagekite.hash
new file mode 100644
index 000000000..262adc7aa
--- /dev/null
+++ b/buildroot/package/libpagekite/libpagekite.hash
@@ -0,0 +1,7 @@
+# Locally calculated
+sha256  df95bfe95c04b6908e835e13444c1c1883765926f1265e0d2223c42d3c59a4c2  libpagekite-v0.91.171102.tar.gz
+
+# License files, locally calculated
+sha256  ba443b9c9d4273d06aae3e147e9ad1ec199cc9c23455f486a039536d47f57eed  doc/COPYING.md
+sha256  4a271d0bb6bb6e0bac880efddb46da73e6df3dcf0d9ca08a945a232f8ab882ef  doc/LICENSE-2.0.txt
+sha256  8e0f770cabe772d67d36469f6bf413afd2dcfa6ac37acfc65f770cf3a134106d  doc/AGPLv3.txt
diff --git a/buildroot/package/libpagekite/libpagekite.mk b/buildroot/package/libpagekite/libpagekite.mk
new file mode 100644
index 000000000..2c143ba02
--- /dev/null
+++ b/buildroot/package/libpagekite/libpagekite.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# libpagekite
+#
+################################################################################
+
+LIBPAGEKITE_VERSION = v0.91.171102
+LIBPAGEKITE_SITE = $(call github,pagekite,libpagekite,$(LIBPAGEKITE_VERSION))
+
+# pkrelay is AGPL-3.0+ but is not built
+LIBPAGEKITE_LICENSE = Apache-2.0 or AGPL-3.0+
+LIBPAGEKITE_LICENSE_FILES = doc/COPYING.md doc/LICENSE-2.0.txt doc/AGPLv3.txt
+
+LIBPAGEKITE_DEPENDENCIES = host-pkgconf libev openssl
+LIBPAGEKITE_INSTALL_STAGING = YES
+
+# Sources from git, no configure included
+# 0001-configure.ac-fix-handling-of-with-os-libev.patch touches configure.ac
+LIBPAGEKITE_AUTORECONF = YES
+
+LIBPAGEKITE_CONF_OPTS = \
+	--with-openssl \
+	--without-tests \
+	--with-os-libev \
+	--without-java \
+	--without-agpl-relay \
+	--without-ds-logfmt
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-systems.patch b/buildroot/package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-systems.patch
new file mode 100644
index 000000000..aabaef338
--- /dev/null
+++ b/buildroot/package/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-systems.patch
@@ -0,0 +1,26 @@
+From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00 2001
+From: maxice8 
+Date: Sun, 22 Jul 2018 18:54:17 -0300
+Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl systems.
+
+fix compilation on musl libc systems like Void Linux and Alpine.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/the-tcpdump-group/libpcap/commit/aafa3512b7b742f5e66a5543e41974cc5e7eebfa]
+---
+ pcap-usb-linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
+index 6f8adf65e..b92c05ea1 100644
+--- a/pcap-usb-linux.c
++++ b/pcap-usb-linux.c
+@@ -50,6 +50,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
diff --git a/buildroot/package/libpcap/Config.in b/buildroot/package/libpcap/Config.in
index 643acbef6..74429f209 100644
--- a/buildroot/package/libpcap/Config.in
+++ b/buildroot/package/libpcap/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBPCAP
 	bool "libpcap"
+	select BR2_PACKAGE_BLUEZ5_UTILS_HEADERS if BR2_PACKAGE_BLUEZ5_UTILS
 	select BR2_PACKAGE_ZLIB
 	help
 	  A system-independent library for user-level network packet
diff --git a/buildroot/package/libpcap/libpcap.hash b/buildroot/package/libpcap/libpcap.hash
index f8bc1bcfe..19ce2adbe 100644
--- a/buildroot/package/libpcap/libpcap.hash
+++ b/buildroot/package/libpcap/libpcap.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e	libpcap-1.8.1.tar.gz
+sha256	2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019	libpcap-1.9.0.tar.gz
 
 # Hash for license file:
 sha256	8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd	LICENSE
diff --git a/buildroot/package/libpcap/libpcap.mk b/buildroot/package/libpcap/libpcap.mk
index c4c5f3146..ebceca527 100644
--- a/buildroot/package/libpcap/libpcap.mk
+++ b/buildroot/package/libpcap/libpcap.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBPCAP_VERSION = 1.8.1
+LIBPCAP_VERSION = 1.9.0
 LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_LICENSE = BSD-3-Clause
 LIBPCAP_LICENSE_FILES = LICENSE
@@ -15,7 +15,9 @@ LIBPCAP_CONF_ENV = \
 	ac_cv_header_linux_wireless_h=yes \
 	CFLAGS="$(LIBPCAP_CFLAGS)"
 LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
-LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux
+LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag
+# Disable dbus to break recursive dependencies
+LIBPCAP_CONF_OPTS += --disable-dbus
 LIBPCAP_CONFIG_SCRIPTS = pcap-config
 
 # Omit -rpath from pcap-config output
@@ -24,27 +26,12 @@ define LIBPCAP_CONFIG_REMOVE_RPATH
 endef
 LIBPCAP_POST_BUILD_HOOKS = LIBPCAP_CONFIG_REMOVE_RPATH
 
-# On purpose, not compatible with bluez5
-ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
-LIBPCAP_DEPENDENCIES += bluez_utils
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),y)
+LIBPCAP_DEPENDENCIES += bluez5_utils-headers
 else
 LIBPCAP_CONF_OPTS += --disable-bluetooth
 endif
 
-ifeq ($(BR2_PACKAGE_DBUS),y)
-LIBPCAP_CONF_OPTS += --enable-dbus
-LIBPCAP_DEPENDENCIES += dbus
-else
-LIBPCAP_CONF_OPTS += --disable-dbus
-endif
-
-ifeq ($(BR2_PACKAGE_LIBUSB),y)
-LIBPCAP_CONF_OPTS += --enable-canusb
-LIBPCAP_DEPENDENCIES += libusb
-else
-LIBPCAP_CONF_OPTS += --disable-canusb
-endif
-
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 LIBPCAP_DEPENDENCIES += libnl
 LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3"
diff --git a/buildroot/package/libpng/libpng.hash b/buildroot/package/libpng/libpng.hash
index 0a0cebee9..e86b8c65c 100644
--- a/buildroot/package/libpng/libpng.hash
+++ b/buildroot/package/libpng/libpng.hash
@@ -1,7 +1,6 @@
-# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.34/
-md5		c05b6ca7190a5e387b78657dbe5536b2			libpng-1.6.34.tar.xz
-sha1	45de4ec996ffcc3e18037e7c128abe95f4d0292a	libpng-1.6.34.tar.xz
-
+# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/
+md5 015e8e15db1eecde5f2eb9eb5b6e59e9  libpng-1.6.37.tar.xz
+sha1 3ab93fabbf4c27e1c4724371df408d9a1bd3f656  libpng-1.6.37.tar.xz
 # Locally computed:
-sha256	2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6	libpng-1.6.34.tar.xz
-sha256	a247c24f82bacf0403fe2f3d5550493a91cdb575fe7036b764bda8cacf3efd9c	LICENSE
+sha256 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca  libpng-1.6.37.tar.xz
+sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b  LICENSE
diff --git a/buildroot/package/libpng/libpng.mk b/buildroot/package/libpng/libpng.mk
index ace62cd87..5c30a4f9a 100644
--- a/buildroot/package/libpng/libpng.mk
+++ b/buildroot/package/libpng/libpng.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-LIBPNG_VERSION = 1.6.34
+LIBPNG_VERSION = 1.6.37
 LIBPNG_SERIES = 16
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
 LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
-LIBPNG_LICENSE = Libpng
+LIBPNG_LICENSE = Libpng-2.0
 LIBPNG_LICENSE_FILES = LICENSE
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkgconf zlib
diff --git a/buildroot/package/libqmi/libqmi.hash b/buildroot/package/libqmi/libqmi.hash
index 297e1f0fa..0c27451ec 100644
--- a/buildroot/package/libqmi/libqmi.hash
+++ b/buildroot/package/libqmi/libqmi.hash
@@ -1,4 +1,4 @@
 # Locally computed:
-sha256 21428cd3749c56246565123f707fee51238651a22c60bdc85ebce97388626eb4  libqmi-1.20.0.tar.xz
+sha256 21c198b481f1617bb7edb1960d823569de3e38b269dbf513af1b56048cafaa17  libqmi-1.22.0.tar.xz
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
diff --git a/buildroot/package/libqmi/libqmi.mk b/buildroot/package/libqmi/libqmi.mk
index a7140dc38..319c2362b 100644
--- a/buildroot/package/libqmi/libqmi.mk
+++ b/buildroot/package/libqmi/libqmi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBQMI_VERSION = 1.20.0
+LIBQMI_VERSION = 1.22.0
 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
 LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
 LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
diff --git a/buildroot/package/libraw/libraw.hash b/buildroot/package/libraw/libraw.hash
index c546b1bee..643a2109b 100644
--- a/buildroot/package/libraw/libraw.hash
+++ b/buildroot/package/libraw/libraw.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256	7cf724a40a0d8915869498f51062a952167e4f5bae2b6920542c9e0e079a471d	LibRaw-0.18.11.tar.gz
+sha256	400d47969292291d297873a06fb0535ccce70728117463927ddd9452aa849644	LibRaw-0.19.2.tar.gz
 sha256	eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449	LICENSE.LGPL
 sha256	0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f	LICENSE.CDDL
-sha256	7fe7564c5d48c5d353d7c1966dcddada3791586a4c2eedbc68ad56e96955e75d	README
+sha256	eee0055723d3483ef3ee7920e2178177b14a334c2a622be4101bcfb05d21407e	README.md
diff --git a/buildroot/package/libraw/libraw.mk b/buildroot/package/libraw/libraw.mk
index 4ff746264..0d95207b7 100644
--- a/buildroot/package/libraw/libraw.mk
+++ b/buildroot/package/libraw/libraw.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBRAW_VERSION = 0.18.11
+LIBRAW_VERSION = 0.19.2
 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz
 LIBRAW_SITE = http://www.libraw.org/data
 LIBRAW_INSTALL_STAGING = YES
@@ -14,7 +14,7 @@ LIBRAW_CONF_OPTS += \
 	--disable-demosaic-pack-gpl2 \
 	--disable-demosaic-pack-gpl3
 LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0
-LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README
+LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README.md
 LIBRAW_DEPENDENCIES = host-pkgconf
 LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS)
 LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)"
diff --git a/buildroot/package/libressl/libressl.hash b/buildroot/package/libressl/libressl.hash
index 111fe4fee..a98f34467 100644
--- a/buildroot/package/libressl/libressl.hash
+++ b/buildroot/package/libressl/libressl.hash
@@ -1,4 +1,4 @@
 # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256
-sha256 1e3a9fada06c1c060011470ad0ff960de28f9a0515277d7336f7e09362517da6  libressl-2.7.4.tar.gz
+sha256 9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477  libressl-2.8.3.tar.gz
 # Locally computed
 sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1  COPYING
diff --git a/buildroot/package/libressl/libressl.mk b/buildroot/package/libressl/libressl.mk
index 35494c823..e02ab9026 100644
--- a/buildroot/package/libressl/libressl.mk
+++ b/buildroot/package/libressl/libressl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBRESSL_VERSION = 2.7.4
+LIBRESSL_VERSION = 2.8.3
 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
 LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code)
 LIBRESSL_LICENSE_FILES = COPYING
diff --git a/buildroot/package/libseccomp/0001-remove-static.patch b/buildroot/package/libseccomp/0001-remove-static.patch
index 9f0ac210c..60a1ff00b 100644
--- a/buildroot/package/libseccomp/0001-remove-static.patch
+++ b/buildroot/package/libseccomp/0001-remove-static.patch
@@ -1,4 +1,4 @@
-From 8632287cf6863b580340f846ac14adf2609abdb0 Mon Sep 17 00:00:00 2001
+From 5d010fb06eae43b284e5ccc322f6de47eb42b751 Mon Sep 17 00:00:00 2001
 From: Fabrice Fontaine 
 Date: Sat, 2 Jun 2018 13:45:22 +0200
 Subject: [PATCH] remove static
@@ -14,16 +14,18 @@ and slighly updated to work with 2.3.3
 
 Signed-off-by: Bernd Kuhls 
 Signed-off-by: Fabrice Fontaine 
+[Peter: updated for v2.4.0 which adds scmp_api_level]
+Signed-off-by: Peter Korsgaard 
 ---
- tools/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
+ tools/Makefile.am | 3 ---
+ 1 file changed, 3 deletions(-)
 
 diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 70b4aed..ef74270 100644
+index f768365..5f9d571 100644
 --- a/tools/Makefile.am
 +++ b/tools/Makefile.am
-@@ -35,8 +35,6 @@ scmp_bpf_disasm_SOURCES = scmp_bpf_disasm.c bpf.h util.h
- scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h
+@@ -37,10 +37,7 @@ scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h
+ scmp_api_level_SOURCES = scmp_api_level.c
  
  scmp_sys_resolver_LDADD = ../src/libseccomp.la
 -scmp_sys_resolver_LDFLAGS = -static
@@ -31,6 +33,8 @@ index 70b4aed..ef74270 100644
 -scmp_arch_detect_LDFLAGS = -static
  scmp_bpf_disasm_LDADD = util.la
  scmp_bpf_sim_LDADD = util.la
+ scmp_api_level_LDADD = ../src/libseccomp.la
+-scmp_api_level_LDFLAGS = -static
 -- 
-2.14.1
+2.11.0
 
diff --git a/buildroot/package/libseccomp/libseccomp.hash b/buildroot/package/libseccomp/libseccomp.hash
index 0362ce9ba..0823903c3 100644
--- a/buildroot/package/libseccomp/libseccomp.hash
+++ b/buildroot/package/libseccomp/libseccomp.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 5a52495207f00d1254707f11226e17c16ec53f5038d65bbabf1892873fa2fe5b libseccomp-v2.3.3.tar.gz
+sha256 b7ee0299157fb7a6a81c99f2e0d7e64429b7d7c0eae43c3a6ef91e87eeed2868 libseccomp-v2.4.0.tar.gz
 sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE
diff --git a/buildroot/package/libseccomp/libseccomp.mk b/buildroot/package/libseccomp/libseccomp.mk
index afa2d3612..90b981f04 100644
--- a/buildroot/package/libseccomp/libseccomp.mk
+++ b/buildroot/package/libseccomp/libseccomp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSECCOMP_VERSION = v2.3.3
+LIBSECCOMP_VERSION = v2.4.0
 LIBSECCOMP_SITE = $(call github,seccomp,libseccomp,$(LIBSECCOMP_VERSION))
 LIBSECCOMP_LICENSE = LGPL-2.1
 LIBSECCOMP_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch b/buildroot/package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch
new file mode 100644
index 000000000..a01da53ad
--- /dev/null
+++ b/buildroot/package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch
@@ -0,0 +1,39 @@
+From 2e4cf095afdcf843e93d1bdea9dbd961558f09bd Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 13 Jan 2019 21:01:19 +0100
+Subject: [PATCH] SerialPort.cpp: fix build when size_t is an unsigned int
+
+size_t can be defined as an unsigned int instead of long unsigned int so
+replace 1UL to (size_t)1 when calling max function
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/crayzeewulf/libserial/pull/126]
+---
+ src/SerialPort.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/SerialPort.cpp b/src/SerialPort.cpp
+index e354fcb..75e762e 100644
+--- a/src/SerialPort.cpp
++++ b/src/SerialPort.cpp
+@@ -2208,7 +2208,7 @@ namespace LibSerial
+ 
+         // Local variables.
+         size_t number_of_bytes_read = 0 ;
+-        size_t number_of_bytes_remaining = std::max(numberOfBytes, 1UL) ;
++        size_t number_of_bytes_remaining = std::max(numberOfBytes, (size_t)1) ;
+         size_t maximum_number_of_bytes = dataBuffer.max_size() ;
+         
+         // Clear the data buffer and reserve enough space in the buffer to store the incoming data.
+@@ -2302,7 +2302,7 @@ namespace LibSerial
+ 
+         // Local variables.
+         size_t number_of_bytes_read = 0 ;
+-        size_t number_of_bytes_remaining = std::max(numberOfBytes, 1UL) ;
++        size_t number_of_bytes_remaining = std::max(numberOfBytes, (size_t)1) ;
+         size_t maximum_number_of_bytes = dataString.max_size() ;
+         
+         // Clear the data buffer and reserve enough space in the buffer to store the incoming data.
+-- 
+2.14.1
+
diff --git a/buildroot/package/libserial/0001-disable-python-bindings.patch b/buildroot/package/libserial/0001-disable-python-bindings.patch
deleted file mode 100644
index 1f2f5ed7d..000000000
--- a/buildroot/package/libserial/0001-disable-python-bindings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Disable build of Python bindings, which requires the sipconfig module.
-
-Signed-off-by: Simon Dawson 
-Signed-off-by: Jörg Krause 
-
-diff -purN libserial-0.6.0rc2.orig/Makefile.am libserial-0.6.0rc2/Makefile.am
---- libserial-0.6.0rc2.orig/Makefile.am	2014-06-05 18:37:25.000000000 +0200
-+++ libserial-0.6.0rc2/Makefile.am	2015-07-30 20:59:28.828429011 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS=src doc examples sip
-+SUBDIRS=src doc examples
- ACLOCAL_AMFLAGS=-I m4
- 
- EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc
-diff -purN libserial-0.6.0rc2.orig/Makefile.in libserial-0.6.0rc2/Makefile.in
---- libserial-0.6.0rc2.orig/Makefile.in	2014-06-05 18:40:09.000000000 +0200
-+++ libserial-0.6.0rc2/Makefile.in	2015-07-30 21:00:09.215188376 +0200
-@@ -348,7 +348,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = src doc examples sip
-+SUBDIRS = src doc examples
- ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc
- pkgconfigdir = $(libdir)/pkgconfig
diff --git a/buildroot/package/libserial/0002-Don-t-use-high-baudrates-when-not-available.patch b/buildroot/package/libserial/0002-Don-t-use-high-baudrates-when-not-available.patch
deleted file mode 100644
index f2ad61ae7..000000000
--- a/buildroot/package/libserial/0002-Don-t-use-high-baudrates-when-not-available.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 47ca0621ccd2100e4ba0d7f4e2a861d14f05f63c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Tue, 17 Nov 2015 23:50:14 +0100
-Subject: [PATCH] Don't use high baudrates when not available
-
-On certain architectures (namely Sparc), the maximum baud rate exposed
-by the kernel headers is B2000000. Therefore, the current libserial
-code doesn't build for the Sparc and Sparc64 architectures due to
-this.
-
-In order to address this problem, this patch tests the value of
-__MAX_BAUD. If it's higher than B2000000 then we assume we're on an
-architecture that supports all baud rates up to B4000000. Otherwise,
-we simply don't support the baud rates above B2000000.
-
-Fixes build failures such as:
-
-./SerialPort.h:88:24: error: 'B2500000' was not declared in this scope
-         BAUD_2500000 = B2500000,
-
-Signed-off-by: Thomas Petazzoni 
----
- src/SerialPort.h      | 2 ++
- src/SerialStreamBuf.h | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/SerialPort.h b/src/SerialPort.h
-index 6c0baaa..0b1af4c 100644
---- a/src/SerialPort.h
-+++ b/src/SerialPort.h
-@@ -85,11 +85,13 @@ public:
-         BAUD_1152000 = B1152000, 
-         BAUD_1500000 = B1500000,
-         BAUD_2000000 = B2000000,
-+#if __MAX_BAUD > B2000000
-         BAUD_2500000 = B2500000,
-         BAUD_3000000 = B3000000,
-         BAUD_3500000 = B3500000,
-         BAUD_4000000 = B4000000,
- #endif
-+#endif /* __linux__ */
-         BAUD_DEFAULT = BAUD_57600
-     } ;
- 
-diff --git a/src/SerialStreamBuf.h b/src/SerialStreamBuf.h
-index ccbb996..174f31c 100644
---- a/src/SerialStreamBuf.h
-+++ b/src/SerialStreamBuf.h
-@@ -85,11 +85,13 @@ extern "C++"
-                 BAUD_1152000 = SerialPort::BAUD_1152000, 
-                 BAUD_1500000 = SerialPort::BAUD_1500000, 
-                 BAUD_2000000 = SerialPort::BAUD_2000000, 
-+#if __MAX_BAUD > B2000000
-                 BAUD_2500000 = SerialPort::BAUD_2500000, 
-                 BAUD_3000000 = SerialPort::BAUD_3000000, 
-                 BAUD_3500000 = SerialPort::BAUD_3500000, 
-                 BAUD_4000000 = SerialPort::BAUD_4000000, 
- #endif
-+#endif /* __linux__ */
-                 BAUD_DEFAULT = SerialPort::BAUD_DEFAULT,
-                 BAUD_INVALID = -1
-             } ;
--- 
-2.6.3
-
diff --git a/buildroot/package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch b/buildroot/package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch
new file mode 100644
index 000000000..4f97f598c
--- /dev/null
+++ b/buildroot/package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch
@@ -0,0 +1,53 @@
+From fc0f031563146b91d255c752a61624f6dd3c14d4 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Tue, 15 Jan 2019 08:33:27 +0100
+Subject: [PATCH] SerialPort.cpp: don't use high baudrates when not available
+
+On certain architectures (namely Sparc), the maximum baud rate exposed
+by the kernel headers is B2000000. Therefore, the current libserial
+code doesn't build for the Sparc and Sparc64 architectures due to
+this.
+
+In order to address this problem, this patch tests the value of
+__MAX_BAUD. If it's higher than B2000000 then we assume we're on an
+architecture that supports all baud rates up to B4000000. Otherwise,
+we simply don't support the baud rates above B2000000.
+
+Fixes build failures such as:
+
+SerialPort.cpp: In member function 'int LibSerial::SerialPort::Implementation::GetBitRate(const LibSerial::BaudRate&) const':
+SerialPort.cpp:1226:14: error: 'BAUD_2000000' is not a member of 'LibSerial::BaudRate'
+         case BaudRate::BAUD_2000000:
+
+Fixes:
+ - http://autobuild.buildroot.org/results/63ba95b6786464fa8e75af64593010df84530079
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/crayzeewulf/libserial/pull/127]
+---
+ src/SerialPort.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/SerialPort.cpp b/src/SerialPort.cpp
+index e3240eb..18daac0 100644
+--- a/src/SerialPort.cpp
++++ b/src/SerialPort.cpp
+@@ -1223,6 +1223,7 @@ namespace LibSerial
+             baud_rate_as_int = 1500000 ;
+             break ;
+ 
++#if __MAX_BAUD > B2000000
+         case BaudRate::BAUD_2000000:
+             baud_rate_as_int = 2000000 ;
+             break ;
+@@ -1242,6 +1243,7 @@ namespace LibSerial
+         case BaudRate::BAUD_4000000:
+             baud_rate_as_int = 4000000 ;
+             break ;
++#endif /* __MAX_BAUD */
+         default:
+             // If an incorrect baud rate was specified, throw an exception.
+             throw std::runtime_error(ERR_MSG_INVALID_BAUD_RATE) ;
+-- 
+2.14.1
+
diff --git a/buildroot/package/libserial/Config.in b/buildroot/package/libserial/Config.in
index d492f6b71..d54ae4d8a 100644
--- a/buildroot/package/libserial/Config.in
+++ b/buildroot/package/libserial/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBSERIAL
 	bool "libserial"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14
 	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
 	depends on BR2_USE_WCHAR # boost
 	select BR2_PACKAGE_BOOST
@@ -10,5 +11,7 @@ config BR2_PACKAGE_LIBSERIAL
 
 	  http://libserial.sourceforge.net/
 
-comment "libserial needs a toolchain w/ C++, threads, wchar"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+comment "libserial needs a toolchain w/ C++, gcc >= 5, threads, wchar"
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \
+		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
diff --git a/buildroot/package/libserial/libserial.hash b/buildroot/package/libserial/libserial.hash
index bca647ae3..e82809c71 100644
--- a/buildroot/package/libserial/libserial.hash
+++ b/buildroot/package/libserial/libserial.hash
@@ -1,5 +1,3 @@
-# From http://sourceforge.net/projects/libserial/files/libserial/0.6.0rc2/
-sha1  e09113be3ba595135e95e853003ff96feea0da63  libserial-0.6.0rc2.tar.gz
-md5  7787679b22901e4810bc53ecccdf8266  libserial-0.6.0rc2.tar.gz
 # Locally calculated
-sha256 35ee29eb1369d52ffb8658237577692f991eb508320d0abbb71c53e6494a1c23 libserial-0.6.0rc2.tar.gz
+sha256 063142d6bfe08898316e9a6055f2ddeedef56de06f7cfc8dcdfecc6efabf4bdd libserial-v1.0.0.tar.gz
+sha256 c42fdfe17c192cfdb900e22d40ef246db1b473f99165e405eda62b41be27f4bf LICENSE.txt
diff --git a/buildroot/package/libserial/libserial.mk b/buildroot/package/libserial/libserial.mk
index b73d4c76c..8da7d1cdd 100644
--- a/buildroot/package/libserial/libserial.mk
+++ b/buildroot/package/libserial/libserial.mk
@@ -4,13 +4,18 @@
 #
 ################################################################################
 
-LIBSERIAL_VERSION = 0.6.0rc2
-LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial
+LIBSERIAL_VERSION = v1.0.0
+LIBSERIAL_SITE = $(call github,crayzeewulf,libserial,$(LIBSERIAL_VERSION))
 LIBSERIAL_INSTALL_STAGING = YES
-LIBSERIAL_LICENSE = GPL-2.0+
-LIBSERIAL_LICENSE_FILES = COPYING
+LIBSERIAL_LICENSE = BSD-3-Clause
+LIBSERIAL_LICENSE_FILES = LICENSE.txt
 LIBSERIAL_DEPENDENCIES = boost
+# From git
+LIBSERIAL_AUTORECONF = YES
 
 LIBSERIAL_CONF_ENV = ac_cv_prog_DOCBOOK2PDF=no
+LIBSERIAL_CONF_OPTS = \
+	--disable-tests \
+	--without-python
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch b/buildroot/package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch
new file mode 100644
index 000000000..49b71501e
--- /dev/null
+++ b/buildroot/package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch
@@ -0,0 +1,59 @@
+From 01fafc449f0de56743d08e7976933c49e2915bfa Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior 
+Date: Wed, 15 Nov 2017 12:46:25 +0000
+Subject: [PATCH] tls: compile with OpenSSL 1.1.0
+
+The init functions are not longer required in OpenSSL 1.1 so I dropped
+them.
+
+TLSv1_client_method() should not be used because it enables only the
+TLSv1.0 protocol. Better is to use SSLv23_client_method() which enable
+all the protocols including TLSv1.2. With this functions SSLv2 and SSLv3
+is theoretically possible but as of today those protocols are usually
+build-time disabled.
+To avoid all this OpenSSL 1.1 provides TLS_client_method() which is aim
+to provide to highest TLS protocol version (same as
+SSLv23_client_method() but it is deprecated in 1.1).
+
+Signed-off-by: Sebastian Andrzej Siewior 
+Signed-off-by: Patrick Havelange 
+---
+ src/tls.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/tls.c b/src/tls.c
+index 4562c7327077..e0e5c1a5f079 100644
+--- a/src/tls.c
++++ b/src/tls.c
+@@ -24,6 +24,7 @@
+ #endif
+ 
+ #include 
++#include 
+ #include "shout_private.h"
+ 
+ #ifndef XXX_HAVE_X509_check_host
+@@ -61,14 +62,17 @@ shout_tls_t *shout_tls_new(shout_t *self, sock_t socket)
+ 
+ static inline int tls_setup(shout_tls_t *tls)
+ {
+-	SSL_METHOD *meth;
+-
++	const SSL_METHOD *meth;
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 	SSL_library_init();
+ 	SSL_load_error_strings();
+ 	SSLeay_add_all_algorithms();
+- 	SSLeay_add_ssl_algorithms();
++	SSLeay_add_ssl_algorithms();
+ 
+-	meth = TLSv1_client_method();
++	meth = SSLv23_client_method();
++#else
++	meth = TLS_client_method();
++#endif
+ 	if (!meth)
+ 		goto error;
+ 
+-- 
+2.15.0
diff --git a/buildroot/package/libsigrok/Config.in b/buildroot/package/libsigrok/Config.in
index fb74beaab..a4b9f6656 100644
--- a/buildroot/package/libsigrok/Config.in
+++ b/buildroot/package/libsigrok/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBSIGROK
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU
+	depends on BR2_ENABLE_LOCALE
 	depends on !BR2_STATIC_LIBS # libzip
 	# std=c11
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
@@ -35,7 +36,8 @@ comment "C++ bindings need a toolchain w/ C++, gcc >= 4.9"
 
 endif
 
-comment "libsigrok needs a toolchain w/ wchar, threads, dynamic library, gcc >= 4.7"
+comment "libsigrok needs a toolchain w/ wchar, locale, threads, dynamic library, gcc >= 4.7"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS \
+		|| !BR2_ENABLE_LOCALE
diff --git a/buildroot/package/libsigrok/libsigrok.hash b/buildroot/package/libsigrok/libsigrok.hash
index 47ad6129f..7a52c6ca1 100644
--- a/buildroot/package/libsigrok/libsigrok.hash
+++ b/buildroot/package/libsigrok/libsigrok.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	4c8c86779b880a5c419f6c77a08b1147021e5a19fa83b0f3b19da27463c9f3a4	libsigrok-0.5.0.tar.gz
+sha256	e40fde7af98d29e922e9d3cbe0a6c0569889153fc31e47b8b1afe4d846292b9c	libsigrok-0.5.1.tar.gz
diff --git a/buildroot/package/libsigrok/libsigrok.mk b/buildroot/package/libsigrok/libsigrok.mk
index ef7fab82b..5bca9ad51 100644
--- a/buildroot/package/libsigrok/libsigrok.mk
+++ b/buildroot/package/libsigrok/libsigrok.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSIGROK_VERSION = 0.5.0
+LIBSIGROK_VERSION = 0.5.1
 LIBSIGROK_SITE = http://sigrok.org/download/source/libsigrok
 LIBSIGROK_LICENSE = GPL-3.0+
 LIBSIGROK_LICENSE_FILES = COPYING
diff --git a/buildroot/package/libsigrokdecode/libsigrokdecode.hash b/buildroot/package/libsigrokdecode/libsigrokdecode.hash
index c2e15f61c..e6eb4a080 100644
--- a/buildroot/package/libsigrokdecode/libsigrokdecode.hash
+++ b/buildroot/package/libsigrokdecode/libsigrokdecode.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	493d8b555ae4c245a5feebbd94de33aec7ee85a4f16bc3f4c3985961b459b51e  libsigrokdecode-0.5.1.tar.gz
+sha256	e08d9e797c54eccf3144da631b6e5f1498ac531e51520428df537a1da82583f0  libsigrokdecode-0.5.2.tar.gz
 sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/buildroot/package/libsigrokdecode/libsigrokdecode.mk b/buildroot/package/libsigrokdecode/libsigrokdecode.mk
index 8b4802a7f..f509fbdf7 100644
--- a/buildroot/package/libsigrokdecode/libsigrokdecode.mk
+++ b/buildroot/package/libsigrokdecode/libsigrokdecode.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSIGROKDECODE_VERSION = 0.5.1
+LIBSIGROKDECODE_VERSION = 0.5.2
 LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode
 LIBSIGROKDECODE_LICENSE = GPL-3.0+
 LIBSIGROKDECODE_LICENSE_FILES = COPYING
diff --git a/buildroot/package/libsigsegv/Config.in b/buildroot/package/libsigsegv/Config.in
index f258dc9e8..8e89ff5aa 100644
--- a/buildroot/package/libsigsegv/Config.in
+++ b/buildroot/package/libsigsegv/Config.in
@@ -1,15 +1,6 @@
 config BR2_PACKAGE_LIBSIGSEGV_ARCH_SUPPORTS
 	bool
-	# with glibc/musl, ucontext is available for all supported
-	# architectures
-	default y if BR2_TOOLCHAIN_USES_GLIBC
-	default y if BR2_TOOLCHAIN_USES_MUSL
-	# with uclibc, ucontext is only available for a subset of the
-	# supported architectures
-	default y if BR2_TOOLCHAIN_USES_UCLIBC && \
-		(BR2_ARM_CPU_HAS_ARM || BR2_i386 || \
-		 BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
-		 BR2_sparc || BR2_x86_64)
+	default y if BR2_TOOLCHAIN_HAS_UCONTEXT
 
 config BR2_PACKAGE_LIBSIGSEGV
 	bool "libsigsegv"
diff --git a/buildroot/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch b/buildroot/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch
new file mode 100644
index 000000000..59ba8f85f
--- /dev/null
+++ b/buildroot/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch
@@ -0,0 +1,39 @@
+From 85c877d5072866aadbe8ed0c3e0590fbb5e16788 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath 
+Date: Thu, 28 Sep 2017 12:15:04 +0200
+Subject: [PATCH] double64_init: Check psf->sf.channels against upper bound
+
+This prevents division by zero later in the code.
+
+While the trivial case to catch this (i.e. sf.channels < 1) has already
+been covered, a crafted file may report a number of channels that is
+so high (i.e. > INT_MAX/sizeof(double)) that it "somehow" gets
+miscalculated to zero (if this makes sense) in the determination of the
+blockwidth. Since we only support a limited number of channels anyway,
+make sure to check here as well.
+
+CVE-2017-14634
+
+Closes: https://github.com/erikd/libsndfile/issues/318
+Signed-off-by: Erik de Castro Lopo 
+Signed-off-by: Peter Korsgaard 
+---
+ src/double64.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/double64.c b/src/double64.c
+index b318ea86..78dfef7f 100644
+--- a/src/double64.c
++++ b/src/double64.c
+@@ -91,7 +91,7 @@ int
+ double64_init	(SF_PRIVATE *psf)
+ {	static int double64_caps ;
+ 
+-	if (psf->sf.channels < 1)
++	if (psf->sf.channels < 1 || psf->sf.channels > SF_MAX_CHANNELS)
+ 	{	psf_log_printf (psf, "double64_init : internal error : channels = %d\n", psf->sf.channels) ;
+ 		return SFE_INTERNAL ;
+ 		} ;
+-- 
+2.11.0
+
diff --git a/buildroot/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch b/buildroot/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch
new file mode 100644
index 000000000..3b828de6a
--- /dev/null
+++ b/buildroot/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch
@@ -0,0 +1,36 @@
+From aaea680337267bfb6d2544da878890ee7f1c5077 Mon Sep 17 00:00:00 2001
+From: "Brett T. Warden" 
+Date: Tue, 28 Aug 2018 12:01:17 -0700
+Subject: [PATCH] Check MAX_CHANNELS in sndfile-deinterleave
+
+Allocated buffer has space for only 16 channels. Verify that input file
+meets this limit.
+
+Fixes #397
+
+Signed-off-by: Peter Korsgaard 
+---
+ programs/sndfile-deinterleave.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/programs/sndfile-deinterleave.c b/programs/sndfile-deinterleave.c
+index 53660310..225b4d54 100644
+--- a/programs/sndfile-deinterleave.c
++++ b/programs/sndfile-deinterleave.c
+@@ -89,6 +89,13 @@ main (int argc, char **argv)
+ 		exit (1) ;
+ 		} ;
+ 
++	if (sfinfo.channels > MAX_CHANNELS)
++	{	printf ("\nError : Input file '%s' has too many (%d) channels. Limit is %d.\n",
++			argv [1], sfinfo.channels, MAX_CHANNELS) ;
++		exit (1) ;
++		} ;
++
++
+ 	state.channels = sfinfo.channels ;
+ 	sfinfo.channels = 1 ;
+ 
+-- 
+2.11.0
+
diff --git a/buildroot/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch b/buildroot/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch
new file mode 100644
index 000000000..536bad267
--- /dev/null
+++ b/buildroot/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch
@@ -0,0 +1,96 @@
+From 8ddc442d539ca775d80cdbc7af17a718634a743f Mon Sep 17 00:00:00 2001
+From: Hugo Lefeuvre 
+Date: Mon, 24 Dec 2018 06:43:48 +0100
+Subject: [PATCH] a/ulaw: fix multiple buffer overflows (#432)
+
+i2ulaw_array() and i2alaw_array() fail to handle ptr [count] = INT_MIN
+properly, leading to buffer underflow. INT_MIN is a special value
+since - INT_MIN cannot be represented as int.
+
+In this case round - INT_MIN to INT_MAX and proceed as usual.
+
+f2ulaw_array() and f2alaw_array() fail to handle ptr [count] = NaN
+properly, leading to null pointer dereference.
+
+In this case, arbitrarily set the buffer value to 0.
+
+This commit fixes #429 (CVE-2018-19661 and CVE-2018-19662) and
+fixes #344 (CVE-2017-17456 and CVE-2017-17457).
+
+Signed-off-by: Peter Korsgaard 
+---
+ src/alaw.c | 9 +++++++--
+ src/ulaw.c | 9 +++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/src/alaw.c b/src/alaw.c
+index 063fd1a2..4220224c 100644
+--- a/src/alaw.c
++++ b/src/alaw.c
+@@ -19,6 +19,7 @@
+ #include	"sfconfig.h"
+ 
+ #include	
++#include	
+ 
+ #include	"sndfile.h"
+ #include	"common.h"
+@@ -326,7 +327,9 @@ s2alaw_array (const short *ptr, int count, unsigned char *buffer)
+ static inline void
+ i2alaw_array (const int *ptr, int count, unsigned char *buffer)
+ {	while (--count >= 0)
+-	{	if (ptr [count] >= 0)
++	{	if (ptr [count] == INT_MIN)
++			buffer [count] = alaw_encode [INT_MAX >> (16 + 4)] ;
++		else if (ptr [count] >= 0)
+ 			buffer [count] = alaw_encode [ptr [count] >> (16 + 4)] ;
+ 		else
+ 			buffer [count] = 0x7F & alaw_encode [- ptr [count] >> (16 + 4)] ;
+@@ -346,7 +349,9 @@ f2alaw_array (const float *ptr, int count, unsigned char *buffer, float normfact
+ static inline void
+ d2alaw_array (const double *ptr, int count, unsigned char *buffer, double normfact)
+ {	while (--count >= 0)
+-	{	if (ptr [count] >= 0)
++	{	if (!isfinite (ptr [count]))
++			buffer [count] = 0 ;
++		else if (ptr [count] >= 0)
+ 			buffer [count] = alaw_encode [lrint (normfact * ptr [count])] ;
+ 		else
+ 			buffer [count] = 0x7F & alaw_encode [- lrint (normfact * ptr [count])] ;
+diff --git a/src/ulaw.c b/src/ulaw.c
+index e50b4cb5..b6070ade 100644
+--- a/src/ulaw.c
++++ b/src/ulaw.c
+@@ -19,6 +19,7 @@
+ #include	"sfconfig.h"
+ 
+ #include	
++#include	
+ 
+ #include	"sndfile.h"
+ #include	"common.h"
+@@ -827,7 +828,9 @@ s2ulaw_array (const short *ptr, int count, unsigned char *buffer)
+ static inline void
+ i2ulaw_array (const int *ptr, int count, unsigned char *buffer)
+ {	while (--count >= 0)
+-	{	if (ptr [count] >= 0)
++	{	if (ptr [count] == INT_MIN)
++			buffer [count] = ulaw_encode [INT_MAX >> (16 + 2)] ;
++		else if (ptr [count] >= 0)
+ 			buffer [count] = ulaw_encode [ptr [count] >> (16 + 2)] ;
+ 		else
+ 			buffer [count] = 0x7F & ulaw_encode [-ptr [count] >> (16 + 2)] ;
+@@ -847,7 +850,9 @@ f2ulaw_array (const float *ptr, int count, unsigned char *buffer, float normfact
+ static inline void
+ d2ulaw_array (const double *ptr, int count, unsigned char *buffer, double normfact)
+ {	while (--count >= 0)
+-	{	if (ptr [count] >= 0)
++	{	if (!isfinite (ptr [count]))
++			buffer [count] = 0 ;
++		else if (ptr [count] >= 0)
+ 			buffer [count] = ulaw_encode [lrint (normfact * ptr [count])] ;
+ 		else
+ 			buffer [count] = 0x7F & ulaw_encode [- lrint (normfact * ptr [count])] ;
+-- 
+2.11.0
+
diff --git a/buildroot/package/libsoxr/0001-Add-Libs.private-for-static-linking.patch b/buildroot/package/libsoxr/0001-Add-Libs.private-for-static-linking.patch
new file mode 100644
index 000000000..be96c6e64
--- /dev/null
+++ b/buildroot/package/libsoxr/0001-Add-Libs.private-for-static-linking.patch
@@ -0,0 +1,43 @@
+From 7d2d1039f303b6322ecb72eebae39b699fd28d19 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= 
+Date: Fri, 22 Feb 2019 01:31:11 +0100
+Subject: [PATCH] Add Libs.private in soxr.pc.in for static linking
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If libsoxr is build statically against libavutil other applications
+needs to know that they must link with `-lavutil` when building in a
+static context.
+
+Signed-off-by: Jörg Krause 
+---
+ CMakeLists.txt | 1 +
+ src/soxr.pc.in | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ee48f6c..714bd4d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -139,6 +139,7 @@ if (WITH_AVFFT OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD32_FOUND AND WI
+   if (AVUTIL_FOUND)
+     include_directories (${AVUTIL_INCLUDE_DIRS})
+     set (LIBS ${LIBS} ${AVUTIL_LIBRARIES})
++    set (PKGCONF_LIBS_PRIV ${PKGCONF_LIBS_PRIV} -lavutil)
+   endif ()
+ endif ()
+ 
+diff --git a/src/soxr.pc.in b/src/soxr.pc.in
+index 69d225b..6c530a6 100644
+--- a/src/soxr.pc.in
++++ b/src/soxr.pc.in
+@@ -2,4 +2,5 @@ Name: ${PROJECT_NAME}
+ Description: ${DESCRIPTION_SUMMARY}
+ Version: ${PROJECT_VERSION}
+ Libs: -L${LIB_INSTALL_DIR} -l${PROJECT_NAME}
++Libs.private: ${PKGCONF_LIBS_PRIV}
+ Cflags: -I${INCLUDE_INSTALL_DIR}
+-- 
+2.20.1
+
diff --git a/buildroot/package/libsoxr/0001-soxr.pc.in-add-avutil-libraries.patch b/buildroot/package/libsoxr/0001-soxr.pc.in-add-avutil-libraries.patch
deleted file mode 100644
index c36988a77..000000000
--- a/buildroot/package/libsoxr/0001-soxr.pc.in-add-avutil-libraries.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8c1edfc22f8b714062b149e3d80ab4357a1a4e49 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Thu, 22 Nov 2018 19:10:03 +0100
-Subject: [PATCH] soxr.pc.in: add avutil libraries
-
-Add ${AVUTIL_LIBRARIES} to soxr.pc.in so applications such as
-shairport-sync will know that they must link with -lavutil when
-building statically
-
-Fixes:
- - http://autobuild.buildroot.org/results/839c0ce6475accc1de7e8a180d4358edb6750c64
-
-Signed-off-by: Fabrice Fontaine 
-[Upstream status: https://sourceforge.net/p/soxr/code/merge-requests/2]
-[Thomas: move to Libs.private.]
-Signed-off-by: Thomas Petazzoni 
----
- src/soxr.pc.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/soxr.pc.in b/src/soxr.pc.in
-index 69d225b..ed212a8 100644
---- a/src/soxr.pc.in
-+++ b/src/soxr.pc.in
-@@ -2,4 +2,5 @@ Name: ${PROJECT_NAME}
- Description: ${DESCRIPTION_SUMMARY}
- Version: ${PROJECT_VERSION}
- Libs: -L${LIB_INSTALL_DIR} -l${PROJECT_NAME}
-+Libs.private: ${AVUTIL_LIBRARIES}
- Cflags: -I${INCLUDE_INSTALL_DIR}
--- 
-2.19.1
-
diff --git a/buildroot/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch b/buildroot/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch
new file mode 100644
index 000000000..ab9e64f0f
--- /dev/null
+++ b/buildroot/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch
@@ -0,0 +1,32 @@
+From 1e541293ac19c49f886220b64de6006c5c700144 Mon Sep 17 00:00:00 2001
+From: Romain Naour 
+Date: Sat, 12 Jan 2019 12:50:54 +0100
+Subject: [PATCH] Makefile: add -f option for ln to remove existing destination
+ files
+
+While reinstalling the library, all symlinks are present.
+Ask ln to remove them with -f.
+
+Signed-off-by: Romain Naour 
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index fd7d6c8..2683819 100644
+--- a/Makefile
++++ b/Makefile
+@@ -25,8 +25,8 @@ install: $(LIB) $(LIBA) libsquish.pc
+ 	$(INSTALL_FILE) $(LIBA) $(INSTALL_DIR)/$(LIB_PATH)
+ ifneq ($(USE_SHARED),0)
+ 	$(INSTALL_FILE) $(LIB) $(INSTALL_DIR)/$(LIB_PATH)
+-	ln -s $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/$(SOLIB)
+-	ln -s $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/libsquish.so
++	ln -sf $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/$(SOLIB)
++	ln -sf $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/libsquish.so
+ 	$(INSTALL_DIRECTORY) $(INSTALL_DIR)/$(LIB_PATH)/pkgconfig
+ 	$(INSTALL_FILE) libsquish.pc $(INSTALL_DIR)/$(LIB_PATH)/pkgconfig
+ endif
+-- 
+2.14.5
+
diff --git a/buildroot/package/libsquish/Config.in b/buildroot/package/libsquish/Config.in
index eabe6c54a..e93e97e57 100644
--- a/buildroot/package/libsquish/Config.in
+++ b/buildroot/package/libsquish/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBSQUISH
 	bool "libsquish"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on !BR2_STATIC_LIBS
 	help
 	  The libSquish library compresses images with the DXT standard
 	  (also known as S3TC). This standard is mainly used by OpenGL
@@ -9,5 +8,5 @@ config BR2_PACKAGE_LIBSQUISH
 
 	  http://sourceforge.net/projects/libsquish
 
-comment "libsquish needs a toolchain w/ C++, dynamic library"
-	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
+comment "libsquish needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/buildroot/package/libsquish/libsquish.hash b/buildroot/package/libsquish/libsquish.hash
index e68d28d66..06c96e977 100644
--- a/buildroot/package/libsquish/libsquish.hash
+++ b/buildroot/package/libsquish/libsquish.hash
@@ -1,3 +1,5 @@
 # From http://sourceforge.net/projects/libsquish/files
 sha1 51844b9a8bc815a27e2cc0ffbede5fee3ef75110 libsquish-1.15.tgz
 md5 c02645800131e55b519ff8dbe7284f93 libsquish-1.15.tgz
+# Locally calculated
+sha256 a6b8c383bf3ab28460d6507484d605dd722e03971606f0cd3032a3af682b63a5  LICENSE.txt
diff --git a/buildroot/package/libsquish/libsquish.mk b/buildroot/package/libsquish/libsquish.mk
index 67892dd9e..75d2cbd16 100644
--- a/buildroot/package/libsquish/libsquish.mk
+++ b/buildroot/package/libsquish/libsquish.mk
@@ -12,26 +12,29 @@ LIBSQUISH_STRIP_COMPONENTS = 0
 LIBSQUISH_LICENSE = MIT
 LIBSQUISH_LICENSE_FILES = LICENSE.txt
 
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBSQUISH_MAKE_ENV = USE_SHARED=0
+else
+LIBSQUISH_MAKE_ENV = USE_SHARED=1
+endif
+
 define LIBSQUISH_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+	$(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
 define LIBSQUISH_INSTALL_STAGING_CMDS
 	mkdir -p $(STAGING_DIR)/usr/include
 	mkdir -p $(STAGING_DIR)/usr/lib
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+	$(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D) \
 		install PREFIX=/usr INSTALL_DIR=$(STAGING_DIR)/usr
 	$(INSTALL) -D -m 644 $(@D)/libsquish.pc $(STAGING_DIR)/usr/lib/pkgconfig/libsquish.pc
-	ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so
-	ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so.0
 endef
 
 define LIBSQUISH_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/usr/include
 	mkdir -p $(TARGET_DIR)/usr/lib
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+	$(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D) \
 		install PREFIX=/usr INSTALL_DIR=$(TARGET_DIR)/usr
-	ln -sf libsquish.so.0.0 $(TARGET_DIR)/usr/lib/libsquish.so.0
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot/package/libssh/0001-buffer-Fix-size-comparison-with-count.patch b/buildroot/package/libssh/0001-buffer-Fix-size-comparison-with-count.patch
new file mode 100644
index 000000000..88e1bc3b4
--- /dev/null
+++ b/buildroot/package/libssh/0001-buffer-Fix-size-comparison-with-count.patch
@@ -0,0 +1,48 @@
+From 2aa8c46a853acd4198af16e417ebffd5b0e2c9f4 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider 
+Date: Mon, 1 Oct 2018 20:58:47 +0200
+Subject: [PATCH] buffer: Fix size comparison with count
+
+Signed-off-by: Andreas Schneider 
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit 9c3ba94960cd5
+
+ src/buffer.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/buffer.c b/src/buffer.c
+index da6e587fc9e4..b029f202660f 100644
+--- a/src/buffer.c
++++ b/src/buffer.c
+@@ -816,8 +816,8 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
+     ssh_string string = NULL;
+     char *cstring = NULL;
+     size_t needed_size = 0;
+-    size_t count;
+     size_t len;
++    int count; /* int for size comparison with argc */
+     int rc = SSH_OK;
+ 
+     for (p = format, count = 0; *p != '\0'; p++, count++) {
+@@ -934,7 +934,7 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
+     char *cstring;
+     bignum b;
+     size_t len;
+-    int count;
++    int count; /* int for size comparison with argc */
+ 
+     for (p = format, count = 0; *p != '\0'; p++, count++) {
+         /* Invalid number of arguments passed */
+@@ -1098,7 +1098,7 @@ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
+     } o;
+     size_t len, rlen, max_len;
+     va_list ap_copy;
+-    int count;
++    int count; /* int for size comparison with argc */
+ 
+     max_len = ssh_buffer_get_len(buffer);
+ 
+-- 
+2.20.1
+
diff --git a/buildroot/package/libssh/0002-buffer-Use-size_t-for-argc-argument-in-ssh_buffer_-u.patch b/buildroot/package/libssh/0002-buffer-Use-size_t-for-argc-argument-in-ssh_buffer_-u.patch
new file mode 100644
index 000000000..c86238a7a
--- /dev/null
+++ b/buildroot/package/libssh/0002-buffer-Use-size_t-for-argc-argument-in-ssh_buffer_-u.patch
@@ -0,0 +1,152 @@
+From 270d6aa2bb01f3430d07cce5f97b48b741e3df9c Mon Sep 17 00:00:00 2001
+From: Andreas Schneider 
+Date: Fri, 7 Dec 2018 12:06:03 +0100
+Subject: [PATCH] buffer: Use size_t for argc argument in ssh_buffer_(un)pack()
+
+Signed-off-by: Andreas Schneider 
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit c306a693f3fbe
+
+ include/libssh/buffer.h |  4 ++--
+ src/buffer.c            | 38 +++++++++++++++++++-------------------
+ 2 files changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/include/libssh/buffer.h b/include/libssh/buffer.h
+index 4721cbe06c20..1c375343ee14 100644
+--- a/include/libssh/buffer.h
++++ b/include/libssh/buffer.h
+@@ -40,11 +40,11 @@ void *ssh_buffer_allocate(struct ssh_buffer_struct *buffer, uint32_t len);
+ int ssh_buffer_allocate_size(struct ssh_buffer_struct *buffer, uint32_t len);
+ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
+                        const char *format,
+-                       int argc,
++                       size_t argc,
+                        va_list ap);
+ int _ssh_buffer_pack(struct ssh_buffer_struct *buffer,
+                      const char *format,
+-                     int argc,
++                     size_t argc,
+                      ...);
+ #define ssh_buffer_pack(buffer, format, ...) \
+     _ssh_buffer_pack((buffer), (format), __VA_NARG__(__VA_ARGS__), __VA_ARGS__, SSH_BUFFER_PACK_END)
+diff --git a/src/buffer.c b/src/buffer.c
+index b029f202660f..99863747fc3c 100644
+--- a/src/buffer.c
++++ b/src/buffer.c
+@@ -809,7 +809,7 @@ ssh_buffer_get_ssh_string(struct ssh_buffer_struct *buffer)
+  */
+ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
+                                        const char *format,
+-                                       int argc,
++                                       size_t argc,
+                                        va_list ap)
+ {
+     const char *p = NULL;
+@@ -817,12 +817,12 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
+     char *cstring = NULL;
+     size_t needed_size = 0;
+     size_t len;
+-    int count; /* int for size comparison with argc */
++    size_t count;
+     int rc = SSH_OK;
+ 
+     for (p = format, count = 0; *p != '\0'; p++, count++) {
+         /* Invalid number of arguments passed */
+-        if (argc != -1 && count > argc) {
++        if (count > argc) {
+             return SSH_ERROR;
+         }
+ 
+@@ -881,7 +881,7 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
+         }
+     }
+ 
+-    if (argc != -1 && argc != count) {
++    if (argc != count) {
+         return SSH_ERROR;
+     }
+ 
+@@ -891,11 +891,7 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
+          */
+         uint32_t canary = va_arg(ap, uint32_t);
+         if (canary != SSH_BUFFER_PACK_END) {
+-            if (argc == -1){
+-                return SSH_ERROR;
+-            } else {
+-                abort();
+-            }
++            abort();
+         }
+     }
+ 
+@@ -918,7 +914,7 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
+  */
+ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
+                        const char *format,
+-                       int argc,
++                       size_t argc,
+                        va_list ap)
+ {
+     int rc = SSH_ERROR;
+@@ -934,11 +930,15 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
+     char *cstring;
+     bignum b;
+     size_t len;
+-    int count; /* int for size comparison with argc */
++    size_t count;
++
++    if (argc > 256) {
++        return SSH_ERROR;
++    }
+ 
+     for (p = format, count = 0; *p != '\0'; p++, count++) {
+         /* Invalid number of arguments passed */
+-        if (argc != -1 && count > argc) {
++        if (count > argc) {
+             return SSH_ERROR;
+         }
+ 
+@@ -1010,7 +1010,7 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
+         }
+     }
+ 
+-    if (argc != -1 && argc != count) {
++    if (argc != count) {
+         return SSH_ERROR;
+     }
+ 
+@@ -1018,11 +1018,7 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
+         /* Check if our canary is intact, if not somthing really bad happened */
+         uint32_t canary = va_arg(ap, uint32_t);
+         if (canary != SSH_BUFFER_PACK_END) {
+-            if (argc == -1){
+-                return SSH_ERROR;
+-            } else {
+-                abort();
+-            }
++            abort();
+         }
+     }
+     return rc;
+@@ -1050,12 +1046,16 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
+  */
+ int _ssh_buffer_pack(struct ssh_buffer_struct *buffer,
+                      const char *format,
+-                     int argc,
++                     size_t argc,
+                      ...)
+ {
+     va_list ap;
+     int rc;
+ 
++    if (argc > 256) {
++        return SSH_ERROR;
++    }
++
+     va_start(ap, argc);
+     rc = ssh_buffer_pack_allocate_va(buffer, format, argc, ap);
+     va_end(ap);
+-- 
+2.20.1
+
diff --git a/buildroot/package/libssh/0003-more-strict-overflow-fixes.patch b/buildroot/package/libssh/0003-more-strict-overflow-fixes.patch
new file mode 100644
index 000000000..6232ee77e
--- /dev/null
+++ b/buildroot/package/libssh/0003-more-strict-overflow-fixes.patch
@@ -0,0 +1,122 @@
+From 7656b1be8dc5425d5af03ffa6af711599fc07e80 Mon Sep 17 00:00:00 2001
+From: Baruch Siach 
+Date: Tue, 22 Jan 2019 08:16:50 +0200
+Subject: [PATCH] buffer: Convert argc to size_t in ssh_buffer_unpack() as well
+
+Commit c306a693f3fb ("buffer: Use size_t for argc argument in
+ssh_buffer_(un)pack()") mentioned unpack in the commit log, but it only
+touches the pack variants. Extend the conversion to unpack.
+
+Pre-initialize the p pointer to avoid possible use before
+initialization in case of early argc check failure.
+
+This fixes build failure:
+
+.../libssh-0.8.6/src/buffer.c: In function 'ssh_buffer_unpack_va':
+.../libssh-0.8.6/src/buffer.c:1229:16: error: assuming signed overflow does not occur when simplifying conditional to constant [-Werror=strict-overflow]
+             if (argc == -1){
+		^
+
+Signed-off-by: Baruch Siach 
+---
+Upstream status: https://www.libssh.org/archive/libssh/2019-01/0000032.html
+
+ include/libssh/buffer.h |  4 ++--
+ src/buffer.c            | 25 +++++++++++++------------
+ 2 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/include/libssh/buffer.h b/include/libssh/buffer.h
+index 1c375343ee14..cd2dea6a7ecc 100644
+--- a/include/libssh/buffer.h
++++ b/include/libssh/buffer.h
+@@ -50,11 +50,11 @@ int _ssh_buffer_pack(struct ssh_buffer_struct *buffer,
+     _ssh_buffer_pack((buffer), (format), __VA_NARG__(__VA_ARGS__), __VA_ARGS__, SSH_BUFFER_PACK_END)
+ 
+ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
+-                         const char *format, int argc,
++                         const char *format, size_t argc,
+                          va_list ap);
+ int _ssh_buffer_unpack(struct ssh_buffer_struct *buffer,
+                        const char *format,
+-                       int argc,
++                       size_t argc,
+                        ...);
+ #define ssh_buffer_unpack(buffer, format, ...) \
+     _ssh_buffer_unpack((buffer), (format), __VA_NARG__(__VA_ARGS__), __VA_ARGS__, SSH_BUFFER_PACK_END)
+diff --git a/src/buffer.c b/src/buffer.c
+index 99863747fc3c..c8ad20f24e43 100644
+--- a/src/buffer.c
++++ b/src/buffer.c
+@@ -1082,11 +1082,11 @@ int _ssh_buffer_pack(struct ssh_buffer_struct *buffer,
+  */
+ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
+                          const char *format,
+-                         int argc,
++                         size_t argc,
+                          va_list ap)
+ {
+     int rc = SSH_ERROR;
+-    const char *p, *last;
++    const char *p = format, *last;
+     union {
+         uint8_t *byte;
+         uint16_t *word;
+@@ -1098,16 +1098,21 @@ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
+     } o;
+     size_t len, rlen, max_len;
+     va_list ap_copy;
+-    int count; /* int for size comparison with argc */
++    size_t count;
+ 
+     max_len = ssh_buffer_get_len(buffer);
+ 
+     /* copy the argument list in case a rollback is needed */
+     va_copy(ap_copy, ap);
+ 
+-    for (p = format, count = 0; *p != '\0'; p++, count++) {
++    if (argc > 256) {
++        rc = SSH_ERROR;
++        goto cleanup;
++    }
++
++    for (count = 0; *p != '\0'; p++, count++) {
+         /* Invalid number of arguments passed */
+-        if (argc != -1 && count > argc) {
++        if (count > argc) {
+             rc = SSH_ERROR;
+             goto cleanup;
+         }
+@@ -1217,7 +1222,7 @@ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
+         }
+     }
+ 
+-    if (argc != -1 && argc != count) {
++    if (argc != count) {
+         rc = SSH_ERROR;
+     }
+ 
+@@ -1226,11 +1231,7 @@ cleanup:
+         /* Check if our canary is intact, if not something really bad happened */
+         uint32_t canary = va_arg(ap, uint32_t);
+         if (canary != SSH_BUFFER_PACK_END){
+-            if (argc == -1){
+-                rc = SSH_ERROR;
+-            } else {
+-                abort();
+-            }
++            abort();
+         }
+     }
+ 
+@@ -1320,7 +1321,7 @@ cleanup:
+  */
+ int _ssh_buffer_unpack(struct ssh_buffer_struct *buffer,
+                        const char *format,
+-                       int argc,
++                       size_t argc,
+                        ...)
+ {
+     va_list ap;
+-- 
+2.20.1
+
diff --git a/buildroot/package/libssh/libssh.hash b/buildroot/package/libssh/libssh.hash
index 257b93cb6..7164c9106 100644
--- a/buildroot/package/libssh/libssh.hash
+++ b/buildroot/package/libssh/libssh.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://www.libssh.org/files/0.8/libssh-0.8.4.tar.xz.asc
+# https://www.libssh.org/files/0.8/libssh-0.8.7.tar.xz.asc
 # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
-sha256 6bb07713021a8586ba2120b2c36c468dc9ac8096d043f9b1726639aa4275b81b  libssh-0.8.4.tar.xz
-sha256 468cf08f784ef6fd3b3705b60dd8111e2b70fbb8f6549cd503665a6bbb3bc625  COPYING
+sha256 43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592  libssh-0.8.7.tar.xz
+sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a  COPYING
diff --git a/buildroot/package/libssh/libssh.mk b/buildroot/package/libssh/libssh.mk
index 1ef09b3a2..332f2a570 100644
--- a/buildroot/package/libssh/libssh.mk
+++ b/buildroot/package/libssh/libssh.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBSSH_VERSION_MAJOR = 0.8
-LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).4
+LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).7
 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
 LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
 LIBSSH_LICENSE = LGPL-2.1
diff --git a/buildroot/package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch b/buildroot/package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch
deleted file mode 100644
index 44eed2bac..000000000
--- a/buildroot/package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 28fe5e4de437f8fce6e428b7db9bc8640cda4c61 Mon Sep 17 00:00:00 2001
-From: Giulio Benetti 
-Date: Thu, 13 Sep 2018 09:51:35 +0200
-Subject: [PATCH] openssl: fix dereferencing ambiguity potentially causing
- build failure
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When dereferencing from *aes_ctr_cipher, being a pointer itself,
-ambiguity can occur with compiler and build can fail reporting:
-openssl.c:574:20: error: ‘*aes_ctr_cipher’ is a pointer; did you mean to use ‘->’?
-     *aes_ctr_cipher->nid = type;
-
-Sorround every *aes_ctr_cipher-> occurence with paranthesis like this
-(*aes_ctr_cipher)->
-
-Signed-off-by: Giulio Benetti 
-Upstream: https://github.com/libssh2/libssh2/commit/b5b6673c2823a18753a14571a6c01bde33fa3a8b
----
- src/openssl.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/openssl.c b/src/openssl.c
-index 678d5de..c26aaec 100644
---- a/src/openssl.c
-+++ b/src/openssl.c
-@@ -571,13 +571,13 @@ make_ctr_evp (size_t keylen, EVP_CIPHER **aes_ctr_cipher, int type)
-         EVP_CIPHER_meth_set_cleanup(*aes_ctr_cipher, aes_ctr_cleanup);
-     }
- #else
--    *aes_ctr_cipher->nid = type;
--    *aes_ctr_cipher->block_size = 16;
--    *aes_ctr_cipher->key_len = keylen;
--    *aes_ctr_cipher->iv_len = 16;
--    *aes_ctr_cipher->init = aes_ctr_init;
--    *aes_ctr_cipher->do_cipher = aes_ctr_do_cipher;
--    *aes_ctr_cipher->cleanup = aes_ctr_cleanup;
-+    (*aes_ctr_cipher)->nid = type;
-+    (*aes_ctr_cipher)->block_size = 16;
-+    (*aes_ctr_cipher)->key_len = keylen;
-+    (*aes_ctr_cipher)->iv_len = 16;
-+    (*aes_ctr_cipher)->init = aes_ctr_init;
-+    (*aes_ctr_cipher)->do_cipher = aes_ctr_do_cipher;
-+    (*aes_ctr_cipher)->cleanup = aes_ctr_cleanup;
- #endif
- 
-     return *aes_ctr_cipher;
--- 
-2.17.1
-
diff --git a/buildroot/package/libssh2/libssh2.hash b/buildroot/package/libssh2/libssh2.hash
index d57c8d706..c4732a2c0 100644
--- a/buildroot/package/libssh2/libssh2.hash
+++ b/buildroot/package/libssh2/libssh2.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 ec2b32b44ae5f8fe094f663f63953fb31314de838eb36e8c47e5a89137b5a1bc  libssh2-8b870ad771cbd9cd29edbb3dbb0878e950f868ab.tar.gz
+sha256 468e7a81a8121c06cb099eef2e17106b0b8c2e1d890b1c0e34e1951f182babb1  libssh2-1b3cbaff518f32e5b70650d4b7b52361b1410d37.tar.gz
 sha256 e15ed284a15e80115467d6d7f030f0d89d8fabbecd78fb6e0f861f0cfc128fd9  COPYING
diff --git a/buildroot/package/libssh2/libssh2.mk b/buildroot/package/libssh2/libssh2.mk
index 89cb73322..abee1f8c7 100644
--- a/buildroot/package/libssh2/libssh2.mk
+++ b/buildroot/package/libssh2/libssh2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSSH2_VERSION = 8b870ad771cbd9cd29edbb3dbb0878e950f868ab
+LIBSSH2_VERSION = 1b3cbaff518f32e5b70650d4b7b52361b1410d37
 LIBSSH2_SITE = $(call github,libssh2,libssh2,$(LIBSSH2_VERSION))
 LIBSSH2_LICENSE = BSD
 LIBSSH2_LICENSE_FILES = COPYING
@@ -26,9 +26,12 @@ LIBSSH2_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
 # linking
 LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`"
 else ifeq ($(BR2_PACKAGE_LIBSSH2_OPENSSL),y)
-LIBSSH2_DEPENDENCIES += openssl
+LIBSSH2_DEPENDENCIES += host-pkgconf openssl
 LIBSSH2_CONF_OPTS += --with-libssl-prefix=$(STAGING_DIR)/usr \
 	--with-crypto=openssl
+# configure.ac forgets to link to dependent libraries of openssl breaking static
+# linking
+LIBSSH2_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 endif
 
 # Add zlib support if enabled
diff --git a/buildroot/package/libtirpc/libtirpc.hash b/buildroot/package/libtirpc/libtirpc.hash
index 643a5d205..eacc94d1d 100644
--- a/buildroot/package/libtirpc/libtirpc.hash
+++ b/buildroot/package/libtirpc/libtirpc.hash
@@ -1,5 +1,5 @@
 # From sourceforge's info on download page:
-sha1 48adb32dc7c3b73c66f001c239da76b8398abf11  libtirpc-1.0.3.tar.bz2
+sha1 d85717035cb9bd6c45557a1eb1351d3af9a69ff7  libtirpc-1.1.4.tar.bz2
 # Locally computed
-sha256 86c3a78fc1bddefa96111dd233124c703b22a78884203c55c3e06b3be6a0fd5e  libtirpc-1.0.3.tar.bz2
+sha256 2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d  libtirpc-1.1.4.tar.bz2
 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7  COPYING
diff --git a/buildroot/package/libtirpc/libtirpc.mk b/buildroot/package/libtirpc/libtirpc.mk
index 36f9f7ef2..1e1905b71 100644
--- a/buildroot/package/libtirpc/libtirpc.mk
+++ b/buildroot/package/libtirpc/libtirpc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBTIRPC_VERSION = 1.0.3
+LIBTIRPC_VERSION = 1.1.4
 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2
 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION)
 LIBTIRPC_LICENSE = BSD-3-Clause
diff --git a/buildroot/package/libtommath/libtommath.hash b/buildroot/package/libtommath/libtommath.hash
index 359dfeda3..75aa7c7f1 100644
--- a/buildroot/package/libtommath/libtommath.hash
+++ b/buildroot/package/libtommath/libtommath.hash
@@ -1,2 +1,5 @@
 # Locally computed
-sha256 47032fb39d698ce4cf9c9c462c198e6b08790ce8203ad1224086b9b978636c69  ltm-1.0.1.tar.xz
+sha256 90466c88783d1fe9f5c2364a69f5479f10d73ed616011be6196f35f7f1537ead  ltm-1.1.0.tar.xz
+
+# Hashes for license files:
+sha256 2fa64b163659f41965c9815882a8296d3d03ff546b76153e11445f9bdecf955a  LICENSE
diff --git a/buildroot/package/libtommath/libtommath.mk b/buildroot/package/libtommath/libtommath.mk
index ceb2e6846..36e7a89e6 100644
--- a/buildroot/package/libtommath/libtommath.mk
+++ b/buildroot/package/libtommath/libtommath.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBTOMMATH_VERSION = 1.0.1
+LIBTOMMATH_VERSION = 1.1.0
 LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION)
 LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz
-LIBTOMMATH_LICENSE = WTFPL
+LIBTOMMATH_LICENSE = Unlicense
 LIBTOMMATH_LICENSE_FILES = LICENSE
 LIBTOMMATH_INSTALL_STAGING = YES
 LIBTOMMATH_INSTALL_TARGET = NO  # only static library
diff --git a/buildroot/package/libtool/libtool.mk b/buildroot/package/libtool/libtool.mk
index bf97ee12b..10af8cf71 100644
--- a/buildroot/package/libtool/libtool.mk
+++ b/buildroot/package/libtool/libtool.mk
@@ -7,12 +7,22 @@
 LIBTOOL_VERSION = 2.4.6
 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.xz
 LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
+
+# For the target variant, we only want to build/install libltdl
+LIBTOOL_SUBDIR = libltdl
+HOST_LIBTOOL_SUBDIR = .
+
 LIBTOOL_INSTALL_STAGING = YES
-LIBTOOL_CONF_ENV = HELP2MAN=true
+
+LIBTOOL_CONF_OPTS = --enable-ltdl-install
+
 LIBTOOL_DEPENDENCIES = host-m4
 HOST_LIBTOOL_DEPENDENCIES = host-m4
-LIBTOOL_LICENSE = GPL-2.0+
-LIBTOOL_LICENSE_FILES = COPYING
+
+LIBTOOL_LICENSE = LGPL-2.1+
+LIBTOOL_LICENSE_FILES = $(LIBTOOL_SUBDIR)/COPYING.LIB
+HOST_LIBTOOL_LICENSE = GPL-2.0+ (libtool), LGPL-2.1+ (libltdl)
+HOST_LIBTOOL_LICENSE_FILES = COPYING $(LIBTOOL_SUBDIR)/COPYING.LIB
 
 HOST_LIBTOOL_CONF_ENV = MAKEINFO=true
 HOST_LIBTOOL_LIBTOOL_PATCH = NO
diff --git a/buildroot/package/libtorrent-rasterbar/Config.in b/buildroot/package/libtorrent-rasterbar/Config.in
new file mode 100644
index 000000000..6c5508594
--- /dev/null
+++ b/buildroot/package/libtorrent-rasterbar/Config.in
@@ -0,0 +1,23 @@
+comment "libtorrent-rasterbar needs a toolchain w/ C++, threads, wchar, gcc >= 4.8"
+	depends on BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
+		!BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+
+config BR2_PACKAGE_LIBTORRENT_RASTERBAR
+	bool "libtorrent-rasterbar"
+	depends on BR2_INSTALL_LIBSTDCPP # boost
+	depends on BR2_HOST_GCC_AT_LEAST_4_8
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
+	depends on BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK
+	depends on BR2_USE_WCHAR # boost
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_BOOST_CHRONO
+	select BR2_PACKAGE_BOOST_SYSTEM
+	select BR2_PACKAGE_BOOST_RANDOM
+	select BR2_PACKAGE_OPENSSL
+	help
+	  libtorrent is a feature complete C++ bittorrent implementation
+	  focusing on efficiency and scalability.
+
+	  https://www.libtorrent.org/
diff --git a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash
new file mode 100644
index 000000000..e38c0f4f1
--- /dev/null
+++ b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 7c23deba7fa279825642307587609d51c9935ac7606e0ef2f2d0ba10728b5847 libtorrent-rasterbar-1.1.11.tar.gz
+sha256 f3a5dd1558cce616b12edad521427ec8976ce2bb0af33f7f359cfa648bf55ad8 COPYING
diff --git a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk
new file mode 100644
index 000000000..24bd011ae
--- /dev/null
+++ b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# libtorrent-rasterbar
+#
+################################################################################
+
+LIBTORRENT_RASTERBAR_VERSION = 1.1.11
+LIBTORRENT_RASTERBAR_SITE = https://github.com/arvidn/libtorrent/releases/download/libtorrent_$(subst .,_,$(LIBTORRENT_RASTERBAR_VERSION))
+LIBTORRENT_RASTERBAR_LICENSE = BSD-3-Clause
+LIBTORRENT_RASTERBAR_LICENSE_FILES = COPYING
+LIBTORRENT_RASTERBAR_DEPENDENCIES = host-pkgconf boost openssl
+LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES
+LIBTORRENT_RASTERBAR_CONF_OPTS = \
+	--with-boost-libdir=$(STAGING_DIR)/usr/lib \
+	--disable-invariant-checks
+LIBTORRENT_RASTERBAR_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
+
+ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y)
+LIBTORRENT_RASTERBAR_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+LIBTORRENT_RASTERBAR_CONF_OPTS += --with-libiconv
+else
+LIBTORRENT_RASTERBAR_CONF_OPTS += --without-libiconv
+endif
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch b/buildroot/package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch
new file mode 100644
index 000000000..6a09821da
--- /dev/null
+++ b/buildroot/package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch
@@ -0,0 +1,51 @@
+From c70d326f3ae88aa2dca903fb17a1f18d3b45a2ca Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 8 Feb 2019 16:45:32 +0100
+Subject: [PATCH] configure.ac: fix build with openssl
+
+- Add a call to PKG_CHECK_MODULES to get openssl libraries and its
+  dependencies if openssl support is enabled
+- Add OPENSSL_LIBS to libupnp.pc.in so that applications linking with
+  pupnp (such as mpd) will be able to retrieve openssl libraries
+
+Fixes:
+ - http://autobuild.buildroot.org/results/a4148e516070b79816769f3443fc24d6d8192073
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/mrjimenez/pupnp/pull/105]
+---
+ configure.ac  | 5 +++++
+ libupnp.pc.in | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 670d363..190b30c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -722,6 +722,11 @@ AC_COMPILE_IFELSE(
+ 			AC_MSG_ERROR([pthread_rwlock_t not available])])])
+ echo "-------------------------------------------------------------------------------"
+ 
++if test "x$enable_open_ssl" = xyes ; then
++	PKG_CHECK_MODULES(OPENSSL, libssl,
++		[LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"],
++		[AC_MSG_ERROR([openssl not found])])
++fi
+ 
+ AC_CONFIG_FILES([
+ 	Makefile
+diff --git a/libupnp.pc.in b/libupnp.pc.in
+index bd2d7b3..54cba90 100644
+--- a/libupnp.pc.in
++++ b/libupnp.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libupnp
+ Description: Linux SDK for UPnP Devices
+ Version: @VERSION@
+-Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml
++Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml @OPENSSL_LIBS@
+ Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
+ 
+-- 
+2.14.1
+
diff --git a/buildroot/package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch b/buildroot/package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch
new file mode 100644
index 000000000..601ea89be
--- /dev/null
+++ b/buildroot/package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch
@@ -0,0 +1,39 @@
+From 04b454f693d0c71336252380d08f1d02967e133e Mon Sep 17 00:00:00 2001
+From: Jean-Francois Dockes 
+Date: Sun, 27 Jan 2019 10:44:17 +0100
+Subject: [PATCH] Do not try to detach detached thread, the result is
+ undefined. Fixes issue #102
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes runtime crash with musl 1.1.20+. The problem is that libupnp is
+calling pthread_detach() on a thread which was created in the detached state.
+
+Backported from: 04b454f693d0c71336252380d08f1d02967e133e
+
+(cherry picked from commit 386b7ed79146ecf7a3bba49f48cb8f41a9b49170)
+Signed-off-by: Jörg Krause 
+---
+ upnp/src/threadutil/ThreadPool.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c
+index d272907..5e590ed 100644
+--- a/upnp/src/threadutil/ThreadPool.c
++++ b/upnp/src/threadutil/ThreadPool.c
+@@ -651,11 +651,6 @@ static int CreateWorker(
+ 	rc = ithread_create(&temp, &attr, WorkerThread, tp);
+ 	ithread_attr_destroy(&attr);
+ 	if (rc == 0) {
+-		rc = ithread_detach(temp);
+-		/* ithread_detach will return EINVAL if thread has been
+-		 successfully detached by ithread_create */
+-		if (rc == EINVAL)
+-			rc = 0;
+ 		tp->pendingWorkerThreadStart = 1;
+ 		/* wait until the new worker thread starts */
+ 		while (tp->pendingWorkerThreadStart) {
+-- 
+2.21.0
+
diff --git a/buildroot/package/libupnp18/libupnp18.mk b/buildroot/package/libupnp18/libupnp18.mk
index 13536b8f7..35e8dc4a4 100644
--- a/buildroot/package/libupnp18/libupnp18.mk
+++ b/buildroot/package/libupnp18/libupnp18.mk
@@ -11,11 +11,13 @@ LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no
 LIBUPNP18_INSTALL_STAGING = YES
 LIBUPNP18_LICENSE = BSD-3-Clause
 LIBUPNP18_LICENSE_FILES = COPYING
+LIBUPNP18_DEPENDENCIES = host-pkgconf
+# We're patching configure.ac
+LIBUPNP18_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBUPNP18_CONF_OPTS += --enable-open-ssl
-LIBUPNP18_DEPENDENCIES += host-pkgconf openssl
-LIBUPNP18_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`"
+LIBUPNP18_DEPENDENCIES += openssl
 else
 LIBUPNP18_CONF_OPTS += --disable-open-ssl
 endif
diff --git a/buildroot/package/libupnpp/0001-Fix-cross-compilation-with-uclibc-on-arm-m68k.patch b/buildroot/package/libupnpp/0001-Fix-cross-compilation-with-uclibc-on-arm-m68k.patch
deleted file mode 100644
index 2c0a4ec79..000000000
--- a/buildroot/package/libupnpp/0001-Fix-cross-compilation-with-uclibc-on-arm-m68k.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2828c2535d4380419ec5114cc3a0564d3686aba9 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Fri, 4 May 2018 11:45:59 +0200
-Subject: [PATCH] Fix cross-compilation with uclibc on arm/m68k
-
-Commit 3f1132ecd27186fa3f1a87ead6a0389802baccbb breaks cross-compilation
-with uclibc on arm and m68k because host_os is set to
-arm-buildroot-uclinux-uclibc or m68k-buildroot-uclinux-uclibc so add
-uclinux to the linux case
-
-Fixes:
- - http://autobuild.buildroot.net/results/cfb332a169863bcb3e6bc6ee7d6f6199f856b0b8
- - http://autobuild.buildroot.net/results/2f6f464f6360ed9ea4c238f503d2c3b8ab3cbd86
-
-[Sent upstream]: https://opensourceprojects.eu/p/libupnpp/code/merge-requests/3
-Signed-off-by: Fabrice Fontaine 
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8903b72..3bb354c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,7 +35,7 @@ build_linux=no
- build_mac=no
- # Detect the target system
- case "${host_os}" in
--    linux*) build_linux=yes;;
-+    linux*|uclinux*) build_linux=yes;;
-     darwin*) build_mac=yes;;
-     *) AC_MSG_ERROR(["OS $host_os is not supported"]);;
- esac
--- 
-2.14.1
-
diff --git a/buildroot/package/libupnpp/Config.in b/buildroot/package/libupnpp/Config.in
index 32877ff56..a71eff542 100644
--- a/buildroot/package/libupnpp/Config.in
+++ b/buildroot/package/libupnpp/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBUPNPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBCURL
-	select BR2_PACKAGE_LIBUPNP
+	select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP
 	help
 	  The libupnpp C++ library wraps libupnp for easier use by
 	  upmpdcli and upplay.
diff --git a/buildroot/package/libupnpp/libupnpp.hash b/buildroot/package/libupnpp/libupnpp.hash
index 742a0c7f6..f08c3a4f2 100644
--- a/buildroot/package/libupnpp/libupnpp.hash
+++ b/buildroot/package/libupnpp/libupnpp.hash
@@ -1,5 +1,5 @@
-# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.16.1.tar.gz.sha256
-sha256  d2ab5a4bb6df035ddddd11542bd4631ab7031354259145f07fbc3c56a8f50fac  libupnpp-0.16.1.tar.gz
+# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.0.tar.gz.sha256
+sha256  7035dda48207c254cbd8cd64e4e679a9e5f085a35d28c19bc2ddeba0deaff58b  libupnpp-0.17.0.tar.gz
 
 # Hash for license file:
 sha256  00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2  COPYING
diff --git a/buildroot/package/libupnpp/libupnpp.mk b/buildroot/package/libupnpp/libupnpp.mk
index 852a72e82..3619050f1 100644
--- a/buildroot/package/libupnpp/libupnpp.mk
+++ b/buildroot/package/libupnpp/libupnpp.mk
@@ -4,14 +4,13 @@
 #
 ################################################################################
 
-LIBUPNPP_VERSION = 0.16.1
+LIBUPNPP_VERSION = 0.17.0
 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
 LIBUPNPP_LICENSE = LGPL-2.1+
 LIBUPNPP_LICENSE_FILES = COPYING
 LIBUPNPP_INSTALL_STAGING = YES
-LIBUPNPP_DEPENDENCIES = expat libcurl libupnp
-# We're patching configure.ac
-LIBUPNPP_AUTORECONF = YES
+LIBUPNPP_DEPENDENCIES = expat libcurl \
+	$(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
 
 # configure script fails to link against the dependencies of libupnp
 # and libcurl causing detection to fail when statically linking
diff --git a/buildroot/package/liburiparser/liburiparser.hash b/buildroot/package/liburiparser/liburiparser.hash
index f71dd5cc7..bbdb37329 100644
--- a/buildroot/package/liburiparser/liburiparser.hash
+++ b/buildroot/package/liburiparser/liburiparser.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  ec67eb34feda8eac166f281799f03ed48387694fca44f6f5852f61f8fb535e2c  uriparser-0.9.0.tar.bz2
+sha256  75248f3de3b7b13c8c9735ff7b86ebe72cbb8ad043291517d7d53488e0893abe  uriparser-0.9.1.tar.bz2
 sha256  ee90029e62d11f48faa59360d15c3ad8e7c094c74cc25b055716d92340da561f  COPYING
diff --git a/buildroot/package/liburiparser/liburiparser.mk b/buildroot/package/liburiparser/liburiparser.mk
index 62bc8d30d..529f70190 100644
--- a/buildroot/package/liburiparser/liburiparser.mk
+++ b/buildroot/package/liburiparser/liburiparser.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBURIPARSER_VERSION = 0.9.0
+LIBURIPARSER_VERSION = 0.9.1
 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2
 LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION)
 LIBURIPARSER_LICENSE = BSD-3-Clause
diff --git a/buildroot/package/libuv/libuv.hash b/buildroot/package/libuv/libuv.hash
index 0a039480a..8f11743b5 100644
--- a/buildroot/package/libuv/libuv.hash
+++ b/buildroot/package/libuv/libuv.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  30af979c4f4b8d1b895ae6d115f7400c751542ccb9e656350fc89fda08d4eabd  libuv-v1.23.2.tar.gz
+sha256  ce3036d444c3fb4f9a9e2994bec1f4fa07872b01456998b422ce918fdc55c254  libuv-v1.25.0.tar.gz
 sha256  6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b  LICENSE
diff --git a/buildroot/package/libuv/libuv.mk b/buildroot/package/libuv/libuv.mk
index ff3903b56..fec6659ed 100644
--- a/buildroot/package/libuv/libuv.mk
+++ b/buildroot/package/libuv/libuv.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBUV_VERSION = v1.23.2
+LIBUV_VERSION = v1.25.0
 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION))
 LIBUV_DEPENDENCIES = host-pkgconf
 LIBUV_INSTALL_STAGING = YES
diff --git a/buildroot/package/libv4l/libv4l.hash b/buildroot/package/libv4l/libv4l.hash
index 2b01c1a71..231a471b9 100644
--- a/buildroot/package/libv4l/libv4l.hash
+++ b/buildroot/package/libv4l/libv4l.hash
@@ -1,6 +1,6 @@
 # Locally calculated after checking signature
-# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.2.tar.bz2.asc
-sha256 6c3208c9a1c73455d30bae83096d161e57bec5008594f270a2a67df8c86d8e47  v4l-utils-1.16.2.tar.bz2
+# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.3.tar.bz2.asc
+sha256 7c5c0d49c130cf65d384f28e9f3a53c5f7d17bf18740c48c40810e0fbbed5b54  v4l-utils-1.16.3.tar.bz2
 # Locally calculated
 sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a  COPYING
 sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78  COPYING.libv4l
diff --git a/buildroot/package/libv4l/libv4l.mk b/buildroot/package/libv4l/libv4l.mk
index 6b5b7bd2e..fe1ffbcf5 100644
--- a/buildroot/package/libv4l/libv4l.mk
+++ b/buildroot/package/libv4l/libv4l.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBV4L_VERSION = 1.16.2
+LIBV4L_VERSION = 1.16.3
 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
 LIBV4L_INSTALL_STAGING = YES
@@ -45,6 +45,7 @@ LIBV4L_DEPENDENCIES += libgl
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+LIBV4L_CONF_OPTS += --with-udevdir=/usr/lib/udev
 LIBV4L_DEPENDENCIES += udev
 endif
 
@@ -72,9 +73,6 @@ LIBV4L_CONF_ENV += \
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 endif
-else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y)
-LIBV4L_CONF_OPTS += --enable-qv4l2
-LIBV4L_DEPENDENCIES += qt
 else
 LIBV4L_CONF_OPTS += --disable-qv4l2
 endif
diff --git a/buildroot/package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch b/buildroot/package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch
new file mode 100644
index 000000000..81591fbbd
--- /dev/null
+++ b/buildroot/package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch
@@ -0,0 +1,71 @@
+From 3db0c4838fe30fcee5beb8b31ca67d5cf7d77fb3 Mon Sep 17 00:00:00 2001
+From: Haihao Xiang 
+Date: Fri, 7 Dec 2018 13:31:43 +0800
+Subject: [PATCH 1/1] Check the interface from libva first
+
+This fixes https://github.com/intel/intel-vaapi-driver/issues/419
+
+Signed-off-by: Haihao Xiang 
+[james.hilliard1@gmail.com: backport from upstream commit
+f139dafa59172d40543f2ec469a035d3de9fdc6a]
+Signed-off-by: James Hilliard 
+---
+ src/i965_output_wayland.c | 27 ++++++++++++++++-----------
+ 1 file changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c
+index 122db95..a637552 100644
+--- a/src/i965_output_wayland.c
++++ b/src/i965_output_wayland.c
+@@ -397,6 +397,7 @@ i965_output_wayland_init(VADriverContextP ctx)
+     struct i965_driver_data * const i965 = i965_driver_data(ctx);
+     struct dso_handle *dso_handle;
+     struct wl_vtable *wl_vtable;
++    struct VADriverVTableWayland * const vtable = ctx->vtable_wayland;
+ 
+     static const struct dso_symbol libegl_symbols[] = {
+         {
+@@ -465,25 +466,29 @@ i965_output_wayland_init(VADriverContextP ctx)
+     if (!i965->wl_output)
+         goto error;
+ 
+-    i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME);
+-    if (!i965->wl_output->libegl_handle) {
+-        i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK);
+-        if (!i965->wl_output->libegl_handle)
++    wl_vtable = &i965->wl_output->vtable;
++
++    if (vtable->wl_interface)
++        wl_vtable->drm_interface = vtable->wl_interface;
++    else {
++        i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME);
++        if (!i965->wl_output->libegl_handle) {
++            i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK);
++            if (!i965->wl_output->libegl_handle)
++                goto error;
++        }
++
++        dso_handle = i965->wl_output->libegl_handle;
++        if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
++                             libegl_symbols))
+             goto error;
+     }
+ 
+-    dso_handle = i965->wl_output->libegl_handle;
+-    wl_vtable  = &i965->wl_output->vtable;
+-    if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
+-                         libegl_symbols))
+-        goto error;
+-
+     i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME);
+     if (!i965->wl_output->libwl_client_handle)
+         goto error;
+ 
+     dso_handle = i965->wl_output->libwl_client_handle;
+-    wl_vtable  = &i965->wl_output->vtable;
+     if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
+                          libwl_client_symbols))
+         goto error;
+-- 
+2.7.4
+
diff --git a/buildroot/package/libva-intel-driver/0001-check-ssp.patch b/buildroot/package/libva-intel-driver/0001-check-ssp.patch
deleted file mode 100644
index c801ed314..000000000
--- a/buildroot/package/libva-intel-driver/0001-check-ssp.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From bf08643583520b763150af9ed20166b7fe272fd5 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls 
-Date: Sun, 29 Jul 2018 20:55:23 +0200
-Subject: [PATCH] Check for -fstack-protector
-
-Not all toolchains provide support for -fstack-protector. This patch
-provides a configure check to avoid build errors like
-
-/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared
-/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp
-
-Patch sent upstream as PR 408.
-
-Signed-off-by: Bernd Kuhls 
----
- configure.ac    | 17 +++++++++++++++++
- src/Makefile.am |  5 ++++-
- 2 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c76060c7..5471aee7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,6 +86,23 @@ AC_SEARCH_LIBS([dlopen], [dl], [], [
-   AC_MSG_ERROR([unable to find the dlopen() function])
- ])
- 
-+
-+# Check for -fstack-protector
-+ssp_cc=yes
-+if test "X$CC-cc" != "X"; then
-+    AC_MSG_CHECKING([whether ${CC-cc} accepts -fstack-protector])
-+    ssp_old_cflags="$CFLAGS"
-+    CFLAGS="$CFLAGS -fstack-protector"
-+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])], [], [ssp_cc=no])
-+    AC_MSG_RESULT([$ssp_cc])
-+    if test "X$ssp_cc" = "Xno"; then
-+        CFLAGS="$ssp_old_cflags"
-+    else
-+        AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
-+    fi
-+fi
-+AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes")
-+
- dnl Check for recent enough DRM
- LIBDRM_VERSION=libdrm_version
- PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION libdrm_intel])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c26293dd..5c52658a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -35,9 +35,12 @@ AM_CPPFLAGS = \
- driver_cflags = \
- 	-Wall			\
- 	-fvisibility=hidden	\
--	-fstack-protector	\
- 	$(NULL)
- 
-+if USE_SSP
-+driver_cflags += -fstack-protector
-+endif
-+
- driver_ldflags = \
- 	-avoid-version		\
- 	-no-undefined		\
diff --git a/buildroot/package/libva-intel-driver/libva-intel-driver.hash b/buildroot/package/libva-intel-driver/libva-intel-driver.hash
index 0509ff8d6..8c01271ae 100644
--- a/buildroot/package/libva-intel-driver/libva-intel-driver.hash
+++ b/buildroot/package/libva-intel-driver/libva-intel-driver.hash
@@ -1,5 +1,5 @@
 # From https://github.com/intel/intel-vaapi-driver/releases
-sha1 0934f97ddcaf4e633f59d049226723239b645b33  intel-vaapi-driver-2.2.0.tar.bz2
+sha1 89096f99da753ac5858304e6c17f5dd9e7581d5b  intel-vaapi-driver-2.3.0.tar.bz2
 # Locally computed
-sha256 e8a5f54694eb76aad42653b591030b8a53b1513144c09a80defb3d8d8c875c18  intel-vaapi-driver-2.2.0.tar.bz2
+sha256 5c2e5deab024a0a6ae81dfe77ef455542a88d824eda7bfd07684337407ecdfe3  intel-vaapi-driver-2.3.0.tar.bz2
 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de  COPYING
diff --git a/buildroot/package/libva-intel-driver/libva-intel-driver.mk b/buildroot/package/libva-intel-driver/libva-intel-driver.mk
index 48564ca48..76cdfee38 100644
--- a/buildroot/package/libva-intel-driver/libva-intel-driver.mk
+++ b/buildroot/package/libva-intel-driver/libva-intel-driver.mk
@@ -4,14 +4,12 @@
 #
 ################################################################################
 
-LIBVA_INTEL_DRIVER_VERSION = 2.2.0
+LIBVA_INTEL_DRIVER_VERSION = 2.3.0
 LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2
 LIBVA_INTEL_DRIVER_SITE = \
 	https://github.com/intel/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION)
 LIBVA_INTEL_DRIVER_LICENSE = MIT
 LIBVA_INTEL_DRIVER_LICENSE_FILES = COPYING
-# 0001-check-ssp.patch
-LIBVA_INTEL_DRIVER_AUTORECONF = YES
 LIBVA_INTEL_DRIVER_DEPENDENCIES = host-pkgconf libdrm libva
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
diff --git a/buildroot/package/libva-utils/0002-Fix-build-failure-when-x11-support-is-disabled.patch b/buildroot/package/libva-utils/0002-Fix-build-failure-when-x11-support-is-disabled.patch
new file mode 100644
index 000000000..b14b662ab
--- /dev/null
+++ b/buildroot/package/libva-utils/0002-Fix-build-failure-when-x11-support-is-disabled.patch
@@ -0,0 +1,33 @@
+From ad66d3c202eb72ac5808f13a0489ac836dc55aac Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls 
+Date: Mon, 11 Feb 2019 20:31:42 +0100
+Subject: [PATCH] Fix build failure when x11 support is disabled
+
+Patch suggested on upstream bug tracker:
+https://github.com/intel/libva-utils/issues/150#issuecomment-462059528
+
+Signed-off-by: Bernd Kuhls 
+---
+ Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d28175a..12da79e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,10 +24,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = common decode encode vainfo videoprocess vendor/intel vendor/intel/sfcsample
++SUBDIRS = common decode encode vainfo videoprocess vendor/intel
+ 
+ if USE_X11
+-SUBDIRS += putsurface
++SUBDIRS += putsurface vendor/intel/sfcsample
+ else
+ if USE_WAYLAND
+ SUBDIRS += putsurface
+-- 
+2.20.1
+
diff --git a/buildroot/package/libva-utils/libva-utils.hash b/buildroot/package/libva-utils/libva-utils.hash
index e86cb6e09..4bd015002 100644
--- a/buildroot/package/libva-utils/libva-utils.hash
+++ b/buildroot/package/libva-utils/libva-utils.hash
@@ -1,5 +1,5 @@
 # From https://github.com/intel/libva-utils/releases
-sha1 ef15d40d6bec847c74f21ee3431b7e7b06fec3b4  libva-utils-2.2.0.tar.bz2
+sha1 98121e21dd3c679d06b1068a1b5f32246533099b  libva-utils-2.4.0.tar.bz2
 # Locally computed
-sha256 ed7a6ed1fab657df4e83ea11f90310efcf31c27828f32d65351a28ca3c404dc0  libva-utils-2.2.0.tar.bz2
+sha256 5b7d1954b40fcb2c0544be20125c71a0852049715ab85a3e8aba60434a40c6b3  libva-utils-2.4.0.tar.bz2
 sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50  COPYING
diff --git a/buildroot/package/libva-utils/libva-utils.mk b/buildroot/package/libva-utils/libva-utils.mk
index 348d41974..be857bb4f 100644
--- a/buildroot/package/libva-utils/libva-utils.mk
+++ b/buildroot/package/libva-utils/libva-utils.mk
@@ -4,13 +4,20 @@
 #
 ################################################################################
 
-LIBVA_UTILS_VERSION = 2.2.0
+LIBVA_UTILS_VERSION = 2.4.0
 LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2
 LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION)
 LIBVA_UTILS_LICENSE = MIT
 LIBVA_UTILS_LICENSE_FILES = COPYING
 # 0001-check-ssp.patch
+# 0002-Fix-build-failure-when-x11-support-is-disabled.patch
 LIBVA_UTILS_AUTORECONF = YES
 LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva
 
+define LIBVA_UTILS_CREATE_M4_DIR
+	@mkdir -p $(@D)/m4
+endef
+
+LIBVA_UTILS_POST_EXTRACT_HOOKS += LIBVA_UTILS_CREATE_M4_DIR
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/libva/libva.hash b/buildroot/package/libva/libva.hash
index 333bb1d78..06b7de576 100644
--- a/buildroot/package/libva/libva.hash
+++ b/buildroot/package/libva/libva.hash
@@ -1,5 +1,5 @@
-# From https://github.com/intel/libva/releases
-sha1 e1138529355cce78fa2edc7c5b1c5aeb40dd0ce5  libva-2.3.0.tar.bz2
+# From https://github.com/intel/libva/releases/download/2.4.0/libva-2.4.0.tar.bz2.sha1sum
+sha1 2e7b69ebb615d039b9253d4708eeec889b812dbf  libva-2.4.0.tar.bz2
 # Locally computed
-sha256 60840e50da6932ee2111e15fc8911180ff8a0d6f18bb9cc6ba8c1030098fdce4  libva-2.3.0.tar.bz2
+sha256 99263056c21593a26f2ece812aee6fe60142b49e6cd46cb33c8dddf18fc19391  libva-2.4.0.tar.bz2
 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de  COPYING
diff --git a/buildroot/package/libva/libva.mk b/buildroot/package/libva/libva.mk
index 9a70bb83f..8a21c11b6 100644
--- a/buildroot/package/libva/libva.mk
+++ b/buildroot/package/libva/libva.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBVA_VERSION = 2.3.0
+LIBVA_VERSION = 2.4.0
 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2
 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION)
 LIBVA_LICENSE = MIT
@@ -30,6 +30,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_WAYLAND),y)
 LIBVA_DEPENDENCIES += wayland
+LIBVA_CONF_ENV += ac_cv_path_WAYLAND_SCANNER=$(HOST_DIR)/usr/bin/wayland-scanner
 LIBVA_CONF_OPTS += --enable-wayland
 else
 LIBVA_CONF_OPTS += --disable-wayland
diff --git a/buildroot/package/libvips/libvips.mk b/buildroot/package/libvips/libvips.mk
index 8078e046d..7622f32fb 100644
--- a/buildroot/package/libvips/libvips.mk
+++ b/buildroot/package/libvips/libvips.mk
@@ -68,9 +68,9 @@ else
 LIBVIPS_CONF_OPTS += --without-tiff
 endif
 
-ifeq ($(BR2_PACKAGE_FFTW),y)
+ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y)
 LIBVIPS_CONF_OPTS += --with-fftw
-LIBVIPS_DEPENDENCIES += fftw
+LIBVIPS_DEPENDENCIES += fftw-double
 else
 LIBVIPS_CONF_OPTS += --without-fftw
 endif
diff --git a/buildroot/package/libwebsock/0002-fix-ssl.patch b/buildroot/package/libwebsock/0002-fix-ssl.patch
index 51b9b3682..f57753871 100644
--- a/buildroot/package/libwebsock/0002-fix-ssl.patch
+++ b/buildroot/package/libwebsock/0002-fix-ssl.patch
@@ -1,26 +1,21 @@
 config: fix SSL detection
 
-The @WEBSOCK_HAVE_SSL@ is not replaced at configure time, and even if
-it was, it would be replaced by an empty string if openssl is disabled,
-thus still defining WEBSOCK_HAVE_SSL when we would not want it.
+The @WEBSOCK_HAVE_SSL@ is replaced at configure time with either a 1 or 0.
+The rest of the code is simply checking to see if WEBSOCK_HAVE_SSL is
+defined at all. Using a #undef WEBSOCK_HAVE_SSL will cause configure
+to either comment it out or change the line to
+"#define WEBSOCK_HAVE_SSL 1".
 
-Instead, rely on config.h, which is properly generated by ./configure,
-to provide the information about whether openssl is enabled or not.
-
-Signed-off-by: "Yann E. MORIN" 
+Signed-off-by: Clayton Shotwell 
 
 diff -durN a/src/websock_config.h.in b/src/websock_config.h.in
 --- a/src/websock_config.h.in
 +++ b/src/websock_config.h.in
-@@ -1,9 +1,10 @@
- #ifndef WEBSOCK_CONFIG_H
- #define WEBSOCK_CONFIG_H 1
- 
-+#include "config.h"
-+
+@@ -4,6 +4,6 @@
  #define WEBSOCK_PACKAGE_STRING @WEBSOCK_PACKAGE_STRING@
  #define WEBSOCK_PACKAGE_VERSION @WEBSOCK_PACKAGE_VERSION@
  #define WEBSOCK_PACKAGE_NAME @WEBSOCK_PACKAGE_NAME@
 -#define WEBSOCK_HAVE_SSL @WEBSOCK_HAVE_SSL@
++#undef WEBSOCK_HAVE_SSL
  
  #endif
diff --git a/buildroot/package/libxml2/0001-CVE-2017-8872.patch b/buildroot/package/libxml2/0001-CVE-2017-8872.patch
deleted file mode 100644
index b7a75c19a..000000000
--- a/buildroot/package/libxml2/0001-CVE-2017-8872.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8b329effb610f4138e4e680f6a6867570f6d6179 Mon Sep 17 00:00:00 2001
-From: Baruch Siach 
-Date: Fri, 9 Feb 2018 10:58:11 +0200
-Subject: [PATCH] CVE-2017-8872
-
-Taken from attachment to upstream bug report comment #9.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=775200#c9
-https://bugzilla.gnome.org/attachment.cgi?id=366193&action=diff
-
-Signed-off-by: Baruch Siach 
----
- parser.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 1c5e036ea265..025111067ae8 100644
---- a/parser.c
-+++ b/parser.c
-@@ -12467,6 +12467,10 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
- 	ctxt->input->cur = BAD_CAST"";
- 	ctxt->input->base = ctxt->input->cur;
-         ctxt->input->end = ctxt->input->cur;
-+    if (ctxt->input->buf)
-+        xmlBufEmpty (ctxt->input->buf->buffer);
-+    else
-+        ctxt->input->length = 0;
-     }
- }
- 
--- 
-2.15.1
-
diff --git a/buildroot/package/libxml2/libxml2.hash b/buildroot/package/libxml2/libxml2.hash
index d114d9806..ce8f5ef7f 100644
--- a/buildroot/package/libxml2/libxml2.hash
+++ b/buildroot/package/libxml2/libxml2.hash
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256	0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732	libxml2-2.9.8.tar.gz
+sha256	94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871	libxml2-2.9.9.tar.gz
 # License files, locally calculated
 sha256	c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd	COPYING
diff --git a/buildroot/package/libxml2/libxml2.mk b/buildroot/package/libxml2/libxml2.mk
index 06a802eb1..f4b4de090 100644
--- a/buildroot/package/libxml2/libxml2.mk
+++ b/buildroot/package/libxml2/libxml2.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBXML2_VERSION = 2.9.8
-LIBXML2_SITE = ftp://xmlsoft.org/libxml2
+LIBXML2_VERSION = 2.9.9
+LIBXML2_SITE = http://xmlsoft.org/sources
 LIBXML2_INSTALL_STAGING = YES
 LIBXML2_LICENSE = MIT
 LIBXML2_LICENSE_FILES = COPYING
diff --git a/buildroot/package/libxslt/0001-Fix-security-framework-bypass.patch b/buildroot/package/libxslt/0001-Fix-security-framework-bypass.patch
new file mode 100644
index 000000000..16700362b
--- /dev/null
+++ b/buildroot/package/libxslt/0001-Fix-security-framework-bypass.patch
@@ -0,0 +1,122 @@
+From e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer 
+Date: Sun, 24 Mar 2019 09:51:39 +0100
+Subject: [PATCH] Fix security framework bypass
+
+xsltCheckRead and xsltCheckWrite return -1 in case of error but callers
+don't check for this condition and allow access. With a specially
+crafted URL, xsltCheckRead could be tricked into returning an error
+because of a supposedly invalid URL that would still be loaded
+succesfully later on.
+
+Fixes #12.
+
+Thanks to Felix Wilhelm for the report.
+
+Signed-off-by: Peter Korsgaard 
+---
+ libxslt/documents.c | 18 ++++++++++--------
+ libxslt/imports.c   |  9 +++++----
+ libxslt/transform.c |  9 +++++----
+ libxslt/xslt.c      |  9 +++++----
+ 4 files changed, 25 insertions(+), 20 deletions(-)
+
+diff --git a/libxslt/documents.c b/libxslt/documents.c
+index 3f3a7312..4aad11bb 100644
+--- a/libxslt/documents.c
++++ b/libxslt/documents.c
+@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const xmlChar *URI) {
+ 	int res;
+ 
+ 	res = xsltCheckRead(ctxt->sec, ctxt, URI);
+-	if (res == 0) {
+-	    xsltTransformError(ctxt, NULL, NULL,
+-		 "xsltLoadDocument: read rights for %s denied\n",
+-			     URI);
++	if (res <= 0) {
++            if (res == 0)
++                xsltTransformError(ctxt, NULL, NULL,
++                     "xsltLoadDocument: read rights for %s denied\n",
++                                 URI);
+ 	    return(NULL);
+ 	}
+     }
+@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const xmlChar *URI) {
+ 	int res;
+ 
+ 	res = xsltCheckRead(sec, NULL, URI);
+-	if (res == 0) {
+-	    xsltTransformError(NULL, NULL, NULL,
+-		 "xsltLoadStyleDocument: read rights for %s denied\n",
+-			     URI);
++	if (res <= 0) {
++            if (res == 0)
++                xsltTransformError(NULL, NULL, NULL,
++                     "xsltLoadStyleDocument: read rights for %s denied\n",
++                                 URI);
+ 	    return(NULL);
+ 	}
+     }
+diff --git a/libxslt/imports.c b/libxslt/imports.c
+index 874870cc..3783b247 100644
+--- a/libxslt/imports.c
++++ b/libxslt/imports.c
+@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, xmlNodePtr cur) {
+ 	int secres;
+ 
+ 	secres = xsltCheckRead(sec, NULL, URI);
+-	if (secres == 0) {
+-	    xsltTransformError(NULL, NULL, NULL,
+-		 "xsl:import: read rights for %s denied\n",
+-			     URI);
++	if (secres <= 0) {
++            if (secres == 0)
++                xsltTransformError(NULL, NULL, NULL,
++                     "xsl:import: read rights for %s denied\n",
++                                 URI);
+ 	    goto error;
+ 	}
+     }
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 13793914..0636dbd0 100644
+--- a/libxslt/transform.c
++++ b/libxslt/transform.c
+@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node,
+      */
+     if (ctxt->sec != NULL) {
+ 	ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
+-	if (ret == 0) {
+-	    xsltTransformError(ctxt, NULL, inst,
+-		 "xsltDocumentElem: write rights for %s denied\n",
+-			     filename);
++	if (ret <= 0) {
++            if (ret == 0)
++                xsltTransformError(ctxt, NULL, inst,
++                     "xsltDocumentElem: write rights for %s denied\n",
++                                 filename);
+ 	    xmlFree(URL);
+ 	    xmlFree(filename);
+ 	    return;
+diff --git a/libxslt/xslt.c b/libxslt/xslt.c
+index 780a5ad7..a234eb79 100644
+--- a/libxslt/xslt.c
++++ b/libxslt/xslt.c
+@@ -6763,10 +6763,11 @@ xsltParseStylesheetFile(const xmlChar* filename) {
+ 	int res;
+ 
+ 	res = xsltCheckRead(sec, NULL, filename);
+-	if (res == 0) {
+-	    xsltTransformError(NULL, NULL, NULL,
+-		 "xsltParseStylesheetFile: read rights for %s denied\n",
+-			     filename);
++	if (res <= 0) {
++            if (res == 0)
++                xsltTransformError(NULL, NULL, NULL,
++                     "xsltParseStylesheetFile: read rights for %s denied\n",
++                                 filename);
+ 	    return(NULL);
+ 	}
+     }
+-- 
+2.11.0
+
diff --git a/buildroot/package/libxslt/libxslt.mk b/buildroot/package/libxslt/libxslt.mk
index 5b1c0ae26..4632301b1 100644
--- a/buildroot/package/libxslt/libxslt.mk
+++ b/buildroot/package/libxslt/libxslt.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBXSLT_VERSION = 1.1.32
-LIBXSLT_SITE = ftp://xmlsoft.org/libxslt
+LIBXSLT_SITE = http://xmlsoft.org/sources
 LIBXSLT_INSTALL_STAGING = YES
 LIBXSLT_LICENSE = MIT
 LIBXSLT_LICENSE_FILES = COPYING
diff --git a/buildroot/package/libyaml/libyaml.mk b/buildroot/package/libyaml/libyaml.mk
index 26e318736..dc7368a16 100644
--- a/buildroot/package/libyaml/libyaml.mk
+++ b/buildroot/package/libyaml/libyaml.mk
@@ -12,3 +12,4 @@ LIBYAML_LICENSE = MIT
 LIBYAML_LICENSE_FILES = LICENSE
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/buildroot/package/lighttpd/lighttpd.hash b/buildroot/package/lighttpd/lighttpd.hash
index 0829c6b4c..926de33ef 100644
--- a/buildroot/package/lighttpd/lighttpd.hash
+++ b/buildroot/package/lighttpd/lighttpd.hash
@@ -1,4 +1,4 @@
-# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.51.sha256sum
-sha256 2af9fdb265d1f025bfa634e13770239712ecbd585e4975b8226edf1df74e9c82  lighttpd-1.4.51.tar.xz
+# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.53.sha256sum
+sha256 3bdfce1cf3e9650a556a8c26fb15342c5717c63f530c54693db632b0371dcb78  lighttpd-1.4.53.tar.xz
 # Locally calculated
 sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13  COPYING
diff --git a/buildroot/package/lighttpd/lighttpd.mk b/buildroot/package/lighttpd/lighttpd.mk
index d8f64dc7e..f50a4af93 100644
--- a/buildroot/package/lighttpd/lighttpd.mk
+++ b/buildroot/package/lighttpd/lighttpd.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIGHTTPD_VERSION_MAJOR = 1.4
-LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).51
+LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).53
 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x
 LIGHTTPD_LICENSE = BSD-3-Clause
diff --git a/buildroot/package/linknx/linknx.hash b/buildroot/package/linknx/linknx.hash
index 40e26766e..312e43bfd 100644
--- a/buildroot/package/linknx/linknx.hash
+++ b/buildroot/package/linknx/linknx.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256 635b8fbd3477fd7d85a95955b93f327cd5a389db80dc18cdae04de19a3a8a972  linknx-0.0.1.33.tar.gz
+sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad  LICENSE
diff --git a/buildroot/package/linknx/linknx.mk b/buildroot/package/linknx/linknx.mk
index dfabef550..5801eb5f8 100644
--- a/buildroot/package/linknx/linknx.mk
+++ b/buildroot/package/linknx/linknx.mk
@@ -7,6 +7,7 @@
 LINKNX_VERSION = 0.0.1.33
 LINKNX_SITE = $(call github,linknx,linknx,$(LINKNX_VERSION))
 LINKNX_LICENSE = GPL-2.0+
+LINKNX_LICENSE_FILES = LICENSE
 LINKNX_INSTALL_STAGING = YES
 LINKNX_CONF_OPTS = \
 	--without-log4cpp \
diff --git a/buildroot/package/linux-firmware/Config.in b/buildroot/package/linux-firmware/Config.in
index bb88afeec..6b182dc64 100644
--- a/buildroot/package/linux-firmware/Config.in
+++ b/buildroot/package/linux-firmware/Config.in
@@ -59,6 +59,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT
 	help
 	  Firmware files for QCA Rome 6174A bluetooth support.
 
+config BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560
+	bool "TI CC2560"
+	help
+	  Firmware files for Bluetooth modules CC2560 and CC2560A
+
 endmenu # Bluetooth
 
 menu "WiFi firmware"
@@ -320,6 +325,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5
 	  Firmware files for Chelsio T5 1Gb and 10Gb ethernet cards
 	  (cxgb4)
 
+config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100
+	bool "Intel e100 825xx"
+	help
+	  Firmware files for Intel 825xx handled by driver e100
+	  (e100)
+
 config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X
 	bool "QLogic FastLinQ 4xxxx"
 	help
diff --git a/buildroot/package/linux-firmware/linux-firmware.hash b/buildroot/package/linux-firmware/linux-firmware.hash
index ca6ad8f59..b44934893 100644
--- a/buildroot/package/linux-firmware/linux-firmware.hash
+++ b/buildroot/package/linux-firmware/linux-firmware.hash
@@ -1,11 +1,11 @@
 # Locally calculated
-sha256 b279ca4d086887c2efab13e28a7ca36e409410d3df38a62d7c7b5799ee3de916 linux-firmware-44d4fca9922a252a0bd81f6307bcc072a78da54a.tar.gz
+sha256 5c636765fd1ac638176893feccfd4a4854f59fc3d01b38f3ccdbb89bd5bb6ef1 linux-firmware-1baa34868b2c0a004dc595b20678145e3fff83e7.tar.gz
 sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis
 sha256 4b3ea5d5a03c0db81bee0bcb14b30d75b30ef568597bb5be7d4dee57f434265f LICENSE.amdgpu
 sha256 38f2037aa14631b4b29826d7a99379613c41a97064d1defdee30a7a022138b20 LICENCE.Marvell
 sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware
 sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt
-sha256 c565861ff7c42f5df98e15239241f1f42614e5e15f362094a2d3e8da724dc842 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
+sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
 sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
 sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware
 sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28
@@ -27,5 +27,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE.
 sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom
 sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon
 sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware
-sha256 ef38a9a8bb4b0f72b369d337426eea63ef8fc9d48453f127028d935f7dbc5820 WHENCE
+sha256 9b873499a822762177a7a02d2a3ead9fdf0d514c0f9899fb16a2d22ed99f4acc WHENCE
 sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt
+sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100
diff --git a/buildroot/package/linux-firmware/linux-firmware.mk b/buildroot/package/linux-firmware/linux-firmware.mk
index 1c8bc3010..86e1d1e75 100644
--- a/buildroot/package/linux-firmware/linux-firmware.mk
+++ b/buildroot/package/linux-firmware/linux-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LINUX_FIRMWARE_VERSION = 44d4fca9922a252a0bd81f6307bcc072a78da54a
+LINUX_FIRMWARE_VERSION = 1baa34868b2c0a004dc595b20678145e3fff83e7
 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git
 
@@ -249,6 +249,14 @@ LINUX_FIRMWARE_FILES += ath10k/QCA6174
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k
 endif
 
+# CC2560(A)
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560),y)
+LINUX_FIRMWARE_FILES += \
+	ti-connectivity/TIInit_6.2.31.bts \
+	ti-connectivity/TIInit_6.6.15.bts
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
+endif
+
 # wl127x
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y)
 # wl1271-nvs.bin is a symlink to wl127x-nvs.bin
@@ -381,6 +389,11 @@ LINUX_FIRMWARE_FILES += cxgb4/t5fw*.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware
 endif
 
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100),y)
+LINUX_FIRMWARE_FILES += e100/*.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.e100
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X),y)
 LINUX_FIRMWARE_FILES += \
 	qed/qed_init_values_zipped-*.bin
diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host
index 5a71e9248..d092da2fb 100644
--- a/buildroot/package/linux-headers/Config.in.host
+++ b/buildroot/package/linux-headers/Config.in.host
@@ -6,6 +6,8 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
 choice
 	prompt "Kernel Headers"
 	default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
+	# We are intentionally staying at 4.19 for the next Buildroot
+	# LTS release (2019.02)
 	default BR2_KERNEL_HEADERS_4_19
 	help
 	  Select the kernel version to get headers from.
@@ -26,17 +28,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL
 	bool "Same as kernel being built"
 	depends on BR2_LINUX_KERNEL
 
-config BR2_KERNEL_HEADERS_3_2
-	bool "Linux 3.2.x kernel headers"
-	depends on !BR2_aarch64 && !BR2_arc && !BR2_nios2
-	depends on !BR2_riscv
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
-
-config BR2_KERNEL_HEADERS_4_1
-	bool "Linux 4.1.x kernel headers"
-	depends on !BR2_riscv
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
-
 config BR2_KERNEL_HEADERS_4_4
 	bool "Linux 4.4.x kernel headers"
 	depends on !BR2_riscv
@@ -52,18 +43,14 @@ config BR2_KERNEL_HEADERS_4_14
 	depends on !BR2_riscv
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
 
-config BR2_KERNEL_HEADERS_4_16
-	bool "Linux 4.16.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
-
-config BR2_KERNEL_HEADERS_4_18
-	bool "Linux 4.18.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
-
 config BR2_KERNEL_HEADERS_4_19
 	bool "Linux 4.19.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
 
+config BR2_KERNEL_HEADERS_4_20
+	bool "Linux 4.20.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
+
 config BR2_KERNEL_HEADERS_VERSION
 	bool "Manually specified Linux version"
 	help
@@ -129,6 +116,10 @@ choice
 	  This is used to hide/show some packages that have strict
 	  requirements on the version of kernel headers.
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20
+	bool "4.20.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19
 	bool "4.19.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
@@ -296,13 +287,11 @@ endchoice
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.2.102"	if BR2_KERNEL_HEADERS_3_2
-	default "4.1.52"	if BR2_KERNEL_HEADERS_4_1
-	default "4.4.166"	if BR2_KERNEL_HEADERS_4_4
-	default "4.9.143"	if BR2_KERNEL_HEADERS_4_9
-	default "4.14.86"	if BR2_KERNEL_HEADERS_4_14
-	default "4.16.18"	if BR2_KERNEL_HEADERS_4_16
-	default "4.18.20"	if BR2_KERNEL_HEADERS_4_18
+	default "4.4.180"	if BR2_KERNEL_HEADERS_4_4
+	default "4.9.180"	if BR2_KERNEL_HEADERS_4_9
+	default "4.14.123"	if BR2_KERNEL_HEADERS_4_14
+	default "4.19.47"	if BR2_KERNEL_HEADERS_4_19
+	default "4.20.17"	if BR2_KERNEL_HEADERS_4_20
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
diff --git a/buildroot/package/linux-headers/linux-headers.mk b/buildroot/package/linux-headers/linux-headers.mk
index 45e17688c..95432ade8 100644
--- a/buildroot/package/linux-headers/linux-headers.mk
+++ b/buildroot/package/linux-headers/linux-headers.mk
@@ -27,42 +27,34 @@ LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTO
 LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_REPO_URL))
 endif # BR2_KERNEL_HEADERS_AS_KERNEL
 
-# Configure tarball filenames.
+# Compute LINUX_HEADERS_SOURCE and LINUX_HEADERS_SITE from the configuration
 ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y)
 LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION))
-else ifeq ($(LINUX_HEADERS_CUSTOM_GIT)$(LINUX_HEADERS_CUSTOM_HG)$(LINUX_HEADERS_CUSTOM_SVN),y)
-LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
-else
-LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
-endif
-
-# Configure the various kernel source locations.
-ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y)
 LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION)))
 else ifeq ($(LINUX_HEADERS_CUSTOM_GIT),y)
+LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
 LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL)
 LINUX_HEADERS_SITE_METHOD = git
 else ifeq ($(LINUX_HEADERS_CUSTOM_HG),y)
+LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
 LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL)
 LINUX_HEADERS_SITE_METHOD = hg
 else ifeq ($(LINUX_HEADERS_CUSTOM_SVN),y)
+LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
 LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL)
 LINUX_HEADERS_SITE_METHOD = svn
+else ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),)
+# Since 4.12-rc1, -rc kernels are generated from cgit. This also works for
+# older -rc kernels.
+LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
+LINUX_HEADERS_SITE = https://git.kernel.org/torvalds/t
 else
-# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
-# to use the $(word) function. We support versions such as 4.0, 3.1,
-# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
+LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
 ifeq ($(findstring x2.6.,x$(LINUX_HEADERS_VERSION)),x2.6.)
 LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
-else ifeq ($(findstring x3.,x$(LINUX_HEADERS_VERSION)),x3.)
-LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
-else ifeq ($(findstring x4.,x$(LINUX_HEADERS_VERSION)),x4.)
-LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
+else
+LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_HEADERS_VERSION))).x
 endif # x2.6
-# release candidates are in testing/ subdir
-ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),)
-LINUX_HEADERS_SITE := $(LINUX_HEADERS_SITE)/testing
-endif # -rc
 endif # LINUX_HEADERS_CUSTOM_TARBALL
 
 # Apply any necessary patches if we are using the headers from a kernel
diff --git a/buildroot/package/linux-tools/Config.in b/buildroot/package/linux-tools/Config.in
index 349dc6bf0..1c660f76f 100644
--- a/buildroot/package/linux-tools/Config.in
+++ b/buildroot/package/linux-tools/Config.in
@@ -34,8 +34,18 @@ config BR2_PACKAGE_LINUX_TOOLS_IIO
 
 	  These tools are available only from kernel version 4.7.
 
+config BR2_PACKAGE_LINUX_TOOLS_PCI
+	bool "pci"
+	select BR2_PACKAGE_LINUX_TOOLS
+	help
+	  pcitest is a tool for testing capabilities related to a
+	  PCI Endpoint (only works with specific Endpoints).
+
+	  These tools are available only from kernel version 4.20.
+
 config BR2_PACKAGE_LINUX_TOOLS_PERF
 	bool "perf"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	select BR2_PACKAGE_LINUX_TOOLS
 	help
 	  perf (sometimes "Perf Events" or perf tools, originally
@@ -74,8 +84,14 @@ config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS
 	depends on BR2_USE_MMU  # bash
 	select BR2_PACKAGE_LINUX_TOOLS
 	select BR2_PACKAGE_BASH # runtime
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NCURSES_TARGET_PROGS # runtime (tput)
+	select BR2_PACKAGE_KMOD
+	select BR2_PACKAGE_KMOD_TOOLS # runtime (modprobe -n)
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_LIBCAP_NG
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS # runtime (taskset)
 	help
 	  Build and install (to /usr/lib/kselftests) kernel selftests.
 
diff --git a/buildroot/package/linux-tools/linux-tool-pci.mk.in b/buildroot/package/linux-tools/linux-tool-pci.mk.in
new file mode 100644
index 000000000..4ef0368a3
--- /dev/null
+++ b/buildroot/package/linux-tools/linux-tool-pci.mk.in
@@ -0,0 +1,27 @@
+################################################################################
+#
+# pci
+#
+################################################################################
+
+LINUX_TOOLS += pci
+
+PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS)
+
+define PCI_BUILD_CMDS
+	$(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \
+		echo "Your kernel version is too old and does not have install section in the pci tools." ; \
+		echo "At least kernel 4.20 must be used." ; \
+		exit 1 ; \
+	fi
+
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/pci \
+		$(PCI_MAKE_OPTS)
+endef
+
+define PCI_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/pci \
+		$(PCI_MAKE_OPTS) \
+		DESTDIR=$(TARGET_DIR) \
+		install
+endef
diff --git a/buildroot/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch b/buildroot/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch
new file mode 100644
index 000000000..332e5491f
--- /dev/null
+++ b/buildroot/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch
@@ -0,0 +1,55 @@
+From d663a483c40939bad58301c256d86da1f3da6cc0 Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar 
+Date: Tue, 13 Nov 2018 13:16:08 +0100
+Subject: [PATCH] Fix building with new kernel headers.
+
+net_tstamp.h in recent kernel versions requires time.h for clockid_t.
+
+Signed-off-by: Miroslav Lichvar 
+---
+ clock.c      | 2 +-
+ sk.c         | 1 +
+ timemaster.c | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/clock.c b/clock.c
+index 9c493c3..8533b39 100644
+--- a/clock.c
++++ b/clock.c
+@@ -17,11 +17,11 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+ #include 
+-#include 
+ #include 
+ 
+ #include "address.h"
+diff --git a/sk.c b/sk.c
+index e2b1f28..30162eb 100644
+--- a/sk.c
++++ b/sk.c
+@@ -18,6 +18,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/timemaster.c b/timemaster.c
+index 058678f..00db59f 100644
+--- a/timemaster.c
++++ b/timemaster.c
+@@ -22,6 +22,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
diff --git a/buildroot/package/linuxptp/S65linuxptp b/buildroot/package/linuxptp/S65linuxptp
old mode 100755
new mode 100644
diff --git a/buildroot/package/linuxptp/linuxptp.hash b/buildroot/package/linuxptp/linuxptp.hash
index ef2db5622..5e6c7741c 100644
--- a/buildroot/package/linuxptp/linuxptp.hash
+++ b/buildroot/package/linuxptp/linuxptp.hash
@@ -1,2 +1,9 @@
+# From https://sourceforge.net/projects/linuxptp/files/v2.0/
+sha1 592ca42c6146a79c1fcabed7c19fa7af4803d4f6  linuxptp-2.0.tgz
+md5 d8bb7374943bb747db7786ac26f17f11  linuxptp-2.0.tgz
+
 # Locally computed:
-sha256 d0ccc4591966e21819cdc248765ebbe02456bc8ca37845eb7c23c2d1ff9bcf6b  linuxptp-303b08cbf55096aba55bd08a314e0701e5c33482.tar.gz
+sha256 0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d  linuxptp-2.0.tgz
+
+# Hash for license file:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/buildroot/package/linuxptp/linuxptp.mk b/buildroot/package/linuxptp/linuxptp.mk
index f43fee6f6..c304ff6d6 100644
--- a/buildroot/package/linuxptp/linuxptp.mk
+++ b/buildroot/package/linuxptp/linuxptp.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LINUXPTP_VERSION = 303b08cbf55096aba55bd08a314e0701e5c33482
-LINUXPTP_SITE_METHOD = git
-LINUXPTP_SITE = git://git.code.sf.net/p/linuxptp/code
+LINUXPTP_VERSION = 2.0
+LINUXPTP_SOURCE = linuxptp-$(LINUXPTP_VERSION).tgz
+LINUXPTP_SITE = http://downloads.sourceforge.net/linuxptp
 LINUXPTP_LICENSE = GPL-2.0+
 LINUXPTP_LICENSE_FILES = COPYING
 
diff --git a/buildroot/package/liquid-dsp/liquid-dsp.mk b/buildroot/package/liquid-dsp/liquid-dsp.mk
index db6789384..64c403e87 100644
--- a/buildroot/package/liquid-dsp/liquid-dsp.mk
+++ b/buildroot/package/liquid-dsp/liquid-dsp.mk
@@ -30,9 +30,9 @@ LIQUID_DSP_CFLAGS += -ffast-math
 endif
 
 # use FFTW instead of built-in FFT
-ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y)
+ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y)
 LIQUID_DSP_LDFLAGS += -lfftw3f
-LIQUID_DSP_DEPENDENCIES += fftw
+LIQUID_DSP_DEPENDENCIES += fftw-single
 endif
 
 # disable altivec, it has build issues
@@ -40,16 +40,6 @@ ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y)
 LIQUID_DSP_CONF_OPTS += --enable-simdoverride
 endif
 
-ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y)
-LIQUID_DSP_LDFLAGS += -lfftw3
-LIQUID_DSP_DEPENDENCIES += fftw
-endif
-
-ifeq ($(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),y)
-LIQUID_DSP_LDFLAGS += -lfftw3l
-LIQUID_DSP_DEPENDENCIES += fftw
-endif
-
 LIQUID_DSP_CONF_OPTS += \
 	CFLAGS="$(LIQUID_DSP_CFLAGS)" \
 	LDFLAGS="$(LIQUID_DSP_LDFLAGS)"
diff --git a/buildroot/package/lirc-tools/S25lircd b/buildroot/package/lirc-tools/S25lircd
old mode 100755
new mode 100644
diff --git a/buildroot/package/lirc-tools/lirc-tools.mk b/buildroot/package/lirc-tools/lirc-tools.mk
index a5165ad43..e468f2a25 100644
--- a/buildroot/package/lirc-tools/lirc-tools.mk
+++ b/buildroot/package/lirc-tools/lirc-tools.mk
@@ -46,7 +46,7 @@ LIRC_TOOLS_DEPENDENCIES += libftdi1
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
-LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools
+LIRC_TOOLS_DEPENDENCIES += python3 host-python3-setuptools
 LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV="$(PKG_PYTHON_SETUPTOOLS_ENV)"
 endif
 
diff --git a/buildroot/package/live555/live555.hash b/buildroot/package/live555/live555.hash
index 024dcac12..f8e5b5e68 100644
--- a/buildroot/package/live555/live555.hash
+++ b/buildroot/package/live555/live555.hash
@@ -1,5 +1,3 @@
-# From http://live555.com/liveMedia/public/live555-latest-md5.txt
-md5 3383dea853735b7a73eda6ddb52b6372 live.2018.10.17.tar.gz
 # Locally generated
-sha256 7c68d9c95b39acd309a2b6a4fc14c3837544a9be3f64062ed38d1ad6f68dc9e8  live.2018.10.17.tar.gz
+sha256 0bd0c26d980425d9a419d835193e292a08a968f175da1902da4b495f126d5abd  live.2019.03.06.tar.gz
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/buildroot/package/live555/live555.mk b/buildroot/package/live555/live555.mk
index 6a6d35365..250eea236 100644
--- a/buildroot/package/live555/live555.mk
+++ b/buildroot/package/live555/live555.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIVE555_VERSION = 2018.10.17
+LIVE555_VERSION = 2019.03.06
 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
-LIVE555_SITE = http://www.live555.com/liveMedia/public
+LIVE555_SITE = http://www.live555.com
 LIVE555_LICENSE = LGPL-2.1+
 LIVE555_LICENSE_FILES = COPYING
 LIVE555_INSTALL_STAGING = YES
diff --git a/buildroot/package/ljlinenoise/Config.in b/buildroot/package/ljlinenoise/Config.in
index e6b587e65..964183f1d 100644
--- a/buildroot/package/ljlinenoise/Config.in
+++ b/buildroot/package/ljlinenoise/Config.in
@@ -2,8 +2,7 @@ config BR2_PACKAGE_LJLINENOISE
 	bool "ljlinenoise"
 	# ljsyscall is specifically for LuaJIT, not Lua.
 	depends on BR2_PACKAGE_LUAJIT
-	# run-time dependency only
-	select BR2_PACKAGE_LJSYSCALL
+	select BR2_PACKAGE_LJSYSCALL # runtime
 	help
 	  ljlinenoise is a pure LuaJIT port of linenoise,
 	  a small alternative to readline and libedit.
diff --git a/buildroot/package/ljlinenoise/ljlinenoise.hash b/buildroot/package/ljlinenoise/ljlinenoise.hash
index c70b5d680..647f11d86 100644
--- a/buildroot/package/ljlinenoise/ljlinenoise.hash
+++ b/buildroot/package/ljlinenoise/ljlinenoise.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	7a6c4142b0096106f498d7ee4bea5bf5086c076d1f071893441b8e5c0665fb47  ljlinenoise-0.1.3-1.src.rock
+# computed by luarocks/buildroot
+sha256 7a6c4142b0096106f498d7ee4bea5bf5086c076d1f071893441b8e5c0665fb47  ljlinenoise-0.1.3-1.src.rock
+sha256 9b17730cb34ea591fb39688e70bd2be9c13d11b9db1c813b4ae68e3da9b7093e  ljlinenoise-0.1.3/COPYRIGHT
diff --git a/buildroot/package/ljsyscall/Config.in b/buildroot/package/ljsyscall/Config.in
index 3af9dabe9..313f24df9 100644
--- a/buildroot/package/ljsyscall/Config.in
+++ b/buildroot/package/ljsyscall/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_LJSYSCALL
 	  An FFI implementation of the Linux and NetBSD kernel ABIs for
 	  LuaJIT.
 
-	  http://github.com/justincormack/ljsyscall
+	  http://www.myriabit.com/ljsyscall/
 
 comment "ljsyscall needs LuaJIT"
 	depends on !BR2_PACKAGE_LUAJIT
diff --git a/buildroot/package/lldpd/0001-build-ability-to-disable-libbsd-with-without-libbsd.patch b/buildroot/package/lldpd/0001-build-ability-to-disable-libbsd-with-without-libbsd.patch
new file mode 100644
index 000000000..7301ac636
--- /dev/null
+++ b/buildroot/package/lldpd/0001-build-ability-to-disable-libbsd-with-without-libbsd.patch
@@ -0,0 +1,106 @@
+From ff3dcc4ad71c1105bd8ea11afe7e07efd48c038d Mon Sep 17 00:00:00 2001
+From: Vincent Bernat 
+Date: Tue, 25 Sep 2018 10:57:49 +0200
+Subject: [PATCH] build: ability to disable libbsd with --without-libbsd
+
+This is useful when user wants to ensure reproducibility of the build
+whatever libbsd is present or not.
+
+Signed-off-by: Trent Piepho 
+---
+ configure.ac  | 59 +++++++++++++++++++++++++++++++++++++++--------------------
+ src/marshal.h |  1 +
+ 2 files changed, 40 insertions(+), 20 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b40473..589cd96 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -173,26 +173,44 @@ AC_FUNC_REALLOC
+ AC_FUNC_FORK
+ 
+ # Some functions can be in libbsd
+-PKG_CHECK_MODULES([libbsd], [libbsd-overlay], [
+-  _save_CFLAGS="$CFLAGS"
+-  _save_LIBS="$LIBS"
+-  CFLAGS="$CFLAGS $libbsd_CFLAGS"
+-  LIBS="$LIBS $libbsd_LIBS"
+-  AC_MSG_CHECKING([if libbsd can be linked correctly])
+-  AC_TRY_LINK([
+-@%:@include 
+-@%:@include 
+-],[],
+-    [
+-      AC_MSG_RESULT(yes)
+-      LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS"
+-      LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS"
+-    ],[
+-      AC_MSG_RESULT(no)
+-      CFLAGS="$_save_CFLAGS"
+-      LIBS="$_save_LIBS"
+-    ])
+-], [:])
++AC_ARG_WITH([libbsd],
++  AS_HELP_STRING(
++    [--with-libbsd],
++    [Use libbsd @<:@default=auto@:>@]),
++  [],
++  [with_libbsd=auto])
++if test x"$with_libbsd" != x"no"; then
++  PKG_CHECK_MODULES([libbsd], [libbsd-overlay], [
++    _save_CFLAGS="$CFLAGS"
++    _save_LIBS="$LIBS"
++    CFLAGS="$CFLAGS $libbsd_CFLAGS"
++    LIBS="$LIBS $libbsd_LIBS"
++    AC_MSG_CHECKING([if libbsd can be linked correctly])
++    AC_TRY_LINK([
++  @%:@include 
++  @%:@include 
++  ],[],
++      [
++        AC_MSG_RESULT(yes)
++        LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS"
++        LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS"
++        with_libbsd=yes
++      ],[
++        AC_MSG_RESULT(no)
++        CFLAGS="$_save_CFLAGS"
++        LIBS="$_save_LIBS"
++        if test x"$with_libbsd" = x"yes"; then
++           AC_MSG_FAILURE([*** no libbsd support found])
++        fi
++        with_libbsd=no
++      ])
++  ], [
++    if test x"$with_libbsd" = x"yes"; then
++       AC_MSG_FAILURE([*** no libbsd support found])
++    fi
++    with_libbsd=no
++  ])
++fi
+ 
+ # setproctitle may have an _init function
+ AC_REPLACE_FUNCS([setproctitle])
+@@ -412,6 +430,7 @@ cat <
++#include 
+ #include 
+ 
+ struct marshal_info;
+-- 
+2.14.4
+
diff --git a/buildroot/package/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch b/buildroot/package/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch
deleted file mode 100644
index d5675d39a..000000000
--- a/buildroot/package/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 106aa50d4e5b336f7dd2d5cf4d882e692d205e91 Mon Sep 17 00:00:00 2001
-From: Vincent Bernat 
-Date: Sat, 18 Jun 2016 22:18:41 +0200
-Subject: [PATCH] build: make generation of atom-glue compatible with older gcc
- versions
-
-With old versions, cpp doesn't accept several files as input. See #186.
-
-Signed-off-by: Vivien Didelot 
----
- src/lib/Makefile.am | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 250e32a..2a5cdb3 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -20,8 +20,9 @@ nodist_liblldpctl_la_SOURCES = atom-glue.c
- liblldpctl_la_LIBADD  = $(top_builddir)/src/libcommon-daemon-lib.la libfixedpoint.la
- 
- atom-glue.c: $(ATOM_FILES) Makefile
--	$(AM_V_GEN)($(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--		$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \
-+	$(AM_V_GEN)(for f in $(ATOM_FILES:%=$(srcdir)/%); do \
-+		$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+		$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \
- 		$(SED) -n 's+^void init_atom_builder_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \
- 		sort | \
- 		$(AWK) '{ atoms[$$2] = 1 } \
-@@ -30,8 +31,9 @@ atom-glue.c: $(ATOM_FILES) Makefile
-                                print " static int init = 0; if (init) return; init++;"; \
- 			       for (atom in atoms) { print " init_atom_builder_"atom"();" } \
- 			       print "}"; }' && \
-+		for f in $(ATOM_FILES:%=$(srcdir)/%); do \
- 		$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--		$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \
-+		$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \
- 		$(SED) -n 's+^void init_atom_map_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \
- 		sort -n | \
- 		$(AWK) '{ atoms[$$2] = 1 } \
--- 
-2.9.0
-
diff --git a/buildroot/package/lldpd/0002-configure-do-not-check-for-libbsd.patch b/buildroot/package/lldpd/0002-configure-do-not-check-for-libbsd.patch
deleted file mode 100644
index 4d6327452..000000000
--- a/buildroot/package/lldpd/0002-configure-do-not-check-for-libbsd.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0801a066cd4a24a858ddfa7c62c7802e0f5533a8 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" 
-Date: Sun, 14 Aug 2016 12:15:17 +0200
-Subject: [PATCH] configure: do not check for libbsd
-
-libbsd causes build issues because its libbsd-overlay.pc file is borked:
-it contains -isystem in CFLAGS, which is not munged by pkgconf, so we
-end up using the headers of the build machine, causing all sorts of
-hard-to-debug trouble at build time.
-
-lldpd uses libbsd-overlay for a few helper functions, but has fallbacks
-in case it is not available. The only feature that is lost when not using
-it is that the neighbour name is no longer displayed in /proc/self/cmdline.
-As the author of lldpd said on IRC: "people should survive! ;-)"
-
-So we just remove the detection of libbsd altogether.
-
-Fixes:
-    http://autobuild.buildroot.org/results/6b7/6b70fa379e834ec71cc260ba6af771b531ca3511/
-    http://autobuild.buildroot.org/results/769/769074c4bb67336ae6679f2c1cd2a8220d2bec24/
-    http://autobuild.buildroot.org/results/c8a/c8a6001f437701ecc75f6c9252935645bda8a8c8/
-    [...]
-
-Signed-off-by: "Yann E. MORIN" 
----
- configure.ac | 19 -------------------
- 1 file changed, 19 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd723b0..45498ce 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,25 +165,6 @@ AC_FUNC_MALLOC
- AC_FUNC_REALLOC
- AC_FUNC_FORK
- 
--# Some functions can be in libbsd
--PKG_CHECK_MODULES([libbsd], [libbsd-overlay], [
--  _save_CFLAGS="$CFLAGS"
--  _save_LIBS="$LIBS"
--  CFLAGS="$CFLAGS $libbsd_CFLAGS"
--  LIBS="$LIBS $libbsd_LIBS"
--  AC_MSG_CHECKING([if libbsd can be linked correctly])
--  AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
--    [
--      AC_MSG_RESULT(yes)
--      LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS"
--      LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS"
--    ],[
--      AC_MSG_RESULT(no)
--      CFLAGS="$_save_CFLAGS"
--      LIBS="$_save_LIBS"
--    ])
--], [:])
--
- # setproctitle may have an _init function
- AC_REPLACE_FUNCS([setproctitle])
- AC_CHECK_FUNCS([setproctitle_init])
--- 
-2.7.4
-
diff --git a/buildroot/package/lldpd/0003-configure-remove-check-on-CXX-compiler.patch b/buildroot/package/lldpd/0003-configure-remove-check-on-CXX-compiler.patch
deleted file mode 100644
index 880f603f7..000000000
--- a/buildroot/package/lldpd/0003-configure-remove-check-on-CXX-compiler.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d28b3bfa1b224f7770004dddf4dfaf10ad7ad6c9 Mon Sep 17 00:00:00 2001
-From: Damien Riegel 
-Date: Mon, 18 Dec 2017 14:37:08 -0500
-Subject: [PATCH] configure: remove check on CXX compiler
-
-lldpd fails to build if the toolchain doesn't have a C++ compiler
-because configure fails with the following error:
-
-  checking how to run the C++ preprocessor... /lib/cpp
-  configure: error: in `/home/dkc/src/buildroot/build-zii/build/lldpd-0.9.4':
-  configure: error: C++ preprocessor "/lib/cpp" fails sanity check
-
-Since "8d92800b: build: cleaner way to not alter CFLAGS/CPPFLAGS/LDFLAGS",
-it seems that the dependency on C++ is not required anymore, so there
-is no reason to keep this restriction. Dropping AC_PROG_CXX allows to
-build with a toolchain that doesn't have C++ just fine.
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0edceb1..5afe8f2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,7 +48,6 @@ AC_PROG_CC_C99
- if test x"$ac_cv_prog_cc_c99" = x"no"; then
-   AC_MSG_FAILURE([*** C99 support is mandatory])
- fi
--AC_PROG_CXX
- AM_PROG_CC_C_O
- AC_PROG_LIBTOOL
- AC_PROG_LN_S
--- 
-2.15.1
-
diff --git a/buildroot/package/lldpd/lldpd.hash b/buildroot/package/lldpd/lldpd.hash
index fc3d21f48..1c0e38099 100644
--- a/buildroot/package/lldpd/lldpd.hash
+++ b/buildroot/package/lldpd/lldpd.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256 eb1f5beff2ff5c13c5e0342b5b9da815ed4a63866262445e1168a79ee65c9079  lldpd-0.9.4.tar.gz
+sha256 450b622aac7ae1758f1ef82f3b7b94ec47f2ff33abfb0e6ac82555b9ee55f151  lldpd-1.0.1.tar.gz
+sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d  LICENSE
diff --git a/buildroot/package/lldpd/lldpd.mk b/buildroot/package/lldpd/lldpd.mk
index 2bdda0213..506b6f136 100644
--- a/buildroot/package/lldpd/lldpd.mk
+++ b/buildroot/package/lldpd/lldpd.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-LLDPD_VERSION = 0.9.4
+LLDPD_VERSION = 1.0.1
 LLDPD_SITE = http://media.luffy.cx/files/lldpd
 LLDPD_DEPENDENCIES = host-pkgconf libevent
 LLDPD_LICENSE = ISC
-LLDPD_LICENSE_FILES = README.md
+LLDPD_LICENSE_FILES = LICENSE
 # 0002-configure-do-not-check-for-libbsd.patch / 0003-configure-remove-check-on-CXX-compiler.patch
 LLDPD_AUTORECONF = YES
 
@@ -28,12 +28,11 @@ endif
 LLDPD_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99
 
 LLDPD_CONF_OPTS = \
-	--without-readline \
 	--without-embedded-libevent \
 	--without-snmp \
 	--without-xml \
-	--without-json \
 	--without-seccomp \
+	--without-libbsd \
 	--disable-hardening \
 	--disable-privsep \
 	$(if $(BR2_PACKAGE_LLDPD_CDP),--enable-cdp,--disable-cdp) \
@@ -45,9 +44,22 @@ LLDPD_CONF_OPTS = \
 	$(if $(BR2_PACKAGE_LLDPD_DOT3),--enable-dot3,--disable-dot3) \
 	$(if $(BR2_PACKAGE_LLDPD_CUSTOM_TLV),--enable-custom,--disable-custom)
 
+ifeq ($(BR2_PACKAGE_READLINE),y)
+LLDPD_CONF_OPTS += --with-readline
+LLDPD_DEPENDENCIES += readline
+else
+LLDPD_CONF_OPTS += --without-readline
+endif
+
 define LLDPD_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/lldpd/S60lldpd \
 		$(TARGET_DIR)/etc/init.d/S60lldpd
 endef
 
+define LLDPD_INSTALL_INIT_SYSTEMD
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/lldpd.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lldpd.service
+endef
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/llvm/llvm.hash b/buildroot/package/llvm/llvm.hash
index 200907fc8..531361ae1 100644
--- a/buildroot/package/llvm/llvm.hash
+++ b/buildroot/package/llvm/llvm.hash
@@ -1,3 +1,3 @@
 # locally calculated
-sha256 8bc1f844e6cbde1b652c19c1edebc1864456fd9c78b8c1bea038e51b363fe222 llvm-7.0.0.src.tar.xz
+sha256 a38dfc4db47102ec79dcc2aa61e93722c5f6f06f0a961073bd84b78fb949419b llvm-7.0.1.src.tar.xz
 sha256 0303dfeaac87b80d2d1e543aa38d5be77b0eac93c3d04fe7e3c8eaa71a778667 LICENSE.TXT
diff --git a/buildroot/package/llvm/llvm.mk b/buildroot/package/llvm/llvm.mk
index 1f9bd447f..952f678ee 100644
--- a/buildroot/package/llvm/llvm.mk
+++ b/buildroot/package/llvm/llvm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LLVM_VERSION = 7.0.0
+LLVM_VERSION = 7.0.1
 LLVM_SITE = http://llvm.org/releases/$(LLVM_VERSION)
 LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz
 LLVM_LICENSE = NCSA
@@ -57,6 +57,9 @@ endif
 # Use native llvm-tblgen from host-llvm (needed for cross-compilation)
 LLVM_CONF_OPTS += -DLLVM_TABLEGEN=$(HOST_DIR)/bin/llvm-tblgen
 
+# Use native llvm-config from host-llvm (needed for cross-compilation)
+LLVM_CONF_OPTS += -DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config
+
 # BUILD_SHARED_LIBS has a misleading name. It is in fact an option for
 # LLVM developers to build all LLVM libraries as separate shared libraries.
 # For normal use of LLVM, it is recommended to build a single
diff --git a/buildroot/package/lm-sensors/0003-musl-fix-includes.patch b/buildroot/package/lm-sensors/0003-musl-fix-includes.patch
deleted file mode 100644
index 69325abce..000000000
--- a/buildroot/package/lm-sensors/0003-musl-fix-includes.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 6d85773537c9f277ed342f57500f784ccb2c4a3e Mon Sep 17 00:00:00 2001
-From: Brendan Heading 
-Date: Sun, 30 Aug 2015 22:26:39 +0100
-Subject: [PATCH 1/1] fix compilation under musl
-
-This patch removes conditional compilation elements that are designed to
-support glibc versions earlier than 2.0, which were causing the build
-to fail under musl.
-
-Based on the patch found here :
-
-http://git.alpinelinux.org/cgit/aports/plain/main/lm_sensors/musl-fix-includes.patch?id=fece1d19448dbd3a56fd8ac70443116187141848
-
-This patch has been accepted for integration upstream and should be
-present in the next release. See :
-
-http://www.lm-sensors.org/changeset/6314
-
-Signed-off-by: Brendan Heading 
-Upstream-Status: pending
----
- prog/dump/isadump.c | 6 ------
- prog/dump/isaset.c  | 6 ------
- prog/dump/superio.c | 5 -----
- prog/dump/util.c    | 5 -----
- 4 files changed, 22 deletions(-)
-
-diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c
-index e031e47..88e4c3b 100644
---- a/prog/dump/isadump.c
-+++ b/prog/dump/isadump.c
-@@ -36,13 +36,7 @@
- #include "util.h"
- #include "superio.h"
- 
--
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include 
--#else
--#include 
--#endif
- 
- #ifdef __powerpc__
- unsigned long isa_io_base = 0; /* XXX for now */
-diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c
-index 1d1bdad..a084c8a 100644
---- a/prog/dump/isaset.c
-+++ b/prog/dump/isaset.c
-@@ -32,13 +32,7 @@
- #include 
- #include "util.h"
- 
--
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include 
--#else
--#include 
--#endif
- 
- #ifdef __powerpc__
- unsigned long isa_io_base = 0; /* XXX for now */
-diff --git a/prog/dump/superio.c b/prog/dump/superio.c
-index 1af7358..31e0d78 100644
---- a/prog/dump/superio.c
-+++ b/prog/dump/superio.c
-@@ -20,12 +20,7 @@
- */
- 
- #include 
--
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include 
--#else
--#include 
--#endif
- 
- #include "superio.h"
- 
-diff --git a/prog/dump/util.c b/prog/dump/util.c
-index 676c339..d8b0927 100644
---- a/prog/dump/util.c
-+++ b/prog/dump/util.c
-@@ -11,12 +11,7 @@
- #include 
- #include "util.h"
- 
--/* To keep glibc2 happy */
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
- #include 
--#else
--#include 
--#endif
- 
- /* Return 1 if we should continue, 0 if we should abort */
- int user_ack(int def)
--- 
-2.4.3
-
diff --git a/buildroot/package/lm-sensors/Config.in b/buildroot/package/lm-sensors/Config.in
index 60571b784..a2e027599 100644
--- a/buildroot/package/lm-sensors/Config.in
+++ b/buildroot/package/lm-sensors/Config.in
@@ -25,12 +25,14 @@ config BR2_PACKAGE_LM_SENSORS_FANCONTROL
 
 config BR2_PACKAGE_LM_SENSORS_ISADUMP
 	bool "isadump"
+	depends on BR2_i386 || BR2_x86_64
 	help
 	  Isadump is a small helper program to examine registers
 	  visible through the ISA bus.
 
 config BR2_PACKAGE_LM_SENSORS_ISASET
 	bool "isaset"
+	depends on BR2_i386 || BR2_x86_64
 	help
 	  Isaset is a small helper program to set register visible
 	  through the ISA bus.
diff --git a/buildroot/package/lm-sensors/lm-sensors.hash b/buildroot/package/lm-sensors/lm-sensors.hash
index eeaa633f4..40728252b 100644
--- a/buildroot/package/lm-sensors/lm-sensors.hash
+++ b/buildroot/package/lm-sensors/lm-sensors.hash
@@ -1,2 +1,4 @@
 # Locally calculated
-sha256	e0579016081a262dd23eafe1d22b41ebde78921e73a1dcef71e05e424340061f	lm-sensors_3.4.0.orig.tar.bz2
+sha256	f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0	lm-sensors-V3-5-0.tar.gz
+sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6	COPYING
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING.LGPL
diff --git a/buildroot/package/lm-sensors/lm-sensors.mk b/buildroot/package/lm-sensors/lm-sensors.mk
index 6fc7ce498..cebfcdf42 100644
--- a/buildroot/package/lm-sensors/lm-sensors.mk
+++ b/buildroot/package/lm-sensors/lm-sensors.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-LM_SENSORS_VERSION = 3.4.0
-LM_SENSORS_SOURCE = lm-sensors_$(LM_SENSORS_VERSION).orig.tar.bz2
-LM_SENSORS_SITE = http://snapshot.debian.org/archive/debian/20170208T211941Z/pool/main/l/lm-sensors
+LM_SENSORS_VERSION = V3-5-0
+LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,$(LM_SENSORS_VERSION))
 LM_SENSORS_INSTALL_STAGING = YES
 LM_SENSORS_DEPENDENCIES = host-bison host-flex
 LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs)
@@ -21,7 +20,6 @@ LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
 
 LM_SENSORS_MAKE_OPTS = \
-	BUILD_STATIC_LIB=1 \
 	MACHINE=$(KERNEL_ARCH) \
 	PREFIX=/usr
 
diff --git a/buildroot/package/log4cplus/log4cplus.mk b/buildroot/package/log4cplus/log4cplus.mk
index 22efde2fd..82fc7135f 100644
--- a/buildroot/package/log4cplus/log4cplus.mk
+++ b/buildroot/package/log4cplus/log4cplus.mk
@@ -11,4 +11,15 @@ LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool)
 LOG4CPLUS_LICENSE_FILES = LICENSE
 LOG4CPLUS_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_QT5BASE),y)
+LOG4CPLUS_DEPENDENCIES += host-pkgconf qt5base
+LOG4CPLUS_CONF_OPTS += --with-qt5
+else
+LOG4CPLUS_CONF_OPTS += --without-qt5
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+LOG4CPLUS_CONF_ENV += LIBS='-latomic'
+endif
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/lpeg/Config.in b/buildroot/package/lpeg/Config.in
index 957991d41..0a7ea47df 100644
--- a/buildroot/package/lpeg/Config.in
+++ b/buildroot/package/lpeg/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LPEG
 	bool "lpeg"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  LPeg is a new pattern-matching library for Lua,
 	  based on Parsing Expression Grammars (PEGs).
 
-	  http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html
+	  http://www.inf.puc-rio.br/~roberto/lpeg.html
diff --git a/buildroot/package/lpeg/lpeg.hash b/buildroot/package/lpeg/lpeg.hash
index 926167486..da38cc875 100644
--- a/buildroot/package/lpeg/lpeg.hash
+++ b/buildroot/package/lpeg/lpeg.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256	149be31e0155c4694f77ea7264d9b398dd134eca0d00ff03358d91a6cfb2ea9d  lpeg-1.0.1-1.src.rock
+# computed by luarocks/buildroot
+sha256 149be31e0155c4694f77ea7264d9b398dd134eca0d00ff03358d91a6cfb2ea9d  lpeg-1.0.1-1.src.rock
diff --git a/buildroot/package/lpty/Config.in b/buildroot/package/lpty/Config.in
index 50cbd2548..ee2d4c20b 100644
--- a/buildroot/package/lpty/Config.in
+++ b/buildroot/package/lpty/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LPTY
 	bool "lpty"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  A simple facility for lua to control other programs via
 	  PTYs.
diff --git a/buildroot/package/lpty/lpty.hash b/buildroot/package/lpty/lpty.hash
index a451fd858..6b21d75a5 100644
--- a/buildroot/package/lpty/lpty.hash
+++ b/buildroot/package/lpty/lpty.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	cf263ece9b50a78a7fb2277e3546fbbf0bf6858f41821932d92f2e3d8a065091  lpty-1.0.1-1.src.rock
+# computed by luarocks/buildroot
+sha256 cf263ece9b50a78a7fb2277e3546fbbf0bf6858f41821932d92f2e3d8a065091  lpty-1.0.1-1.src.rock
+sha256 c5a128a73cad5f6e111ebd8f4a9fa3500562c57912972eb15627db9610d43dec  lpty-1.0.1-1/doc/LICENSE
diff --git a/buildroot/package/lrandom/Config.in b/buildroot/package/lrandom/Config.in
index 64bcf0ce0..a8a0a837a 100644
--- a/buildroot/package/lrandom/Config.in
+++ b/buildroot/package/lrandom/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LRANDOM
 	bool "lrandom"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  A library for generating random numbers
 	  based on the Mersenne Twister
diff --git a/buildroot/package/lrandom/lrandom.hash b/buildroot/package/lrandom/lrandom.hash
index 3f601330c..ce59268bb 100644
--- a/buildroot/package/lrandom/lrandom.hash
+++ b/buildroot/package/lrandom/lrandom.hash
@@ -1,3 +1,3 @@
-# Locally calculated
-sha256	96fbc56beb0efca20253301915e14ba25150e2b09541ea7a3570e0def624b196  lrandom-20120430.51-1.src.rock
-sha256	480a6cf11caaba99290ff30cd6e854ac9dce61e38b9d9caf5498165f7fb93454  lrandom-20120430.52-1.src.rock
+# computed by luarocks/buildroot
+sha256 96fbc56beb0efca20253301915e14ba25150e2b09541ea7a3570e0def624b196  lrandom-20120430.51-1.src.rock
+sha256 480a6cf11caaba99290ff30cd6e854ac9dce61e38b9d9caf5498165f7fb93454  lrandom-20120430.52-1.src.rock
diff --git a/buildroot/package/lrandom/lrandom.mk b/buildroot/package/lrandom/lrandom.mk
index 09b62c94a..2fe5fdb5a 100644
--- a/buildroot/package/lrandom/lrandom.mk
+++ b/buildroot/package/lrandom/lrandom.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ifeq ($(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUA_5_3),y)
+ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LRANDOM_VERSION = 20120430.52-1
 else
 LRANDOM_VERSION = 20120430.51-1
diff --git a/buildroot/package/lrzsz/lrzsz.mk b/buildroot/package/lrzsz/lrzsz.mk
index 25ecf3dea..6c6823285 100644
--- a/buildroot/package/lrzsz/lrzsz.mk
+++ b/buildroot/package/lrzsz/lrzsz.mk
@@ -9,6 +9,8 @@ LRZSZ_SITE = http://www.ohse.de/uwe/releases
 LRZSZ_CONF_OPTS = --disable-timesync
 LRZSZ_LICENSE = GPL-2.0+
 LRZSZ_LICENSE_FILES = COPYING
+LRZSZ_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+LRZSZ_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 
 define LRZSZ_POST_CONFIGURE_HOOKS
 	$(SED) "s/-lnsl//;" $(@D)/src/Makefile
diff --git a/buildroot/package/lsof/lsof.hash b/buildroot/package/lsof/lsof.hash
index 4a1249f1a..ccb737153 100644
--- a/buildroot/package/lsof/lsof.hash
+++ b/buildroot/package/lsof/lsof.hash
@@ -1,2 +1,7 @@
+# From http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/CHECKSUMS_4.91
+md5 148ed410cb52e08c2adc0c60f480f11f  lsof_4.91.tar.bz2
 # Locally calculated after checking pgp signature
-sha256	81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718	lsof_4.89.tar.bz2
+# http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.91.tar.bz2.sig
+# with (old, weak) key 40BD3D55
+sha256	c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3	lsof_4.91.tar.bz2
+sha256	32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1	dialects/linux/dproto.h
diff --git a/buildroot/package/lsof/lsof.mk b/buildroot/package/lsof/lsof.mk
index 83a9b6c38..58a2d8ef1 100644
--- a/buildroot/package/lsof/lsof.mk
+++ b/buildroot/package/lsof/lsof.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LSOF_VERSION = 4.89
+LSOF_VERSION = 4.91
 LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2
 # Use http mirror since master ftp site access is very draconian
 LSOF_SITE = http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof
diff --git a/buildroot/package/lsqlite3/Config.in b/buildroot/package/lsqlite3/Config.in
index 223fb59c9..932657e58 100644
--- a/buildroot/package/lsqlite3/Config.in
+++ b/buildroot/package/lsqlite3/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LSQLITE3
 	bool "lsqlite3"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_SQLITE
 	help
-	  a thin Lua wrapper for the SQLite3 library.
+	  A binding for Lua to the SQLite3 database library.
 
 	  http://lua.sqlite.org/
diff --git a/buildroot/package/lsqlite3/lsqlite3.hash b/buildroot/package/lsqlite3/lsqlite3.hash
index 7cf0358d1..8ed989825 100644
--- a/buildroot/package/lsqlite3/lsqlite3.hash
+++ b/buildroot/package/lsqlite3/lsqlite3.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256	e6eb64a7ca3727c3093f3c37341d8ecadf9eac913e468eae413828476b19c225  lsqlite3-0.9.4-2.src.rock
+# computed by luarocks/buildroot
+sha256 fdae3c03390ab4e4b7db3a13d09b79ffe19318739b752d17914adcdb3d2ef9ff  lsqlite3-0.9.5-1.src.rock
diff --git a/buildroot/package/lsqlite3/lsqlite3.mk b/buildroot/package/lsqlite3/lsqlite3.mk
index 6f6445d93..bbf6a1db1 100644
--- a/buildroot/package/lsqlite3/lsqlite3.mk
+++ b/buildroot/package/lsqlite3/lsqlite3.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LSQLITE3_VERSION = 0.9.4-2
-LSQLITE3_SUBDIR = lsqlite3_fsl09x
-LSQLITE3_DEPENDENCIES = sqlite
+LSQLITE3_VERSION = 0.9.5-1
+LSQLITE3_SUBDIR = lsqlite3_fsl09y
 LSQLITE3_LICENSE = MIT
+LSQLITE3_DEPENDENCIES = sqlite
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/ltp-testsuite/0002-statx-fix-compile-errors.patch b/buildroot/package/ltp-testsuite/0002-statx-fix-compile-errors.patch
deleted file mode 100644
index 6ddd2c905..000000000
--- a/buildroot/package/ltp-testsuite/0002-statx-fix-compile-errors.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a945304b6a2286d0665c70250cc5475eb07fd21e Mon Sep 17 00:00:00 2001
-From: Thadeu Lima de Souza Cascardo 
-Date: Wed, 26 Sep 2018 11:15:45 -0300
-Subject: [PATCH] statx: fix compile errors
-
-struct statx is only defined in sys/stat.h when _GNU_SOURCE is defined.
-The testcases do define _GNU_SOURCE, but not the m4 struct check.
-
-Signed-off-by: Thadeu Lima de Souza Cascardo 
-Acked-by: Cyril Hrubis 
----
- m4/ltp-statx.m4 | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/m4/ltp-statx.m4 b/m4/ltp-statx.m4
-index 44303d30c..5f79a94cd 100644
---- a/m4/ltp-statx.m4
-+++ b/m4/ltp-statx.m4
-@@ -23,6 +23,11 @@ dnl
- AC_DEFUN([LTP_CHECK_STATX],[
- AC_CHECK_FUNCS(statx,,,[[#include ]])
- AC_CHECK_HEADER(linux/fs.h,,,)
--AC_CHECK_TYPES([struct statx],,,[[#include ]])
--AC_CHECK_TYPES([struct statx_timestamp],,,[[#include ]])
-+AC_CHECK_TYPES([struct statx],,,[[
-+	#define _GNU_SOURCE
-+	#include 
-+]])
-+AC_CHECK_TYPES([struct statx_timestamp],,,[[
-+	#define _GNU_SOURCE
-+	#include ]])
- ])
--- 
-2.19.0
-
diff --git a/buildroot/package/ltp-testsuite/ltp-testsuite.hash b/buildroot/package/ltp-testsuite/ltp-testsuite.hash
index 1f04aee48..ba0dcbe7e 100644
--- a/buildroot/package/ltp-testsuite/ltp-testsuite.hash
+++ b/buildroot/package/ltp-testsuite/ltp-testsuite.hash
@@ -1,2 +1,2 @@
-# From: https://github.com/linux-test-project/ltp/releases/download/20180926/ltp-full-20180926.tar.xz.sha1
-sha1 da5c8e847ed909dbd0b859c6918bc526cf6c2695  ltp-full-20180926.tar.xz
+# From: https://github.com/linux-test-project/ltp/releases/download/20190115/ltp-full-20190115.tar.xz.sha1
+sha1 d87e2f96dc628f927e98ecba2e9dae581fc115b4  ltp-full-20190115.tar.xz
diff --git a/buildroot/package/ltp-testsuite/ltp-testsuite.mk b/buildroot/package/ltp-testsuite/ltp-testsuite.mk
index 9001316fb..ebc386d0c 100644
--- a/buildroot/package/ltp-testsuite/ltp-testsuite.mk
+++ b/buildroot/package/ltp-testsuite/ltp-testsuite.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTP_TESTSUITE_VERSION = 20180926
+LTP_TESTSUITE_VERSION = 20190115
 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
 LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION)
 LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+
@@ -75,7 +75,4 @@ endef
 LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_LDD
 endif
 
-# 0002-statx-fix-compile-errors.patch
-LTP_TESTSUITE_AUTORECONF = YES
-
 $(eval $(autotools-package))
diff --git a/buildroot/package/lua-basexx/lua-basexx.hash b/buildroot/package/lua-basexx/lua-basexx.hash
index 91c428c14..aee636c32 100644
--- a/buildroot/package/lua-basexx/lua-basexx.hash
+++ b/buildroot/package/lua-basexx/lua-basexx.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df  basexx-0.4.0-1.src.rock
+sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b  basexx-0.4.0/LICENSE
diff --git a/buildroot/package/lua-basexx/lua-basexx.mk b/buildroot/package/lua-basexx/lua-basexx.mk
index bfdc1e27b..5aa5ecf21 100644
--- a/buildroot/package/lua-basexx/lua-basexx.mk
+++ b/buildroot/package/lua-basexx/lua-basexx.mk
@@ -4,10 +4,8 @@
 #
 ################################################################################
 
-LUA_BASEXX_VERSION_UPSTREAM =0.4.0
-LUA_BASEXX_VERSION = $(LUA_BASEXX_VERSION_UPSTREAM)-1
+LUA_BASEXX_VERSION = 0.4.0-1
 LUA_BASEXX_NAME_UPSTREAM = basexx
-LUA_BASEXX_SUBDIR = basexx-$(LUA_BASEXX_VERSION_UPSTREAM)
 LUA_BASEXX_LICENSE = MIT
 LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE
 
diff --git a/buildroot/package/lua-bit32/lua-bit32.hash b/buildroot/package/lua-bit32/lua-bit32.hash
index 21dbd0531..22d5b01be 100644
--- a/buildroot/package/lua-bit32/lua-bit32.hash
+++ b/buildroot/package/lua-bit32/lua-bit32.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256  fe7bc70d1e48183d95ccfb6741e70a676283075173122cb161303d77059b27a6  bit32-5.3.0-1.src.rock
+# computed by luarocks/buildroot
+sha256 fe7bc70d1e48183d95ccfb6741e70a676283075173122cb161303d77059b27a6  bit32-5.3.0-1.src.rock
+sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66  lua-compat-5.2/LICENSE
diff --git a/buildroot/package/lua-cjson/Config.in b/buildroot/package/lua-cjson/Config.in
index 262452a82..9474b3176 100644
--- a/buildroot/package/lua-cjson/Config.in
+++ b/buildroot/package/lua-cjson/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUA_CJSON
 	bool "lua-cjson"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  The Lua CJSON module provides JSON support for Lua.
 	  It features:
diff --git a/buildroot/package/lua-cjson/lua-cjson.hash b/buildroot/package/lua-cjson/lua-cjson.hash
index 852dc6781..2a23eb3d2 100644
--- a/buildroot/package/lua-cjson/lua-cjson.hash
+++ b/buildroot/package/lua-cjson/lua-cjson.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	db7af849c555d1a474f729fe4a56b5530e9be7b24749eb7a7c474a7c7207b972  lua-cjson-2.1.0-1.src.rock
+# computed by luarocks/buildroot
+sha256 455fa7d07d8ac9d61f68f538958f8e28972256f38b0a1c2740873daf809d1837  lua-cjson-2.1.0.6-1.src.rock
+sha256 9576e82ef5013fbe80b3bd446a7d9ddd47328baa2186c31d3d885e2a9a8cd31e  lua-cjson/LICENSE
diff --git a/buildroot/package/lua-cjson/lua-cjson.mk b/buildroot/package/lua-cjson/lua-cjson.mk
index 1823aa50d..e029dab5c 100644
--- a/buildroot/package/lua-cjson/lua-cjson.mk
+++ b/buildroot/package/lua-cjson/lua-cjson.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-LUA_CJSON_VERSION = 2.1.0-1
+LUA_CJSON_VERSION = 2.1.0.6-1
+LUA_CJSON_SUBDIR = lua-cjson
 LUA_CJSON_LICENSE = MIT
 LUA_CJSON_LICENSE_FILES = $(LUA_CJSON_SUBDIR)/LICENSE
 
diff --git a/buildroot/package/lua-coat/Config.in b/buildroot/package/lua-coat/Config.in
index fa7aed90a..f34f6b97e 100644
--- a/buildroot/package/lua-coat/Config.in
+++ b/buildroot/package/lua-coat/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA_COAT
 	bool "lua-coat"
 	help
-	  Yet Another Lua Object-Oriented Model
+	  Yet Another Lua Object-Oriented Model.
 
 	  https://fperrad.frama.io/lua-Coat/
diff --git a/buildroot/package/lua-coat/lua-coat.hash b/buildroot/package/lua-coat/lua-coat.hash
index 1f2135566..491ba2964 100644
--- a/buildroot/package/lua-coat/lua-coat.hash
+++ b/buildroot/package/lua-coat/lua-coat.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	24d0e894d743f46c09a282e4dd272d2a6004557608b618c1c9d9f464dd65af02  lua-coat-0.9.2-1.src.rock
+# computed by luarocks/buildroot
+sha256 24d0e894d743f46c09a282e4dd272d2a6004557608b618c1c9d9f464dd65af02  lua-coat-0.9.2-1.src.rock
+sha256 81b5f657812ccfd63f19c9af1389b5fe6b26f079a4841c5d074940c47bf7cb1e  lua-Coat-0.9.2/COPYRIGHT
diff --git a/buildroot/package/lua-coatpersistent/Config.in b/buildroot/package/lua-coatpersistent/Config.in
index 049a0bc2a..4e8e64329 100644
--- a/buildroot/package/lua-coatpersistent/Config.in
+++ b/buildroot/package/lua-coatpersistent/Config.in
@@ -1,9 +1,8 @@
 config BR2_PACKAGE_LUA_COATPERSISTENT
 	bool "lua-coatpersistent"
 	depends on BR2_PACKAGE_LSQLITE3 || BR2_PACKAGE_LUASQL_SQLITE3
-	# run-time dependencies
-	select BR2_PACKAGE_DADO
-	select BR2_PACKAGE_LUA_COAT
+	select BR2_PACKAGE_DADO # runtime
+	select BR2_PACKAGE_LUA_COAT # runtime
 	help
 	  An ORM for lua-Coat.
 
diff --git a/buildroot/package/lua-coatpersistent/lua-coatpersistent.hash b/buildroot/package/lua-coatpersistent/lua-coatpersistent.hash
index eeb13bb1c..a15379e13 100644
--- a/buildroot/package/lua-coatpersistent/lua-coatpersistent.hash
+++ b/buildroot/package/lua-coatpersistent/lua-coatpersistent.hash
@@ -1,3 +1,4 @@
-# Locally calculated
-sha256	e718ee36a17312108f266e8412f840db150afd89e8587d36e685673fff65f142  lua-coatpersistent-lsqlite3-0.2.2-1.src.rock
-sha256	5d36d6a8b413a2d56a466a45314291a0265c514a179e741b3fc95f4dd901abe6  lua-coatpersistent-luasql-0.2.2-1.src.rock
+# computed by luarocks/buildroot
+sha256 e718ee36a17312108f266e8412f840db150afd89e8587d36e685673fff65f142  lua-coatpersistent-lsqlite3-0.2.2-1.src.rock
+sha256 5d36d6a8b413a2d56a466a45314291a0265c514a179e741b3fc95f4dd901abe6  lua-coatpersistent-luasql-0.2.2-1.src.rock
+sha256 f8ed30644056ceff4315e694a1c1af4af4f08ec0adabae353ab8f3f5289ffbf3  lua-CoatPersistent-0.2.2/COPYRIGHT
diff --git a/buildroot/package/lua-compat53/Config.in b/buildroot/package/lua-compat53/Config.in
index 7ab3d740f..76c5b3fd7 100644
--- a/buildroot/package/lua-compat53/Config.in
+++ b/buildroot/package/lua-compat53/Config.in
@@ -3,6 +3,6 @@ config BR2_PACKAGE_LUA_COMPAT53
 	depends on !BR2_PACKAGE_LUA_5_3
 	help
 	  Compatibility module providing Lua-5.3-style APIs for Lua 5.2
-	  and 5.1
+	  and 5.1.
 
 	  https://github.com/keplerproject/lua-compat-5.3
diff --git a/buildroot/package/lua-compat53/lua-compat53.hash b/buildroot/package/lua-compat53/lua-compat53.hash
index f311b9ce8..b40596f86 100644
--- a/buildroot/package/lua-compat53/lua-compat53.hash
+++ b/buildroot/package/lua-compat53/lua-compat53.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 cb5fdca362780a30405c4134310ea78627a092b0ee8445a52456f2fceeeaea4e  compat53-0.7-1.src.rock
+sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5  lua-compat-5.3-0.7/LICENSE
diff --git a/buildroot/package/lua-csnappy/lua-csnappy.hash b/buildroot/package/lua-csnappy/lua-csnappy.hash
index f88742644..43790f2bd 100644
--- a/buildroot/package/lua-csnappy/lua-csnappy.hash
+++ b/buildroot/package/lua-csnappy/lua-csnappy.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	4fc373ba714cb8b428e9971f1725d82de6a43dfea361a0b7894e4762238dc95c  lua-csnappy-0.1.5-1.src.rock
+# computed by luarocks/buildroot
+sha256 4fc373ba714cb8b428e9971f1725d82de6a43dfea361a0b7894e4762238dc95c  lua-csnappy-0.1.5-1.src.rock
+sha256 8865da757dbc6fe3c8cee4d88bdfd82c1e0e789974a4d0d52db75a985025c1f0  lua-csnappy-0.1.5/COPYRIGHT
diff --git a/buildroot/package/lua-curl/0001-Fix-build-with-curl-7.62.0.patch b/buildroot/package/lua-curl/0001-Fix-build-with-curl-7.62.0.patch
deleted file mode 100644
index 456afb30f..000000000
--- a/buildroot/package/lua-curl/0001-Fix-build-with-curl-7.62.0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4e3764ecf2b2c3f62475579fee6af4a753729f07 Mon Sep 17 00:00:00 2001
-From: Baruch Siach 
-Date: Thu, 1 Nov 2018 19:12:20 +0200
-Subject: [PATCH] Fix build with curl 7.62.0
-
-Fixes #134.
-
-curl 7.62.0 deprecates the CURLE_SSL_CACERT error code, and unifies it
-with CURLE_PEER_FAILED_VERIFICATION. Adjust the errors list to match.
-
-This fixes the following build failure:
-
-src/lcerr_easy.h: In function 'lcurl_err_easy_mnemo':
-src/lcerror.c:32:22: error: duplicate case value
- #define ERR_ENTRY(E) case CURLE_##E: return #E;
-                      ^
-src/lcerr_easy.h:74:1: note: in expansion of macro 'ERR_ENTRY'
- ERR_ENTRY ( SSL_CACERT               )
- ^~~~~~~~~
-src/lcerror.c:32:22: note: previously used here
- #define ERR_ENTRY(E) case CURLE_##E: return #E;
-                      ^
-src/lcerr_easy.h:65:1: note: in expansion of macro 'ERR_ENTRY'
- ERR_ENTRY ( PEER_FAILED_VERIFICATION )
- ^~~~~~~~~
-
-Signed-off-by: Baruch Siach 
----
-Upstream status: https://github.com/Lua-cURL/Lua-cURLv3/pull/136
-
-diff --git a/src/lcerr_easy.h b/src/lcerr_easy.h
-index 94ad143c3bfe..895c6d87d72f 100644
---- a/Lua-cURLv3-0.3.7/src/lcerr_easy.h
-+++ b/Lua-cURLv3-0.3.7/src/lcerr_easy.h
-@@ -62,7 +62,11 @@ ERR_ENTRY ( UNKNOWN_TELNET_OPTION    ) /* User specified an unknown option */
- #endif
- ERR_ENTRY ( TELNET_OPTION_SYNTAX     )
- ERR_ENTRY ( OBSOLETE50               )
-+#if LCURL_CURL_VER_GE(7,62,0)
-+ERR_ENTRY ( OBSOLETE51               )
-+#else
- ERR_ENTRY ( PEER_FAILED_VERIFICATION )
-+#endif
- ERR_ENTRY ( GOT_NOTHING              )
- ERR_ENTRY ( SSL_ENGINE_NOTFOUND      )
- ERR_ENTRY ( SSL_ENGINE_SETFAILED     )
-@@ -71,7 +75,11 @@ ERR_ENTRY ( RECV_ERROR               )
- ERR_ENTRY ( OBSOLETE57               )
- ERR_ENTRY ( SSL_CERTPROBLEM          )
- ERR_ENTRY ( SSL_CIPHER               )
-+#if LCURL_CURL_VER_GE(7,62,0)
-+ERR_ENTRY ( PEER_FAILED_VERIFICATION )
-+#else
- ERR_ENTRY ( SSL_CACERT               )
-+#endif
- ERR_ENTRY ( BAD_CONTENT_ENCODING     )
- ERR_ENTRY ( LDAP_INVALID_URL         )
- ERR_ENTRY ( FILESIZE_EXCEEDED        )
diff --git a/buildroot/package/lua-curl/0001-add-variant-definition-of-lcurl_url_t.patch b/buildroot/package/lua-curl/0001-add-variant-definition-of-lcurl_url_t.patch
new file mode 100644
index 000000000..0fdd0760d
--- /dev/null
+++ b/buildroot/package/lua-curl/0001-add-variant-definition-of-lcurl_url_t.patch
@@ -0,0 +1,40 @@
+From 28ac0c5e642c9f7e3091a60268745f7cab4cc92b Mon Sep 17 00:00:00 2001
+From: Francois Perrad 
+Date: Sat, 23 Feb 2019 15:23:26 +0100
+Subject: [PATCH] add variant definition of lcurl_url_t
+
+like in lceasy.h
+
+Signed-off-by: Francois Perrad 
+---
+ src/lcurlapi.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/Lua-cURLv3-0.3.9/src/lcurlapi.h b/Lua-cURLv3-0.3.9/src/lcurlapi.h
+index 4dd4672..862c94f 100644
+--- a/Lua-cURLv3-0.3.9/src/lcurlapi.h
++++ b/Lua-cURLv3-0.3.9/src/lcurlapi.h
+@@ -19,11 +19,20 @@
+ 
+ #if LCURL_CURL_VER_GE(7,62,0)
+ 
++#if LCURL_CC_SUPPORT_FORWARD_TYPEDEF
+ typedef struct lcurl_url_tag {
+   CURLU *url;
+ 
+   int err_mode;
+ }lcurl_url_t;
++#else
++struct lcurl_url_tag {
++  CURLU *url;
++
++  int err_mode;
++};
++#define lcurl_url_t struct lcurl_url_tag
++#endif
+ 
+ int lcurl_url_create(lua_State *L, int error_mode);
+ 
+-- 
+2.17.1
+
diff --git a/buildroot/package/lua-curl/lua-curl.hash b/buildroot/package/lua-curl/lua-curl.hash
index e73810ced..49cd6653a 100644
--- a/buildroot/package/lua-curl/lua-curl.hash
+++ b/buildroot/package/lua-curl/lua-curl.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256 4cc6389bf5d4a868cc1e6017733b9b6306f2fc8b5083aa928d66399195697f34  lua-curl-0.3.7-1.src.rock
+# computed by luarocks/buildroot
+sha256 ec761e800cec630ff0e78f100e1a61246c35823073014de65f1af0a85bfe1dc0  lua-curl-0.3.9-1.src.rock
+sha256 264807cb89f960808fed1ef9922aed9d9f8437764e836d8e594e66db7be9c54c  Lua-cURLv3-0.3.9/LICENSE
diff --git a/buildroot/package/lua-curl/lua-curl.mk b/buildroot/package/lua-curl/lua-curl.mk
index 9e4f262cf..9fa9408a4 100644
--- a/buildroot/package/lua-curl/lua-curl.mk
+++ b/buildroot/package/lua-curl/lua-curl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_CURL_VERSION_UPSTREAM = 0.3.7
+LUA_CURL_VERSION_UPSTREAM = 0.3.9
 LUA_CURL_VERSION = $(LUA_CURL_VERSION_UPSTREAM)-1
 LUA_CURL_SUBDIR = Lua-cURLv3-$(LUA_CURL_VERSION_UPSTREAM)
 LUA_CURL_LICENSE = MIT
diff --git a/buildroot/package/lua-datafile/lua-datafile.hash b/buildroot/package/lua-datafile/lua-datafile.hash
index 83c346eae..c43b2b147 100644
--- a/buildroot/package/lua-datafile/lua-datafile.hash
+++ b/buildroot/package/lua-datafile/lua-datafile.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256 37a33079c3476477f19de14bebd664635a39a57dd05a2709c3a402cbc1e79a6b  datafile-0.4-1.src.rock
+# computed by luarocks/buildroot
+sha256 4f7d58c50267b5ebd2145e52aaa5fb63fbf63a74ae765f08e2d0dddd570b6b6a  datafile-0.6-1.src.rock
+sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66  datafile/LICENSE
diff --git a/buildroot/package/lua-datafile/lua-datafile.mk b/buildroot/package/lua-datafile/lua-datafile.mk
index 75aef5290..5d30fdcf9 100644
--- a/buildroot/package/lua-datafile/lua-datafile.mk
+++ b/buildroot/package/lua-datafile/lua-datafile.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_DATAFILE_VERSION = 0.4-1
+LUA_DATAFILE_VERSION = 0.6-1
 LUA_DATAFILE_NAME_UPSTREAM = datafile
 LUA_DATAFILE_SUBDIR = datafile
 LUA_DATAFILE_LICENSE = MIT
diff --git a/buildroot/package/lua-ev/Config.in b/buildroot/package/lua-ev/Config.in
index 52f82e112..1e89c270a 100644
--- a/buildroot/package/lua-ev/Config.in
+++ b/buildroot/package/lua-ev/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUA_EV
 	bool "lua-ev"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_LIBEV
 	help
 	  Get access to the libev library from Lua.
diff --git a/buildroot/package/lua-fifo/lua-fifo.hash b/buildroot/package/lua-fifo/lua-fifo.hash
index bab372804..7d885f413 100644
--- a/buildroot/package/lua-fifo/lua-fifo.hash
+++ b/buildroot/package/lua-fifo/lua-fifo.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 53dea24ad658614a0254dcb10296a1a0fc5357315ada5724d6362f54c32b4c20  fifo-0.2-0.src.rock
+sha256 8b4423dd4f55a69da1454b7a48346a54fd5b6e0408b38fde25cd29c0922962b6  fifo.lua-0.2/LICENSE
diff --git a/buildroot/package/lua-fifo/lua-fifo.mk b/buildroot/package/lua-fifo/lua-fifo.mk
index 875b89577..8b15fc1fc 100644
--- a/buildroot/package/lua-fifo/lua-fifo.mk
+++ b/buildroot/package/lua-fifo/lua-fifo.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LUA_FIFO_VERSION_UPSTREAM =0.2
-LUA_FIFO_VERSION =$(LUA_FIFO_VERSION_UPSTREAM)-0
+LUA_FIFO_VERSION_UPSTREAM = 0.2
+LUA_FIFO_VERSION = $(LUA_FIFO_VERSION_UPSTREAM)-0
 LUA_FIFO_NAME_UPSTREAM = fifo
 LUA_FIFO_SUBDIR = fifo.lua-$(LUA_FIFO_VERSION_UPSTREAM)
 LUA_FIFO_LICENSE = MIT
diff --git a/buildroot/package/lua-flu/lua-flu.hash b/buildroot/package/lua-flu/lua-flu.hash
index 92a0a13ff..2195b4246 100644
--- a/buildroot/package/lua-flu/lua-flu.hash
+++ b/buildroot/package/lua-flu/lua-flu.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	1389c22daec77161ec93ff90c39ee70e0f8a656ff92f22f9cf5d7121999d5c53  flu-20150331-1.src.rock
+# computed by luarocks/buildroot
+sha256 1389c22daec77161ec93ff90c39ee70e0f8a656ff92f22f9cf5d7121999d5c53  flu-20150331-1.src.rock
+sha256 409f7c274eb26874a382241d675a360ba6b2659742c5941e680d71a41dd35913  doub-flu-a7daae986339/doc/LICENSE.txt
diff --git a/buildroot/package/lua-flu/lua-flu.mk b/buildroot/package/lua-flu/lua-flu.mk
index 7cfea8e6d..c01a4848c 100644
--- a/buildroot/package/lua-flu/lua-flu.mk
+++ b/buildroot/package/lua-flu/lua-flu.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUA_FLU_VERSION = 20150331-1
-LUA_FLU_NAME_UPSTREAM = flu
+LUA_FLU_NAME_UPSTREAM = Flu
 LUA_FLU_SUBDIR = doub-flu-a7daae986339
 LUA_FLU_LICENSE = MIT
 LUA_FLU_LICENSE_FILES = $(LUA_FLU_SUBDIR)/doc/LICENSE.txt
diff --git a/buildroot/package/lua-http/Config.in b/buildroot/package/lua-http/Config.in
index 247cc4031..8aaec69ef 100644
--- a/buildroot/package/lua-http/Config.in
+++ b/buildroot/package/lua-http/Config.in
@@ -1,16 +1,16 @@
 config BR2_PACKAGE_LUA_HTTP
 	bool "lua-http"
 	depends on BR2_TOOLCHAIN_HAS_THREADS    # luaossl & lua-cqueues
-	# These are runtime dependencies
-	select BR2_PACKAGE_LUA_BASEXX
-	select BR2_PACKAGE_LUA_COMPAT53 if !BR2_PACKAGE_LUA_5_3
-	select BR2_PACKAGE_LUA_CQUEUES
-	select BR2_PACKAGE_LUA_FIFO
-	select BR2_PACKAGE_LUA_LPEG_PATTERNS
-	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
-	select BR2_PACKAGE_LUAOSSL
+	select BR2_PACKAGE_LPEG # runtime
+	select BR2_PACKAGE_LUA_BASEXX # runtime
+	select BR2_PACKAGE_LUA_COMPAT53 if !BR2_PACKAGE_LUA_5_3 # runtime
+	select BR2_PACKAGE_LUA_CQUEUES # runtime
+	select BR2_PACKAGE_LUA_FIFO # runtime
+	select BR2_PACKAGE_LUA_LPEG_PATTERNS # runtime
+	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1 # runtime
+	select BR2_PACKAGE_LUAOSSL # runtime
 	help
-	  HTTP library for Lua
+	  HTTP library for Lua.
 
 	  https://daurnimator.github.io/lua-http/
 
diff --git a/buildroot/package/lua-http/lua-http.hash b/buildroot/package/lua-http/lua-http.hash
index 2346ab97a..3c7bcebd3 100644
--- a/buildroot/package/lua-http/lua-http.hash
+++ b/buildroot/package/lua-http/lua-http.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 d68591eeeeb60c4187469eae89f5bad02d753a8c0adaa460d453b0734222645a  http-0.2-0.src.rock
+sha256 10650e71ba335c76955bbbec2b1f5b9d5655f2e0fdc6c7cecae5bd28a376302c  lua-http-0.2/LICENSE.md
diff --git a/buildroot/package/lua-iconv/lua-iconv.hash b/buildroot/package/lua-iconv/lua-iconv.hash
index 46291026c..8015599e4 100644
--- a/buildroot/package/lua-iconv/lua-iconv.hash
+++ b/buildroot/package/lua-iconv/lua-iconv.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	fb66e785e15376c2d2817f1f1b27d10272b877eacc998c727a10f081a7d768fa  lua-iconv-7-1.src.rock
+# computed by luarocks/buildroot
+sha256 fb66e785e15376c2d2817f1f1b27d10272b877eacc998c727a10f081a7d768fa  lua-iconv-7-1.src.rock
+sha256 30227b9571827f3dfcdeb3830594fc415459d64ad7271e9954178d3ef58a9bd4  lua-iconv-7/COPYING
diff --git a/buildroot/package/lua-iconv/lua-iconv.mk b/buildroot/package/lua-iconv/lua-iconv.mk
index dd7533af5..ea8e0dd8b 100644
--- a/buildroot/package/lua-iconv/lua-iconv.mk
+++ b/buildroot/package/lua-iconv/lua-iconv.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 LUA_ICONV_VERSION = 7-1
-LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 LUA_ICONV_LICENSE = MIT
 LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYING
+LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/lua-lpeg-patterns/Config.in b/buildroot/package/lua-lpeg-patterns/Config.in
index 9c701d3de..08c063a0c 100644
--- a/buildroot/package/lua-lpeg-patterns/Config.in
+++ b/buildroot/package/lua-lpeg-patterns/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUA_LPEG_PATTERNS
 	bool "lua-lpeg-patterns"
-	# These are runtime dependencies
-	select BR2_PACKAGE_LPEG
+	select BR2_PACKAGE_LPEG # runtime
 	help
 	  a collection of LPEG patterns.
 
diff --git a/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.hash b/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
index f779466df..3fad73ca0 100644
--- a/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
+++ b/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256 82c8eddee52069e5ae821b68cb9e295ab5767a47d07545a4ca36ac1e81066086  lpeg_patterns-0.4-0.src.rock
+# computed by luarocks/buildroot
+sha256 0e6d33543689e83911e2cb47965752e00412cbdfca888812ccbde9ec95259c56  lpeg_patterns-0.5-0.src.rock
+sha256 5b0346f2b2432e5f05e8e4ad31503cf84ddf802dacde9e8c3e529efaa4be3348  lpeg_patterns-0.5/LICENSE.md
diff --git a/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.mk b/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.mk
index 8f40c9954..290af8c17 100644
--- a/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.mk
+++ b/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_LPEG_PATTERNS_VERSION = 0.4-0
+LUA_LPEG_PATTERNS_VERSION = 0.5-0
 LUA_LPEG_PATTERNS_NAME_UPSTREAM = lpeg_patterns
 LUA_LPEG_PATTERNS_ROCKSPEC = $(LUA_LPEG_PATTERNS_NAME_UPSTREAM)-$(LUA_LPEG_PATTERNS_VERSION).rockspec
 LUA_LPEG_PATTERNS_SOURCE = $(LUA_LPEG_PATTERNS_NAME_UPSTREAM)-$(LUA_LPEG_PATTERNS_VERSION).src.rock
diff --git a/buildroot/package/lua-markdown/lua-markdown.hash b/buildroot/package/lua-markdown/lua-markdown.hash
index 9bfbf6007..682b4f84c 100644
--- a/buildroot/package/lua-markdown/lua-markdown.hash
+++ b/buildroot/package/lua-markdown/lua-markdown.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 bed84231bb48322f8e614b4392181c52c36bc71340f9273e0c3bd72dc922bc07  markdown-0.33-1.src.rock
+sha256 c13c5634db49d16c87f164ce0b79fb7e1b313c8b66818ebf1c970747a429b39b  markdown/LICENSE
diff --git a/buildroot/package/lua-markdown/lua-markdown.mk b/buildroot/package/lua-markdown/lua-markdown.mk
index a98f3125a..d35f8be83 100644
--- a/buildroot/package/lua-markdown/lua-markdown.mk
+++ b/buildroot/package/lua-markdown/lua-markdown.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUA_MARKDOWN_VERSION = 0.33-1
-LUA_MARKDOWN_NAME_UPSTREAM = markdown
+LUA_MARKDOWN_NAME_UPSTREAM = Markdown
 LUA_MARKDOWN_SUBDIR = markdown
 LUA_MARKDOWN_LICENSE = MIT
 LUA_MARKDOWN_LICENSE_FILES = $(LUA_MARKDOWN_SUBDIR)/LICENSE
diff --git a/buildroot/package/lua-messagepack/lua-messagepack.hash b/buildroot/package/lua-messagepack/lua-messagepack.hash
index 86ea5d088..aa1a1b541 100644
--- a/buildroot/package/lua-messagepack/lua-messagepack.hash
+++ b/buildroot/package/lua-messagepack/lua-messagepack.hash
@@ -1,3 +1,4 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 a27d985b8bdb79ebe78dfe255c795e839a04eb2fed1c610a81c7876e3f72fd97  lua-messagepack-0.5.1-1.src.rock
 sha256 b7f69ada6aed7e0cdfd690291607d8f41246e67f191107ecdc0a1e592c449abe  lua-messagepack-lua53-0.5.1-1.src.rock
+sha256 e409ff1f089c1cd36840349fd790a6ffce5a31f16d30c108ce94aaa3b128dcea  lua-MessagePack-0.5.1/COPYRIGHT
diff --git a/buildroot/package/lua-msgpack-native/Config.in b/buildroot/package/lua-msgpack-native/Config.in
index 3837228fa..8af508dd9 100644
--- a/buildroot/package/lua-msgpack-native/Config.in
+++ b/buildroot/package/lua-msgpack-native/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUA_MSGPACK_NATIVE
 	bool "lua-msgpack-native"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
 	help
 	  This is a native, C language implementation of msgpack
@@ -8,6 +7,6 @@ config BR2_PACKAGE_LUA_MSGPACK_NATIVE
 
 	  https://github.com/kengonakajima/lua-msgpack-native
 
-comment "lua-msgpack-native needs a Lua 5.1 interpreter"
+comment "lua-msgpack-native needs Lua 5.1 or LuaJIT"
 	depends on !BR2_PACKAGE_LUA_5_1
 	depends on !BR2_PACKAGE_LUAJIT
diff --git a/buildroot/package/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch b/buildroot/package/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch
deleted file mode 100644
index 22c748ccb..000000000
--- a/buildroot/package/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1d8cb0ad54099c3d7261aaa19a2c0786f16736d0 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Sat, 8 Aug 2015 22:42:39 +0200
-Subject: [PATCH] Add missing header for musl compatibility
-
- is needed to get the definition of _IOC_SIZEBITS and
-solve the following build failure:
-
-src/spi.c: In function 'spi_transfer':
-src/spi.c:100:24: error: '_IOC_SIZEBITS' undeclared (first use in this function)
-     if (ioctl(spi->fd, SPI_IOC_MESSAGE(1), &spi_xfer) < 1)
-
-Signed-off-by: Thomas Petazzoni 
-[Port from c-periphery]
-Signed-off-by: Jörg Krause 
----
- src/spi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lua-periphery/c-periphery/src/spi.c b/lua-periphery/c-periphery/src/spi.c
-index 52a8d3d..1a6b17c 100644
---- a/lua-periphery/c-periphery/src/spi.c
-+++ b/lua-periphery/c-periphery/src/spi.c
-@@ -16,6 +16,7 @@
- #include 
- 
- #include 
-+#include 
- #include 
- 
- #include "spi.h"
--- 
-2.5.0
-
diff --git a/buildroot/package/lua-periphery/0002-Fix-build-on-SPARC.patch b/buildroot/package/lua-periphery/0002-Fix-build-on-SPARC.patch
deleted file mode 100644
index ce461ddca..000000000
--- a/buildroot/package/lua-periphery/0002-Fix-build-on-SPARC.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-[PATCH] Fix build on SPARC
-
-On SPARC, the definitions of B2500000, B3000000, B3500000 and B4000000
-are not necessarily available, so use those values only if defined in
-the kernel headers.
-
-It fixes SPARC build failures such as:
-
-src/serial.c: In function '_serial_baudrate_to_bits':
-src/serial.c:73:30: error: 'B2500000' undeclared (first use in this function)
-         case 2500000: return B2500000;
-                              ^
-src/serial.c:73:30: note: each undeclared identifier is reported only once for each function it appears in
-src/serial.c:74:30: error: 'B3000000' undeclared (first use in this function)
-         case 3000000: return B3000000;
-                              ^
-Signed-off-by: Thomas Petazzoni 
-
-Index: b/lua-periphery/c-periphery/src/serial.c
-===================================================================
---- a/lua-periphery/c-periphery/src/serial.c
-+++ b/lua-periphery/c-periphery/src/serial.c
-@@ -70,10 +70,18 @@
-         case 1152000: return B1152000;
-         case 1500000: return B1500000;
-         case 2000000: return B2000000;
-+#ifdef B2500000
-         case 2500000: return B2500000;
-+#endif
-+#ifdef B3000000
-         case 3000000: return B3000000;
-+#endif
-+#ifdef B3500000
-         case 3500000: return B3500000;
-+#endif
-+#ifdef B4000000
-         case 4000000: return B4000000;
-+#endif
-         default: return -1;
-     }
- }
-@@ -107,10 +115,18 @@
-         case B1152000: return 1152000;
-         case B1500000: return 1500000;
-         case B2000000: return 2000000;
-+#ifdef B2500000
-         case B2500000: return 2500000;
-+#endif
-+#ifdef B3000000
-         case B3000000: return 3000000;
-+#endif
-+#ifdef B3500000
-         case B3500000: return 3500000;
-+#endif
-+#ifdef B4000000
-         case B4000000: return 4000000;
-+#endif
-         default: return -1;
-     }
- }
diff --git a/buildroot/package/lua-periphery/Config.in b/buildroot/package/lua-periphery/Config.in
index de5a71633..e40abd712 100644
--- a/buildroot/package/lua-periphery/Config.in
+++ b/buildroot/package/lua-periphery/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUA_PERIPHERY
 	bool "lua-periphery"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  A library for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O
 	  interface access in userspace Linux with Lua.
diff --git a/buildroot/package/lua-periphery/lua-periphery.hash b/buildroot/package/lua-periphery/lua-periphery.hash
index 7f6e63f3b..b87cfbbc6 100644
--- a/buildroot/package/lua-periphery/lua-periphery.hash
+++ b/buildroot/package/lua-periphery/lua-periphery.hash
@@ -1,2 +1,3 @@
-# Locally computed
-sha256  53762ed9b8a2edfcc5b4c535ef73e6a425f2577e036bb15994ca16a39b16ebab  lua-periphery-1.0.6-1.src.rock
+# computed by luarocks/buildroot
+sha256 ff8a4d08f02356586fadfe47f01859ba28539cc42013836f79a032bf4ccc78b3  lua-periphery-1.1.1-1.src.rock
+sha256 7c60847b46f718e9651d1eca2f56bf6be09608cf08d130446a521eb8288c98e1  lua-periphery/LICENSE
diff --git a/buildroot/package/lua-periphery/lua-periphery.mk b/buildroot/package/lua-periphery/lua-periphery.mk
index 2c04eede8..af5abe70d 100644
--- a/buildroot/package/lua-periphery/lua-periphery.mk
+++ b/buildroot/package/lua-periphery/lua-periphery.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_PERIPHERY_VERSION = 1.0.6-1
+LUA_PERIPHERY_VERSION = 1.1.1-1
 LUA_PERIPHERY_SUBDIR = lua-periphery
 LUA_PERIPHERY_LICENSE = MIT
 LUA_PERIPHERY_LICENSE_FILES = $(LUA_PERIPHERY_SUBDIR)/LICENSE
diff --git a/buildroot/package/lua-resty-http/lua-resty-http.hash b/buildroot/package/lua-resty-http/lua-resty-http.hash
index e45df0e91..486a110a7 100644
--- a/buildroot/package/lua-resty-http/lua-resty-http.hash
+++ b/buildroot/package/lua-resty-http/lua-resty-http.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 4628413a5a2828645e3ddb38a2a0c764e81443cbd1a011357eeed7e983750329  lua-resty-http-0.12-0.src.rock
+sha256 407e4b1412d8afa317dc703a1d318866c3de87d78899402125cbd90548c6057d  lua-resty-http/LICENSE
diff --git a/buildroot/package/lua-sailor/Config.in b/buildroot/package/lua-sailor/Config.in
index 2600d4600..c973c8767 100644
--- a/buildroot/package/lua-sailor/Config.in
+++ b/buildroot/package/lua-sailor/Config.in
@@ -1,13 +1,12 @@
 config BR2_PACKAGE_LUA_SAILOR
 	bool "lua-sailor"
-	# These are runtime dependencies
-	select BR2_PACKAGE_CGILUA
-	select BR2_PACKAGE_LBASE64
-	select BR2_PACKAGE_LUAFILESYSTEM
-	select BR2_PACKAGE_LUA_DATAFILE
-	select BR2_PACKAGE_LUA_VALUA
-	select BR2_PACKAGE_XAVANTE
-	select BR2_PACKAGE_WSAPI_XAVANTE
+	select BR2_PACKAGE_CGILUA # runtime
+	select BR2_PACKAGE_LBASE64 # runtime
+	select BR2_PACKAGE_LUA_DATAFILE # runtime
+	select BR2_PACKAGE_LUA_VALUA # runtime
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
+	select BR2_PACKAGE_WSAPI_XAVANTE # runtime
+	select BR2_PACKAGE_XAVANTE # runtime
 	help
 	  Sailor is a web framework written in Lua that follows the MVC
 	  design pattern.
diff --git a/buildroot/package/lua-sailor/lua-sailor.hash b/buildroot/package/lua-sailor/lua-sailor.hash
index f4c42cccc..aec00afe5 100644
--- a/buildroot/package/lua-sailor/lua-sailor.hash
+++ b/buildroot/package/lua-sailor/lua-sailor.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 4f7f43a7cf6c62712a521ebaf5f53aaf230039c7fb06480ae168c3aa036120bf  sailor-0.5-4.src.rock
+sha256 3a19bc44e1a653b39bcb1b91cc8058ac6b1cd1caf7e6cef93517fd559b189065  sailor/LICENSE
diff --git a/buildroot/package/lua-sailor/lua-sailor.mk b/buildroot/package/lua-sailor/lua-sailor.mk
index 17fbd7c61..f88e03591 100644
--- a/buildroot/package/lua-sailor/lua-sailor.mk
+++ b/buildroot/package/lua-sailor/lua-sailor.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUA_SAILOR_VERSION = 0.5-4
-LUA_SAILOR_NAME_UPSTREAM = sailor
+LUA_SAILOR_NAME_UPSTREAM = Sailor
 LUA_SAILOR_SUBDIR = sailor
 LUA_SAILOR_LICENSE = MIT
 LUA_SAILOR_LICENSE_FILES = $(LUA_SAILOR_SUBDIR)/LICENSE
diff --git a/buildroot/package/lua-std-debug/Config.in b/buildroot/package/lua-std-debug/Config.in
new file mode 100644
index 000000000..948f2427d
--- /dev/null
+++ b/buildroot/package/lua-std-debug/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_STD_DEBUG
+	bool "lua-std-debug"
+	help
+	  Manage an overall debug state, and associated hint
+	  substates.
+
+	  http://lua-stdlib.github.io/_debug
diff --git a/buildroot/package/lua-std-debug/lua-std-debug.hash b/buildroot/package/lua-std-debug/lua-std-debug.hash
new file mode 100644
index 000000000..3e94b40a9
--- /dev/null
+++ b/buildroot/package/lua-std-debug/lua-std-debug.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 7f6b84283d4b78dafee17e7765dd5f1f8e75c3314169977f4dda0e7873616ce2  std._debug-1.0.1-1.src.rock
+sha256 034abdbbe9a13899c813509776d1e04af81bc58c2982b704c8b3663549504a31  _debug-1.0.1/LICENSE.md
diff --git a/buildroot/package/lua-std-debug/lua-std-debug.mk b/buildroot/package/lua-std-debug/lua-std-debug.mk
new file mode 100644
index 000000000..e044d6cb4
--- /dev/null
+++ b/buildroot/package/lua-std-debug/lua-std-debug.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# lua-std-debug
+#
+################################################################################
+
+LUA_STD_DEBUG_VERSION_UPSTREAM = 1.0.1
+LUA_STD_DEBUG_VERSION = $(LUA_STD_DEBUG_VERSION_UPSTREAM)-1
+LUA_STD_DEBUG_NAME_UPSTREAM = std._debug
+LUA_STD_DEBUG_SUBDIR = _debug-$(LUA_STD_DEBUG_VERSION_UPSTREAM)
+LUA_STD_DEBUG_ROCKSPEC = $(LUA_STD_DEBUG_NAME_UPSTREAM)-$(LUA_STD_DEBUG_VERSION).rockspec
+LUA_STD_DEBUG_SOURCE = $(LUA_STD_DEBUG_NAME_UPSTREAM)-$(LUA_STD_DEBUG_VERSION).src.rock
+LUA_STD_DEBUG_LICENSE = MIT
+LUA_STD_DEBUG_LICENSE_FILES = $(LUA_STD_DEBUG_SUBDIR)/LICENSE.md
+
+$(eval $(luarocks-package))
diff --git a/buildroot/package/lua-std-normalize/Config.in b/buildroot/package/lua-std-normalize/Config.in
new file mode 100644
index 000000000..35d0a113a
--- /dev/null
+++ b/buildroot/package/lua-std-normalize/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LUA_STD_NORMALIZE
+	bool "lua-std-normalize"
+	select BR2_PACKAGE_LUA_STD_DEBUG # runtime
+	help
+	  This module can inject deterministic versions of core Lua
+	  functions that do not behave identically across all
+	  supported Lua implementations into your module's lexical
+	  environment.  Each function is as thin and fast a version as
+	  is possible in each Lua implementation, evaluating to the
+	  Lua C implementation with no overhead when semantics allow.
+
+	  https://lua-stdlib.github.io/normalize
diff --git a/buildroot/package/lua-std-normalize/lua-std-normalize.hash b/buildroot/package/lua-std-normalize/lua-std-normalize.hash
new file mode 100644
index 000000000..7c11f4914
--- /dev/null
+++ b/buildroot/package/lua-std-normalize/lua-std-normalize.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 50baac6fbcbc6bbe72b63ce0871ec36176d75c04dccc6e368590ba6ef107c67a  std.normalize-2.0.2-1.src.rock
+sha256 a6a0a0ddc04f7437806a52cbd637c819144df7626a2e8a496cd3a2e20c8effb3  normalize-2.0.2/LICENSE.md
diff --git a/buildroot/package/lua-std-normalize/lua-std-normalize.mk b/buildroot/package/lua-std-normalize/lua-std-normalize.mk
new file mode 100644
index 000000000..d3a58aa0d
--- /dev/null
+++ b/buildroot/package/lua-std-normalize/lua-std-normalize.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-std-normalize
+#
+################################################################################
+
+LUA_STD_NORMALIZE_VERSION_UPSTREAM = 2.0.2
+LUA_STD_NORMALIZE_VERSION = $(LUA_STD_NORMALIZE_VERSION_UPSTREAM)-1
+LUA_STD_NORMALIZE_NAME_UPSTREAM = std.normalize
+LUA_STD_NORMALIZE_SUBDIR = normalize-$(LUA_STD_NORMALIZE_VERSION_UPSTREAM)
+LUA_STD_NORMALIZE_LICENSE = MIT
+LUA_STD_NORMALIZE_LICENSE_FILES = $(LUA_STD_NORMALIZE_SUBDIR)/LICENSE.md
+
+$(eval $(luarocks-package))
diff --git a/buildroot/package/lua-stdlib/lua-stdlib.hash b/buildroot/package/lua-stdlib/lua-stdlib.hash
index 4882bf1e7..68f4d2412 100644
--- a/buildroot/package/lua-stdlib/lua-stdlib.hash
+++ b/buildroot/package/lua-stdlib/lua-stdlib.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256 b7302ecc8ea3992d3bad96c0c4d56272e38d786d16cc1ad5964fefa73fd7c10b  stdlib-41.2.1-1.src.rock
+# computed by luarocks/buildroot
+sha256 67eadaccbb2b6037ea70129f9616da49eaeeaf1477652a8e2cc77740286531cf  stdlib-41.2.2-1.src.rock
+sha256 d3177e0cd97e6ef7c459aa2c6a85f53d9b4ff091f7f296d4ed8bfaf713b6fea2  lua-stdlib-release-v41.2.2/COPYING
diff --git a/buildroot/package/lua-stdlib/lua-stdlib.mk b/buildroot/package/lua-stdlib/lua-stdlib.mk
index a7930be5d..bf90116e4 100644
--- a/buildroot/package/lua-stdlib/lua-stdlib.mk
+++ b/buildroot/package/lua-stdlib/lua-stdlib.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_STDLIB_VERSION_UPSTREAM = 41.2.1
+LUA_STDLIB_VERSION_UPSTREAM = 41.2.2
 LUA_STDLIB_VERSION = $(LUA_STDLIB_VERSION_UPSTREAM)-1
 LUA_STDLIB_NAME_UPSTREAM = stdlib
 LUA_STDLIB_SUBDIR = lua-stdlib-release-v$(LUA_STDLIB_VERSION_UPSTREAM)
diff --git a/buildroot/package/lua-testmore/lua-testmore.hash b/buildroot/package/lua-testmore/lua-testmore.hash
index 8db664f2d..673e1cf60 100644
--- a/buildroot/package/lua-testmore/lua-testmore.hash
+++ b/buildroot/package/lua-testmore/lua-testmore.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	163055ef92df9e01d9ae57cd45d6f6aace1ff4dd3abf7e29b9e30ecb1ab76ae2  lua-testmore-0.3.3-1.src.rock
+# computed by luarocks/buildroot
+sha256 163055ef92df9e01d9ae57cd45d6f6aace1ff4dd3abf7e29b9e30ecb1ab76ae2  lua-testmore-0.3.3-1.src.rock
+sha256 0fa63370a149eda33e25987dd63bd096a616a3e47d2cfc45ca2fd66e8d2bfb35  lua-TestMore-0.3.3/COPYRIGHT
diff --git a/buildroot/package/lua-utf8/lua-utf8.hash b/buildroot/package/lua-utf8/lua-utf8.hash
index 51fa2439f..e119f9435 100644
--- a/buildroot/package/lua-utf8/lua-utf8.hash
+++ b/buildroot/package/lua-utf8/lua-utf8.hash
@@ -1,2 +1,2 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 c9ceb3a9f327b3215cdf959eebf616970b5b0427ca3fde05b19f8236defa4b91  utf8-1.2-0.src.rock
diff --git a/buildroot/package/lua-valua/lua-valua.hash b/buildroot/package/lua-valua/lua-valua.hash
index 92ea61311..71d43e4fa 100644
--- a/buildroot/package/lua-valua/lua-valua.hash
+++ b/buildroot/package/lua-valua/lua-valua.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 bff39692fd2ac3590fd814aa1b1ca33e5d5971092955309aa8424b02b88ce1a3  valua-0.3-1.src.rock
+sha256 3444c2e739c88e41e327c6cd15e4a50fea8988570642bad6e6a43d50a7f7961f  valua/LICENSE
diff --git a/buildroot/package/lua/5.2.4/0001-root-path.patch b/buildroot/package/lua/5.2.4/0001-root-path.patch
deleted file mode 100644
index c6f242c20..000000000
--- a/buildroot/package/lua/5.2.4/0001-root-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Adjust installation location to /usr.
-
-Signed-off-by: Francois Perrad 
-
-Index: b/src/luaconf.h
-===================================================================
---- a/src/luaconf.h
-+++ b/src/luaconf.h
-@@ -100,7 +100,7 @@
- #else			/* }{ */
- 
- #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
- #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
- #define LUA_PATH_DEFAULT  \
diff --git a/buildroot/package/lua/5.2.4/0002-shared-libs-for-lua.patch b/buildroot/package/lua/5.2.4/0002-shared-libs-for-lua.patch
deleted file mode 100644
index 3cf3b2484..000000000
--- a/buildroot/package/lua/5.2.4/0002-shared-libs-for-lua.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Add the compilation of a shared library.
-Compile the lua binary with the shared library.
-And install the shared library.
-The variable BUILDMODE allows to switch between static and dynamic mode.
-
-Signed-off-by: Francois Perrad 
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -42,6 +42,7 @@
- TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
- TO_LIB= liblua.a
-+TO_SOLIB = liblua.so.$(R)
- TO_MAN= lua.1 luac.1
- 
- # Lua version and release.
-@@ -60,6 +61,8 @@
- install: dummy
- 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
- 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
-+	test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || :
-+	test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || :
- 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
- 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
- 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-Index: b/src/Makefile
-===================================================================
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -29,6 +29,7 @@
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
- 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
- 	ltm.o lundump.o lvm.o lzio.o
-@@ -43,8 +44,13 @@
- LUAC_O=	luac.o
- 
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-+ifneq (dynamic,$(BUILDMODE))
- ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+else
-+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
-+endif
- ALL_A= $(LUA_A)
-+ALL_SO= $(LUA_SO)
- 
- # Targets start here.
- default: $(PLAT)
-@@ -55,12 +61,23 @@
- 
- a:	$(ALL_A)
- 
-+so:	$(ALL_SO)
-+
- $(LUA_A): $(BASE_O)
- 	$(AR) $@ $(BASE_O)
- 	$(RANLIB) $@
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
-+	ln -fs $@.$(PKG_VERSION) $@
-+
-+ifneq (dynamic,$(BUILDMODE))
- $(LUA_T): $(LUA_O) $(LUA_A)
- 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-+else
-+$(LUA_T): $(LUA_O) $(LUA_SO)
-+	$(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS)
-+endif
- 
- $(LUAC_T): $(LUAC_O) $(LUA_A)
- 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/buildroot/package/lua/5.2.4/0011-linenoise.patch b/buildroot/package/lua/5.2.4/0011-linenoise.patch
deleted file mode 100644
index b1f228cd4..000000000
--- a/buildroot/package/lua/5.2.4/0011-linenoise.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Add support of linenoise (replace readline)
-
-see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html
-
-Signed-off-by: Francois Perrad 
-
-Index: b/src/lua.c
-===================================================================
---- a/src/lua.c
-+++ b/src/lua.c
-@@ -72,6 +72,15 @@
-           add_history(lua_tostring(L, idx));  /* add it to history */
- #define lua_freeline(L,b)	((void)L, free(b))
- 
-+#elif defined(LUA_USE_LINENOISE)
-+
-+#include 
-+#define lua_readline(L,b,p)	((void)L, ((b)=linenoise(p)) != NULL)
-+#define lua_saveline(L,idx) \
-+	if (lua_rawlen(L,idx) > 0)  /* non-empty line? */ \
-+	  linenoiseHistoryAdd(lua_tostring(L, idx));  /* add it to history */
-+#define lua_freeline(L,b)	((void)L, free(b))
-+
- #elif !defined(lua_readline)
- 
- #define lua_readline(L,b,p) \
diff --git a/buildroot/package/lua/Config.in b/buildroot/package/lua/Config.in
index 4d2f0e90f..ce2e439f6 100644
--- a/buildroot/package/lua/Config.in
+++ b/buildroot/package/lua/Config.in
@@ -21,9 +21,6 @@ choice
 config BR2_PACKAGE_LUA_5_1
 	bool "Lua 5.1.x"
 
-config BR2_PACKAGE_LUA_5_2
-	bool "Lua 5.2.x"
-
 config BR2_PACKAGE_LUA_5_3
 	bool "Lua 5.3.x"
 
@@ -31,7 +28,6 @@ endchoice
 
 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
 	default "5.1"	if BR2_PACKAGE_LUA_5_1
-	default "5.2"	if BR2_PACKAGE_LUA_5_2
 	default "5.3"	if BR2_PACKAGE_LUA_5_3
 
 if BR2_PACKAGE_LUA_5_3
diff --git a/buildroot/package/lua/lua.hash b/buildroot/package/lua/lua.hash
index 43f5be275..ba57304d0 100644
--- a/buildroot/package/lua/lua.hash
+++ b/buildroot/package/lua/lua.hash
@@ -2,8 +2,5 @@
 md5 4f4b4f323fd3514a68e0ab3da8ce3455           lua-5.3.5.tar.gz
 sha1 112eb10ff04d1b4c9898e121d6bdf54a81482447  lua-5.3.5.tar.gz
 
-md5 913fdb32207046b273fdb17aad70be13           lua-5.2.4.tar.gz
-sha1 ef15259421197e3d85b7d6e4871b8c26fd82c1cf  lua-5.2.4.tar.gz
-
 md5 2e115fe26e435e33b0d5c022e4490567           lua-5.1.5.tar.gz
 sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc  lua-5.1.5.tar.gz
diff --git a/buildroot/package/lua/lua.mk b/buildroot/package/lua/lua.mk
index 22643c4c8..8a5f9258a 100644
--- a/buildroot/package/lua/lua.mk
+++ b/buildroot/package/lua/lua.mk
@@ -7,16 +7,12 @@
 ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LUA_VERSION = 5.3.5
 else
-ifeq ($(BR2_PACKAGE_LUA_5_2),y)
-LUA_VERSION = 5.2.4
-else
 LUA_VERSION = 5.1.5
 endif
-endif
 LUA_SITE = http://www.lua.org/ftp
 LUA_INSTALL_STAGING = YES
 LUA_LICENSE = MIT
-ifeq ($(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUA_5_3),y)
+ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LUA_LICENSE_FILES = doc/readme.html
 else
 LUA_LICENSE_FILES = COPYRIGHT
@@ -26,10 +22,6 @@ LUA_PROVIDES = luainterpreter
 
 LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
 
-ifeq ($(BR2_PACKAGE_LUA_5_2),y)
-LUA_CFLAGS += -DLUA_COMPAT_ALL
-endif
-
 ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LUA_CFLAGS += -DLUA_COMPAT_5_2
 endif
diff --git a/buildroot/package/luabitop/luabitop.hash b/buildroot/package/luabitop/luabitop.hash
index 78110205a..6f36bd18b 100644
--- a/buildroot/package/luabitop/luabitop.hash
+++ b/buildroot/package/luabitop/luabitop.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256	fc7a8065a57462ee13bed7f95b0ab13f94ecd1bf846108c61ccf2c75548af26e  luabitop-1.0.2-1.src.rock
+# computed by luarocks/buildroot
+sha256 fc7a8065a57462ee13bed7f95b0ab13f94ecd1bf846108c61ccf2c75548af26e  luabitop-1.0.2-1.src.rock
diff --git a/buildroot/package/luacrypto/Config.in b/buildroot/package/luacrypto/Config.in
deleted file mode 100644
index e9d43cd80..000000000
--- a/buildroot/package/luacrypto/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_LUACRYPTO
-	bool "luacrypto"
-	select BR2_PACKAGE_OPENSSL
-	help
-	  LuaCrypto provides a Lua frontend to the OpenSSL cryptographic
-	  library.
-	  The OpenSSL features that are currently exposed are digests
-	  (MD5, SHA-1, HMAC, and more) and crypto-grade random number
-	  generators communication.
-
-	  http://luacrypto.luaforge.net
diff --git a/buildroot/package/luacrypto/luacrypto.hash b/buildroot/package/luacrypto/luacrypto.hash
deleted file mode 100644
index 5c577672e..000000000
--- a/buildroot/package/luacrypto/luacrypto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256	dc935c923b8851208d5d504b343448a9d5bd3e537bb8657875f12d72155600b8  luacrypto-0.3.2-1.src.rock
diff --git a/buildroot/package/luacrypto/luacrypto.mk b/buildroot/package/luacrypto/luacrypto.mk
deleted file mode 100644
index b6dbb9999..000000000
--- a/buildroot/package/luacrypto/luacrypto.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# luacrypto
-#
-################################################################################
-
-LUACRYPTO_VERSION = 0.3.2-1
-LUACRYPTO_LICENSE = MIT
-LUACRYPTO_LICENSE_FILES = $(LUACRYPTO_SUBDIR)/COPYING
-LUACRYPTO_DEPENDENCIES = openssl
-
-$(eval $(luarocks-package))
diff --git a/buildroot/package/luadbi-sqlite3/Config.in b/buildroot/package/luadbi-sqlite3/Config.in
index 6ed32a29a..600c5526f 100644
--- a/buildroot/package/luadbi-sqlite3/Config.in
+++ b/buildroot/package/luadbi-sqlite3/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LUADBI_SQLITE3
 	bool "luadbi-sqlite3"
-	select BR2_PACKAGE_LUADBI # runtime dependency
 	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_LUADBI # runtime
 	help
 	  LuaDBI is a database interface library for Lua.
 	  And this is the SQLite3 backend.
diff --git a/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash
index bd8b927fa..093a9067f 100644
--- a/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash
+++ b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 2868dad4d189368fcf5cddd191965c8cb2efaa3a3ba83d50e6a88c30353f74ce  luadbi-sqlite3-0.6-2.src.rock
+sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928  luadbi/COPYING
diff --git a/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk
index 422fa1e31..44cf4d107 100644
--- a/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk
+++ b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 LUADBI_SQLITE3_VERSION = 0.6-2
-LUADBI_SQLITE3_LICENSE = MIT
 LUADBI_SQLITE3_SUBDIR = luadbi
+LUADBI_SQLITE3_LICENSE = MIT
 LUADBI_SQLITE3_LICENSE_FILES = $(LUADBI_SQLITE3_SUBDIR)/COPYING
 LUADBI_SQLITE3_DEPENDENCIES = sqlite
 
diff --git a/buildroot/package/luadbi/luadbi.hash b/buildroot/package/luadbi/luadbi.hash
index e5c022bdf..d72690d9a 100644
--- a/buildroot/package/luadbi/luadbi.hash
+++ b/buildroot/package/luadbi/luadbi.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 723f63b744b7367ddfd6bbf7a7e6f6867aa1eaabbbc2bab5dc8a90e80b0c34c2  luadbi-0.6-2.src.rock
+sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928  luadbi/COPYING
diff --git a/buildroot/package/luadbi/luadbi.mk b/buildroot/package/luadbi/luadbi.mk
index 268e0e628..969c01ee2 100644
--- a/buildroot/package/luadbi/luadbi.mk
+++ b/buildroot/package/luadbi/luadbi.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 LUADBI_VERSION = 0.6-2
-LUADBI_LICENSE = MIT
 LUADBI_SUBDIR = luadbi
+LUADBI_LICENSE = MIT
 LUADBI_LICENSE_FILES = $(LUADBI_SUBDIR)/COPYING
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/luaexpat/0001-restore-getcurrentbytecount.patch b/buildroot/package/luaexpat/0001-restore-getcurrentbytecount.patch
new file mode 100644
index 000000000..6cf219267
--- /dev/null
+++ b/buildroot/package/luaexpat/0001-restore-getcurrentbytecount.patch
@@ -0,0 +1,40 @@
+From 77cb691f781918908dfe34785f00a5ff75d5cc20 Mon Sep 17 00:00:00 2001
+From: Francois Perrad 
+Date: Sat, 16 Feb 2019 15:56:00 +0100
+Subject: [PATCH] restore getcurrentbytecount
+
+see https://github.com/tomasguisasola/luaexpat/issues/3
+
+Fetch from: https://github.com/tomasguisasola/luaexpat/commit/0926f2d705109b7d35b721344264b39c1169e0de
+
+Signed-off-by: Francois Perrad 
+---
+ src/lxplib.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/luaexpat-1.3.3/src/lxplib.c b/luaexpat-1.3.3/src/lxplib.c
+index 7726913..35bec3c 100644
+--- a/luaexpat-1.3.3/src/lxplib.c
++++ b/luaexpat-1.3.3/src/lxplib.c
+@@ -538,11 +538,18 @@ static int lxp_stop (lua_State *L) {
+   return 1;
+ }
+ 
++static int lxp_getcurrentbytecount (lua_State* L) {
++  lxp_userdata *xpu = checkparser(L, 1);
++  lua_pushinteger(L, XML_GetCurrentByteCount(xpu->parser));
++  return 1;
++}
++
+ static const luaL_Reg lxp_meths[] = {
+   {"parse", lxp_parse},
+   {"close", lxp_close},
+   {"__gc", parser_gc},
+   {"pos", lxp_pos},
++  {"getcurrentbytecount", lxp_getcurrentbytecount},
+   {"setencoding", lxp_setencoding},
+   {"getcallbacks", getcallbacks},
+   {"getbase", getbase},
+-- 
+2.17.1
+
diff --git a/buildroot/package/luaexpat/Config.in b/buildroot/package/luaexpat/Config.in
index 7139e8c6d..2322dc430 100644
--- a/buildroot/package/luaexpat/Config.in
+++ b/buildroot/package/luaexpat/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LUAEXPAT
 	bool "luaexpat"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_EXPAT
 	help
 	  LuaExpat is a SAX XML parser based on the Expat library.
 
-	  http://matthewwild.co.uk/projects/luaexpat/
+	  http://www.keplerproject.org/luaexpat/
diff --git a/buildroot/package/luaexpat/luaexpat.hash b/buildroot/package/luaexpat/luaexpat.hash
index 27f6ed034..dd1cf40e5 100644
--- a/buildroot/package/luaexpat/luaexpat.hash
+++ b/buildroot/package/luaexpat/luaexpat.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	aa7883a0d44f500e32ef306c04632546f97f33159fffa7bcdc3f451170f95896  luaexpat-1.3.0-1.src.rock
+# computed by luarocks/buildroot
+sha256 b55908fcd7df490a59aab25284460add8283f1c6b94ab584900fe3e49775172a  luaexpat-1.3.3-1.src.rock
+sha256 7f5cb0c1750babcbb09637b7f0ff34972d51cf23b7f413bef902b47aa65febcd  luaexpat-1.3.3/LICENSE
diff --git a/buildroot/package/luaexpat/luaexpat.mk b/buildroot/package/luaexpat/luaexpat.mk
index c7377f6af..8c86b24f2 100644
--- a/buildroot/package/luaexpat/luaexpat.mk
+++ b/buildroot/package/luaexpat/luaexpat.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LUAEXPAT_VERSION = 1.3.0-1
-LUAEXPAT_DEPENDENCIES = expat
+LUAEXPAT_VERSION = 1.3.3-1
 LUAEXPAT_LICENSE = MIT
-LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/doc/us/license.html
+LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/LICENSE
+LUAEXPAT_DEPENDENCIES = expat
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/luafilesystem/Config.in b/buildroot/package/luafilesystem/Config.in
index 50e7975b9..7c130f8d3 100644
--- a/buildroot/package/luafilesystem/Config.in
+++ b/buildroot/package/luafilesystem/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUAFILESYSTEM
 	bool "luafilesystem"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  LuaFileSystem offers a portable way to access
 	  the underlying directory structure and file attributes.
diff --git a/buildroot/package/luafilesystem/luafilesystem.hash b/buildroot/package/luafilesystem/luafilesystem.hash
index bd4a446cf..9afc05c25 100644
--- a/buildroot/package/luafilesystem/luafilesystem.hash
+++ b/buildroot/package/luafilesystem/luafilesystem.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 65e6d437e577a1d6cd509b6cd224d2cb9501d58d32a72cafbd4fd3f911681576  luafilesystem-1.7.0-2.src.rock
+sha256 beb2c9eed6466d572c3888028a77421206053a3c023429cbd69e5015badba842  luafilesystem/LICENSE
diff --git a/buildroot/package/luafilesystem/luafilesystem.mk b/buildroot/package/luafilesystem/luafilesystem.mk
index bde04267c..37f265e2b 100644
--- a/buildroot/package/luafilesystem/luafilesystem.mk
+++ b/buildroot/package/luafilesystem/luafilesystem.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 LUAFILESYSTEM_VERSION = 1.7.0-2
-LUAFILESYSTEM_LICENSE = MIT
-LUAFILESYSTEM_LICENSE_FILES = luafilesystem/LICENSE
 LUAFILESYSTEM_SUBDIR = luafilesystem
+LUAFILESYSTEM_LICENSE = MIT
+LUAFILESYSTEM_LICENSE_FILES = $(LUAFILESYSTEM_SUBDIR)/LICENSE
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/luajit/Config.in b/buildroot/package/luajit/Config.in
index 7e792c53c..88c5bcbf2 100644
--- a/buildroot/package/luajit/Config.in
+++ b/buildroot/package/luajit/Config.in
@@ -36,6 +36,11 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
 	default "5.1"
 
+config BR2_PACKAGE_LUAJIT_COMPAT52
+	bool "Lua 5.2 compatibility"
+	help
+	  Compile with Lua 5.2 compatibility.
+
 endif
 
 comment "luajit needs a toolchain w/ dynamic library"
diff --git a/buildroot/package/luajit/luajit.hash b/buildroot/package/luajit/luajit.hash
index 2081d1272..7e2d87ebb 100644
--- a/buildroot/package/luajit/luajit.hash
+++ b/buildroot/package/luajit/luajit.hash
@@ -1,2 +1,5 @@
 # Hashes from: http://luajit.org/download.html
 md5 48353202cbcacab84ee41a5a70ea0a2c    LuaJIT-2.0.5.tar.gz
+
+# Locally calculated
+sha256 accb335aa3102f80d31caa2c2508fbcb795314106493519a367f13a87d0e87de  COPYRIGHT
diff --git a/buildroot/package/luajit/luajit.mk b/buildroot/package/luajit/luajit.mk
index 939fa660d..5b08a42d9 100644
--- a/buildroot/package/luajit/luajit.mk
+++ b/buildroot/package/luajit/luajit.mk
@@ -14,6 +14,10 @@ LUAJIT_INSTALL_STAGING = YES
 
 LUAJIT_PROVIDES = luainterpreter
 
+ifeq ($(BR2_PACKAGE_LUAJIT_COMPAT52),y)
+LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT
+endif
+
 ifeq ($(BR2_STATIC_LIBS),y)
 LUAJIT_BUILDMODE = static
 else
@@ -48,6 +52,7 @@ define LUAJIT_BUILD_CMDS
 		HOST_CFLAGS="$(HOST_CFLAGS)" \
 		HOST_LDFLAGS="$(HOST_LDFLAGS)" \
 		BUILDMODE=$(LUAJIT_BUILDMODE) \
+		XCFLAGS=$(LUAJIT_XCFLAGS) \
 		-C $(@D) amalg
 endef
 
@@ -68,6 +73,7 @@ LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK
 define HOST_LUAJIT_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" BUILDMODE=dynamic \
 		TARGET_LDFLAGS="$(HOST_LDFLAGS)" \
+		XCFLAGS=$(LUAJIT_XCFLAGS) \
 		-C $(@D) amalg
 endef
 
diff --git a/buildroot/package/luajson/Config.in b/buildroot/package/luajson/Config.in
index c04aa7f00..c9321bb70 100644
--- a/buildroot/package/luajson/Config.in
+++ b/buildroot/package/luajson/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUAJSON
 	bool "luajson"
-	# run-time dependency
-	select BR2_PACKAGE_LPEG
+	select BR2_PACKAGE_LPEG # runtime
 	help
 	  LuaJSON is a customizable JSON decoder/encoder
 	  using LPEG for parsing.
diff --git a/buildroot/package/luajson/luajson.hash b/buildroot/package/luajson/luajson.hash
index 36534fe34..3b7885aa7 100644
--- a/buildroot/package/luajson/luajson.hash
+++ b/buildroot/package/luajson/luajson.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 28a5928cf2e4fd79fa9a9aceaef5ebf1dccb1146489b7de4c2726f561700f01c  luajson-1.3.4-1.src.rock
+sha256 87565fca189b70f2e119b2a99e5e92a7aaab9f2eb05228b56b88e6c2e2f98bcd  luajson/LICENSE
diff --git a/buildroot/package/lualogging/Config.in b/buildroot/package/lualogging/Config.in
index bb87f57f0..a1ed775fb 100644
--- a/buildroot/package/lualogging/Config.in
+++ b/buildroot/package/lualogging/Config.in
@@ -6,4 +6,4 @@ config BR2_PACKAGE_LUALOGGING
 	  supports, through the use of appenders, console, file, rolling
 	  file, email, socket and SQL outputs.
 
-	  http://www.keplerproject.org/lualogging/
+	  https://github.com/Neopallium/lualogging
diff --git a/buildroot/package/lualogging/lualogging.hash b/buildroot/package/lualogging/lualogging.hash
index 8a6211ec3..e2ba5df3a 100644
--- a/buildroot/package/lualogging/lualogging.hash
+++ b/buildroot/package/lualogging/lualogging.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	6ca3827c4903814626b96011e17ad99b42ecfa983b605aa75bf58f17e90ed58d  lualogging-1.3.0-1.src.rock
+# computed by luarocks/buildroot
+sha256 6ca3827c4903814626b96011e17ad99b42ecfa983b605aa75bf58f17e90ed58d  lualogging-1.3.0-1.src.rock
+sha256 4e86086c032a006ce1289565cc9d9afff26b5117891cd26ffa15aa866bd28ee5  lualogging/COPYRIGHT
diff --git a/buildroot/package/luaossl/luaossl.hash b/buildroot/package/luaossl/luaossl.hash
index 8c91a1fcf..981ad10a1 100644
--- a/buildroot/package/luaossl/luaossl.hash
+++ b/buildroot/package/luaossl/luaossl.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256 f9c94c97579efddf8abad1e373e0fe0ecc93d00cd9d1bd49f48c5716c281a08b  luaossl-20171028-0.src.rock
+# computed by luarocks/buildroot
+sha256 b0af04a5ad83c12badaf0e988dbeddc98ad6d2cd9fc06baaf0c801290ae1a5bd  luaossl-20181207-0.src.rock
+sha256 7c397b120b8356805c17ba10fdea13d4319b1ee244703813d0de4cbb22720c74  luaossl-rel-20181207/LICENSE
diff --git a/buildroot/package/luaossl/luaossl.mk b/buildroot/package/luaossl/luaossl.mk
index 26021a73a..aa3937bb0 100644
--- a/buildroot/package/luaossl/luaossl.mk
+++ b/buildroot/package/luaossl/luaossl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUAOSSL_VERSION_UPSTREAM = 20171028
+LUAOSSL_VERSION_UPSTREAM = 20181207
 LUAOSSL_VERSION = $(LUAOSSL_VERSION_UPSTREAM)-0
 LUAOSSL_SUBDIR = luaossl-rel-$(LUAOSSL_VERSION_UPSTREAM)
 LUAOSSL_LICENSE = MIT
diff --git a/buildroot/package/luaposix/Config.in b/buildroot/package/luaposix/Config.in
index 91abcb9e3..bdc9926b1 100644
--- a/buildroot/package/luaposix/Config.in
+++ b/buildroot/package/luaposix/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LUAPOSIX
 	bool "luaposix"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
+	select BR2_PACKAGE_LUA_STD_NORMALIZE # runtime
 	# "bit32" is included in Lua 5.2+. luajit has an equivalent
 	# "bit" module, but since it has a different name, luaposix
 	# doesn't find it.
-	select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
+	select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT # runtime
 	help
 	  This is a POSIX binding for LuaJIT, Lua 5.1, 5.2 and 5.3;
 	  like most libraries it simply binds to C APIs on the
diff --git a/buildroot/package/luaposix/luaposix.hash b/buildroot/package/luaposix/luaposix.hash
index b3984c1d1..a13cb4a9e 100644
--- a/buildroot/package/luaposix/luaposix.hash
+++ b/buildroot/package/luaposix/luaposix.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 ba0bc343783fc33958cd02a68cdbfd65430152d9f297f7ed92678b1a305bd5d7  luaposix-34.0.1.tar.gz
+sha256 eb6e7322da3013bdb3d524f68df4f5510a2efd805c06bf7cc27be6611eab7483  luaposix-34.0.4.tar.gz
diff --git a/buildroot/package/luaposix/luaposix.mk b/buildroot/package/luaposix/luaposix.mk
index 779e707ce..f4679929c 100644
--- a/buildroot/package/luaposix/luaposix.mk
+++ b/buildroot/package/luaposix/luaposix.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LUAPOSIX_VERSION = 34.0.1
-LUAPOSIX_SITE = $(call github,luaposix,luaposix,release-v$(LUAPOSIX_VERSION))
+LUAPOSIX_VERSION = 34.0.4
+LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION))
 LUAPOSIX_LICENSE = MIT
 LUAPOSIX_LICENSE_FILES = LICENSE
 LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
diff --git a/buildroot/package/luarocks/buildroot.lua b/buildroot/package/luarocks/buildroot.lua
new file mode 100644
index 000000000..4be5fbd7c
--- /dev/null
+++ b/buildroot/package/luarocks/buildroot.lua
@@ -0,0 +1,326 @@
+
+--- Module implementing the LuaRocks "buildroot" command.
+local buildroot = {}
+
+local dir = require("luarocks.dir")
+local fs = require("luarocks.fs")
+local util = require("luarocks.util")
+local queries = require("luarocks.queries")
+local search = require("luarocks.search")
+local download = require("luarocks.download")
+local fetch = require("luarocks.fetch")
+
+buildroot.help_summary = "generate buildroot package files of a rock."
+buildroot.help_arguments = "rockname [brname]"
+buildroot.help = [[
+This addon generates Buildroot package files of a rock.
+First argument is the name of a rock, the second argument is optional
+and needed when Buildroot uses another name (usually prefixed by lua-).
+Files are generated with the source content of the rock and more
+especially the rockspec. So, the rock is downloaded and unpacked.
+]]
+
+local function brname (name)
+   return name:upper():gsub('-', '_')
+end
+
+local function brlicense (license)
+   if license:match('MIT/X') then
+      return 'MIT'
+   end
+   return license
+end
+
+local function wrap (txt, max)
+   local lines = {}
+   local line = ''
+   for word in txt:gmatch('(%S+)') do
+      if line:len() + word:len() > max - 1 then
+          lines[#lines+1] = line
+          line = ''
+      end
+      if line == '' then
+         line  = word
+      else
+         line = line .. ' ' .. word
+      end
+   end
+   lines[#lines+1] = line
+   return lines
+end
+
+local function get_external_dependencies (rockspec)
+   local t = {}
+   for k in pairs(rockspec.external_dependencies or {}) do
+      k = k:lower()
+      if fs.is_dir('package/' .. k) then
+         t[#t+1] = k
+      else
+         t[#t+1] = 'lib' .. k
+         if not fs.is_dir('package/lib' .. k) then
+            util.printout('unkwown external dependency: ' .. k)
+         end
+      end
+   end
+   table.sort(t)
+   return t
+end
+
+local function get_dependencies (rockspec)
+   local t = {}
+   for i = 1, #rockspec.dependencies do
+      local dep = tostring(rockspec.dependencies[i]):match('^(%S+)')
+      if dep ~= 'lua' then
+         dep = dep:gsub('_', '-')
+         if fs.is_dir('package/lua-' .. dep) then
+            t[#t+1] = 'lua-' .. dep
+         else
+            t[#t+1] = dep
+            if not fs.is_dir('package/' .. dep) then
+               util.printout('unkwown dependency: ' .. dep)
+            end
+         end
+      end
+   end
+   table.sort(t)
+   return t
+end
+
+function get_digest (file)
+   local absname = fs.absolute_name(file)
+   local pipe = io.popen('sha256sum ' .. fs.Q(absname))
+   local line = pipe:read('*l')
+   pipe:close()
+   local computed = line and line:match('(' .. ('%x'):rep(64) .. ')')
+   if computed then
+      return computed
+   else
+      return nil, "Failed to compute SHA256 hash for file " .. absname
+   end
+end
+
+local function generate_config (rockspec, lcname)
+   local ucname = brname(lcname)
+   local only_luajit = rockspec.package:match('^lj')
+   local summary = rockspec.description.summary
+   if not summary then
+      summary = '???'
+   elseif not summary:match('%.%s*$') then
+      summary = summary:gsub('%s*$', '.')
+   end
+   local homepage = rockspec.description.homepage or '???'
+   local external_dependencies = get_external_dependencies(rockspec)
+   local dependencies = get_dependencies(rockspec)
+   local fname = 'package/' .. lcname .. '/Config.in'
+   local f = assert(io.open(fname, 'w'))
+   util.printout('write ' .. fname)
+   f:write('config BR2_PACKAGE_' .. ucname .. '\n')
+   f:write('\tbool "' .. lcname .. '"\n')
+   if only_luajit then
+      f:write('\tdepends on BR2_PACKAGE_LUAJIT\n')
+   end
+   for i = 1, #external_dependencies do
+      f:write('\tselect BR2_PACKAGE_' .. brname(external_dependencies[i]) .. '\n')
+   end
+   for i = 1, #dependencies do
+      f:write('\tselect BR2_PACKAGE_' .. brname(dependencies[i]) .. ' # runtime\n')
+   end
+   f:write('\thelp\n')
+   f:write('\t  ' .. table.concat(wrap(summary, 62), '\n\t  ') .. '\n')
+   f:write('\n\t  ' .. homepage .. '\n')
+   if only_luajit then
+      f:write('\ncomment "' .. lcname .. ' needs LuaJIT"\n')
+      f:write('\tdepends on !BR2_PACKAGE_LUAJIT\n')
+   end
+   f:close()
+end
+
+local function generate_mk (rockspec, lcname, licenses)
+   local function escape (s)
+      return s:gsub('-', '%%-'):gsub('%.', '%%.')
+   end
+
+   local ucname = brname(lcname)
+   local need_name_upstream = false
+   local need_version_upstream = false
+   local name_upstream = rockspec.package
+   local version = rockspec.version
+   local version_upstream = version:match('^([^-]+)-')
+   local revision = version:match('-(%d+)$')
+   local license = rockspec.description.license
+   local subdir = rockspec.source.dir
+   if subdir then
+      local root = subdir:match('^(.-)-' .. escape(version) .. '$')
+      if root then
+         subdir = root .. '-$(' .. ucname .. '_VERSION)'
+      end
+      root = subdir:match('^(.--[Vv])' .. escape(version_upstream) .. '$')
+      if root then
+         need_version_upstream = true
+         subdir = root .. '$(' .. ucname .. '_VERSION_UPSTREAM)'
+      end
+      root = subdir:match('^(.-)-' .. escape(version_upstream) .. '$')
+      if root then
+         if root == lcname then
+            subdir = nil
+         elseif root == name_upstream then
+            subdir = nil
+            need_name_upstream = true
+         else
+            need_version_upstream = true
+            subdir = root .. '-$(' .. ucname .. '_VERSION_UPSTREAM)'
+         end
+      end
+   end
+   local external_dependencies = get_external_dependencies(rockspec)
+   local fname = 'package/' .. lcname .. '/' .. lcname .. '.mk'
+   local f = assert(io.open(fname, 'w'))
+   util.printout('write ' .. fname)
+   f:write('################################################################################\n')
+   f:write('#\n')
+   f:write('# ' .. lcname .. '\n')
+   f:write('#\n')
+   f:write('################################################################################\n')
+   f:write('\n')
+   if need_version_upstream then
+      f:write(ucname .. '_VERSION_UPSTREAM = ' .. version_upstream .. '\n')
+      f:write(ucname .. '_VERSION = $(' .. ucname .. '_VERSION_UPSTREAM)-' .. revision .. '\n')
+   else
+      f:write(ucname .. '_VERSION = ' .. version .. '\n')
+   end
+   if lcname ~= name_upstream:lower() or need_name_upstream then
+      f:write(ucname .. '_NAME_UPSTREAM = ' .. name_upstream .. '\n')
+   end
+   if subdir then
+      f:write(ucname .. '_SUBDIR = ' .. subdir .. '\n')
+   end
+   if license then
+      f:write(ucname .. '_LICENSE = ' .. brlicense(license) .. '\n')
+   end
+   if #licenses == 1 then
+      f:write(ucname .. '_LICENSE_FILES = $(' .. ucname .. '_SUBDIR)/' .. licenses[1] .. '\n')
+   elseif #licenses > 1 then
+      f:write(ucname .. '_LICENSE_FILES =')
+      for i = 1, #licenses do
+         local file = licenses[i]
+         f:write(' \\\n\t$(' .. ucname .. '_SUBDIR)/' .. file)
+      end
+      f:write('\n')
+   end
+   if #external_dependencies > 0 then
+      f:write(ucname .. '_DEPENDENCIES = ' .. table.concat(external_dependencies, ' ') .. '\n')
+   end
+   f:write('\n$(eval $(luarocks-package))\n')
+   f:close()
+end
+
+local function generate_hash (rockspec, lcname, rock_file, licenses, digest)
+   local subdir = rockspec.source.dir
+   local fname = 'package/' .. lcname .. '/' .. lcname .. '.hash'
+   local f = assert(io.open(fname, 'w'))
+   util.printout('write ' .. fname)
+   f:write('# computed by luarocks/buildroot\n')
+   f:write('sha256 ' .. digest[rock_file] .. '  ' .. rock_file .. '\n')
+   for i = 1, #licenses do
+      local file = licenses[i]
+      f:write('sha256 ' .. digest[file] .. '  ' .. subdir .. '/' .. file .. '\n')
+   end
+   f:close()
+end
+
+--- Driver function for the "buildroot" command.
+-- @param rockname string: the name of a rock to be fetched and unpacked.
+-- @param brname string: the name used by Buildroot (optional)
+-- @return boolean: true if successful
+function buildroot.command(flags, rockname, fsname)
+   if type(rockname) ~= 'string' then
+      return nil, "Argument missing. "..util.see_help('buildroot')
+   end
+   fsname = fsname or rockname
+   assert(type(fsname) == 'string')
+
+   local query = queries.new(rockname:lower(), nil, false, 'src')
+   local url, err = search.find_suitable_rock(query)
+   if not url then
+      return nil, "Could not find a result named " .. tostring(query) .. ": " .. err
+   end
+   local rock_file = dir.base_name(url)
+
+   local temp_dir, err = fs.make_temp_dir(rockname)
+   if not temp_dir then
+      return nil, "Failed creating temporary dir: " .. err
+   end
+   local ok, err = fs.change_dir(temp_dir)
+   if not ok then return nil, err end
+
+   ok = fs.download(url, rock_file, true)
+   if not ok then
+      return nil, "Failed downloading " .. url
+   end
+
+   local digest = {}
+   digest[rock_file], err = get_digest(rock_file)
+   if not digest[rock_file] then return nil, err end
+   ok, err = fs.unzip(rock_file)
+   if not ok then return nil, err end
+
+   local rockspec_file = rock_file:gsub('%.src%.rock$', '.rockspec')
+   local rockspec, err = fetch.load_rockspec(rockspec_file)
+   if not rockspec then
+      return nil, "Error loading rockspec: " .. err
+   end
+   if rockspec.source.file then
+      ok, err = fs.unpack_archive(rockspec.source.file)
+      if not ok then return nil, err end
+   end
+
+   if rockspec.source.dir ~= '.' then
+      fs.copy(rockspec.local_abs_filename, rockspec.source.dir, 'read')
+   end
+
+   local build_type = rockspec.build.type
+   if build_type ~= 'none' and build_type ~= 'builtin' and build_type ~= 'module' then
+      util.printout('[' .. rockspec.package .. "] build_type '" .. build_type .. "' not supported")
+   end
+
+   local licenses = {}
+   ok, err = fs.change_dir(rockspec.source.dir)
+   if not ok then return nil, err end
+   local files = fs.find()
+   for i = 1, #files do
+      local v = files[i]
+      if v == 'COPYING'
+         or v == 'COPYRIGHT'
+         or v:match('^LICENSE') then
+         licenses[#licenses+1] = v
+         digest[v], err = get_digest(v)
+         if not digest[v] then return nil, err end
+      end
+   end
+   if #licenses == 0 then
+      for i = 1, #files do
+         local v = files[i]
+         if v:match('^doc/LICENSE')
+            or v:match('^doc/license')
+            or v:match('^doc/us/license') then
+            licenses[#licenses+1] = v
+            digest[v], err = get_digest(v)
+            if not digest[v] then return nil, err end
+         end
+      end
+   end
+   fs.pop_dir()
+   table.sort(licenses)
+
+   fs.pop_dir()
+   ok, err = fs.make_dir('package/' .. fsname:lower())
+   if not ok then return nil, err end
+
+   generate_config(rockspec, fsname:lower())
+   generate_mk(rockspec, fsname:lower(), licenses)
+   generate_hash(rockspec, fsname:lower(), rock_file, licenses, digest)
+
+   return true
+end
+
+return buildroot
diff --git a/buildroot/package/luarocks/luarocks-br-config.lua b/buildroot/package/luarocks/luarocks-br-config.lua
new file mode 100644
index 000000000..32d71e1e2
--- /dev/null
+++ b/buildroot/package/luarocks/luarocks-br-config.lua
@@ -0,0 +1,13 @@
+-- BR cross-compilation
+local function getenv (name) return os_getenv(name) or '' end
+variables.LUA_INCDIR = getenv('STAGING_DIR') .. [[/usr/include]]
+variables.LUA_LIBDIR = getenv('STAGING_DIR') .. [[/usr/lib]]
+variables.CC = getenv('TARGET_CC')
+variables.LD = getenv('TARGET_CC')
+variables.CFLAGS = getenv('TARGET_CFLAGS')
+variables.LIBFLAG = [[-shared ]] .. getenv('TARGET_LDFLAGS')
+external_deps_dirs = { getenv('STAGING_DIR') .. [[/usr]] }
+gcc_rpath = false
+rocks_trees = { getenv('TARGET_DIR') .. [[/usr]] }
+wrap_bin_scripts = false
+deps_mode = [[none]]
diff --git a/buildroot/package/luarocks/luarocks.mk b/buildroot/package/luarocks/luarocks.mk
index cfef8f19b..5b15eae67 100644
--- a/buildroot/package/luarocks/luarocks.mk
+++ b/buildroot/package/luarocks/luarocks.mk
@@ -18,6 +18,12 @@ ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2
 endif
 
+define LUAROCKS_ADDON_EXTRACT
+	mkdir $(@D)/src/luarocks/cmd/external
+	cp package/luarocks/buildroot.lua $(@D)/src/luarocks/cmd/external/buildroot.lua
+endef
+HOST_LUAROCKS_POST_EXTRACT_HOOKS += LUAROCKS_ADDON_EXTRACT
+
 HOST_LUAROCKS_CONF_OPTS = \
 	--prefix=$(HOST_DIR) \
 	--sysconfdir=$(LUAROCKS_CONFIG_DIR) \
@@ -30,23 +36,16 @@ endef
 define HOST_LUAROCKS_INSTALL_CMDS
 	rm -f $(LUAROCKS_CONFIG_FILE)
 	$(MAKE1) -C $(@D) install
-	echo "-- BR cross-compilation"                                  >> $(LUAROCKS_CONFIG_FILE)
-	echo "variables.LUA_INCDIR = [[$(STAGING_DIR)/usr/include]]"    >> $(LUAROCKS_CONFIG_FILE)
-	echo "variables.LUA_LIBDIR = [[$(STAGING_DIR)/usr/lib]]"        >> $(LUAROCKS_CONFIG_FILE)
-	echo "variables.CC = [[$(TARGET_CC)]]"                          >> $(LUAROCKS_CONFIG_FILE)
-	echo "variables.LD = [[$(TARGET_CC)]]"                          >> $(LUAROCKS_CONFIG_FILE)
-	echo "variables.CFLAGS = [[$(LUAROCKS_CFLAGS)]]"                >> $(LUAROCKS_CONFIG_FILE)
-	echo "variables.LIBFLAG = [[-shared $(TARGET_LDFLAGS)]]"        >> $(LUAROCKS_CONFIG_FILE)
-	echo "external_deps_dirs = { [[$(STAGING_DIR)/usr]] }"          >> $(LUAROCKS_CONFIG_FILE)
-	echo "gcc_rpath = false"                                        >> $(LUAROCKS_CONFIG_FILE)
-	echo "rocks_trees = { [[$(TARGET_DIR)/usr]] }"                  >> $(LUAROCKS_CONFIG_FILE)
-	echo "wrap_bin_scripts = false"                                 >> $(LUAROCKS_CONFIG_FILE)
-	echo "deps_mode = [[none]]"                                     >> $(LUAROCKS_CONFIG_FILE)
+	cat $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua >> $(LUAROCKS_CONFIG_FILE)
 endef
 
 $(eval $(host-generic-package))
 
-LUAROCKS_RUN_ENV = LUA_PATH="$(HOST_DIR)/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua"
+LUAROCKS_RUN_ENV = \
+	LUA_PATH="$(HOST_DIR)/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \
+	TARGET_CC="$(TARGET_CC)" \
+	TARGET_CFLAGS="$(LUAROCKS_CFLAGS)" \
+	TARGET_LDFLAGS="$(TARGET_LDFLAGS)"
 LUAROCKS_RUN_CMD = $(LUA_RUN) $(HOST_DIR)/bin/luarocks
 
 define LUAROCKS_FINALIZE_TARGET
diff --git a/buildroot/package/luasec/Config.in b/buildroot/package/luasec/Config.in
index d7900a081..43527ab09 100644
--- a/buildroot/package/luasec/Config.in
+++ b/buildroot/package/luasec/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LUASEC
 	bool "luasec"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_LUASOCKET
+	select BR2_PACKAGE_LUASOCKET # runtime
 	help
 	  LuaSec is a binding for OpenSSL library to provide TLS/SSL
 	  communication.
diff --git a/buildroot/package/luasec/luasec.hash b/buildroot/package/luasec/luasec.hash
index 1fdbe7d7e..37fc08d45 100644
--- a/buildroot/package/luasec/luasec.hash
+++ b/buildroot/package/luasec/luasec.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	383e183ba712f00b2fcbf60187177432ccde724a23ac6186075ceae620cf0b0a  luasec-0.7-1.src.rock
+# computed by luarocks/buildroot
+sha256 383e183ba712f00b2fcbf60187177432ccde724a23ac6186075ceae620cf0b0a  luasec-0.7-1.src.rock
+sha256 b310a4c5a9927a43123e3ffcfaa5f5921b545b64d38ea55c7faf2a837547a200  luasec-luasec-0.7/LICENSE
diff --git a/buildroot/package/luasocket/Config.in b/buildroot/package/luasocket/Config.in
index 45f959e8d..45263030f 100644
--- a/buildroot/package/luasocket/Config.in
+++ b/buildroot/package/luasocket/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUASOCKET
 	bool "luasocket"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  LuaSocket is the most comprehensive networking support library
 	  for the Lua language.
diff --git a/buildroot/package/luasocket/luasocket.hash b/buildroot/package/luasocket/luasocket.hash
index ad91f4420..843647b27 100644
--- a/buildroot/package/luasocket/luasocket.hash
+++ b/buildroot/package/luasocket/luasocket.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a  luasocket-3.0rc1-1.src.rock
+# computed by luarocks/buildroot
+sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a  luasocket-3.0rc1-1.src.rock
+sha256 8e8c6314d9e78fe452ee355167f2c40cfbee8207e14dcb5ddd4a2655cb5c6aad  luasocket-3.0-rc1/LICENSE
diff --git a/buildroot/package/luasql-sqlite3/Config.in b/buildroot/package/luasql-sqlite3/Config.in
index 483d6a0f3..cc4d3d545 100644
--- a/buildroot/package/luasql-sqlite3/Config.in
+++ b/buildroot/package/luasql-sqlite3/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LUASQL_SQLITE3
 	bool "luasql-sqlite3"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_SQLITE
 	help
 	  LuaSQL is a simple interface from Lua to a DBMS.
diff --git a/buildroot/package/luasql-sqlite3/luasql-sqlite3.hash b/buildroot/package/luasql-sqlite3/luasql-sqlite3.hash
index 5728c8db0..5406d9454 100644
--- a/buildroot/package/luasql-sqlite3/luasql-sqlite3.hash
+++ b/buildroot/package/luasql-sqlite3/luasql-sqlite3.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	e98d4e997682097f5bc2859596b9615f4cb87438db23ceb4af5e36b4424524ab  luasql-sqlite3-2.3.0-1.src.rock
+# computed by luarocks/buildroot
+sha256 502faabc5e06c1d7c1ddb9a0550eb19220020c86b9f1e26a2cc2001e1343b35d  luasql-sqlite3-2.4.0-1.src.rock
+sha256 c8bb3a3947379addb89412e578d0aae95ca37dc6e48a17e128f40e512d10b025  luasql/doc/us/license.html
diff --git a/buildroot/package/luasql-sqlite3/luasql-sqlite3.mk b/buildroot/package/luasql-sqlite3/luasql-sqlite3.mk
index 51178db22..69fc956c9 100644
--- a/buildroot/package/luasql-sqlite3/luasql-sqlite3.mk
+++ b/buildroot/package/luasql-sqlite3/luasql-sqlite3.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUASQL_SQLITE3_VERSION = 2.3.0-1
+LUASQL_SQLITE3_VERSION = 2.4.0-1
 LUASQL_SQLITE3_SUBDIR = luasql
 LUASQL_SQLITE3_LICENSE = MIT
 LUASQL_SQLITE3_LICENSE_FILES = $(LUASQL_SQLITE3_SUBDIR)/doc/us/license.html
diff --git a/buildroot/package/lunit/lunit.hash b/buildroot/package/lunit/lunit.hash
index 9c8d53c5e..bd168ba8f 100644
--- a/buildroot/package/lunit/lunit.hash
+++ b/buildroot/package/lunit/lunit.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	b19854c685337ddcec2fe9c22113d2cd14715d52ccd2676abe2fa49b61a2ec4d  lunit-0.5-2.src.rock
+# computed by luarocks/buildroot
+sha256 b19854c685337ddcec2fe9c22113d2cd14715d52ccd2676abe2fa49b61a2ec4d  lunit-0.5-2.src.rock
+sha256 316317e9e9b7eac811e1be56738e2434fb4a0c39ecd660f3b34dad739bfb3707  lunit-0.5/LICENSE
diff --git a/buildroot/package/lutok/Config.in b/buildroot/package/lutok/Config.in
index ab9c32b6d..abeaa4011 100644
--- a/buildroot/package/lutok/Config.in
+++ b/buildroot/package/lutok/Config.in
@@ -9,4 +9,3 @@ config BR2_PACKAGE_LUTOK
 
 comment "lutok needs a toolchain w/ C++ and full Lua"
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_LUAJIT
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
diff --git a/buildroot/package/luvi/0001-Add-missing-define-for-luaL_newlib-for-Lua-5.1.patch b/buildroot/package/luvi/0001-Add-missing-define-for-luaL_newlib-for-Lua-5.1.patch
deleted file mode 100644
index 903b9d6a6..000000000
--- a/buildroot/package/luvi/0001-Add-missing-define-for-luaL_newlib-for-Lua-5.1.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 7f9fcbd827295df72b15466fd3c47589d52117b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= 
-Date: Wed, 31 Oct 2018 18:22:31 +0100
-Subject: [PATCH] Add missing define for luaL_newlib for Lua 5.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since commit c286f3b741d0968fd1c49c28da83bc723468ecba, which bumped the
-library luv to version 1.22.0-1, building luvi fails.
-
-The reason for this error is, that instead of defining Lua 5.3 API itself,
-luv now [1] uses lua-compat-5.3 [1,2] for providing a Lua 5.3 API.
-
-Unfortunately, upstreams "luv.h" now exposes "compat-5.3.h" directly, causing
-redefinition errors when building luvi 2.7.6 (as well as latest release 2.8.0)
-with luv 1.22.0-1. Instead, "compat-5.3.h" should only be included in "luv.c",
-which is addressed in patching luv (Patch: "Do not include compat-5.3.h in luv
-header file").
-
-Patching luv reveals an issue in luvi itself, as it is using the Lua 5.3 API,
-without defining the Lua 5.3 itself, nor using lua-compat-5.3. Instead, it was
-using the definition provided by the "luv.h" file in luv versions before 1.22.0.
-
-Correctly, luvi should define the necessary Lua 5.3 itself, which is done by
-this patch, by providing a definition for `luaL_newlib`.
-
-Note, that this patch is not upstreamable, as upstream already switched to
-using lua-compat-5.3 [3,4]. However, backporting this patch set is to much of a
-burden, so we keep it simple, by just defining `luaL_newlib`.
-
-[1] https://github.com/luvit/luv/commit/34ada3e1d75796d2295ec54f3f20b3e2abf93406
-[2] https://github.com/keplerproject/lua-compat-5.3
-[3] https://github.com/luvit/luvi/commit/3a444d183d2fde91b6c2f3798b37881cdaa29691
-[4] https://github.com/luvit/luvi/commit/0376894bae7c1c3bee42ddad65e824da9cccdada
-
-Signed-off-by: Jörg Krause 
----
- src/luvi.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/luvi.h b/src/luvi.h
-index e7558b3..ceca2b9 100644
---- a/src/luvi.h
-+++ b/src/luvi.h
-@@ -52,6 +52,12 @@ int luaopen_lpeg(lua_State* L);
- #endif
- #endif
- 
-+#if LUA_VERSION_NUM < 502
-+#ifndef luaL_newlib
-+# define luaL_newlib(L,l) (lua_newtable(L), luaL_register(L,NULL,l))
-+#endif
-+#endif
-+
- #if (LUA_VERSION_NUM >= 502)
- # undef luaL_register
- # define luaL_register(L,n,f) \
--- 
-2.19.1
-
diff --git a/buildroot/package/luvi/0002-luvi-executable-needs-to-export-symbols.patch b/buildroot/package/luvi/0002-luvi-executable-needs-to-export-symbols.patch
deleted file mode 100644
index 74b6537f9..000000000
--- a/buildroot/package/luvi/0002-luvi-executable-needs-to-export-symbols.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 1ea2c1e372ab59b9a633a51f0dcefc24328528f1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= 
-Date: Mon, 10 Sep 2018 08:18:38 +0200
-Subject: [PATCH] luvi executable needs to export symbols
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Using CMake 3.12 running luvi fails with:
-
-```
-[string "return require('init')(...)"]:1: module 'init' not found:
-	no field package.preload['init']
-	no file './init.lua'
-	no file '/usr/share/luajit-2.0.5/init.lua'
-	no file '/usr/local/share/lua/5.1/init.lua'
-	no file '/usr/local/share/lua/5.1/init/init.lua'
-	no file '/usr/share/lua/5.1/init.lua'
-	no file '/usr/share/lua/5.1/init/init.lua'
-	no file './init.so'
-	no file '/usr/local/lib/lua/5.1/init.so'
-	no file '/usr/lib/lua/5.1/init.so'
-	no file '/usr/local/lib/lua/5.1/loadall.so'
-```
-
-Looking at link.txt for the luvi executable shows that `-rdynamic` is
-not set anymore in CMake 3.12. This has the effect, that symbols are
-missing in the `.dynsym` section.
-
-Therefore, set `ENABLE_EXPORTS` to true which set `-rdynamic` explicitly.
-
-Upstream status: b8781653dcb8815a3019a77baf4f3b7f7a255ebe
-
-Signed-off-by: Jörg Krause 
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e141f8e..8219d0b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -158,6 +158,7 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- endif()
- 
- target_link_libraries(luvi ${LUVI_LIBRARIES} ${EXTRA_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-+set_target_properties(luvi PROPERTIES ENABLE_EXPORTS ON)
- 
- ###############################################################################
- ## Installation Targets
--- 
-2.19.1
-
diff --git a/buildroot/package/luvi/luvi.hash b/buildroot/package/luvi/luvi.hash
index 22e5cfa7b..084f3a42c 100644
--- a/buildroot/package/luvi/luvi.hash
+++ b/buildroot/package/luvi/luvi.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  ce9a1fb762e61267618ddea9ea129170fd543bb918c382b71cb35985d0024c42  luvi-src-v2.7.6.tar.gz
+sha256  81e898dc67b8166222716f763d8d0e0307132edc999167259d28ad0b54e20a7f  luvi-src-v2.9.0.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/buildroot/package/luvi/luvi.mk b/buildroot/package/luvi/luvi.mk
index 4b693e23a..c43033f4f 100644
--- a/buildroot/package/luvi/luvi.mk
+++ b/buildroot/package/luvi/luvi.mk
@@ -4,9 +4,7 @@
 #
 ################################################################################
 
-# we keep version 2.7.6 because 2.8.0 causes build errors and only
-# contains updates to submodules we do not need
-LUVI_VERSION = v2.7.6
+LUVI_VERSION = v2.9.0
 LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz
 LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION)
 LUVI_LICENSE = Apache-2.0
diff --git a/buildroot/package/lvm2/lvm2.hash b/buildroot/package/lvm2/lvm2.hash
index 697a41399..ad0d93b14 100644
--- a/buildroot/package/lvm2/lvm2.hash
+++ b/buildroot/package/lvm2/lvm2.hash
@@ -1,5 +1,5 @@
 # From ftp://sources.redhat.com/pub/lvm2/sha512.sum
-sha512 6e0a10ab48be4f0c751447c6ab88b8f9fa1dcd1d703de77966e8507b173df70b1987fa0be252c31dfce9e0ee70e5f439db58c8f534e24144a70f254c091554ee  LVM2.2.02.180.tgz
+sha512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7  LVM2.2.02.183.tgz
 # Locally computed sha256 checksums
 sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1  COPYING
 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a  COPYING.LIB
diff --git a/buildroot/package/lvm2/lvm2.mk b/buildroot/package/lvm2/lvm2.mk
index 152381d65..7fdb9a7e3 100644
--- a/buildroot/package/lvm2/lvm2.mk
+++ b/buildroot/package/lvm2/lvm2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LVM2_VERSION = 2.02.180
+LVM2_VERSION = 2.02.183
 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
 LVM2_SITE = ftp://sources.redhat.com/pub/lvm2
 LVM2_INSTALL_STAGING = YES
diff --git a/buildroot/package/lxc/0001-stringutils-include-stdarg-for-va_list.patch b/buildroot/package/lxc/0001-stringutils-include-stdarg-for-va_list.patch
deleted file mode 100644
index b1fe98923..000000000
--- a/buildroot/package/lxc/0001-stringutils-include-stdarg-for-va_list.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b7df06ad14c04f18b7db5b64d5142b802bf64cb2 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Mon, 3 Dec 2018 22:18:16 +0100
-Subject: [PATCH] stringutils: include stdarg for va_list
-
-Fixes:
- - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86
-
-Signed-off-by: Fabrice Fontaine 
-[Upstream status: https://github.com/lxc/lxc/commit/b7df06ad14c04f18b7db5b64d5142b802bf64cb2]
----
- src/lxc/string_utils.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/lxc/string_utils.h b/src/lxc/string_utils.h
-index 4065e4e6..d4e633cc 100644
---- a/src/lxc/string_utils.h
-+++ b/src/lxc/string_utils.h
-@@ -20,6 +20,8 @@
- #ifndef __LXC_STRING_UTILS_H
- #define __LXC_STRING_UTILS_H
- 
-+#include 
-+
- #include "config.h"
- 
- #include "initutils.h"
--- 
-2.14.1
-
diff --git a/buildroot/package/lxc/0002-configure.ac-fix-build-without-stack-protector.patch b/buildroot/package/lxc/0002-configure.ac-fix-build-without-stack-protector.patch
deleted file mode 100644
index 744fcbbed..000000000
--- a/buildroot/package/lxc/0002-configure.ac-fix-build-without-stack-protector.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3aa7271157d3c815a4426c1f8eaea2f3b6dafa6a Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Tue, 4 Dec 2018 08:40:05 +0100
-Subject: [PATCH] configure.ac: fix build without stack-protector
-
-Compiler based hardening (including -fstack-protector-strong) are
-enabled since version 3.0.3 and
-https://github.com/lxc/lxc/commit/2268c27754152aa538db2c9e3753d72d19bcd17a
-
-However, some compilers could missed the needed library (-lssp or
--lssp_nonshared) at linking step so use ax_check_link_flag instead of
-ax_check_compile_flag
-
-Fixes:
- - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86
-
-Signed-off-by: Fabrice Fontaine 
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a9adac3..032e4cfd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -696,7 +696,7 @@ AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"],,[-Werror]
- AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [CFLAGS="$CFLAGS -fstack-clash-protection"],,[-Werror])
--AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror])
-+AX_CHECK_LINK_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([-g], [CFLAGS="$CFLAGS -g"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([--mcet -fcf-protection], [CFLAGS="$CFLAGS --mcet -fcf-protection"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration], [CFLAGS="$CFLAGS -Werror=implicit-function-declaration"],,[-Werror])
--- 
-2.14.1
-
diff --git a/buildroot/package/lxc/lxc.hash b/buildroot/package/lxc/lxc.hash
index c741a5bab..aad38ca57 100644
--- a/buildroot/package/lxc/lxc.hash
+++ b/buildroot/package/lxc/lxc.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	620cb832cc02c63bf4d330657bf6176544e145da281ee384a34d689635a19841	lxc-3.0.3.tar.gz
+sha256	4d8772c25baeaea2c37a954902b88c05d1454c91c887cb6a0997258cfac3fdc5	lxc-3.1.0.tar.gz
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING
diff --git a/buildroot/package/lxc/lxc.mk b/buildroot/package/lxc/lxc.mk
index c9838fb22..a059fd578 100644
--- a/buildroot/package/lxc/lxc.mk
+++ b/buildroot/package/lxc/lxc.mk
@@ -4,19 +4,21 @@
 #
 ################################################################################
 
-LXC_VERSION = 3.0.3
+LXC_VERSION = 3.1.0
 LXC_SITE = https://linuxcontainers.org/downloads/lxc
 LXC_LICENSE = LGPL-2.1+
 LXC_LICENSE_FILES = COPYING
 LXC_DEPENDENCIES = host-pkgconf
 LXC_INSTALL_STAGING = YES
-# We're patching configure.ac
-LXC_AUTORECONF = YES
 
 LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
 	--disable-werror \
 	$(if $(BR2_PACKAGE_BASH),,--disable-bash)
 
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+LXC_DEPENDENCIES += bash-completion
+endif
+
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 LXC_CONF_OPTS += --enable-gnutls
 LXC_DEPENDENCIES += gnutls
diff --git a/buildroot/package/lynx/lynx.mk b/buildroot/package/lynx/lynx.mk
index 174d741dd..07a3ddfcf 100644
--- a/buildroot/package/lynx/lynx.mk
+++ b/buildroot/package/lynx/lynx.mk
@@ -22,7 +22,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LYNX_DEPENDENCIES += openssl
-LYNX_CONF_OPTS += --with-ssl
+LYNX_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
+LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 else ifeq ($(BR2_PACKAGE_GNUTLS),y)
 LYNX_DEPENDENCIES += gnutls
 LYNX_CONF_OPTS += --with-gnutls
@@ -35,4 +36,11 @@ else
 LYNX_CONF_OPTS += --without-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_LIBIDN),y)
+LYNX_DEPENDENCIES += libidn
+LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libidn`
+endif
+
+LYNX_CONF_ENV = LIBS="$(LYNX_LIBS)"
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/lz4/lz4.hash b/buildroot/package/lz4/lz4.hash
index 90bd217cd..691ec6c42 100644
--- a/buildroot/package/lz4/lz4.hash
+++ b/buildroot/package/lz4/lz4.hash
@@ -1,4 +1,4 @@
 # sha256 locally computed
-sha256 0963fbe9ee90acd1d15e9f09e826eaaf8ea0312e854803caf2db0a6dd40f4464  lz4-v1.8.2.tar.gz
+sha256 33af5936ac06536805f9745e0b6d61da606a1f8b4cc5c04dd3cbaca3b9b4fc43  lz4-v1.8.3.tar.gz
 sha256 d15d99c8dc6b0ec22174c0e563a95bc40f9363ca7f9d9d793bb5c5a8e8d0af71  lib/LICENSE
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  programs/COPYING
diff --git a/buildroot/package/lz4/lz4.mk b/buildroot/package/lz4/lz4.mk
index 183df4564..a7152cb53 100644
--- a/buildroot/package/lz4/lz4.mk
+++ b/buildroot/package/lz4/lz4.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LZ4_VERSION = v1.8.2
+LZ4_VERSION = v1.8.3
 LZ4_SITE = $(call github,lz4,lz4,$(LZ4_VERSION))
 LZ4_INSTALL_STAGING = YES
 LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs)
diff --git a/buildroot/package/madplay/0002-buildroot-libtool-v1.5.patch.patch b/buildroot/package/madplay/0002-buildroot-libtool-v1.5.patch.patch
deleted file mode 100644
index 2be336384..000000000
--- a/buildroot/package/madplay/0002-buildroot-libtool-v1.5.patch.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From ce661985c098635965573aac8fc983a72f60d396 Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Tue, 30 May 2017 16:42:34 +0200
-Subject: [PATCH] buildroot-libtool-v1.5.patch
-
-Apply buildroot-libtool-v1.5.patch rebased on libtool 1.5.2 used
-in madplay and fixing all conflicts.
-
-Signed-off-by: Romain Naour 
----
- ltmain.sh | 40 ++++++++++++++++++++++++++++++----------
- 1 file changed, 30 insertions(+), 10 deletions(-)
-
-diff --git a/ltmain.sh b/ltmain.sh
-index 4b9f940..0b71220 100644
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -164,6 +164,11 @@ do
-   arg="$1"
-   shift
- 
-+  # Make -static behave as -all-static
-+  case $arg in
-+  -static) arg="-all-static" ;;
-+  esac
-+
-   case $arg in
-   -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-   *) optarg= ;;
-@@ -549,8 +554,9 @@ if test -z "$show_help"; then
- 	# line option must be used.
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
-+	  $echo "$modename: defaulting to \`CC'"
-+	  $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+#	  exit 1
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -1228,7 +1234,8 @@ EOF
-       prevarg="$arg"
- 
-       case $arg in
--      -all-static)
-+      # Make -static behave like -all-static
-+      -all-static | -static)
- 	if test -n "$link_static_flag"; then
- 	  compile_command="$compile_command $link_static_flag"
- 	  finalize_command="$finalize_command $link_static_flag"
-@@ -2135,8 +2142,14 @@ EOF
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+            # Adding 'libdir' from the .la file to our library search paths
-+            # breaks crosscompilation horribly.  We cheat here and don't add
-+            # it, instead adding the path where we found the .la.  -CL
-+	    dir="$abs_ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	    #dir="$libdir"
-+	    #absdir="$libdir"
- 	  fi
- 	else
- 	  dir="$ladir/$objdir"
-@@ -2261,7 +2274,7 @@ EOF
- 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- 	  if test "$installed" = no; then
- 	    notinst_deplibs="$notinst_deplibs $lib"
--	    need_relink=yes
-+	    need_relink=no
- 	  fi
- 	  # This is a shared library
- 	
-@@ -5146,6 +5159,10 @@ fi\
- 	    # Replace all uninstalled libtool libraries with the installed ones
- 	    newdependency_libs=
- 	    for deplib in $dependency_libs; do
-+              # Replacing uninstalled with installed can easily break crosscompilation,
-+              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
- 	      case $deplib in
- 	      *.la)
- 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5464,10 +5481,13 @@ relink_command=\"$relink_command\""
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit 1
--	  fi
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  # if test "$inst_prefix_dir" = "$destdir"; then
-+	  #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #   exit 1
-+	  # fi
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
--- 
-2.9.4
-
diff --git a/buildroot/package/madplay/0002-configure-ac-automake-foreign.patch b/buildroot/package/madplay/0002-configure-ac-automake-foreign.patch
new file mode 100644
index 000000000..38d163098
--- /dev/null
+++ b/buildroot/package/madplay/0002-configure-ac-automake-foreign.patch
@@ -0,0 +1,16 @@
+configure.ac: don't require GNU-specific files when running automake
+
+Signed-off-by: Fabrice Fontaine 
+
+diff -durN madplay-0.15.2b-orig/configure.ac madplay-0.15.2b/configure.ac
+--- madplay-0.15.2b-orig/configure.ac	2019-02-14 21:34:01.507212449 +0100
++++ madplay-0.15.2b/configure.ac	2019-02-14 21:34:23.439336353 +0100
+@@ -26,7 +26,7 @@
+ 
+ AC_CONFIG_SRCDIR([madplay.c])
+ 
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ 
+ AM_CONFIG_HEADER([config.h])
+ 
diff --git a/buildroot/package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch b/buildroot/package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch
new file mode 100644
index 000000000..47645edd4
--- /dev/null
+++ b/buildroot/package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch
@@ -0,0 +1,23 @@
+configure.ac: use pkg-config to find id3tag
+
+Signed-off-by: Fabrice Fontaine 
+
+diff -durN madplay-0.15.2b-orig/configure.ac madplay-0.15.2b/configure.ac
+--- madplay-0.15.2b-orig/configure.ac	2019-02-14 21:34:01.507212449 +0100
++++ madplay-0.15.2b/configure.ac	2019-02-15 23:24:00.079876087 +0100
+@@ -182,12 +182,13 @@
+ *** environment variable to specify its installed location, e.g. -L
              .])
+ ])
+ 
+-AC_CHECK_LIB(id3tag, id3_tag_parse, :, [
++PKG_CHECK_MODULES(ID3TAG, id3tag, [
++	CFLAGS="$CFLAGS $ID3TAG_CFLAGS" LIBS="$LIBS $ID3TAG_LIBS"], [
+ 	AC_MSG_ERROR([libid3tag was not found
+ *** You must first install libid3tag before you can build this package.
+ *** If libid3tag is already installed, you may need to use the LDFLAGS
+ *** environment variable to specify its installed location, e.g. -L.])
+-], [-lz])
++])
+ 
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS(madvise localeconv)
diff --git a/buildroot/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch b/buildroot/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch
new file mode 100644
index 000000000..7d3fb8ddc
--- /dev/null
+++ b/buildroot/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch
@@ -0,0 +1,23 @@
+configure.ac: call AM_MKINSTALLDIRS to substitute @MKINSTALLDIRS@
+
+MKINSTALLDIRS is obsolete and doesn't get automatically called.
+
+Force call AM_MKINSTALLDIRS() macro to substitute every @MKINSTALLDIRS@
+occurence in *.in files.
+
+Signed-off-by: Giulio Benetti 
+
+diff -urpN madplay-0.15.2b.orig/configure.ac madplay-0.15.2b/configure.ac
+--- madplay-0.15.2b.orig/configure.ac	2019-04-16 12:06:03.781018755 +0200
++++ madplay-0.15.2b/configure.ac	2019-04-16 12:07:48.399162610 +0200
+@@ -146,6 +146,10 @@ ALL_LINGUAS="en es fr hr no"
+ AM_GNU_GETTEXT([use-libtool])
+ AM_GNU_GETTEXT_VERSION(0.14.1)
+ 
++dnl Substitute MKINSTALLDIRS
++
++AM_MKINSTALLDIRS()
++
+ dnl Checks for header files.
+ 
+ AC_HEADER_STDC
diff --git a/buildroot/package/madplay/Config.in b/buildroot/package/madplay/Config.in
index 922460e0c..a3373057a 100644
--- a/buildroot/package/madplay/Config.in
+++ b/buildroot/package/madplay/Config.in
@@ -6,8 +6,8 @@ config BR2_PACKAGE_MADPLAY
 	  Command-line front-end to libmad, a high-quality MPEG audio
 	  decoder.  It currently supports MPEG-1 and the MPEG-2
 	  extension to lower sampling frequencies, as well as the de
-	  facto MPEG 2.5 format. All three audio layers — Layer I,
-	  Layer II, and Layer III (i.e. MP3) — are fully implemented.
+	  facto MPEG 2.5 format. All three audio layers - Layer I,
+	  Layer II, and Layer III (i.e. MP3) - are fully implemented.
 
 	  http://www.underbit.com/products/mad/
 
diff --git a/buildroot/package/madplay/madplay.hash b/buildroot/package/madplay/madplay.hash
index 99487b5ec..227702976 100644
--- a/buildroot/package/madplay/madplay.hash
+++ b/buildroot/package/madplay/madplay.hash
@@ -1,2 +1,4 @@
 # Locally computed:
 sha256  5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0  madplay-0.15.2b.tar.gz
+sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
+sha256  915bfd70548f31d11f9b4ffb21f343d1196af96c79d6aaac5663ea46c39dd3a3  COPYRIGHT
diff --git a/buildroot/package/madplay/madplay.mk b/buildroot/package/madplay/madplay.mk
index e72e2f818..e1a78bd7d 100644
--- a/buildroot/package/madplay/madplay.mk
+++ b/buildroot/package/madplay/madplay.mk
@@ -8,14 +8,18 @@ MADPLAY_VERSION = 0.15.2b
 MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
 MADPLAY_LICENSE = GPL-2.0+
 MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
-MADPLAY_LIBTOOL_PATCH = NO
-MADPLAY_DEPENDENCIES = libmad libid3tag $(TARGET_NLS_DEPENDENCIES)
+MADPLAY_DEPENDENCIES = host-pkgconf libmad libid3tag $(TARGET_NLS_DEPENDENCIES)
+
+# Force autoreconf to be able to use a more recent libtool script, that
+# is able to properly behave in the face of a missing C++ compiler.
+# Also 0003-configure-ac-use-pkg-config-to-find-id3tag.patch
+MADPLAY_AUTORECONF = YES
 
 # Check if ALSA is built, then we should configure after alsa-lib so
 # ./configure can find alsa-lib.
 ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)
 MADPLAY_CONF_OPTS += --with-alsa
-MADPLAY_DEPENDENCIES += host-pkgconf alsa-lib
+MADPLAY_DEPENDENCIES += alsa-lib
 MADPLAY_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs alsa`"
 endif
 
diff --git a/buildroot/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/buildroot/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
new file mode 100644
index 000000000..33ded3c50
--- /dev/null
+++ b/buildroot/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
@@ -0,0 +1,70 @@
+From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
+From: Paul Eggert 
+Date: Sun, 24 Sep 2017 09:12:58 -0400
+Subject: [PATCH] glob: Do not assume glibc glob internals.
+
+It has been proposed that glibc glob start using gl_lstat,
+which the API allows it to do.  GNU 'make' should not get in
+the way of this.  See:
+https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
+
+* dir.c (local_lstat): New function, like local_stat.
+(dir_setup_glob): Use it to initialize gl_lstat too, as the API
+requires.
+
+Signed-off-by: Samuel Mendoza-Jonas 
+(from upstream commit 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4)
+---
+ dir.c | 29 +++++++++++++++++++++++++++--
+ 1 file changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/dir.c b/dir.c
+index adbb8a9..c343e4c 100644
+--- a/dir.c
++++ b/dir.c
+@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
+ }
+ #endif
+ 
++/* Similarly for lstat.  */
++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
++# ifndef VMS
++#  ifndef HAVE_SYS_STAT_H
++int lstat (const char *path, struct stat *sbuf);
++#  endif
++# else
++    /* We are done with the fake lstat.  Go back to the real lstat */
++#   ifdef lstat
++#     undef lstat
++#   endif
++# endif
++# define local_lstat lstat
++#elif defined(WINDOWS32)
++/* Windows doesn't support lstat().  */
++# define local_lstat local_stat
++#else
++static int
++local_lstat (const char *path, struct stat *buf)
++{
++  int e;
++  EINTRLOOP (e, lstat (path, buf));
++  return e;
++}
++#endif
++
+ void
+ dir_setup_glob (glob_t *gl)
+ {
+   gl->gl_opendir = open_dirstream;
+   gl->gl_readdir = read_dirstream;
+   gl->gl_closedir = free;
++  gl->gl_lstat = local_lstat;
+   gl->gl_stat = local_stat;
+-  /* We don't bother setting gl_lstat, since glob never calls it.
+-     The slot is only there for compatibility with 4.4 BSD.  */
+ }
+ 
+ void
+-- 
+2.21.0
+
diff --git a/buildroot/package/mariadb/0002-cmake-fix-ucontext-detection.patch b/buildroot/package/mariadb/0002-cmake-fix-ucontext-detection.patch
deleted file mode 100644
index fff43e821..000000000
--- a/buildroot/package/mariadb/0002-cmake-fix-ucontext-detection.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3c8d309616295045745e778000c0185eec4b21d9 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls 
-Date: Sun, 7 Oct 2018 14:25:59 +0200
-Subject: [PATCH] cmake: fix ucontext detection
-
-On some archs uclibc does not provide the ucontext structure despite
-providing ucontext.h, for details see
-https://git.buildroot.net/buildroot/commit/?id=f1cbfeea95e6287c7a666aafc182ffa318eff262
-
-This patch improves the detection of ucontext by making sure that
-HAVE_UCONTEXT_H is only set when makecontext() was found.
-
-Patch sent upstream: https://github.com/MariaDB/server/pull/878
-
-Signed-off-by: Bernd Kuhls 
----
- configure.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.cmake b/configure.cmake
-index d840dd4e565..a5df355ac42 100644
---- a/configure.cmake
-+++ b/configure.cmake
-@@ -986,12 +986,12 @@ CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_len
- 
- SET(CMAKE_EXTRA_INCLUDE_FILES) 
- 
--CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H)
--IF(NOT HAVE_UCONTEXT_H)
--  CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H)
-+CHECK_INCLUDE_FILE(ucontext.h HAVE_FILE_UCONTEXT_H)
-+IF(NOT HAVE_FILE_UCONTEXT_H)
-+  CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_FILE_UCONTEXT_H)
- ENDIF()
--IF(HAVE_UCONTEXT_H)
--  CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H)
-+IF(HAVE_FILE_UCONTEXT_H)
-+  CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H)
- ENDIF()
- 
- CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_sec "time.h" STRUCT_TIMESPEC_HAS_TV_SEC)
--- 
-2.19.0
-
diff --git a/buildroot/package/mariadb/mariadb.hash b/buildroot/package/mariadb/mariadb.hash
index 5b01b03df..db24f7bb9 100644
--- a/buildroot/package/mariadb/mariadb.hash
+++ b/buildroot/package/mariadb/mariadb.hash
@@ -1,9 +1,9 @@
-# From https://downloads.mariadb.org/mariadb/10.3.10
-md5 a63e00179d5e09b63bf71860a19a5507  mariadb-10.3.10.tar.gz
-sha1 187b3e3d7bcc6a4b03a2ca79b8d1930a6fcc76b2  mariadb-10.3.10.tar.gz
-sha256 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda  mariadb-10.3.10.tar.gz
-sha512 dee7789dff359a6352ceacb2db6bcb4730940e9458adda4e23894f9bfa0a7ff8c238060bffca58a60b662275e52a31ea1784d51fae114312b003c024e9412b31  mariadb-10.3.10.tar.gz
+# From https://downloads.mariadb.org/mariadb/10.3.13
+md5 603ce42e35b9a688f2cca05275acb5cb  mariadb-10.3.13.tar.gz
+sha1 08467885412184e99b835732913d445fd2c4b1b3  mariadb-10.3.13.tar.gz
+sha256 b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a  mariadb-10.3.13.tar.gz
+sha512 3cbd93291aa43b235e5b81d953ea69fb32df54fb518f922f69b5485952f01fae693c77b0efac37f414ed7ff132d3b58f899812bdb7be8a5b344c3640e2c3a0dd  mariadb-10.3.13.tar.gz
 
 # Hash for license files
-sha256 5baa5057c525cacc9f7814215582ac150e5bb0b0007aa8f6ebc50a5c1b7a496d  README.md
+sha256 43f4b5b13cecbbdb04a180cbf6c2bd64237819d1a32165b7d475c1b392e6a8d1  README.md
 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/buildroot/package/mariadb/mariadb.mk b/buildroot/package/mariadb/mariadb.mk
index 06d6365fa..356dd29af 100644
--- a/buildroot/package/mariadb/mariadb.mk
+++ b/buildroot/package/mariadb/mariadb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MARIADB_VERSION = 10.3.10
+MARIADB_VERSION = 10.3.13
 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
 MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
 # Tarball no longer contains LGPL license text
diff --git a/buildroot/package/matchbox-panel/matchbox-panel.mk b/buildroot/package/matchbox-panel/matchbox-panel.mk
index 344d8fde4..aaa723682 100644
--- a/buildroot/package/matchbox-panel/matchbox-panel.mk
+++ b/buildroot/package/matchbox-panel/matchbox-panel.mk
@@ -10,7 +10,8 @@ MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
 MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR)
 MATCHBOX_PANEL_LICENSE = GPL-2.0+
 MATCHBOX_PANEL_LICENSE_FILES = COPYING
-MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
+MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib $(TARGET_NLS_DEPENDENCIES)
+MATCHBOX_PANEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 MATCHBOX_PANEL_CONF_OPTS = --enable-expat --enable-dnotify
 
 ifeq ($(BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR),y)
diff --git a/buildroot/package/mbedtls/mbedtls.hash b/buildroot/package/mbedtls/mbedtls.hash
index 47e446dd0..57a5aeffc 100644
--- a/buildroot/package/mbedtls/mbedtls.hash
+++ b/buildroot/package/mbedtls/mbedtls.hash
@@ -1,5 +1,5 @@
-# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.12.0-2.7.5-and-2.1.14-released
-sha1	180ca49e2bb6df3826113781b793529a81427ce3	mbedtls-2.7.5-apache.tgz
-sha256	a1302ad9094aabb9880d2755927b466a6bac8e02b68e04dee77321f3859e9b40	mbedtls-2.7.5-apache.tgz
+# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.0-2.7.9-and-2.1.18-released
+sha1	70dc65f3f6f6b2392b821163be7f1f634f0012c8	mbedtls-2.7.9-apache.tgz
+sha256	18e57260b46579245744adb79c2924194dad36aac38c2d0be9e749b9181c706f	mbedtls-2.7.9-apache.tgz
 # Locally calculated
 sha256	cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30	apache-2.0.txt
diff --git a/buildroot/package/mbedtls/mbedtls.mk b/buildroot/package/mbedtls/mbedtls.mk
index e07cc3d71..4a5a731d4 100644
--- a/buildroot/package/mbedtls/mbedtls.mk
+++ b/buildroot/package/mbedtls/mbedtls.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 MBEDTLS_SITE = https://tls.mbed.org/code/releases
-MBEDTLS_VERSION = 2.7.5
+MBEDTLS_VERSION = 2.7.9
 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz
 MBEDTLS_CONF_OPTS = \
 	-DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \
diff --git a/buildroot/package/memcached/memcached.hash b/buildroot/package/memcached/memcached.hash
index c3cc11c3b..df430cf4f 100644
--- a/buildroot/package/memcached/memcached.hash
+++ b/buildroot/package/memcached/memcached.hash
@@ -1,6 +1,6 @@
-# From http://www.memcached.org/files/memcached-1.5.10.tar.gz.sha1
-sha1 fff9351b360a09497cd805d3e4c1ffbe860d067d  memcached-1.5.10.tar.gz
+# From http://www.memcached.org/files/memcached-1.5.12.tar.gz.sha1
+sha1 f67096ba64b0c47668bcad5b680010c4f8987d4c  memcached-1.5.12.tar.gz
 
 # Locally computed
-sha256 494c060dbd96d546c74ab85a3cc3984d009b4423767ac33e05dd2340c01f1c4b  memcached-1.5.10.tar.gz
+sha256 c02f97d5685617b209fbe25f3464317b234d765b427d254c2413410a5c095b29  memcached-1.5.12.tar.gz
 sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c  COPYING
diff --git a/buildroot/package/memcached/memcached.mk b/buildroot/package/memcached/memcached.mk
index f591fcf1c..b7c36ec15 100644
--- a/buildroot/package/memcached/memcached.mk
+++ b/buildroot/package/memcached/memcached.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MEMCACHED_VERSION = 1.5.10
+MEMCACHED_VERSION = 1.5.12
 MEMCACHED_SITE = http://www.memcached.org/files
 MEMCACHED_DEPENDENCIES = libevent
 MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
diff --git a/buildroot/package/mender/0001-FIX-Enabling-compiling-ppc64le.patch b/buildroot/package/mender/0001-FIX-Enabling-compiling-ppc64le.patch
deleted file mode 100644
index 3197a0ec0..000000000
--- a/buildroot/package/mender/0001-FIX-Enabling-compiling-ppc64le.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2b13f9a50793fdc15199925000107cb0cc4e7bad Mon Sep 17 00:00:00 2001
-From: Angelo Compagnucci 
-Date: Thu, 9 Aug 2018 09:28:06 +0200
-Subject: [PATCH] FIX: Enabling compiling ppc64le
-
-This patch enables Mender compilation on ppc64le
-
-Changelog: FIX: Enabling compiling ppc64le
-
-Signed-off-by: Angelo Compagnucci 
-Signed-off-by: Giulio Benetti 
----
- ioctl_64_bit.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ioctl_64_bit.go b/ioctl_64_bit.go
-index 6f61a6c..f1e2dd8 100644
---- a/ioctl_64_bit.go
-+++ b/ioctl_64_bit.go
-@@ -1,4 +1,4 @@
--// Copyright 2017 Northern.tech AS
-+// Copyright 2018 Northern.tech AS
- //
- //    Licensed under the Apache License, Version 2.0 (the "License");
- //    you may not use this file except in compliance with the License.
-@@ -12,7 +12,7 @@
- //    See the License for the specific language governing permissions and
- //    limitations under the License.
- 
--// +build amd64 arm64
-+// +build amd64 arm64 ppc64le
- 
- package main
- 
--- 
-2.17.1
-
diff --git a/buildroot/package/mender/S42mender b/buildroot/package/mender/S42mender
new file mode 100644
index 000000000..108fecfea
--- /dev/null
+++ b/buildroot/package/mender/S42mender
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# Starts mender service.
+#
+
+start() {
+	# If /var/lib/mender is a symlink to /var/run/mender, and
+	#   - the filesystem is RO (i.e. we can not rm the symlink),
+	#     create the directory pointed to by the symlink.
+	#   - the filesystem is RW (i.e. we can rm the symlink),
+	#     replace the symlink with an actual directory
+	if [ -L /var/lib/mender \
+	     -a "$(readlink /var/lib/mender)" = "/var/run/mender" ]
+	then
+		if rm -f /var/lib/mender >/dev/null 2>&1; then
+			mkdir -p /var/lib/mender
+		else
+			echo "No persistent location to store mender data. Data will be lost"
+			echo "at reboot. Are you sure this is what you want to do?"
+			mkdir -p "$(readlink /var/lib/mender)"
+		fi
+	fi
+
+	printf "Starting mender service: "
+	umask 077
+
+	start-stop-daemon -S -q -b -m -p /var/run/mender.pid \
+		--exec /usr/bin/mender -- -daemon
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+stop() {
+	printf "Stopping mender service: "
+	start-stop-daemon -K -q -p /var/run/mender.pid
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart|reload)
+		restart
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		exit 1
+esac
+
+exit $?
diff --git a/buildroot/package/mender/artifact_info b/buildroot/package/mender/artifact_info
new file mode 100644
index 000000000..1c84b088d
--- /dev/null
+++ b/buildroot/package/mender/artifact_info
@@ -0,0 +1 @@
+artifact_name=BUILDROOT_ARTIFACT
diff --git a/buildroot/package/mender/device_type b/buildroot/package/mender/device_type
new file mode 100644
index 000000000..a097ef2b3
--- /dev/null
+++ b/buildroot/package/mender/device_type
@@ -0,0 +1 @@
+device_type=BUILDROOT_DEVICE
diff --git a/buildroot/package/mender/mender.conf b/buildroot/package/mender/mender.conf
index 979f16aaf..f89118ac1 100644
--- a/buildroot/package/mender/mender.conf
+++ b/buildroot/package/mender/mender.conf
@@ -2,8 +2,8 @@
   "InventoryPollIntervalSeconds": 1800,
   "UpdatePollIntervalSeconds": 1800,
   "RetryPollIntervalSeconds": 300,
-  "RootfsPartA": "mmcblk0p2",
-  "RootfsPartB": "mmcblk0p3",
+  "RootfsPartA": "/dev/mmcblk0p2",
+  "RootfsPartB": "/dev/mmcblk0p3",
   "ServerCertificate": "/etc/mender/server.crt",
   "ServerURL": "https://docker.mender.io",
   "TenantToken": "dummy"
diff --git a/buildroot/package/mender/mender.hash b/buildroot/package/mender/mender.hash
index 8faa740e3..89aec239b 100644
--- a/buildroot/package/mender/mender.hash
+++ b/buildroot/package/mender/mender.hash
@@ -1,14 +1,14 @@
 # Locally computed:
-sha256 267fa73ad472b034248ee298593b5c52ea0b105fd73c91febb3587280c61bee2 mender-1.4.0.tar.gz
+sha256 caee18d1b8446df0cbb9a9c5a1c040d7eb1924332da94c3489494443a8077eb8 1.7.0.tar.gz
 
 # Apache-2.0 license, locally computed
-sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 LICENSE
+sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE
 
 # Vendor licenses
 # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256  /' LIC_FILES_CHKSUM.sha256
 
 # Apache-2.0 license.
-sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680  vendor/github.com/mendersoftware/mendertesting/LICENSE
+sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7  vendor/github.com/mendersoftware/mendertesting/LICENSE
 sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de  vendor/github.com/mendersoftware/log/LICENSE
 sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483  vendor/github.com/mendersoftware/log/COPYING
 sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de  vendor/github.com/mendersoftware/scopestack/LICENSE
@@ -38,4 +38,4 @@ sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e  vendor/
 sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569  vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
 
 # sha256 of all the vendor licenses combined
-sha256 54d6f54a2815cc2e3cef4f7dde5a3aae20f09b2cde394d8d3f1dce5d8a79d738 LIC_FILES_CHKSUM.sha256
+sha256 b84b543cab0505452982422783c0e68b7bfa0a1de4a625753d325e0a8b2dacb1 LIC_FILES_CHKSUM.sha256
diff --git a/buildroot/package/mender/mender.mk b/buildroot/package/mender/mender.mk
index 37a99c1f1..d56b63471 100644
--- a/buildroot/package/mender/mender.mk
+++ b/buildroot/package/mender/mender.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-MENDER_VERSION = 1.4.0
-MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION))
+MENDER_VERSION = 1.7.0
+MENDER_SITE = https://github.com/mendersoftware/mender/archive
+MENDER_SOURCE = $(MENDER_VERSION).tar.gz
 MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8
 
 # Vendor license paths generated with:
@@ -45,10 +46,19 @@ define MENDER_INSTALL_CONFIG_FILES
 
 	$(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \
 		$(TARGET_DIR)/usr/share/mender/identity/mender-device-identity
-	$(foreach f,hostinfo network, \
+	$(foreach f,hostinfo network os rootfs-type, \
 		$(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \
 			$(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f)
 	)
+
+	$(INSTALL) -D -m 0755 package/mender/artifact_info \
+			$(TARGET_DIR)/etc/mender/artifact_info
+
+	$(INSTALL) -D -m 0755 package/mender/device_type \
+			$(TARGET_DIR)/etc/mender/device_type
+
+	mkdir -p $(TARGET_DIR)/var/lib
+	ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender
 endef
 
 MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES
@@ -61,4 +71,9 @@ define MENDER_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mender.service
 endef
 
+define MENDER_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/mender/S42mender \
+		$(TARGET_DIR)/etc/init.d/S42mender
+endef
+
 $(eval $(golang-package))
diff --git a/buildroot/package/mender/mender.service b/buildroot/package/mender/mender.service
index 9ede55acb..2a5f476ee 100644
--- a/buildroot/package/mender/mender.service
+++ b/buildroot/package/mender/mender.service
@@ -6,7 +6,17 @@ After=systemd-resolved.service
 Type=idle
 User=root
 Group=root
-ExecStartPre=/bin/mkdir -p -m 0700 /data/mender
+ExecStartPre=/bin/sh -c '\
+if [ -L /var/lib/mender \
+     -a "$(readlink /var/lib/mender)" = "/var/run/mender" ]; then \
+    if rm -f /var/lib/mender >/dev/null 2>&1; then \
+        mkdir -p /var/lib/mender; \
+    else \
+        echo "No persistent location to store mender data. Data will be lost" \
+        echo "at reboot. Are you sure this is what you want to do?"; \
+        mkdir -p "$(readlink /var/lib/mender)"; \
+    fi; \
+fi'
 ExecStart=/usr/bin/mender -daemon
 Restart=on-abort
 
diff --git a/buildroot/package/mender/readme.txt b/buildroot/package/mender/readme.txt
new file mode 100644
index 000000000..c884524a1
--- /dev/null
+++ b/buildroot/package/mender/readme.txt
@@ -0,0 +1,154 @@
+=== Notes on using Mender on Buildroot
+======================================
+
+Mender is an open source over-the-air (OTA) software updater for
+embedded Linux devices. Mender comprises a client running at the
+embedded device, as well as a server that manages deployments across
+many devices. There is also various tooling around the Mender project,
+such as 'mender-artifact' which is used to create Mender Artifacts
+that are compatible with the Mender client and server.
+
+Mender aims to address this challenge with a robust and easy to use
+updater for embedded Linux devices, which is open source and available
+to anyone.
+
+Robustness is ensured with atomic image-based deployments using a dual
+A/B rootfs partition layout. This makes it always possible to roll
+back to a working state, even when losing power at any time during the
+update process.
+
+The official documentation is a good resource to get an in depth
+understanding of how Mender works:
+
+    https://docs.mender.io
+
+In Buildroot the following packages are provided:
+
+- BR2_PACKAGE_MENDER
+    - This will install the client on target rootfs
+- BR2_PACKAGE_HOST_MENDER_ARTIFACT
+    - This will install the 'mender-artifact' tool in host rootfs.
+
+To fully utilize atomic image-based deployments using the A/B update
+strategy, additional integration is required in the bootloader. This
+integration is board specific.
+
+Currently supported bootloaders are GRUB and U-boot, and for reference
+integrations please visit:
+
+    https://github.com/mendersoftware/buildroot-mender
+
+Default configurations files
+----------------------------
+
+Buildroot comes with a default configuration and there a couple of
+files that need your attention:
+
+- /etc/mender/mender.conf
+    - main configuration file for the Mender client
+    - https://docs.mender.io/client-configuration/configuration-file/configuration-options
+
+- /etc/mender/artifact_info
+    - The name of the image or update that will be built. This is what the
+      device will report that it is running, and different updates must have
+      different names
+
+- /var/lib/mender/device_type
+    - A string that defines the type of device
+
+Mender server configuration
+---------------------------
+
+The Mender server can be setup in different ways, and how you
+configure the Mender client differs slightly depending on which server
+environment is used.
+
+- Mender demo environment
+
+This is if you have followed the Getting started documentation where
+you launch a Mender server locally and to configure your environment
+to connect to this local server you need to provide the IP address of
+the server on the local network.
+
+By default the demo environment will connect to 'docker.mender.io' and
+'s3.docker.mender.io' and we need to make sure that these are resolved
+to the local IP address of the running server by adding the following
+entry to '/etc/hosts'
+
+     docker.mender.io s3.docker.mender.io
+
+This is required because the communication between client and server
+is utilizing TLS and the provided demo server certificate (server.crt)
+is only valid for 'docker.mender.io' and 's3.docker.mender.io'
+domains.
+
+- Hosted Mender
+
+To authenticate the Mender client with the Hosted Mender server you
+need a tenant token.
+
+To get your tenant token:
+
+- log in to https://hosted.mender.io
+- click your email at the top right and then “My organizationâ€
+- press the “COPY TO CLIPBOARDâ€
+- assign content of clipboard to TenantToken
+
+Example mender.conf options for Hosted Mender:
+
+    {
+      ...
+      "ServerURL": "https://hosted.mender.io",
+      "TenantToken": ""
+      ...
+    }
+
+
+Creating Mender Artifacts
+-------------------------
+
+To create Mender Artifacts based on Buildroot build output you must
+include BR2_PACKAGE_HOST_MENDER_ARTIFACT in your configuration, and
+then you would typically create the Mender Artifact in a post image
+script (BR2_ROOTFS_POST_IMAGE_SCRIPT). Below is an example of such a
+script:
+
+    #!/bin/sh
+
+    set -e
+    set -x
+
+    device_type=$(cat ${TARGET_DIR}/var/lib/mender/device_type | sed 's/[^=]*=//')
+    artifact_name=$(cat ${TARGET_DIR}/etc/mender/artifact_info | sed 's/[^=]*=//')
+
+    if [ -z "${device_type}" ] || [ -z "${artifact_name}" ]; then
+        echo "missing files required by Mender"
+        exit 1
+    fi
+
+    ${HOST_DIR}/usr/bin/mender-artifact write rootfs-image \
+        --update ${BINARIES_DIR}/rootfs.ext4 \
+        --output-path ${BINARIES_DIR}/${artifact_name}.mender \
+        --artifact-name ${artifact_name} \
+        --device-type ${device_type}
+
+As you can see some properties are extracted from target rootfs, and
+this is because these values are used for compatibility checks,
+meaning that the information must be present in both rootfs and in
+Mender Artifact meta data.
+
+- device_type - must be an exact match between rootfs and Mender
+                Artifact meta-data to apply update. You can set an
+                array of devices here as well, e.g if your image is
+                compatible with multiple hardware revisions
+
+- artifact_name - must be an exact match between rootfs and Mender
+                  Artifact meta-data to apply update.
+
+Configuring Mender with certificates
+------------------------------------
+
+Mender uses TLS to communicate with the management server, and if you
+use a CA-signed certificate on the server, you must include
+BR2_PACKAGE_CA_CERTIFICATES in your configuration to authenticate TLS
+connections.
diff --git a/buildroot/package/mesa3d-headers/mesa3d-headers.mk b/buildroot/package/mesa3d-headers/mesa3d-headers.mk
index 99dfb431a..4730463ea 100644
--- a/buildroot/package/mesa3d-headers/mesa3d-headers.mk
+++ b/buildroot/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 18.2.4
+MESA3D_HEADERS_VERSION = 18.3.3
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
 MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
 MESA3D_HEADERS_DL_SUBDIR = mesa3d
@@ -63,6 +63,10 @@ ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
 MESA3D_HEADERS_DIRS += GLES GLES2
 endif
 
+ifeq ($(BR2_PACKAGE_HAS_LIBOPENCL),y)
+MESA3D_HEADERS_DIRS += CL
+endif
+
 define MESA3D_HEADERS_BUILD_CMDS
 	$(MESA3D_HEADERS_BUILD_DRI_PC)
 endef
diff --git a/buildroot/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch b/buildroot/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch
index 337ad642a..513552879 100644
--- a/buildroot/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch
+++ b/buildroot/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch
@@ -15,6 +15,8 @@ Signed-off-by: Gustavo Zacarias 
 Signed-off-by: Vicente Olivert Riera 
 [Romain: rebase on 18.1]
 Signed-off-by: Romain Naour 
+[Bernd rebase on 18.3]
+Signed-off-by: Bernd Kuhls 
 ---
  configure.ac | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
@@ -23,22 +25,27 @@ diff --git a/configure.ac b/configure.ac
 index f1fbdcc6c7..dcf87e7dd6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1796,11 +1796,11 @@ for plat in $platforms; do
-         PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
+@@ -1841,17 +1841,16 @@
+         fi
          WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
  
 -        PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
--                          WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
--                          WAYLAND_SCANNER='')
-+        AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
-         if test "x$WAYLAND_SCANNER" = x; then
--            AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
-+		PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
-+			WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
-+			WAYLAND_SCANNER='')
-         fi
++        AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
++        if test "x$WAYLAND_SCANNER" = x; then
++                PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
+                           WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
+                           WAYLAND_SCANNER='')
++        fi
+         PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
+                           AC_SUBST(SCANNER_ARG, 'private-code'),
+                           AC_SUBST(SCANNER_ARG, 'code'))
  
+-        if test "x$WAYLAND_SCANNER" = x; then
+-            AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
+-        fi
+-
          if test "x$WAYLAND_SCANNER" = "x:"; then
+                 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
+         fi
 -- 
 2.14.3
-
diff --git a/buildroot/package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch b/buildroot/package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch
new file mode 100644
index 000000000..42ae826a3
--- /dev/null
+++ b/buildroot/package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch
@@ -0,0 +1,37 @@
+From 94bceeb621e36f3188c6246a763def8695526578 Mon Sep 17 00:00:00 2001
+From: Valentin Korenblit 
+Date: Sat, 20 Oct 2018 10:56:23 +0200
+Subject: [PATCH] Set proper value for LIBCLC_INCLUDEDIR
+
+LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation
+will look for OpenCL "headers" on the target, when building the OpenCL
+kernels.
+
+The value returned by pkg-config for includedir is relevant when
+cross-compiling, on the build machine. But in this specific case, we
+really need a value that is valid on the target.
+
+Those headers are installed by the libclc package in /usr/share so
+that they are not removed by Buildroot target-finalize logic.
+
+Signed-off-by: Valentin Korenblit 
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 864dcae..cc2390b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2429,7 +2429,7 @@ if test "x$enable_opencl" = xyes; then
+                     PKG_CONFIG_PATH environment variable.
+                     By default libclc.pc is installed to /usr/local/share/pkgconfig/])
+     else
+-        LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc`
++        LIBCLC_INCLUDEDIR="/usr/share"
+         LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc`
+         AC_SUBST([LIBCLC_INCLUDEDIR])
+         AC_SUBST([LIBCLC_LIBEXECDIR])
+-- 
+2.7.4
+
diff --git a/buildroot/package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch b/buildroot/package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch
new file mode 100644
index 000000000..04621eeab
--- /dev/null
+++ b/buildroot/package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch
@@ -0,0 +1,47 @@
+From eb44c36cf1729e7e200b77cf8ea755dff72d1639 Mon Sep 17 00:00:00 2001
+From: Gurchetan Singh 
+Date: Wed, 28 Nov 2018 08:39:34 -0800
+Subject: [PATCH] egl: add missing #include  in egldevice.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise, I get this error:
+
+main/egldevice.h:54:13: error: ‘NULL’ undeclared (first use in this function)
+       dev = NULL;
+             ^~~~
+with this config:
+
+./autogen.sh --enable-gles1 --enable-gles2 --with-platforms='surfaceless' --disable-glx
+             --with-dri-drivers="i965" --with-gallium-drivers="" --enable-gbm
+
+v3: Use stddef.h (Matt)
+v4: Modify commit message (Eric)
+
+Reviewed-by: Matt Turner 
+Reviewed-by: Eric Engestrom 
+Backported from upstream commit eb44c36cf1729e7e200b77cf8ea755dff72d1639
+Signed-off-by: James Hilliard 
+---
+ src/egl/main/egldevice.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/egl/main/egldevice.h b/src/egl/main/egldevice.h
+index ddcdcd1..83a47d5 100644
+--- a/src/egl/main/egldevice.h
++++ b/src/egl/main/egldevice.h
+@@ -31,9 +31,9 @@
+ 
+ 
+ #include 
++#include 
+ #include "egltypedefs.h"
+ 
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-- 
+2.7.4
+
diff --git a/buildroot/package/mesa3d/Config.in b/buildroot/package/mesa3d/Config.in
index 872859b69..fdd64b033 100644
--- a/buildroot/package/mesa3d/Config.in
+++ b/buildroot/package/mesa3d/Config.in
@@ -14,6 +14,7 @@ menuconfig BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXXF86VM if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_ZLIB
 	help
@@ -50,6 +51,17 @@ comment "llvm support needs a toolchain not affected by GCC bug 64735"
 	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 
+# clang and libclc dependencies are satisfied by
+# BR2_PACKAGE_MESA3D_LLVM
+config BR2_PACKAGE_MESA3D_OPENCL
+	bool "OpenCL support"
+	depends on BR2_PACKAGE_MESA3D_LLVM
+	depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \
+		BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
+	select BR2_PACKAGE_CLANG
+	select BR2_PACKAGE_LIBCLC
+	select BR2_PACKAGE_HAS_LIBOPENCL
+
 # inform the .mk file of gallium, dri or vulkan driver selection
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
 	bool
@@ -113,6 +125,7 @@ comment "R600 driver needs a uClibc or glibc toolchain when llvm is enabled"
 
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
 	bool "Gallium Radeon SI driver"
+	depends on BR2_USE_MMU # libdrm
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_PACKAGE_MESA3D_LLVM
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
@@ -129,6 +142,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
 # Radeon SI needs libelf
 # musl is not currently compatible with elfutils
 comment "Radeon SI driver needs a uClibc or glibc toolchain"
+	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_MESA3D_LLVM
 	depends on !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
 
@@ -270,6 +284,9 @@ config BR2_PACKAGE_PROVIDES_LIBEGL
 config BR2_PACKAGE_PROVIDES_LIBGLES
 	default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES
 
+config BR2_PACKAGE_PROVIDES_LIBOPENCL
+	default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL
+
 endif # BR2_PACKAGE_MESA3D
 
 comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library"
diff --git a/buildroot/package/mesa3d/mesa3d.hash b/buildroot/package/mesa3d/mesa3d.hash
index 9ee353ee1..b0774ff40 100644
--- a/buildroot/package/mesa3d/mesa3d.hash
+++ b/buildroot/package/mesa3d/mesa3d.hash
@@ -1,7 +1,7 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2018-October/000471.html
-md5  33c4b4ad2f33d4faedec3206da7853d3  mesa-18.2.4.tar.xz
-sha1 9ebe58bdf03a1ff5e671de75f92c3c739edd3c4e  mesa-18.2.4.tar.xz
-sha256 621d1aebb57876d5b6a5d2dcf4eb7e0620e650c6fe5cf3655c65e243adc9cb4e  mesa-18.2.4.tar.xz
-sha512 088d43b087f4005752e4db75eaa6897e0fcb6de7b9a1f2d2b2ce3b5557d1dff829022e0092e8b1038ff01182c863ca0f26c97b9adde34bca462d3fa24502bfde  mesa-18.2.4.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2019-February/000492.html
+md5 e9d1a24dbd5ca20efa75b9a29eb4566f  mesa-18.3.3.tar.xz
+sha1 abb067204ae31493dba7710c378b2b90245108ca  mesa-18.3.3.tar.xz
+sha256 2ab6886a6966c532ccbcc3b240925e681464b658244f0cbed752615af3936299  mesa-18.3.3.tar.xz
+sha512 cd6214b8bbeb3e3d187139ae1e949684f32f90152e1d7ba8d81222bd088770e28cff7ff165f2ccc41c068950561fe952420c6e54472f7204532a8d8700ff18bb  mesa-18.3.3.tar.xz
 # License
 sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c  docs/license.html
diff --git a/buildroot/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk
index 1a1fb17c7..c3469f778 100644
--- a/buildroot/package/mesa3d/mesa3d.mk
+++ b/buildroot/package/mesa3d/mesa3d.mk
@@ -5,12 +5,13 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 18.2.4
+MESA3D_VERSION = 18.3.3
 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = https://mesa.freedesktop.org/archive
 MESA3D_LICENSE = MIT, SGI, Khronos
 MESA3D_LICENSE_FILES = docs/license.html
 # 0002-configure.ac-invert-order-for-wayland-scanner-check.patch
+# 0003-set-LIBCLC_INCLUDEDIR.patch
 MESA3D_AUTORECONF = YES
 
 MESA3D_INSTALL_STAGING = YES
@@ -44,8 +45,17 @@ else
 MESA3D_CONF_OPTS += --disable-llvm
 endif
 
-# Disable opencl in case libclc is detected
+# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of
+# libMesaOpenCL and CL headers are installed
+ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y)
+MESA3D_PROVIDES += libopencl
+MESA3D_DEPENDENCIES += clang libclc
+MESA3D_CONF_OPTS += --enable-opencl \
+	--disable-opencl-icd \
+	--with-clang-libdir=$(STAGING_DIR)/usr/lib
+else
 MESA3D_CONF_OPTS += --disable-opencl
+endif
 
 ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)
 MESA3D_DEPENDENCIES += elfutils
@@ -66,6 +76,7 @@ MESA3D_DEPENDENCIES += \
 	xlib_libXdamage \
 	xlib_libXfixes \
 	xlib_libXrandr \
+	xlib_libXxf86vm \
 	xorgproto \
 	libxcb
 MESA3D_CONF_OPTS += --enable-glx --disable-mangling
@@ -122,12 +133,10 @@ MESA3D_CONF_OPTS += --enable-dri3
 else
 MESA3D_CONF_OPTS += --disable-dri3
 endif
-ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y)
-MESA3D_DEPENDENCIES += xlib_libXxf86vm
-endif
 MESA3D_CONF_OPTS += \
 	--enable-shared-glapi \
 	--enable-driglx-direct \
+	--with-dri-driverdir=/usr/lib/dri \
 	--with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y))
 endif
 
diff --git a/buildroot/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/buildroot/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
index 0e59907a0..a7b66c106 100644
--- a/buildroot/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
+++ b/buildroot/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
@@ -1,21 +1,25 @@
-From 649140f09d8a8805125830cd7b2327d35447ffe8 Mon Sep 17 00:00:00 2001
+From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001
 From: Eric Le Bihan 
 Date: Sat, 14 Jul 2018 11:18:45 +0200
 Subject: [PATCH] Only fix RPATH if install_rpath is not empty
 
 Signed-off-by: Eric Le Bihan 
+[Fix: remove leftover from original/unconditional code]
+Signed-off-by: Peter Seiderer 
 ---
- mesonbuild/minstall.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ mesonbuild/minstall.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index 1d721795..e04e1f6a 100644
+index 8ac6aab1..7ef04116 100644
 --- a/mesonbuild/minstall.py
 +++ b/mesonbuild/minstall.py
-@@ -495,6 +495,14 @@ class Installer:
+@@ -478,8 +478,14 @@ class Installer:
+                         printed_symlink_error = True
+             if os.path.isfile(outname):
                  try:
-                     depfixer.fix_rpath(outname, install_rpath, final_path,
-                                        install_name_mappings, verbose=False)
+-                    depfixer.fix_rpath(outname, install_rpath, final_path,
+-                                       install_name_mappings, verbose=False)
 +                    # Buildroot check-host-rpath script expects RPATH
 +                    # But if install_rpath is empty, it will stripped.
 +                    # So, preserve it in this case
@@ -28,5 +32,5 @@ index 1d721795..e04e1f6a 100644
                      if isinstance(e.code, int) and e.code == 0:
                          pass
 -- 
-2.14.4
+2.20.1
 
diff --git a/buildroot/package/meson/cross-compilation.conf.in b/buildroot/package/meson/cross-compilation.conf.in
index 0eec74087..fc8e27f7e 100644
--- a/buildroot/package/meson/cross-compilation.conf.in
+++ b/buildroot/package/meson/cross-compilation.conf.in
@@ -11,6 +11,7 @@ strip = '@TARGET_CROSS@strip'
 pkgconfig = '@HOST_DIR@/usr/bin/pkg-config'
 
 [properties]
+needs_exe_wrapper = true
 c_args = [@TARGET_CFLAGS@]
 c_link_args = [@TARGET_LDFLAGS@]
 cpp_args = [@TARGET_CXXFLAGS@]
diff --git a/buildroot/package/meson/meson.hash b/buildroot/package/meson/meson.hash
index a9968977d..3a5c7dd43 100644
--- a/buildroot/package/meson/meson.hash
+++ b/buildroot/package/meson/meson.hash
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-# https://github.com/mesonbuild/meson/releases/download/0.47.2/meson-0.47.2.tar.gz.asc
-sha256 92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb meson-0.47.2.tar.gz
+# https://github.com/mesonbuild/meson/releases/download/0.49.0/meson-0.49.0.tar.gz.asc
+sha256 fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551 meson-0.49.0.tar.gz
 sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
diff --git a/buildroot/package/meson/meson.mk b/buildroot/package/meson/meson.mk
index e1675c21b..d76541cc9 100644
--- a/buildroot/package/meson/meson.mk
+++ b/buildroot/package/meson/meson.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MESON_VERSION = 0.47.2
+MESON_VERSION = 0.49.0
 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
 MESON_LICENSE = Apache-2.0
 MESON_LICENSE_FILES = COPYING
@@ -16,14 +16,45 @@ HOST_MESON_NEEDS_HOST_PYTHON = python3
 HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN))
 HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU)
 
+# https://mesonbuild.com/Reference-tables.html#cpu-families
+ifeq ($(BR2_arcle)$(BR2_arceb),y)
+HOST_MESON_TARGET_CPU_FAMILY = arc
+else ifeq ($(BR2_arm)$(BR2_armeb),y)
+HOST_MESON_TARGET_CPU_FAMILY = arm
+else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y)
+HOST_MESON_TARGET_CPU_FAMILY = aarch64
+else ifeq ($(BR2_i386),y)
+HOST_MESON_TARGET_CPU_FAMILY = x86
+else ifeq ($(BR2_mips)$(BR2_mipsel),y)
+HOST_MESON_TARGET_CPU_FAMILY = mips
+else ifeq ($(BR2_mips64)$(BR2_mips64el),y)
+HOST_MESON_TARGET_CPU_FAMILY = mips64
+else ifeq ($(BR2_powerpc),y)
+HOST_MESON_TARGET_CPU_FAMILY = ppc
+else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y)
+HOST_MESON_TARGET_CPU_FAMILY = ppc64
+else ifeq ($(BR2_riscv),y)
+HOST_MESON_TARGET_CPU_FAMILY = riscv64
+else ifeq ($(BR2_sparc),y)
+HOST_MESON_TARGET_CPU_FAMILY = sparc
+else ifeq ($(BR2_sparc64),y)
+HOST_MESON_TARGET_CPU_FAMILY = sparc64
+else ifeq ($(BR2_x86_64),y)
+HOST_MESON_TARGET_CPU_FAMILY = x86_64
+else
+HOST_MESON_TARGET_CPU_FAMILY = $(ARCH)
+endif
+
 HOST_MESON_SED_CFLAGS = $(if $(TARGET_CFLAGS),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`)
 HOST_MESON_SED_LDFLAGS = $(if $(TARGET_LDFLAGS),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`)
 HOST_MESON_SED_CXXFLAGS = $(if $(TARGET_CXXFLAGS),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`)
 
+# Generate a Meson cross-compilation.conf suitable for use with the
+# SDK
 define HOST_MESON_INSTALL_CROSS_CONF
 	mkdir -p $(HOST_DIR)/etc/meson
 	sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
-	    -e "s%@TARGET_ARCH@%$(ARCH)%g" \
+	    -e "s%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
 	    -e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \
 	    -e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \
 	    -e "s%@TARGET_CFLAGS@%$(HOST_MESON_SED_CFLAGS)%g" \
@@ -34,6 +65,6 @@ define HOST_MESON_INSTALL_CROSS_CONF
 	    > $(HOST_DIR)/etc/meson/cross-compilation.conf
 endef
 
-HOST_MESON_POST_INSTALL_HOOKS += HOST_MESON_INSTALL_CROSS_CONF
+TARGET_FINALIZE_HOOKS += HOST_MESON_INSTALL_CROSS_CONF
 
 $(eval $(host-python-package))
diff --git a/buildroot/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch b/buildroot/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch
new file mode 100644
index 000000000..36ddee422
--- /dev/null
+++ b/buildroot/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch
@@ -0,0 +1,31 @@
+From 949ae648bf7c654b8fae607a0988bfa672607156 Mon Sep 17 00:00:00 2001
+From: Patrick Rauscher 
+Date: Fri, 18 Aug 2017 17:31:23 +0200
+Subject: [PATCH] Prepend zero-byte before unsigned integers
+
+fixes #8
+
+Signed-off-by: Alexander Sverdlin 
+---
+ mib.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/mib.c b/mib.c
+index 7d2e513..a9ffbe2 100644
+--- a/mib.c
++++ b/mib.c
+@@ -207,6 +207,11 @@ static int encode_unsigned(data_t *data, int type, unsigned int ticks_value)
+ 	else
+ 		length = 1;
+ 
++	/* check if the integer could be interpreted negative during a signed decode and prepend a zero-byte if necessary */
++	if ((ticks_value >> (8 * (length - 1))) & 0x80) {
++		length++;
++	}
++
+ 	*buffer++ = type;
+ 	*buffer++ = length;
+ 	while (length--)
+-- 
+2.13.2
+
diff --git a/buildroot/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch b/buildroot/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch
new file mode 100644
index 000000000..045d29691
--- /dev/null
+++ b/buildroot/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch
@@ -0,0 +1,28 @@
+From 556c8a406c9e08dd9444222e072f7eb9c82a81e8 Mon Sep 17 00:00:00 2001
+From: Patrick Rauscher 
+Date: Fri, 18 Aug 2017 17:44:32 +0200
+Subject: [PATCH] mib.c: allow unsigned integers to have an extra byte
+
+The extra byte can be needed when encoding huge unsigned numbers (i.e. 0x80000000 or higher). In this case, during encoding we need an extra byte to make sure clients decoding as signed int do not get negative numbers. For further details, see commit 949ae648
+
+Signed-off-by: Alexander Sverdlin 
+---
+ mib.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mib.c b/mib.c
+index a9ffbe2..83cc20d 100644
+--- a/mib.c
++++ b/mib.c
+@@ -372,7 +372,7 @@ static int data_alloc(data_t *data, int type)
+ 		case BER_TYPE_COUNTER:
+ 		case BER_TYPE_GAUGE:
+ 		case BER_TYPE_TIME_TICKS:
+-			data->max_length = sizeof(unsigned int) + 2;
++			data->max_length = sizeof(unsigned int) + 3;
+ 			data->encoded_length = 0;
+ 			data->buffer = allocate(data->max_length);
+ 			break;
+-- 
+2.13.2
+
diff --git a/buildroot/package/mini-snmpd/Config.in b/buildroot/package/mini-snmpd/Config.in
new file mode 100644
index 000000000..1f61cddbc
--- /dev/null
+++ b/buildroot/package/mini-snmpd/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_MINI_SNMPD
+	bool "mini-snmpd"
+	help
+	  Mini SNMPd is a minimal implementation targeted at small or
+	  embedded UNIX systems with limited resources
+
+	  http://troglobit.com/mini-snmpd.html
diff --git a/buildroot/package/mini-snmpd/mini-snmpd.hash b/buildroot/package/mini-snmpd/mini-snmpd.hash
new file mode 100644
index 000000000..19118b7f9
--- /dev/null
+++ b/buildroot/package/mini-snmpd/mini-snmpd.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 59f84e94ef7c9ff36d243c7974a100903a4a9a0bb529b67cf6f0d3352138a86b mini-snmpd-v1.4.tar.gz
+sha256 8a43b895972a24567297f44f35dab0f5f9ed3b7db6dac0bf6094075b27ab9d56 COPYING
diff --git a/buildroot/package/mini-snmpd/mini-snmpd.mk b/buildroot/package/mini-snmpd/mini-snmpd.mk
new file mode 100644
index 000000000..ebcbcce1c
--- /dev/null
+++ b/buildroot/package/mini-snmpd/mini-snmpd.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# mini-snmpd
+#
+################################################################################
+
+MINI_SNMPD_VERSION = v1.4
+MINI_SNMPD_SITE = $(call github,troglobit,mini-snmpd,$(MINI_SNMPD_VERSION))
+MINI_SNMPD_LICENSE = GPL-2.0
+MINI_SNMPD_LICENSE_FILES = COPYING
+MINI_SNMPD_AUTORECONF = YES
+
+define MINI_SNMPD_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 package/mini-snmpd/mini-snmpd.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/mini-snmpd.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/mini-snmpd.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mini-snmpd.service
+endef
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/mini-snmpd/mini-snmpd.service b/buildroot/package/mini-snmpd/mini-snmpd.service
new file mode 100644
index 000000000..8a15585e6
--- /dev/null
+++ b/buildroot/package/mini-snmpd/mini-snmpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mini SNMP Daemon
+StartLimitIntervalSec=0
+
+[Service]
+Environment='COMMUNITY=public'
+ExecStart=/sbin/mini_snmpd -a -n -c ${COMMUNITY} $EXTRA_PARAMS
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/buildroot/package/minicom/0002-src-Makefile.am-fix-ascii-xfr-link-with-lintl.patch b/buildroot/package/minicom/0002-src-Makefile.am-fix-ascii-xfr-link-with-lintl.patch
new file mode 100644
index 000000000..efc880d2e
--- /dev/null
+++ b/buildroot/package/minicom/0002-src-Makefile.am-fix-ascii-xfr-link-with-lintl.patch
@@ -0,0 +1,44 @@
+From 6fe734c5a1d51e2d4a3c1cd4d7a61cc246faa3f2 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sat, 20 Apr 2019 13:34:23 +0200
+Subject: [PATCH] src/Makefile.am: fix ascii-xfr link with lintl
+
+ascii-xfr needs to link with lintl if needed:
+
+/home/dawncrow/buildroot-test/scripts/instance-0/output/host/bin/m68k-linux-gcc  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -O2   -W -Wall -Wextra -std=gnu99 -Wno-format-truncation   -o ascii-xfr ascii-xfr.o ../lib/libport.a -lncurses
+ascii-xfr.o: In function `stats':
+ascii-xfr.c:(.text+0x4c): undefined reference to `libintl_gettext'
+ascii-xfr.c:(.text+0xb2): undefined reference to `libintl_gettext'
+ascii-xfr.o: In function `usage':
+ascii-xfr.c:(.text+0x10e): undefined reference to `libintl_gettext'
+ascii-xfr.o: In function `asend':
+ascii-xfr.c:(.text+0x534): undefined reference to `libintl_gettext'
+ascii-xfr.o: In function `main':
+ascii-xfr.c:(.text.startup+0xc8): undefined reference to `libintl_gettext'
+ascii-xfr.o:ascii-xfr.c:(.text.startup+0x1a8): more undefined references to `libintl_gettext' follow
+
+Fixes:
+ - http://autobuild.buildroot.org/results/e64cdcf648764be53a3e951304bb89dc9410db23
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status:
+https://salsa.debian.org/minicom-team/minicom/merge_requests/7]
+---
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 19b1888..ba92f71 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -29,6 +29,7 @@ confdir = @MINICOM_CONFDIR@
+ AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib -DCONFDIR=\"$(confdir)\" \
+               -DLOCALEDIR=\"$(datadir)/locale\"
+ 
++ascii_xfr_LDADD = @LIBINTL@
+ minicom_LDADD = @LIBINTL@ $(LIBICONV) $(MINICOM_LIBPORT) $(LOCKDEV_LIBS)
+ minicom_keyserv_LDADD = @LIBINTL@ $(MINICOM_LIBPORT)
+ runscript_LDADD = @LIBINTL@ $(MINICOM_LIBPORT)
+-- 
+2.20.1
+
diff --git a/buildroot/package/minizip/Config.in b/buildroot/package/minizip/Config.in
index 68fa1d711..5a0c52b3b 100644
--- a/buildroot/package/minizip/Config.in
+++ b/buildroot/package/minizip/Config.in
@@ -1,9 +1,6 @@
 config BR2_PACKAGE_MINIZIP
 	bool "minizip"
-	depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd
-	depends on BR2_USE_WCHAR # libbsd
-	select BR2_PACKAGE_LIBBSD
+	depends on BR2_USE_WCHAR
 	help
 	  Enables to extract files from a .zip archive file.
 	  It is compatible with PKZip 2.04g, WinZip, InfoZip,
@@ -17,6 +14,5 @@ config BR2_PACKAGE_MINIZIP_DEMOS
 	help
 	  Enable minizip binary tool.
 
-comment "minizip needs a toolchain w/ threads, wchar"
-	depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+comment "minizip needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR
diff --git a/buildroot/package/minizip/minizip.hash b/buildroot/package/minizip/minizip.hash
index f77d40a02..d9473581c 100644
--- a/buildroot/package/minizip/minizip.hash
+++ b/buildroot/package/minizip/minizip.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 0afe6528f530cc9c1440053a7bbff53087e86f849e145d233464052c730431e9  minizip-2.5.3.tar.gz
+sha256 b01607d219ed40d817404947dd5339d64242a083df6372c37b0387b5501d84f5  minizip-2.8.2.tar.gz
 sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4  LICENSE
diff --git a/buildroot/package/minizip/minizip.mk b/buildroot/package/minizip/minizip.mk
index 5a596f7cc..a9eea1b1c 100644
--- a/buildroot/package/minizip/minizip.mk
+++ b/buildroot/package/minizip/minizip.mk
@@ -4,11 +4,16 @@
 #
 ################################################################################
 
-MINIZIP_VERSION = 2.5.3
+MINIZIP_VERSION = 2.8.2
 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION))
-MINIZIP_DEPENDENCIES = host-pkgconf libbsd
+MINIZIP_DEPENDENCIES = \
+	host-pkgconf \
+	$(if $(BR2_PACKAGE_LIBBSD),libbsd) \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
 MINIZIP_INSTALL_STAGING = YES
-MINIZIP_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DBUILD_TEST=ON)
+MINIZIP_CONF_OPTS = \
+	$(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DBUILD_TEST=ON) \
+	-DUSE_COMPAT=OFF
 MINIZIP_LICENSE = Zlib
 MINIZIP_LICENSE_FILES = LICENSE
 
@@ -19,6 +24,13 @@ else
 MINIZIP_CONF_OPTS += -DUSE_BZIP2=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MINIZIP_DEPENDENCIES += openssl
+MINIZIP_CONF_OPTS += -DUSE_OPENSSL=ON
+else
+MINIZIP_CONF_OPTS += -DUSE_OPENSSL=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 MINIZIP_DEPENDENCIES += zlib
 MINIZIP_CONF_OPTS += -DUSE_ZLIB=ON
diff --git a/buildroot/package/mksh/Config.in b/buildroot/package/mksh/Config.in
index 55d1cc15e..e6ccc9064 100644
--- a/buildroot/package/mksh/Config.in
+++ b/buildroot/package/mksh/Config.in
@@ -14,7 +14,7 @@ config BR2_PACKAGE_MKSH
 	  secure shell not cut off modern extensions; a shell with
 	  Unicode support; an actively developed, current, and
 	  portable product; one with developers that listen to
-	  their users’ requests and implement them if they
+	  their users' requests and implement them if they
 	  actually make sense.
 
 	  mksh aims to replace pdksh in all but very rare use cases
diff --git a/buildroot/package/mmc-utils/0002-fix-overlapping-with-strncpy.patch b/buildroot/package/mmc-utils/0002-fix-overlapping-with-strncpy.patch
index a134dd3c5..a562845ff 100644
--- a/buildroot/package/mmc-utils/0002-fix-overlapping-with-strncpy.patch
+++ b/buildroot/package/mmc-utils/0002-fix-overlapping-with-strncpy.patch
@@ -1,7 +1,7 @@
 From 1c90a7534658056b884d71ef82dc7ca8bad4271b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= 
 Date: Wed, 24 Oct 2018 13:00:47 +0200
-Subject: [PATCH 1/1] mmc-utils: fix overlapping with strncpy
+Subject: [PATCH] mmc-utils: fix overlapping with strncpy
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/buildroot/package/moarvm/0001-Fix-Name-Collision-With-LibTomMath-Funcs.patch b/buildroot/package/moarvm/0001-Fix-Name-Collision-With-LibTomMath-Funcs.patch
new file mode 100644
index 000000000..4af4d3264
--- /dev/null
+++ b/buildroot/package/moarvm/0001-Fix-Name-Collision-With-LibTomMath-Funcs.patch
@@ -0,0 +1,65 @@
+From ead5f4da759465cf6fc2ceab7c431d3550a3323f Mon Sep 17 00:00:00 2001
+From: Timo Paulssen 
+Date: Tue, 15 Jan 2019 12:35:56 +0100
+Subject: [PATCH] Fix Name Collision With Existing LibTomMath Function
+
+fixes #1032
+
+Upstream: https://github.com/MoarVM/MoarVM/commit/f7204a3ee5199dd70f26d6fe133008cc86c63bbe
+(backported mp_get_double() as other functions weren't yet used)
+
+Signed-off-by: Matthew Weber 
+---
+ src/math/bigintops.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/math/bigintops.c b/src/math/bigintops.c
+index 2275593..8ab7ed6 100644
+--- a/src/math/bigintops.c
++++ b/src/math/bigintops.c
+@@ -45,7 +45,7 @@ int MVM_bigint_mp_set_uint64(mp_int * a, MVMuint64 b) {
+   return MP_OKAY;
+ }
+ 
+-static MVMnum64 mp_get_double(mp_int *a) {
++static MVMnum64 MVM_mp_get_double(mp_int *a) {
+     MVMnum64 d    = 0.0;
+     MVMnum64 sign = SIGN(a) == MP_NEG ? -1.0 : 1.0;
+     int i;
+@@ -680,8 +680,8 @@ MVMObject * MVM_bigint_pow(MVMThreadContext *tc, MVMObject *a, MVMObject *b,
+         }
+     }
+     else {
+-        MVMnum64 f_base = mp_get_double(base);
+-        MVMnum64 f_exp = mp_get_double(exponent);
++        MVMnum64 f_base = MVM_mp_get_double(base);
++        MVMnum64 f_exp = MVM_mp_get_double(exponent);
+         r = MVM_repr_box_num(tc, num_type, pow(f_base, f_exp));
+     }
+     clear_temp_bigints(tmp, 2);
+@@ -880,7 +880,7 @@ MVMnum64 MVM_bigint_to_num(MVMThreadContext *tc, MVMObject *a) {
+ 
+     if (MVM_BIGINT_IS_BIG(ba)) {
+         mp_int *ia = ba->u.bigint;
+-        return mp_get_double(ia);
++        return MVM_mp_get_double(ia);
+     } else {
+         return (double)ba->u.smallint.value;
+     }
+@@ -913,11 +913,11 @@ MVMnum64 MVM_bigint_div_num(MVMThreadContext *tc, MVMObject *a, MVMObject *b) {
+             mp_init(&reduced_b);
+             mp_div_2d(ia, max_size - 1023, &reduced_a, NULL);
+             mp_div_2d(ib, max_size - 1023, &reduced_b, NULL);
+-            c = mp_get_double(&reduced_a) / mp_get_double(&reduced_b);
++            c = MVM_mp_get_double(&reduced_a) / MVM_mp_get_double(&reduced_b);
+             mp_clear(&reduced_a);
+             mp_clear(&reduced_b);
+         } else {
+-            c = mp_get_double(ia) / mp_get_double(ib);
++            c = MVM_mp_get_double(ia) / MVM_mp_get_double(ib);
+         }
+         clear_temp_bigints(tmp, 2);
+     } else {
+-- 
+1.9.1
+
diff --git a/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash
index 5ab2e318f..632fc935a 100644
--- a/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash
+++ b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash
@@ -1,2 +1,4 @@
-# From http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/20151214/mobile-broadband-provider-info-20151214.sha256sum
-sha256	8ae45d6f10fed9750e259935804c4f40a4372bb119f0504187e4221896b205a4	mobile-broadband-provider-info-20151214.tar.xz
+# http://ftp.acc.umu.se/pub/GNOME/sources/mobile-broadband-provider-info/20190116/mobile-broadband-provider-info-20190116.sha256sum
+sha256	2cba10f82b8e6aec46b871c1f7d20086ecc17e1168f18e588a6a37770fa3c59b  mobile-broadband-provider-info-20190116.tar.xz
+# Locally computed
+sha256	3d510b215a33087b9ceb9592da21575ea1f9f98bd4d983a38e65fe851a552174  COPYING
diff --git a/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk
index 1a68708d4..ed741f6fa 100644
--- a/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk
+++ b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20151214
+MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20190116
 MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
 MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz
 MOBILE_BROADBAND_PROVIDER_INFO_LICENSE = Public domain
diff --git a/buildroot/package/modem-manager/S44modem-manager b/buildroot/package/modem-manager/S44modem-manager
old mode 100755
new mode 100644
diff --git a/buildroot/package/mongodb/0001-add-missing-sysmacros-include.patch b/buildroot/package/mongodb/0001-add-missing-sysmacros-include.patch
deleted file mode 100644
index 3a8bfa16c..000000000
--- a/buildroot/package/mongodb/0001-add-missing-sysmacros-include.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Add missing 
-
-mmap_v1_engine.cpp is using major()/minor(), which are defined by
-. This header file was implicitly included by
- in glibc < 2.28. But this glibc 2.28, this is no longer
-the case, so  needs to be included explicitly.
-
-Signed-off-by: Florian La Roche 
-
---- ./src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-+++ ./src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-@@ -32,6 +32,7 @@
- 
- #include "mongo/db/storage/mmap_v1/mmap_v1_engine.h"
- 
-+#include 
- #include 
- #include 
- #include 
diff --git a/buildroot/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch b/buildroot/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch
new file mode 100644
index 000000000..b4b174668
--- /dev/null
+++ b/buildroot/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch
@@ -0,0 +1,55 @@
+From 362be06fc16a5ad0f9e9aa90cc763c5242e8e35c Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sat, 9 Feb 2019 12:41:45 +0100
+Subject: [PATCH] ssl_manager.cpp: fix build with gcc 7 and -fpermissive
+
+Change prototype of DERToken::parse function from
+parse(ConstDataRange cdr, size_t* outLength);
+to parse(ConstDataRange cdr, uint64_t* outLength);
+
+Otherwise, we got the following error:
+
+src/mongo/util/net/ssl_manager.cpp: In static member function 'static mongo::StatusWith mongo::{anonymous}::DERToken::parse(mongo::ConstDataRange, size_t*)':
+src/mongo/util/net/ssl_manager.cpp:575:79: error: invalid conversion from 'size_t* {aka unsigned int*}' to 'long unsigned int*' [-fpermissive]
+  if (mongoUnsignedAddOverflow64(tagAndLengthByteCount, derLength, outLength) ||
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/mongodb/mongo/pull/1296]
+---
+ src/mongo/util/net/ssl_manager.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
+index b93ebe84a4..3511eb5d99 100644
+--- a/src/mongo/util/net/ssl_manager.cpp
++++ b/src/mongo/util/net/ssl_manager.cpp
+@@ -782,7 +782,7 @@ public:
+      *
+      * Returns a DERToken which consists of the (tag, length, value) tuple.
+      */
+-    static StatusWith parse(ConstDataRange cdr, size_t* outLength);
++    static StatusWith parse(ConstDataRange cdr, uint64_t* outLength);
+ 
+ private:
+     DERType _type{DERType::EndOfContent};
+@@ -799,7 +799,7 @@ struct DataType::Handler {
+                        size_t length,
+                        size_t* advanced,
+                        std::ptrdiff_t debug_offset) {
+-        size_t outLength;
++        uint64_t outLength;
+ 
+         auto swPair = DERToken::parse(ConstDataRange(ptr, length), &outLength);
+ 
+@@ -844,7 +844,7 @@ StatusWith readDERString(ConstDataRangeCursor& cdc) {
+ }
+ 
+ 
+-StatusWith DERToken::parse(ConstDataRange cdr, size_t* outLength) {
++StatusWith DERToken::parse(ConstDataRange cdr, uint64_t* outLength) {
+     const size_t kTagLength = 1;
+     const size_t kTagLengthAndInitialLengthByteLength = kTagLength + 1;
+ 
+-- 
+2.14.1
+
diff --git a/buildroot/package/mongodb/Config.in b/buildroot/package/mongodb/Config.in
index ed3ad5691..9c5dba834 100644
--- a/buildroot/package/mongodb/Config.in
+++ b/buildroot/package/mongodb/Config.in
@@ -1,18 +1,30 @@
-# from src/mongo/platform/bits.h
+# from https://docs.mongodb.com/manual/installation/#supported-platforms
 config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS
 	bool
 	# ARM needs LDREX/STREX, so ARMv6+
 	default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5
-	default y if BR2_aarch64 || BR2_i386 || BR2_powerpc64 || BR2_x86_64
+	default y if BR2_aarch64 || BR2_x86_64
 
 config BR2_PACKAGE_MONGODB
 	bool "mongodb"
 	depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS
+	depends on !BR2_PACKAGE_PYTHON3
 	depends on BR2_TOOLCHAIN_USES_GLIBC # needs glibc malloc_usable_size
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_BOOST_FILESYSTEM
+	select BR2_PACKAGE_BOOST_IOSTREAMS
+	select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+	select BR2_PACKAGE_BOOST_SYSTEM
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE_UTF # runtime
+	select BR2_PACKAGE_SNAPPY
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_YAML_CPP
+	select BR2_PACKAGE_ZLIB
 	help
 	  MongoDB is a cross-platform document-oriented database
 	  (NoSQL).
@@ -23,8 +35,9 @@ config BR2_PACKAGE_MONGODB
 
 	  https://www.mongodb.org/
 
-comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 4.8"
+comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 6"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS
+	depends on !BR2_PACKAGE_PYTHON3
diff --git a/buildroot/package/mongodb/mongodb.hash b/buildroot/package/mongodb/mongodb.hash
index b01ad53ab..916323d7c 100644
--- a/buildroot/package/mongodb/mongodb.hash
+++ b/buildroot/package/mongodb/mongodb.hash
@@ -1,2 +1,4 @@
 # Locally computed:
-sha256 4764945631bca4ac5c2b239e04e91db00e39716915204349170c37cb7897c564  mongodb-r3.3.4.tar.gz
+sha256 5db85f06b2a0b2ae393339a4aed1366928aaef2b46c7c32826fa87c3217dc6f7  mongodb-r4.0.6.tar.gz
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  APACHE-2.0.txt
+sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27  LICENSE-Community.txt
diff --git a/buildroot/package/mongodb/mongodb.mk b/buildroot/package/mongodb/mongodb.mk
index 54c904e51..e420ecb41 100644
--- a/buildroot/package/mongodb/mongodb.mk
+++ b/buildroot/package/mongodb/mongodb.mk
@@ -4,21 +4,38 @@
 #
 ################################################################################
 
-MONGODB_VERSION_BASE = 3.3.4
+MONGODB_VERSION_BASE = 4.0.6
 MONGODB_VERSION = r$(MONGODB_VERSION_BASE)
 MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION))
 
-MONGODB_LICENSE = AGPL-3.0, Apache-2.0
-MONGODB_LICENSE_FILES = GNU-AGPL-3.0.txt APACHE-2.0.txt
+MONGODB_LICENSE = Apache-2.0 (drivers), SSPL (database)
+MONGODB_LICENSE_FILES = APACHE-2.0.txt LICENSE-Community.txt
 
-MONGODB_DEPENDENCIES = host-scons
+MONGODB_DEPENDENCIES = \
+	boost \
+	host-python-cheetah \
+	host-python-pyyaml \
+	host-python-typing \
+	host-scons \
+	pcre \
+	snappy \
+	sqlite \
+	yaml-cpp \
+	zlib
 
 MONGODB_SCONS_TARGETS = mongod mongos
 
 MONGODB_SCONS_ENV = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
 	-j"$(PARALLEL_JOBS)"
 
-MONGODB_SCONS_OPTS = --disable-warnings-as-errors
+MONGODB_SCONS_OPTS = \
+	--disable-warnings-as-errors \
+	--use-system-boost \
+	--use-system-pcre \
+	--use-system-snappy \
+	--use-system-sqlite \
+	--use-system-yaml \
+	--use-system-zlib
 
 # need to pass mongo version when not building from git repo
 MONGODB_SCONS_OPTS += MONGO_VERSION=$(MONGODB_VERSION_BASE)-
@@ -41,9 +58,18 @@ else
 MONGODB_SCONS_OPTS += --js-engine=none --allocator=system
 endif
 
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+MONGODB_DEPENDENCIES += libcurl
+MONGODB_SCONS_OPTS += --enable-free-mon=on
+else
+MONGODB_SCONS_OPTS += --enable-free-mon=off
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MONGODB_DEPENDENCIES += openssl
-MONGODB_SCONS_OPTS += --ssl=SSL
+MONGODB_SCONS_OPTS += \
+	--ssl \
+	--ssl-provider=openssl
 endif
 
 define MONGODB_BUILD_CMDS
diff --git a/buildroot/package/mosquitto/Config.in b/buildroot/package/mosquitto/Config.in
index 1e6418a4d..11b6d7891 100644
--- a/buildroot/package/mosquitto/Config.in
+++ b/buildroot/package/mosquitto/Config.in
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_MOSQUITTO
 	bool "mosquitto"
-	depends on BR2_USE_MMU # fork()
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_STATIC_LIBS # builds .so
 	help
 	  Mosquitto is an open source message broker that implements
@@ -14,7 +12,16 @@ config BR2_PACKAGE_MOSQUITTO
 
 	  http://mosquitto.org/
 
+config BR2_PACKAGE_MOSQUITTO_BROKER
+	bool "install the mosquitto broker"
+	default y
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_PACKAGE_MOSQUITTO
+	help
+	  Build and install the mosquitto broker onto target.
+
+comment "mosquitto broker needs a system with MMU"
+	depends on BR2_PACKAGE_MOSQUTTO && !BR2_USE_MMU
+
 comment "mosquitto needs a toolchain w/ dynamic library"
-	depends on BR2_USE_MMU
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_STATIC_LIBS
diff --git a/buildroot/package/mosquitto/mosquitto.hash b/buildroot/package/mosquitto/mosquitto.hash
index 96e2ae936..25b991013 100644
--- a/buildroot/package/mosquitto/mosquitto.hash
+++ b/buildroot/package/mosquitto/mosquitto.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking gpg signature
-sha256 5fd7f3454fd6d286645d032bc07f44a1c8583cec02ef2422c9eb32e0a89a9b2f  mosquitto-1.5.4.tar.gz
+sha256 78d7e70c3794dc3a1d484b4f2f8d3addebe9c2da3f5a1cebe557f7d13beb0da4  mosquitto-1.5.8.tar.gz
 
 # License files
 sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1  LICENSE.txt
diff --git a/buildroot/package/mosquitto/mosquitto.mk b/buildroot/package/mosquitto/mosquitto.mk
index fcce0535c..51c0abd0b 100644
--- a/buildroot/package/mosquitto/mosquitto.mk
+++ b/buildroot/package/mosquitto/mosquitto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MOSQUITTO_VERSION = 1.5.4
+MOSQUITTO_VERSION = 1.5.8
 MOSQUITTO_SITE = https://mosquitto.org/files/source
 MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0
 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
@@ -67,24 +67,30 @@ endef
 MOSQUITTO_POST_PATCH_HOOKS += MOSQUITTO_DISABLE_CPP
 endif
 
+MOSQUITTO_MAKE_DIRS = lib client
+ifeq ($(BR2_PACKAGE_MOSQUITTO_BROKER),y)
+MOSQUITTO_MAKE_DIRS += src
+endif
+
 define MOSQUITTO_BUILD_CMDS
-	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DIRS="$(MOSQUITTO_MAKE_DIRS)" \
 		$(MOSQUITTO_MAKE_OPTS)
 endef
 
 define MOSQUITTO_INSTALL_STAGING_CMDS
-	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DIRS="$(MOSQUITTO_MAKE_DIRS)" \
 		$(MOSQUITTO_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
 endef
 
 define MOSQUITTO_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DIRS="$(MOSQUITTO_MAKE_DIRS)" \
 		$(MOSQUITTO_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
 	rm -f $(TARGET_DIR)/etc/mosquitto/*.example
 	$(INSTALL) -D -m 0644 $(@D)/mosquitto.conf \
 		$(TARGET_DIR)/etc/mosquitto/mosquitto.conf
 endef
 
+ifeq ($(BR2_PACKAGE_MOSQUITTO_BROKER),y)
 define MOSQUITTO_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/mosquitto/S50mosquitto \
 		$(TARGET_DIR)/etc/init.d/S50mosquitto
@@ -101,5 +107,6 @@ endef
 define MOSQUITTO_USERS
 	mosquitto -1 nogroup -1 * - - - Mosquitto user
 endef
+endif
 
 $(eval $(generic-package))
diff --git a/buildroot/package/motion/0001-fix-static-linking-with-webp.patch b/buildroot/package/motion/0001-fix-static-linking-with-webp.patch
deleted file mode 100644
index 201ef3d8a..000000000
--- a/buildroot/package/motion/0001-fix-static-linking-with-webp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3e59613c286316e963d98ea99ded35ded4361c48 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Wed, 21 Nov 2018 18:55:31 +0100
-Subject: [PATCH] fix static linking with webp
-
-Static build with webp fails because webp is put before webpmux
-
-Fixes:
- - http://autobuild.buildroot.org/results/4d4e72808300ba1ff79ca794930112b554eb2533
-
-Signed-off-by: Fabrice Fontaine 
-[Upstream status: https://github.com/Motion-Project/motion/pull/850]
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 89179e5..60147fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -276,7 +276,7 @@ if test "${WEBP}" = "yes"; then
-     AC_MSG_RESULT(found)
-     AC_DEFINE([HAVE_WEBP], 1, [Define to 1 if WEBP is around])
-     HAVE_WEBP="yes"
--    TEMP_LIBS="$TEMP_LIBS -lwebp -lwebpmux"
-+    TEMP_LIBS="$TEMP_LIBS -lwebpmux -lwebp"
-   else
-     AC_MSG_RESULT(not found)
-   fi
--- 
-2.14.1
-
diff --git a/buildroot/package/motion/motion.hash b/buildroot/package/motion/motion.hash
index 9c6a2b7fb..679defa3d 100644
--- a/buildroot/package/motion/motion.hash
+++ b/buildroot/package/motion/motion.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256	6ef8504fc5be00a49c82c4045c0004fbf575d9a5df8687025a9b06923efda2a9	motion-release-4.2.tar.gz
+sha256	d97ec6ae766adfd478b6f7f9cc0da5f2fe21faa9366d98664be255714c1cf81d	motion-release-4.2.1.tar.gz
 sha256	91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad	COPYING
diff --git a/buildroot/package/motion/motion.mk b/buildroot/package/motion/motion.mk
index 1bbb548fd..6dfc5a561 100644
--- a/buildroot/package/motion/motion.mk
+++ b/buildroot/package/motion/motion.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MOTION_VERSION = release-4.2
+MOTION_VERSION = release-4.2.1
 MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION))
 MOTION_LICENSE = GPL-2.0
 MOTION_LICENSE_FILES = COPYING
diff --git a/buildroot/package/mpv/mpv.mk b/buildroot/package/mpv/mpv.mk
index b8260213b..3ab267377 100644
--- a/buildroot/package/mpv/mpv.mk
+++ b/buildroot/package/mpv/mpv.mk
@@ -132,7 +132,7 @@ endif
 
 # LUA support, only for lua51/lua52/luajit
 # This enables the controller (OSD) together with libass
-ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUAJIT),y)
+ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUAJIT),y)
 MPV_CONF_OPTS += --enable-lua
 MPV_DEPENDENCIES += luainterpreter
 else
diff --git a/buildroot/package/msgpack/msgpack.hash b/buildroot/package/msgpack/msgpack.hash
index f1033ade4..df4e54b18 100644
--- a/buildroot/package/msgpack/msgpack.hash
+++ b/buildroot/package/msgpack/msgpack.hash
@@ -1,2 +1,4 @@
 # Locally computed:
-sha256  9c87f80fc651b900772deaef0ab154b63160c74d292529b5be6d06d6485d4640  msgpack-2.1.5.tar.gz
+sha256  bda49f996a73d2c6080ff0523e7b535917cd28c8a79c3a5da54fc29332d61d1e  msgpack-3.1.1.tar.gz
+sha256  664550b43996452a5a2c7471bb0ff77185a58c69ccafa60f983dc4c162e1ee22  COPYING
+sha256  c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566  LICENSE_1_0.txt
diff --git a/buildroot/package/msgpack/msgpack.mk b/buildroot/package/msgpack/msgpack.mk
index abb6e2e21..781e67e37 100644
--- a/buildroot/package/msgpack/msgpack.mk
+++ b/buildroot/package/msgpack/msgpack.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MSGPACK_VERSION = 2.1.5
+MSGPACK_VERSION = 3.1.1
 MSGPACK_SITE = $(call github,msgpack,msgpack-c,cpp-$(MSGPACK_VERSION))
 MSGPACK_LICENSE = BSL-1.0
 MSGPACK_LICENSE_FILES = COPYING LICENSE_1_0.txt
diff --git a/buildroot/package/msmtp/Config.in b/buildroot/package/msmtp/Config.in
index 46bb1985e..c83525d5b 100644
--- a/buildroot/package/msmtp/Config.in
+++ b/buildroot/package/msmtp/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_MSMTP
 	  mail to an SMTP server (for example at a free mail provider)
 	  which takes care of further delivery.
 
-	  http://msmtp.sourceforge.net/
+	  https://marlam.de/msmtp/
diff --git a/buildroot/package/msmtp/msmtp.hash b/buildroot/package/msmtp/msmtp.hash
index 0b66cec86..f966e5d6d 100644
--- a/buildroot/package/msmtp/msmtp.hash
+++ b/buildroot/package/msmtp/msmtp.hash
@@ -1,9 +1,6 @@
-# From http://sourceforge.net/projects/msmtp/files/msmtp/1.6.6/
-md5	82b0520b57db4b2cf05333d11fb5974d	msmtp-1.6.6.tar.xz
-sha1	f997f40dfb3f882df837cfd9a63bd4d271dcdc41	msmtp-1.6.6.tar.xz
 # Locally calculated after checking signature
-# http://downloads.sourceforge.net/project/msmtp/msmtp/1.6.6/msmtp-1.6.6.tar.xz.sig
-sha256	da15db1f62bd0201fce5310adb89c86188be91cd745b7cb3b62b81a501e7fb5e	msmtp-1.6.6.tar.xz
+# https://marlam.de/msmtp/releases/msmtp-1.8.0.tar.xz.sig
+sha256	bd730cbf000d1b8382849ea21d569a387e63f936be00dc07c569f67915e53ccd	msmtp-1.8.0.tar.xz
 
 # Hash for license file:
 sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
diff --git a/buildroot/package/msmtp/msmtp.mk b/buildroot/package/msmtp/msmtp.mk
index 65fd0e431..db3d42cd9 100644
--- a/buildroot/package/msmtp/msmtp.mk
+++ b/buildroot/package/msmtp/msmtp.mk
@@ -4,14 +4,21 @@
 #
 ################################################################################
 
-MSMTP_VERSION = 1.6.6
-MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
+MSMTP_VERSION = 1.8.0
+MSMTP_SITE = https://marlam.de/msmtp/releases
 MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz
 MSMTP_DEPENDENCIES = host-pkgconf
 MSMTP_CONF_OPTS = --disable-gai-idn
 MSMTP_LICENSE = GPL-3.0+
 MSMTP_LICENSE_FILES = COPYING
 
+# msmtpd needs fork
+ifeq ($(BR2_USE_MMU),y)
+MSMTP_CONF_OPTS += --with-msmtpd
+else
+MSMTP_CONF_OPTS += --without-msmtpd
+endif
+
 ifeq ($(BR2_PACKAGE_LIBGSASL),y)
 MSMTP_CONF_OPTS += --with-libgsasl
 MSMTP_DEPENDENCIES += libgsasl
@@ -19,9 +26,9 @@ else
 MSMTP_CONF_OPTS += --without-libgsasl
 endif
 
-ifeq ($(BR2_PACKAGE_LIBIDN),y)
+ifeq ($(BR2_PACKAGE_LIBIDN2),y)
 MSMTP_CONF_OPTS += --with-libidn
-MSMTP_DEPENDENCIES += libidn
+MSMTP_DEPENDENCIES += libidn2
 else
 MSMTP_CONF_OPTS += --without-libidn
 endif
@@ -33,18 +40,14 @@ else
 MSMTP_CONF_OPTS += --without-libsecret
 endif
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MSMTP_CONF_OPTS += --with-ssl=openssl
-MSMTP_DEPENDENCIES += openssl
-ifeq ($(BR2_STATIC_LIBS),y)
-# openssl uses zlib, so we need to explicitly link with it when static
-MSMTP_CONF_ENV += LIBS=-lz
-endif
-else ifeq ($(BR2_PACKAGE_GNUTLS),y)
-MSMTP_CONF_OPTS += --with-ssl=gnutls
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+MSMTP_CONF_OPTS += --with-tls=gnutls
 MSMTP_DEPENDENCIES += gnutls
+else ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MSMTP_CONF_OPTS += --with-tls=openssl
+MSMTP_DEPENDENCIES += openssl
 else
-MSMTP_CONF_OPTS += --with-ssl=no
+MSMTP_CONF_OPTS += --with-tls=no
 endif
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/musl/0002-fix-race-condition-in-file-locking.patch b/buildroot/package/musl/0002-fix-race-condition-in-file-locking.patch
deleted file mode 100644
index f3e85e688..000000000
--- a/buildroot/package/musl/0002-fix-race-condition-in-file-locking.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0db393d3a77bb9f300a356c6a5484fc2dddb161d Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen 
-Date: Tue, 18 Sep 2018 10:03:27 +0300
-Subject: [PATCH] fix race condition in file locking
-
-The condition occurs when
-- thread #1 is holding the lock
-- thread #2 is waiting for it on __futexwait
-- thread #1 is about to release the lock and performs a_swap
-- thread #3 enters the __lockfile function and manages to grab the lock
-  before thread #1 calls __wake, resetting the MAYBE_WAITERS flag
-- thread #1 calls __wake
-- thread #2 wakes up but goes again to __futexwait as the lock is
-  held by thread #3
-- thread #3 releases the lock but does not call __wake as the
-  MAYBE_WAITERS flag is not set
-
-This condition results in thread #2 not being woken up. This patch fixes
-the problem by making the woken up thread ensure that the flag is
-properly set before going to sleep again.
-
-Mainainer's note: This fixes a regression introduced in commit
-c21f750727515602a9e84f2a190ee8a0a2aeb2a1.
-Signed-off-by: Thomas Petazzoni 
----
- src/stdio/__lockfile.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
-index 2ff75d8a..0dcb2a42 100644
---- a/src/stdio/__lockfile.c
-+++ b/src/stdio/__lockfile.c
-@@ -8,13 +8,13 @@ int __lockfile(FILE *f)
- 	int owner = f->lock, tid = __pthread_self()->tid;
- 	if ((owner & ~MAYBE_WAITERS) == tid)
- 		return 0;
--	for (;;) {
--		owner = a_cas(&f->lock, 0, tid);
--		if (!owner) return 1;
--		if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break;
-+	owner = a_cas(&f->lock, 0, tid);
-+	if (!owner) return 1;
-+	while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) {
-+		if ((owner & MAYBE_WAITERS) ||
-+		    a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner)
-+			__futexwait(&f->lock, owner|MAYBE_WAITERS, 1);
- 	}
--	while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS)))
--		__futexwait(&f->lock, owner, 1);
- 	return 1;
- }
- 
--- 
-2.14.4
-
diff --git a/buildroot/package/musl/musl.hash b/buildroot/package/musl/musl.hash
index f7cc05bcc..564440177 100644
--- a/buildroot/package/musl/musl.hash
+++ b/buildroot/package/musl/musl.hash
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature from
-# http://www.musl-libc.org/releases/musl-1.1.20.tar.gz.asc
-sha256  44be8771d0e6c6b5f82dd15662eb2957c9a3173a19a8b49966ac0542bbd40d61  musl-1.1.20.tar.gz
-sha256  15d9afbf84041872b4d840ed7d165d3eee786ff3f97e703b10467c259ff4e7d9  COPYRIGHT
+# http://www.musl-libc.org/releases/musl-1.1.22.tar.gz.asc
+sha256  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3  musl-1.1.22.tar.gz
+sha256  a3ae1b9fc5d4938f5734734383b9813d27a5652df23010c6f9d4c5419b239a41  COPYRIGHT
diff --git a/buildroot/package/musl/musl.mk b/buildroot/package/musl/musl.mk
index 058a36292..5db5bbd26 100644
--- a/buildroot/package/musl/musl.mk
+++ b/buildroot/package/musl/musl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MUSL_VERSION = 1.1.20
+MUSL_VERSION = 1.1.22
 MUSL_SITE = http://www.musl-libc.org/releases
 MUSL_LICENSE = MIT
 MUSL_LICENSE_FILES = COPYRIGHT
@@ -58,7 +58,7 @@ endef
 define MUSL_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
 		DESTDIR=$(TARGET_DIR) install-libs
-	$(RM) $(addprefix $(TARGET_DIR)/lib/,crt1.o crtn.o crti.o Scrt1.o)
+	$(RM) $(addprefix $(TARGET_DIR)/lib/,crt1.o crtn.o crti.o rcrt1.o Scrt1.o)
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot/package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch b/buildroot/package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch
deleted file mode 100644
index 56b90f5e3..000000000
--- a/buildroot/package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1baceb95bd8e6f35c25bc7afdc6a88c8f6264f3f Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Mon, 20 Aug 2018 19:06:08 +0200
-Subject: [PATCH] Fix static build with libidn2 and libunistring
-
-When libidn2 is statically build with libunistring support, mutt needs
-to add -lunistring to LIBS.
-To do that, add a call to PKG_CHECK_MODULES to retrieve this information
-from libidn2.pc
-
-Fixes:
- - http://autobuild.buildroot.net/results/177da8f4798f69298db5385957184f1c53cca923
-
-Signed-off-by: Fabrice Fontaine 
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 29252173..2e69ac19 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1341,6 +1341,10 @@ AC_ARG_WITH(idn2, AS_HELP_STRING([--with-idn2=@<:@PFX@:>@],[Use GNU libidn2 for
-             if test "$with_idn2" != "yes" ; then
-               CPPFLAGS="$CPPFLAGS -I$with_idn2/include"
-               LDFLAGS="$LDFLAGS -L$with_idn2/lib"
-+            else
-+              PKG_CHECK_MODULES([LIBIDN2], libidn2,
-+                                 [CPPFLAGS="$CPPFLAGS $LIBIDN2_CFLAGS"
-+                                 LIBS="$LIBIDN2_LIBS"])
-             fi
-           fi
-         ],
--- 
-2.14.1
-
diff --git a/buildroot/package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch b/buildroot/package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch
new file mode 100644
index 000000000..c802cbb36
--- /dev/null
+++ b/buildroot/package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch
@@ -0,0 +1,37 @@
+From c53b36698fe4721fb562908ac6119aa9280383af Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 14 Apr 2019 10:22:12 +0200
+Subject: [PATCH] configure.ac: fix static build with idn2 and unistring
+
+Commit 78db40f25c6479b14da5a73adf7207bfbec5ccc5 did not fix static build
+failure
+
+AC_SEARCH_LIBS prepends the library to LIBS as a result -lunistring is
+added before -lidn2. To fix static build, we must set -lunistring after
+-lidn2
+
+Fixes:
+ - http://autobuild.buildroot.org/results/c9544b4f1a0252e260a2ed19218fa950f4dc2d2d
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://gitlab.com/muttmua/mutt/merge_requests/42]
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bd8beb91..75943eee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1402,7 +1402,7 @@ if test "x$with_idn2" != "xno"; then
+     AC_SEARCH_LIBS([idn2_check_version], [idn2], [
+       AC_DEFINE([HAVE_LIBIDN2], 1, [Define to 1 if you have the GNU idn2 library])
+       dnl -lunistring is needed for static linking
+-      AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring])
++      AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring], [LIBS="$LIBS -lunistring"])
+       MUTTLIBS="$MUTTLIBS $LIBS"
+ 
+       dnl libidn2 >= 2.0.0 declares compatibility macros in idn2.h
+-- 
+2.20.1
+
diff --git a/buildroot/package/mutt/mutt.hash b/buildroot/package/mutt/mutt.hash
index 27eeb5680..476773c29 100644
--- a/buildroot/package/mutt/mutt.hash
+++ b/buildroot/package/mutt/mutt.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 734a3883158ec3d180cf6538d8bd7f685ce641d2cdef657aa0038f76e79a54a0  mutt-1.10.1.tar.gz
+sha256 da5cd4c39f228914d3933d8cf3a017c8271fdd9b9d81c6e4fc42ad22e1a28723  mutt-1.11.2.tar.gz
 sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee  GPL
diff --git a/buildroot/package/mutt/mutt.mk b/buildroot/package/mutt/mutt.mk
index 9918b45e6..5860e8430 100644
--- a/buildroot/package/mutt/mutt.mk
+++ b/buildroot/package/mutt/mutt.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-MUTT_VERSION = 1.10.1
+MUTT_VERSION = 1.11.2
 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads
 MUTT_LICENSE = GPL-2.0+
 MUTT_LICENSE_FILES = GPL
-MUTT_DEPENDENCIES = host-pkgconf ncurses
+MUTT_DEPENDENCIES = ncurses
 MUTT_CONF_OPTS = --disable-doc --disable-smtp
 # We're patching configure.ac
 MUTT_AUTORECONF = YES
diff --git a/buildroot/package/nano/nano.hash b/buildroot/package/nano/nano.hash
index 6b0f90bf4..eae648d16 100644
--- a/buildroot/package/nano/nano.hash
+++ b/buildroot/package/nano/nano.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://www.nano-editor.org/dist/v3/nano-3.0.tar.xz.asc
+# https://www.nano-editor.org/dist/v3/nano-3.2.tar.xz.asc
 # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884
-sha256 e0a5bca354514e64762c987c200a8758b05e7bcced3b00b3e48ea0a2d383c8a0  nano-3.0.tar.xz
+sha256 d12773af3589994b2e4982c5792b07c6240da5b86c5aef2103ab13b401fe6349  nano-3.2.tar.xz
 sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7  COPYING
diff --git a/buildroot/package/nano/nano.mk b/buildroot/package/nano/nano.mk
index a1d2fe986..206d210a1 100644
--- a/buildroot/package/nano/nano.mk
+++ b/buildroot/package/nano/nano.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 NANO_VERSION_MAJOR = 3
-NANO_VERSION = $(NANO_VERSION_MAJOR).0
+NANO_VERSION = $(NANO_VERSION_MAJOR).2
 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR)
 NANO_SOURCE = nano-$(NANO_VERSION).tar.xz
 NANO_LICENSE = GPL-3.0+
diff --git a/buildroot/package/ncdu/ncdu.hash b/buildroot/package/ncdu/ncdu.hash
index 8a0c1d16c..7326a1598 100644
--- a/buildroot/package/ncdu/ncdu.hash
+++ b/buildroot/package/ncdu/ncdu.hash
@@ -1,3 +1,6 @@
-# From http://dev.yorhel.nl/download/ncdu-1.12.tar.gz.{md5,sha1}
-md5 7365ac46c420bc511621216b1747984f  ncdu-1.12.tar.gz
-sha1 b79b1c44784f334dca74d89a49f49274f14cfeef  ncdu-1.12.tar.gz
+# From http://dev.yorhel.nl/download/ncdu-1.13.tar.gz.{md5,sha1}
+md5 67239592ac41f42290f52ab89ff198be  ncdu-1.13.tar.gz
+sha1 3233c4185208d9989ac528a94817ed92dd59c773  ncdu-1.13.tar.gz
+
+# computed locally
+sha256 0ee47c3742a867ace26eb429cce593b54ab4ccb4c4a97d62e41363cbf80c8a24 COPYING
diff --git a/buildroot/package/ncdu/ncdu.mk b/buildroot/package/ncdu/ncdu.mk
index d45e62d95..9a7170d60 100644
--- a/buildroot/package/ncdu/ncdu.mk
+++ b/buildroot/package/ncdu/ncdu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NCDU_VERSION = 1.12
+NCDU_VERSION = 1.13
 NCDU_SITE = http://dev.yorhel.nl/download
 
 NCDU_DEPENDENCIES = ncurses
diff --git a/buildroot/package/neard/S53neard b/buildroot/package/neard/S53neard
old mode 100755
new mode 100644
diff --git a/buildroot/package/neon/neon.mk b/buildroot/package/neon/neon.mk
index 1b8eb368c..2c00e6a8b 100644
--- a/buildroot/package/neon/neon.mk
+++ b/buildroot/package/neon/neon.mk
@@ -11,7 +11,8 @@ NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README
 NEON_INSTALL_STAGING = YES
 NEON_CONF_OPTS = --without-gssapi --disable-rpath
 NEON_CONFIG_SCRIPTS = neon-config
-NEON_DEPENDENCIES = host-pkgconf
+NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
+NEON_CONF_ENV = ne_cv_libsfor_bindtextdomain=$(TARGET_NLS_LIBS)
 
 ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
 NEON_CONF_OPTS += --with-zlib=$(STAGING_DIR)
diff --git a/buildroot/package/netatalk/S50netatalk b/buildroot/package/netatalk/S50netatalk
old mode 100755
new mode 100644
diff --git a/buildroot/package/netatalk/netatalk.hash b/buildroot/package/netatalk/netatalk.hash
index ce78373ae..762fcd460 100644
--- a/buildroot/package/netatalk/netatalk.hash
+++ b/buildroot/package/netatalk/netatalk.hash
@@ -1,3 +1,3 @@
-# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.11/
-md5 8f79ce2a275b128ebb07188766f088fc  netatalk-3.1.11.tar.bz2
-sha1 5aa7900e6f7de3c7ee812aa1130c1245d1974586  netatalk-3.1.11.tar.bz2
+# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/
+md5 021d2330cb7f7cd2977aec46299dcc1b  netatalk-3.1.12.tar.bz2
+sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5  netatalk-3.1.12.tar.bz2
diff --git a/buildroot/package/netatalk/netatalk.mk b/buildroot/package/netatalk/netatalk.mk
index 28a87509e..1214fc3bf 100644
--- a/buildroot/package/netatalk/netatalk.mk
+++ b/buildroot/package/netatalk/netatalk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NETATALK_VERSION = 3.1.11
+NETATALK_VERSION = 3.1.12
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch
diff --git a/buildroot/package/netcat-openbsd/netcat-openbsd.mk b/buildroot/package/netcat-openbsd/netcat-openbsd.mk
index e98b479c4..b313116b3 100644
--- a/buildroot/package/netcat-openbsd/netcat-openbsd.mk
+++ b/buildroot/package/netcat-openbsd/netcat-openbsd.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 NETCAT_OPENBSD_VERSION = debian/1.190-1
-NETCAT_OPENBSD_SITE = git://anonscm.debian.org/collab-maint/netcat-openbsd
+NETCAT_OPENBSD_SITE = https://salsa.debian.org/debian/netcat-openbsd.git
+NETCAT_OPENBSD_SITE_METHOD = git
 NETCAT_OPENBSD_LICENSE = BSD-3-Clause
 NETCAT_OPENBSD_LICENSE_FILES = debian/copyright
 NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd
diff --git a/buildroot/package/netplug/S29netplug b/buildroot/package/netplug/S29netplug
old mode 100755
new mode 100644
diff --git a/buildroot/package/netsnmp/S59snmpd b/buildroot/package/netsnmp/S59snmpd
old mode 100755
new mode 100644
diff --git a/buildroot/package/netsnmp/netsnmp.mk b/buildroot/package/netsnmp/netsnmp.mk
index 65a3f16a4..ed573c51e 100644
--- a/buildroot/package/netsnmp/netsnmp.mk
+++ b/buildroot/package/netsnmp/netsnmp.mk
@@ -53,15 +53,12 @@ endif
 
 # OpenSSL
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-NETSNMP_DEPENDENCIES += openssl
+NETSNMP_DEPENDENCIES += host-pkgconf openssl
 NETSNMP_CONF_OPTS += \
 	--with-openssl=$(STAGING_DIR)/usr/include/openssl \
 	--with-security-modules="tsm,usm" \
 	--with-transports="DTLSUDP,TLSTCP"
-ifeq ($(BR2_STATIC_LIBS),y)
-# openssl uses zlib, so we need to explicitly link with it when static
-NETSNMP_CONF_ENV += LIBS=-lz
-endif
+NETSNMP_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 else ifeq ($(BR2_PACKAGE_NETSNMP_OPENSSL_INTERNAL),y)
 NETSNMP_CONF_OPTS += --with-openssl=internal
 else
@@ -106,12 +103,4 @@ define NETSNMP_INSTALL_INIT_SYSV
 endef
 endif
 
-define NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
-	$(SED)	"s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
-		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
-		$(STAGING_DIR)/usr/bin/net-snmp-config
-endef
-
-NETSNMP_POST_INSTALL_STAGING_HOOKS += NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
-
 $(eval $(autotools-package))
diff --git a/buildroot/package/netsurf/0001-avoid-system-perl-dependencies.patch b/buildroot/package/netsurf/0001-avoid-system-perl-dependencies.patch
new file mode 100644
index 000000000..979ddafc8
--- /dev/null
+++ b/buildroot/package/netsurf/0001-avoid-system-perl-dependencies.patch
@@ -0,0 +1,29 @@
+From b42e4b5bfca030965dcfca993a47a6ddaa941287 Mon Sep 17 00:00:00 2001
+From: Francois Perrad 
+Date: Sun, 25 Nov 2018 18:27:54 +0100
+Subject: [PATCH] avoid system perl dependencies
+
+this subroutine format is used for android target.
+with eval the load of HTML::Entities is deferred.
+
+Signed-off-by: Francois Perrad 
+---
+ netsurf/utils/split-messages.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/netsurf/utils/split-messages.pl b/netsurf/utils/split-messages.pl
+index 4b50dde..e47dded 100644
+--- a/netsurf/utils/split-messages.pl
++++ b/netsurf/utils/split-messages.pl
+@@ -311,7 +311,7 @@ TXT
+     sub footer { qq|| }
+     sub format
+     {
+-	use HTML::Entities qw(encode_entities);
++	eval q|use HTML::Entities qw(encode_entities);|;
+ 	my $escaped = encode_entities( $_[1], '<>&"' );
+ 	qq|  $escaped\n|;
+     }
+-- 
+2.17.1
+
diff --git a/buildroot/package/netsurf/0002-fix-freetype-detection.patch b/buildroot/package/netsurf/0002-fix-freetype-detection.patch
new file mode 100644
index 000000000..27e3a6a1d
--- /dev/null
+++ b/buildroot/package/netsurf/0002-fix-freetype-detection.patch
@@ -0,0 +1,32 @@
+From 85336f2404b9583267019650ea0112ebf1bb571a Mon Sep 17 00:00:00 2001
+From: Francois Perrad 
+Date: Wed, 28 Nov 2018 17:59:44 +0100
+Subject: [PATCH] fix freetype detection
+
+Using freetype-config doesn't work well, because it's going to use the
+system freetype-config instead of the one installed in the
+cross-compilation sysroot. So, let's use pkg-config instead.
+
+Signed-off-by: Francois Perrad 
+---
+ netsurf/frontends/framebuffer/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/netsurf/frontends/framebuffer/Makefile b/netsurf/frontends/framebuffer/Makefile
+index bdedd90..249c7c4 100644
+--- a/netsurf/frontends/framebuffer/Makefile
++++ b/netsurf/frontends/framebuffer/Makefile
+@@ -35,8 +35,8 @@ LDFLAGS += -Wl,--no-whole-archive
+ 
+ # freetype is optional but does not use pkg-config
+ ifeq ($(NETSURF_FB_FONTLIB),freetype)
+-  CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags)
+-  LDFLAGS += $(shell freetype-config --libs)
++  CFLAGS += -DFB_USE_FREETYPE $(shell $(PKG_CONFIG) --cflags freetype2)
++  LDFLAGS += $(shell $(PKG_CONFIG) --libs freetype2)
+ endif
+ 
+ 
+-- 
+2.17.1
+
diff --git a/buildroot/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch b/buildroot/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch
new file mode 100644
index 000000000..01e77e977
--- /dev/null
+++ b/buildroot/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch
@@ -0,0 +1,30 @@
+From 2419ad79b25fcc1746178aba609fddbb0aa8c9e0 Mon Sep 17 00:00:00 2001
+From: Francois Perrad 
+Date: Sat, 1 Dec 2018 16:10:13 +0100
+Subject: [PATCH] build nsgenbind for the build machine
+
+The nsgenbind tool is meant to be executed on the build machine during
+the build, so it should not be built with the cross-compiler, but with
+the native compiler.
+
+Signed-off-by: Francois Perrad 
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f279f01..5698c87 100644
+--- a/Makefile
++++ b/Makefile
+@@ -109,7 +109,7 @@ endef
+ 
+ # prefixed install macro for each host sub target
+ define do_build_prefix_install
+-	$(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR=
++	$(MAKE) install --directory=$1 HOST=$(BUILD) CC=$(BUILD_CC) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR=
+ 
+ endef
+ 
+-- 
+2.17.1
+
diff --git a/buildroot/package/netsurf/0004-fix-compilation-without-curl.patch b/buildroot/package/netsurf/0004-fix-compilation-without-curl.patch
new file mode 100644
index 000000000..2300ae5f4
--- /dev/null
+++ b/buildroot/package/netsurf/0004-fix-compilation-without-curl.patch
@@ -0,0 +1,27 @@
+From 7d7c59dbfc92fcbcd0eac2c84e0fb98662c4bd71 Mon Sep 17 00:00:00 2001
+From: Francois Perrad 
+Date: Sat, 8 Dec 2018 09:43:40 +0100
+Subject: [PATCH] fix compilation without curl
+
+Signed-off-by: Francois Perrad 
+---
+ netsurf/content/fetch.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/netsurf/content/fetch.c b/netsurf/content/fetch.c
+index 7665029..0f41c49 100644
+--- a/netsurf/content/fetch.c
++++ b/netsurf/content/fetch.c
+@@ -54,7 +54,9 @@
+ #include "content/fetchers.h"
+ #include "content/fetchers/resource.h"
+ #include "content/fetchers/about.h"
++#ifdef WITH_CURL
+ #include "content/fetchers/curl.h"
++#endif
+ #include "content/fetchers/data.h"
+ #include "content/fetchers/file.h"
+ #include "javascript/fetcher.h"
+-- 
+2.17.1
+
diff --git a/buildroot/package/netsurf/Config.in b/buildroot/package/netsurf/Config.in
new file mode 100644
index 000000000..4f7d5c271
--- /dev/null
+++ b/buildroot/package/netsurf/Config.in
@@ -0,0 +1,56 @@
+# netsurf mixes up host and target CFLAGS, so it isn't compatible with
+# architectures where we pass ABI specific compiler flags (TARGET_ABI)
+config BR2_PACKAGE_NETSURF_ARCH_SUPPORTS
+	bool
+	default y if !((BR2_arc && BR2_ARC_ATOMIC_EXT) || \
+		BR2_powerpc_8540 || BR2_powerpc_8548 || BR2_powerpc_e500mc || \
+		BR2_xtensa)
+
+comment "netsurf needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+	depends on BR2_PACKAGE_NETSURF_ARCH_SUPPORTS
+
+config BR2_PACKAGE_NETSURF
+	bool "netsurf"
+	# static linking support is broken beyond repair
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_PACKAGE_NETSURF_ARCH_SUPPORTS
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_LIBCURL
+	help
+	  NetSurf is a compact graphical web browser which aims for
+	  HTML5, CSS and JavaScript support.
+	  Frontends: GTK (X11), SDL 1.2 (framebuffer)
+
+	  http://www.netsurf-browser.org/
+
+if BR2_PACKAGE_NETSURF
+
+choice
+	prompt "Netsurf frontend"
+	default BR2_PACKAGE_NETSURF_SDL
+
+config BR2_PACKAGE_NETSURF_SDL
+	bool "sdl frontend"
+	select BR2_PACKAGE_SDL
+	help
+	  Select SDL 1.2 frontend.
+
+config BR2_PACKAGE_NETSURF_GTK
+	bool "gtk2 frontend"
+	depends on BR2_PACKAGE_LIBGTK2
+	help
+	  Select GTK+ 2 frontend.
+
+config BR2_PACKAGE_NETSURF_GTK3
+	bool "gtk3 frontend"
+	depends on BR2_PACKAGE_LIBGTK3
+	help
+	  Select GTK+ 3 frontend.
+
+endchoice
+
+endif
diff --git a/buildroot/package/netsurf/netsurf.hash b/buildroot/package/netsurf/netsurf.hash
new file mode 100644
index 000000000..26e8c76f3
--- /dev/null
+++ b/buildroot/package/netsurf/netsurf.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 eb4864d4459d6f9958dd10a3301c272ea7f5df72667a7db0aad5bc5ae06c0e10  netsurf-all-3.8.tar.gz
+sha256 55c4a7ae3953d720a462e69d1f128a20004933d12538be5314a33f8821675378  netsurf/COPYING
diff --git a/buildroot/package/netsurf/netsurf.mk b/buildroot/package/netsurf/netsurf.mk
new file mode 100644
index 000000000..31cf9e62b
--- /dev/null
+++ b/buildroot/package/netsurf/netsurf.mk
@@ -0,0 +1,101 @@
+################################################################################
+#
+# netsurf
+#
+################################################################################
+
+NETSURF_VERSION = 3.8
+NETSURF_SOURCE = netsurf-all-$(NETSURF_VERSION).tar.gz
+NETSURF_SITE = http://download.netsurf-browser.org/netsurf/releases/source-full
+NETSURF_LICENSE = GPL-2.0
+NETSURF_LICENSE_FILES = netsurf/COPYING
+NETSURF_DEPENDENCIES = expat jpeg libpng \
+	host-bison host-flex host-gperf host-pkgconf
+
+ifeq ($(BR2_PACKAGE_NETSURF_GTK),y)
+NETSURF_DEPENDENCIES += libgtk2
+NETSURF_FRONTEND = gtk
+endif
+
+ifeq ($(BR2_PACKAGE_NETSURF_GTK3),y)
+NETSURF_DEPENDENCIES += libgtk3
+NETSURF_FRONTEND = gtk3
+endif
+
+ifeq ($(BR2_PACKAGE_NETSURF_GTK)$(BR2_PACKAGE_NETSURF_GTK3),y)
+ifeq ($(BR2_PACKAGE_LIBRSVG),y)
+NETSURF_DEPENDENCIES += librsvg
+define NETSURF_SVG_CONFIGURE_CMDS
+	echo "override NETSURF_USE_RSVG := YES"         >> $(@D)/netsurf/Makefile.config
+	echo "override NETSURF_USE_NSSVG := NO"         >> $(@D)/netsurf/Makefile.config
+endef
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_NETSURF_SDL),y)
+NETSURF_DEPENDENCIES += sdl host-libpng
+NETSURF_FRONTEND = framebuffer
+NETSURF_CONFIG = \
+	HOST_CFLAGS='$(HOST_CFLAGS)' \
+	HOST_LDFLAGS='$(HOST_LDFLAGS) -lpng'
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+NETSURF_DEPENDENCIES += freetype
+define NETSURF_FONTLIB_CONFIGURE_CMDS
+	echo "override NETSURF_FB_FONTLIB := freetype"  >> $(@D)/netsurf/Makefile.config
+endef
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+NETSURF_DEPENDENCIES += libiconv
+define NETSURF_ICONV_CONFIGURE_CMDS
+	echo "CFLAGS += -DWITH_ICONV_FILTER"            >> $(@D)/libparserutils/Makefile.config.override
+	echo "override NETSURF_USE_LIBICONV_PLUG := NO" >> $(@D)/netsurf/Makefile.config
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+NETSURF_DEPENDENCIES += libcurl openssl
+else
+define NETSURF_CURL_CONFIGURE_CMDS
+	echo "override NETSURF_USE_CURL := NO"          >> $(@D)/netsurf/Makefile.config
+	echo "override NETSURF_USE_OPENSSL := NO"       >> $(@D)/netsurf/Makefile.config
+endef
+endif
+
+define NETSURF_CONFIGURE_CMDS
+	$(NETSURF_ICONV_CONFIGURE_CMDS)
+	$(NETSURF_SVG_CONFIGURE_CMDS)
+	$(NETSURF_FONTLIB_CONFIGURE_CMDS)
+	$(NETSURF_CURL_CONFIGURE_CMDS)
+endef
+
+NETSURF_MAKE_ENV = \
+	$(TARGET_MAKE_ENV) \
+	CFLAGS="$(TARGET_CFLAGS) -I$(@D)/tmpusr/include" \
+	LDFLAGS="$(TARGET_LDFLAGS) -L$(@D)/tmpusr/lib"
+
+NETSURF_MAKE_OPTS = \
+	TARGET=$(NETSURF_FRONTEND) \
+	BISON="$(HOST_DIR)/bin/bison" \
+	FLEX="$(HOST_DIR)/bin/flex" \
+	PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+	BUILD_CC="$(HOSTCC)" \
+	CC="$(TARGET_CC)" \
+	AR="$(TARGET_AR)" \
+	TMP_PREFIX=$(@D)/tmpusr \
+	NETSURF_CONFIG="$(NETSURF_CONFIG)" \
+	PREFIX=/usr
+
+define NETSURF_BUILD_CMDS
+	mkdir -p $(@D)/tmpusr
+	$(NETSURF_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
+		build
+endef
+
+define NETSURF_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
+		DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/buildroot/package/nettle/0001-Fix-accidental-use-of-C99-for-loop.patch b/buildroot/package/nettle/0001-Fix-accidental-use-of-C99-for-loop.patch
new file mode 100644
index 000000000..e03af7a45
--- /dev/null
+++ b/buildroot/package/nettle/0001-Fix-accidental-use-of-C99-for-loop.patch
@@ -0,0 +1,71 @@
+From f5a3a224bf00bef5669366d2ae23c2b2b13b8016 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niels=20M=C3=B6ller?= 
+Date: Wed, 26 Dec 2018 11:04:31 +0100
+Subject: [PATCH] Fix accidental use of C99 for loop.
+
+* rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop.
+Reported by Andreas Gustafsson.
+* testsuite/rsa-sec-decrypt-test.c (test_main): Likewise.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://git.lysator.liu.se/nettle/nettle/commit/f5a3a224bf00bef5669366d2ae23c2b2b13b8016]
+---
+ ChangeLog                        | 6 ++++++
+ rsa-sign-tr.c                    | 3 ++-
+ testsuite/rsa-sec-decrypt-test.c | 3 ++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 4c7338a1..079d0153 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,9 @@
++2018-12-26  Niels Möller  
++
++	* rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop.
++	Reported by Andreas Gustafsson.
++	* testsuite/rsa-sec-decrypt-test.c (test_main): Likewise.
++
+ 2018-12-04  Niels Möller  
+ 
+ 	* Released nettle-3.4.1.
+diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c
+index 59c9bd07..f824c4ca 100644
+--- a/rsa-sign-tr.c
++++ b/rsa-sign-tr.c
+@@ -239,8 +239,9 @@ static int
+ sec_equal(const mp_limb_t *a, const mp_limb_t *b, size_t limbs)
+ {
+   volatile mp_limb_t z = 0;
++  size_t i;
+ 
+-  for (size_t i = 0; i < limbs; i++)
++  for (i = 0; i < limbs; i++)
+     {
+       z |= (a[i] ^ b[i]);
+     }
+diff --git a/testsuite/rsa-sec-decrypt-test.c b/testsuite/rsa-sec-decrypt-test.c
+index 64f0b13c..fb0ed3a1 100644
+--- a/testsuite/rsa-sec-decrypt-test.c
++++ b/testsuite/rsa-sec-decrypt-test.c
+@@ -68,6 +68,7 @@ test_main(void)
+   unsigned n_size = 1024;
+   mpz_t gibberish;
+   mpz_t garbage;
++  size_t size;
+ 
+   rsa_private_key_init(&key);
+   rsa_public_key_init(&pub);
+@@ -78,7 +79,7 @@ test_main(void)
+ 
+   memset(verifybad, 'A', PAYLOAD_SIZE);
+ 
+-  for (size_t size = 1; size < 51; size++)
++  for (size = 1; size < 51; size++)
+     {
+       ASSERT (rsa_generate_keypair(&pub, &key, &random_ctx,
+ 			           (nettle_random_func *) knuth_lfib_random,
+-- 
+2.18.1
+
diff --git a/buildroot/package/nettle/nettle.hash b/buildroot/package/nettle/nettle.hash
index 473be1c2d..32ed22c6c 100644
--- a/buildroot/package/nettle/nettle.hash
+++ b/buildroot/package/nettle/nettle.hash
@@ -1,6 +1,6 @@
 # Locally calculated after checking pgp signature
-# https://ftp.gnu.org/gnu/nettle/nettle-3.4.tar.gz.sig
-sha256	ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94	nettle-3.4.tar.gz
+# https://ftp.gnu.org/gnu/nettle/nettle-3.4.1.tar.gz.sig
+sha256	f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad	nettle-3.4.1.tar.gz
 # Locally calculated
 sha256	a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c	COPYING.LESSERv3
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYINGv2
diff --git a/buildroot/package/nettle/nettle.mk b/buildroot/package/nettle/nettle.mk
index 958281504..6a1144ed3 100644
--- a/buildroot/package/nettle/nettle.mk
+++ b/buildroot/package/nettle/nettle.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NETTLE_VERSION = 3.4
+NETTLE_VERSION = 3.4.1
 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
 NETTLE_DEPENDENCIES = gmp
 NETTLE_INSTALL_STAGING = YES
diff --git a/buildroot/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/buildroot/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
deleted file mode 100644
index c6066abe2..000000000
--- a/buildroot/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 01ca2053bbea09f35b958c8cc7631e15469acb79 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering 
-Date: Fri, 19 Oct 2018 12:12:33 +0200
-Subject: dhcp6: make sure we have enough space for the DHCP6 option header
-
-Fixes a vulnerability originally discovered by Felix Wilhelm from
-Google.
-
-CVE-2018-15688
-LP: #1795921
-https://bugzilla.redhat.com/show_bug.cgi?id=1639067
-
-(cherry picked from commit 4dac5eaba4e419b29c97da38a8b1f82336c2c892)
-
-Patch downloaded from upstream commit:
-https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=01ca2053bbea09f35b958c8cc7631e15469acb79
-
-Signed-off-by: Bernd Kuhls 
----
- src/systemd/src/libsystemd-network/dhcp6-option.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c
-index d178fe2..9027c14 100644
---- a/src/systemd/src/libsystemd-network/dhcp6-option.c
-+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c
-@@ -108,7 +108,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) {
-                 return -EINVAL;
-         }
- 
--        if (*buflen < len)
-+        if (*buflen < offsetof(DHCP6Option, data) + len)
-                 return -ENOBUFS;
- 
-         ia_hdr = *buf;
--- 
-cgit v1.1
-
diff --git a/buildroot/package/network-manager/S45network-manager b/buildroot/package/network-manager/S45network-manager
old mode 100755
new mode 100644
diff --git a/buildroot/package/network-manager/network-manager.hash b/buildroot/package/network-manager/network-manager.hash
index 343943917..f1bc5d1b0 100644
--- a/buildroot/package/network-manager/network-manager.hash
+++ b/buildroot/package/network-manager/network-manager.hash
@@ -1,5 +1,4 @@
 # From https://download.gnome.org/sources/NetworkManager/1.10/NetworkManager-1.10.8.sha256sum
-sha256 eb4ac8ce75fed5ec804f409caec7b54342d4e01512baf7d7fc119fd40ac8a938  NetworkManager-1.10.8.tar.xz
+sha256 8fe9cd2c45bd661c58a91b03d8a922d6d2ab6b25bc185b2d3f050c80f427589f  NetworkManager-1.16.2.tar.xz
 # Locally computed
 sha256 49d9659a4f9a09747c320d51d3cf9dfde210de67b70862acf849890f6477b00d  COPYING
-sha256 3a2968e3abb4fea464cd8dc1146d71996f9544af91a5f687bc4f3a2932df49b4  libnm-util/COPYING
diff --git a/buildroot/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk
index c54cabc8c..2951f1230 100644
--- a/buildroot/package/network-manager/network-manager.mk
+++ b/buildroot/package/network-manager/network-manager.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-NETWORK_MANAGER_VERSION_MAJOR = 1.10
-NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8
+NETWORK_MANAGER_VERSION_MAJOR = 1.16
+NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2
 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
 NETWORK_MANAGER_INSTALL_STAGING = YES
diff --git a/buildroot/package/nfs-utils/S60nfs b/buildroot/package/nfs-utils/S60nfs
old mode 100755
new mode 100644
diff --git a/buildroot/package/nfs-utils/nfs-utils.mk b/buildroot/package/nfs-utils/nfs-utils.mk
index 9fa7ae200..4bb62de1c 100644
--- a/buildroot/package/nfs-utils/nfs-utils.mk
+++ b/buildroot/package/nfs-utils/nfs-utils.mk
@@ -57,7 +57,7 @@ NFS_UTILS_CONF_OPTS += --disable-tirpc
 endif
 
 define NFS_UTILS_INSTALL_FIXUP
-	rm -f $(NFS_UTILS_TARGETS_)
+	cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_)
 	touch $(TARGET_DIR)/etc/exports
 	$(INSTALL) -D -m 644 \
 		$(@D)/utils/mount/nfsmount.conf $(TARGET_DIR)/etc/nfsmount.conf
diff --git a/buildroot/package/nftables/nftables.hash b/buildroot/package/nftables/nftables.hash
index 3effe68f2..a0e0d5e77 100644
--- a/buildroot/package/nftables/nftables.hash
+++ b/buildroot/package/nftables/nftables.hash
@@ -1,6 +1,3 @@
-# From http://www.netfilter.org/projects/nftables/downloads.html
-sha1	533cb3bf17e90579d24f9621fdb22bdb4f7e3287 	nftables-0.8.3.tar.bz2
-# Locally calculated after checking pgp signature
-# http://www.netfilter.org/projects/nftables/files/nftables-0.8.3.tar.bz2.sig
-sha256	d16be1f5db88e95d29fc0b0e4df88acd079f3ee8e2b872ec7673f9a0d5d95e38	nftables-0.8.3.tar.bz2
+# From https://netfilter.org/projects/nftables/downloads.html
+sha256	ad8181b5fcb9ca572f444bed54018749588522ee97e4c21922648bb78d7e7e91	nftables-0.9.0.tar.bz2
 sha256	c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e	COPYING
diff --git a/buildroot/package/nftables/nftables.mk b/buildroot/package/nftables/nftables.mk
index 571cd33ad..9f12e42c5 100644
--- a/buildroot/package/nftables/nftables.mk
+++ b/buildroot/package/nftables/nftables.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-NFTABLES_VERSION = 0.8.3
+NFTABLES_VERSION = 0.9.0
 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2
-NFTABLES_SITE = http://www.netfilter.org/projects/nftables/files
+NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files
 NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \
 	host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 NFTABLES_LICENSE = GPL-2.0
@@ -20,6 +20,13 @@ else
 NFTABLES_CONF_OPTS += --without-cli
 endif
 
+ifeq ($(BR2_PACKAGE_JANSSON),y)
+NFTABLES_DEPENDENCIES += jansson
+NFTABLES_CONF_OPTS += --with-json
+else
+NFTABLES_CONF_OPTS += --without-json
+endif
+
 ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy)
 NFTABLES_LIBS += -ljansson -lm
 endif
diff --git a/buildroot/package/nginx/S50nginx b/buildroot/package/nginx/S50nginx
old mode 100755
new mode 100644
diff --git a/buildroot/package/nodejs/nodejs.hash b/buildroot/package/nodejs/nodejs.hash
index 13a5c2daa..ad8ad4ad9 100644
--- a/buildroot/package/nodejs/nodejs.hash
+++ b/buildroot/package/nodejs/nodejs.hash
@@ -1,5 +1,5 @@
-# From https://nodejs.org/dist/v8.14.0/SHASUMS256.txt
-sha256 8ce252913c9f6aaa9871f2d9661b6e54858dae2f0064bd3c624676edb09083c4  node-v8.14.0.tar.xz
+# From https://nodejs.org/dist/v8.15.1/SHASUMS256.txt
+sha256 6b6486a3f452624941f6e11dd5f878c298d43e9c21b5f43ca1721dc7ce25add1  node-v8.15.1.tar.xz
 
 # Hash for license file
 sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5  LICENSE
diff --git a/buildroot/package/nodejs/nodejs.mk b/buildroot/package/nodejs/nodejs.mk
index 8c8afbc33..06d2eaad9 100644
--- a/buildroot/package/nodejs/nodejs.mk
+++ b/buildroot/package/nodejs/nodejs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NODEJS_VERSION = 8.14.0
+NODEJS_VERSION = 8.15.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 \
diff --git a/buildroot/package/nodm/S90nodm b/buildroot/package/nodm/S90nodm
old mode 100755
new mode 100644
diff --git a/buildroot/package/ntp/0003-fix-nommu.patch b/buildroot/package/ntp/0003-fix-nommu.patch
deleted file mode 100644
index 0959fa0ba..000000000
--- a/buildroot/package/ntp/0003-fix-nommu.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix no-MMU build
-
-The detach_from_terminal() is unused for no-MMU, but it depends on symbols
-that are not defined for no-MMU. Don't define detach_from_terminal() when
-HAVE_WORKING_FORK is not defined.
-
-Signed-off-by: Baruch Siach 
----
-Upstream status: http://bugs.ntp.org/show_bug.cgi?id=3538
-
-diff -Nuar ntp-4.2.8p12.orig/ntpd/ntpd.c ntp-4.2.8p12/ntpd/ntpd.c
---- ntp-4.2.8p12.orig/ntpd/ntpd.c	2018-08-14 14:51:30.000000000 +0300
-+++ ntp-4.2.8p12/ntpd/ntpd.c	2018-10-13 21:25:25.858261249 +0300
-@@ -534,6 +534,7 @@
-  * Detach from terminal (much like daemon())
-  * Nothe that this function calls exit()
-  */
-+# ifdef HAVE_WORKING_FORK
- static void
- detach_from_terminal(
- 	int pipe_fds[2],
-@@ -617,6 +618,7 @@
- 
- 	return;
- }
-+# endif /* HAVE_WORKING_FORK */
- 
- #ifdef HAVE_DROPROOT
- /*
diff --git a/buildroot/package/ntp/0004-fix-work-fork-without-droproot.patch b/buildroot/package/ntp/0004-fix-work-fork-without-droproot.patch
deleted file mode 100644
index cb6fec012..000000000
--- a/buildroot/package/ntp/0004-fix-work-fork-without-droproot.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix work_fork build when droproot is disabled
-
-The set_user_group_ids() depends on HAVE_DROPROOT. When HAVE_DROPROOT is not
-enabled, work_fork.c code causes a link failure:
-
-../libntp/libntp.a(work_fork.o): In function `send_blocking_req_internal':
-work_fork.c:(.text+0x498): undefined reference to `set_user_group_ids'
-
-Make the set_user_group_ids() call depend on HAVE_DROPROOT.
-
-Signed-off-by: Baruch Siach 
----
-Upstream status: http://bugs.ntp.org/show_bug.cgi?id=3539
-
---- ntp-4.2.8p12.orig/libntp/work_fork.c	2018-08-14 14:51:06.000000000 +0300
-+++ ntp-4.2.8p12/libntp/work_fork.c	2018-10-15 21:10:54.580917962 +0300
-@@ -594,7 +594,9 @@
- 	init_logging("ntp_intres", 0, FALSE);
- 	setup_logfile(NULL);
- 
-+#if defined(HAVE_DROPROOT)
- 	(void) set_user_group_ids();
-+#endif
- 
- 	/*
- 	 * And now back to the portable code
diff --git a/buildroot/package/ntp/Config.in b/buildroot/package/ntp/Config.in
index efd47e189..97d933b5a 100644
--- a/buildroot/package/ntp/Config.in
+++ b/buildroot/package/ntp/Config.in
@@ -12,7 +12,12 @@ if BR2_PACKAGE_NTP
 config BR2_PACKAGE_NTP_SNTP
 	bool "sntp"
 	help
-	  Simple network time protocol program
+	  Simple network time protocol program (a replacement
+	  for the ntpdate tool)
+
+	  A script is installed as S48sntp which will retrieve and
+	  step the time if there is a large difference before ntpd
+	  takes over the necessary slew adjustments in S49ntp.
 
 config BR2_PACKAGE_NTP_NTP_KEYGEN
 	bool "ntp-keygen"
diff --git a/buildroot/package/ntp/S48sntp b/buildroot/package/ntp/S48sntp
new file mode 100644
index 000000000..96d8d507a
--- /dev/null
+++ b/buildroot/package/ntp/S48sntp
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+DAEMON="sntp"
+# sntp uses all the IPs resolved for the hostname (i.e. pool.ntp.org has 4).
+# It will try each until they either all timeout or time has been set. Thus
+# default to only providing one NTP pool host.
+SNTP_SERVERS="pool.ntp.org"
+# Step if time delta is greater then 128ms, otherwise slew
+SNTP_ARGS="-Ss -M 128"
+SNTP_KEY_CACHE="/tmp/kod"
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# Create key cache file to prevents warning that file is missing
+	touch $SNTP_KEY_CACHE
+	# shellcheck disable=SC2086 # we need the word splitting
+	/usr/bin/$DAEMON $SNTP_ARGS -K $SNTP_KEY_CACHE $SNTP_SERVERS
+	# sntp behavior
+	# - Does not background
+	# - Does not infinitely block
+	# - Time-out w/o network = ~2 sec
+	# - Time-out w/ network = ~5sec * # of servers
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	echo "Nothing to do, $DAEMON is not a daemon."
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+reload() {
+	echo "Nothing to do, $DAEMON does not support reload."
+}
+
+case "$1" in
+	start|stop|restart|reload)
+		"$1";;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
diff --git a/buildroot/package/ntp/S49ntp b/buildroot/package/ntp/S49ntp
old mode 100755
new mode 100644
diff --git a/buildroot/package/ntp/ntp.hash b/buildroot/package/ntp/ntp.hash
index 2fd8a8322..4014936e6 100644
--- a/buildroot/package/ntp/ntp.hash
+++ b/buildroot/package/ntp/ntp.hash
@@ -1,5 +1,5 @@
-# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p12.tar.gz.md5
-md5 1522d66574bae14abb2622746dad2bdc  ntp-4.2.8p12.tar.gz
+# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz.md5
+md5 ea040ab9b4ca656b5229b89d6b822f13  ntp-4.2.8p13.tar.gz
 # Calculated based on the hash above
-sha256 709b222b5013d77d26bfff532b5ea470a8039497ef29d09363931c036cb30454  ntp-4.2.8p12.tar.gz
-sha256 62c87b269365b38b55359b16dfde7ec28c683c722ef489db90afd0f2e478e4a1  COPYRIGHT
+sha256 288772cecfcd9a53694ffab108d1825a31ba77f3a8466b0401baeca3bc232a38  ntp-4.2.8p13.tar.gz
+sha256 3828da5fc8126889d6a64432288ace08526c490bf5427d799931689069968d91  COPYRIGHT
diff --git a/buildroot/package/ntp/ntp.mk b/buildroot/package/ntp/ntp.mk
index af3c1aad9..d53fcc5d0 100644
--- a/buildroot/package/ntp/ntp.mk
+++ b/buildroot/package/ntp/ntp.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 NTP_VERSION_MAJOR = 4.2
-NTP_VERSION = $(NTP_VERSION_MAJOR).8p12
+NTP_VERSION = $(NTP_VERSION_MAJOR).8p13
 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR)
 NTP_DEPENDENCIES = host-pkgconf libevent
 NTP_LICENSE = NTP
@@ -93,8 +93,16 @@ define NTP_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 package/ntp/ntpd.etc.conf $(TARGET_DIR)/etc/ntp.conf
 endef
 
+# This script will step the time if there is a large difference
+# before ntpd takes over the necessary slew adjustments
+ifeq ($(BR2_PACKAGE_NTP_SNTP),y)
+define NTP_INSTALL_INIT_SYSV_SNTP
+	$(INSTALL) -D -m 755 package/ntp/S48sntp $(TARGET_DIR)/etc/init.d/S48sntp
+endef
+endif
+
 ifeq ($(BR2_PACKAGE_NTP_NTPD),y)
-define NTP_INSTALL_INIT_SYSV
+define NTP_INSTALL_INIT_SYSV_NTPD
 	$(INSTALL) -D -m 755 package/ntp/S49ntp $(TARGET_DIR)/etc/init.d/S49ntp
 endef
 
@@ -106,4 +114,9 @@ define NTP_INSTALL_INIT_SYSTEMD
 endef
 endif
 
+define NTP_INSTALL_INIT_SYSV
+	$(NTP_INSTALL_INIT_SYSV_NTPD)
+	$(NTP_INSTALL_INIT_SYSV_SNTP)
+endef
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch b/buildroot/package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
deleted file mode 100644
index ebb934f60..000000000
--- a/buildroot/package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls 
-Date: Fri, 12 Feb 2016 19:25:02 +0100
-Subject: [PATCH] Fix usage of __GLIBC_PREREQ for non-glibc toolchains
-
-The way __GLIBC_PREREQ() is currently used means that it's evaluated
-even if __GLIBC__ is not defined. But obviously, __GLIBC_PREREQ will
-not exist if __GLIBC__ is not defined, causing build failures on C
-libraries not defining __GLIBC__ such as the musl C library.
-
-Patch originally taken from:
-https://github.com/voidlinux/void-packages/blob/master/srcpkgs/numactl/patches/musl.patch
-
-Signed-off-by: Bernd Kuhls 
-[Bernd: Reworked to fix uClibc]
-Signed-off-by: Thomas Petazzoni 
-[Thomas: improve patch description.]
-[Upstream commit: https://github.com/numactl/numactl/commit/3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.]
----
- syscall.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/syscall.c b/syscall.c
-index 4589b85..37782d9 100644
---- a/syscall.c
-+++ b/syscall.c
-@@ -115,7 +115,7 @@
- 
- #endif
- 
--#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
-+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 11)
- 
- /* glibc 2.11 seems to have working 6 argument sycall. Use the
-    glibc supplied syscall in this case.
diff --git a/buildroot/package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch b/buildroot/package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
deleted file mode 100644
index a98fd7247..000000000
--- a/buildroot/package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 31dc2951c758698bff060aeae8ffd8854616183b Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls 
-Date: Fri, 12 Feb 2016 19:25:02 +0100
-Subject: [PATCH] Fix usage of __GLIBC_PREREQ for non-glibc toolchains
-
-The way __GLIBC_PREREQ() is currently used means that it's evaluated
-even if __GLIBC__ is not defined. But obviously, __GLIBC_PREREQ will
-not exist if __GLIBC__ is not defined, causing build failures on C
-libraries not defining __GLIBC__ such as the musl C library.
-
-Patch originally taken from:
-https://github.com/voidlinux/void-packages/blob/master/srcpkgs/numactl/patches/musl.patch
-
-Signed-off-by: Bernd Kuhls 
-[Bernd: Reworked to fix uClibc]
-Signed-off-by: Thomas Petazzoni 
-[Thomas: improve patch description.]
-[Upstream commit: https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b]
----
- syscall.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/syscall.c b/syscall.c
-index 37782d9..255853d 100644
---- a/syscall.c
-+++ b/syscall.c
-@@ -115,7 +115,11 @@
- 
- #endif
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 11)
-+#ifndef __GLIBC_PREREQ
-+# define __GLIBC_PREREQ(x,y) 0
-+#endif
-+
-+#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
- 
- /* glibc 2.11 seems to have working 6 argument sycall. Use the
-    glibc supplied syscall in this case.
diff --git a/buildroot/package/nut/0003-Add-compatibility-with-openssl-1.1.0.patch b/buildroot/package/nut/0003-Add-compatibility-with-openssl-1.1.0.patch
new file mode 100644
index 000000000..5a0031acd
--- /dev/null
+++ b/buildroot/package/nut/0003-Add-compatibility-with-openssl-1.1.0.patch
@@ -0,0 +1,76 @@
+From fcbf18c92918ce5e81d0aab62a7aed5c2245ea4d Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz 
+Date: Fri, 1 Jun 2018 11:17:28 -0300
+Subject: [PATCH] Add compatibility with openssl 1.1.0
+
+Minor adjustments were needed:
+* Openssl 1.1 libs do not need to be initialized.
+* TLSv*_method became TLS_*_method.
+
+Signed-off-by: Eneas U de Queiroz 
+Upstream: https://github.com/networkupstools/nut/pull/558/
+[added check for libressl]
+Signed-off-by: Patrick Havelange 
+---
+ clients/upsclient.c        | 5 ++++-
+ m4/nut_check_libopenssl.m4 | 2 +-
+ server/netssl.c            | 7 +++++--
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/clients/upsclient.c b/clients/upsclient.c
+index b90587b0..053d60fb 100644
+--- a/clients/upsclient.c
++++ b/clients/upsclient.c
+@@ -316,10 +316,13 @@ int upscli_init(int certverify, const char *certpath,
+ 	
+ #ifdef WITH_OPENSSLdefined(LIBRESSL_VERSION_NUMBER)
+ 	
++# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 	SSL_library_init();
+ 	SSL_load_error_strings();
++#  define TLS_client_method TLSv1_client_method
++# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ 
+-	ssl_method = TLSv1_client_method();
++	ssl_method = TLS_client_method();
+ 
+ 	if (!ssl_method) {
+ 		return 0;
+diff --git a/m4/nut_check_libopenssl.m4 b/m4/nut_check_libopenssl.m4
+index 1b875077..7eb401cd 100644
+--- a/m4/nut_check_libopenssl.m4
++++ b/m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@ if test -z "${nut_have_libopenssl_seen}"; then
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+diff --git a/server/netssl.c b/server/netssl.c
+index c2f40989..0289e296 100644
+--- a/server/netssl.c
++++ b/server/netssl.c
+@@ -387,12 +387,15 @@ void ssl_init(void)
+ 
+ #ifdef WITH_OPENSSL
+ 
++# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
++#  define TLS_server_method TLSv1_server_method
++# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	if ((ssl_method = TLS_server_method()) == NULL) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "TLS_server_method failed");
+ 	}
+ 
+ 	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
+-- 
+2.16.1
+
diff --git a/buildroot/package/nvidia-driver/Config.in b/buildroot/package/nvidia-driver/Config.in
index 732d9255c..9631b3e70 100644
--- a/buildroot/package/nvidia-driver/Config.in
+++ b/buildroot/package/nvidia-driver/Config.in
@@ -60,6 +60,11 @@ if BR2_PACKAGE_NVIDIA_DRIVER_CUDA
 
 config BR2_PACKAGE_NVIDIA_DRIVER_OPENCL
 	bool "OpenCL support"
+	select BR2_PACKAGE_MESA3D_HEADERS
+	select BR2_PACKAGE_HAS_LIBOPENCL
+
+config BR2_PACKAGE_PROVIDES_LIBOPENCL
+	default "nvidia-driver" if BR2_PACKAGE_NVIDIA_DRIVER_OPENCL
 
 config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS
 	bool "CUDA MPS server and control"
diff --git a/buildroot/package/nvidia-driver/nvidia-driver.mk b/buildroot/package/nvidia-driver/nvidia-driver.mk
index a595aed4f..baf2ba2be 100644
--- a/buildroot/package/nvidia-driver/nvidia-driver.mk
+++ b/buildroot/package/nvidia-driver/nvidia-driver.mk
@@ -20,8 +20,8 @@ ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_XORG),y)
 # are build dependencies of packages that depend on nvidia-driver, so
 # they should be built prior to those packages, and the only simple
 # way to do so is to make nvidia-driver depend on them.
-NVIDIA_DRIVER_DEPENDENCIES = mesa3d-headers xlib_libX11 xlib_libXext
-NVIDIA_DRIVER_PROVIDES = libgl libegl libgles
+NVIDIA_DRIVER_DEPENDENCIES += mesa3d-headers xlib_libX11 xlib_libXext
+NVIDIA_DRIVER_PROVIDES += libgl libegl libgles
 
 # libGL.so.$(NVIDIA_DRIVER_VERSION) is the legacy libGL.so library; it
 # has been replaced with libGL.so.1.0.0. Installing both is technically
@@ -65,7 +65,7 @@ NVIDIA_DRIVER_LIBS_MISC = \
 	libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
 	libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION)
 
-NVIDIA_DRIVER_LIBS = \
+NVIDIA_DRIVER_LIBS += \
 	$(NVIDIA_DRIVER_LIBS_GL) \
 	$(NVIDIA_DRIVER_LIBS_EGL) \
 	$(NVIDIA_DRIVER_LIBS_GLES) \
@@ -116,6 +116,8 @@ ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_OPENCL),y)
 NVIDIA_DRIVER_LIBS += \
 	libOpenCL.so.1.0.0 \
 	libnvidia-opencl.so.$(NVIDIA_DRIVER_VERSION)
+NVIDIA_DRIVER_DEPENDENCIES += mesa3d-headers
+NVIDIA_DRIVER_PROVIDES += libopencl
 endif
 
 # Build and install the kernel modules if needed
diff --git a/buildroot/package/ocrad/ocrad.hash b/buildroot/package/ocrad/ocrad.hash
index 5cde4d3ac..7ae38c30e 100644
--- a/buildroot/package/ocrad/ocrad.hash
+++ b/buildroot/package/ocrad/ocrad.hash
@@ -1,3 +1,3 @@
 # Locally calculated after checking pgp signature
-sha256 c383d37869baa0990d38d38836d4d567e9e2862aa0cd704868b62dafeac18e3c  ocrad-0.26.tar.lz
+sha256 a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36  ocrad-0.27.tar.lz
 sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef  COPYING
diff --git a/buildroot/package/ocrad/ocrad.mk b/buildroot/package/ocrad/ocrad.mk
index 94020d2d2..e037a0819 100644
--- a/buildroot/package/ocrad/ocrad.mk
+++ b/buildroot/package/ocrad/ocrad.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OCRAD_VERSION = 0.26
+OCRAD_VERSION = 0.27
 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz
 OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad
 OCRAD_LICENSE = GPL-3.0+
diff --git a/buildroot/package/odhcp6c/0001-dhcpv6-fix-strncpy-bounds.patch b/buildroot/package/odhcp6c/0001-dhcpv6-fix-strncpy-bounds.patch
new file mode 100644
index 000000000..abf519152
--- /dev/null
+++ b/buildroot/package/odhcp6c/0001-dhcpv6-fix-strncpy-bounds.patch
@@ -0,0 +1,28 @@
+From 327f73dd7093d04c2dbea13ee30fc3dfafc5e944 Mon Sep 17 00:00:00 2001
+From: Hans Dedecker 
+Date: Sat, 21 Apr 2018 13:40:29 +0200
+Subject: [PATCH] dhcpv6: fix strncpy bounds
+
+Fixes dhcpv6.c:138:2: error: 'strncpy' specified bound 16 equals destination size [-Werror=stringop-truncation]                                                                                                        strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+
+Signed-off-by: Khem Raj 
+Signed-off-by: Hans Dedecker 
+[Retrieved (and backported) from:
+https://github.com/openwrt/odhcp6c/commit/327f73dd7093d04c2dbea13ee30fc3dfafc5e944]
+Signed-off-by: Fabrice Fontaine 
+---
+ src/dhcpv6.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dhcpv6.c b/src/dhcpv6.c
+index 0b3585c..d70d533 100644
+--- a/src/dhcpv6.c
++++ b/src/dhcpv6.c
+@@ -135,7 +135,7 @@ int init_dhcpv6(const char *ifname, unsigned int options, int sol_timeout)
+ 	// Detect interface
+ 	struct ifreq ifr;
+-	strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
++	strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
+ 	if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0)
+ 		return -1;
+ 
diff --git a/buildroot/package/ofono/0002-fix-musl-compile.patch b/buildroot/package/ofono/0002-fix-musl-compile.patch
new file mode 100644
index 000000000..369fb7179
--- /dev/null
+++ b/buildroot/package/ofono/0002-fix-musl-compile.patch
@@ -0,0 +1,37 @@
+From 4a1d114fa3a5d6bef1f71222787c1f6c3a952284 Mon Sep 17 00:00:00 2001
+From: Nicolas Serafini 
+Date: Thu, 24 Jan 2019 10:11:42 +0100
+Subject: [PATCH] mbim: add optional copy of TEMP_FAILURE_RETRY macro (fix musl
+ compile)
+
+TEMP_FAILURE_RETRY is not available on musl.
+
+Signed-off-by: Nicolas Serafini 
+---
+ drivers/mbimmodem/mbim.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/mbimmodem/mbim.c b/drivers/mbimmodem/mbim.c
+index 54b18acf..4b040528 100644
+--- a/drivers/mbimmodem/mbim.c
++++ b/drivers/mbimmodem/mbim.c
+@@ -37,6 +37,16 @@
+ #include "mbim-message.h"
+ #include "mbim-private.h"
+ 
++/* taken from glibc unistd.h for musl support */
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression)             \
++  (__extension__                                   \
++    ({ long int __result;                          \
++       do __result = (long int) (expression);      \
++       while (__result == -1L && errno == EINTR);  \
++       __result; }))
++#endif
++
+ #define MAX_CONTROL_TRANSFER 4096
+ #define HEADER_SIZE (sizeof(struct mbim_message_header) + \
+ 					sizeof(struct mbim_fragment_header))
+-- 
+2.20.1
+
diff --git a/buildroot/package/ofono/S46ofono b/buildroot/package/ofono/S46ofono
old mode 100755
new mode 100644
diff --git a/buildroot/package/ofono/ofono.hash b/buildroot/package/ofono/ofono.hash
index 37933f126..2dbb9986c 100644
--- a/buildroot/package/ofono/ofono.hash
+++ b/buildroot/package/ofono/ofono.hash
@@ -1,2 +1,4 @@
 # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc
-sha256 a6b021cda0b444b772897cd637d5f455857fb5819b62c279a8302b44f9c7f2c3  ofono-1.21.tar.xz
+sha256 93bb2cedef54f897dd5200e22b072a6e38b5d9b44be57eebbbe8d513f0beb0e4	ofono-1.28.tar.xz
+# Locally computed
+sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4	COPYING
diff --git a/buildroot/package/ofono/ofono.mk b/buildroot/package/ofono/ofono.mk
index b4b7915a3..0552a181f 100644
--- a/buildroot/package/ofono/ofono.mk
+++ b/buildroot/package/ofono/ofono.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OFONO_VERSION = 1.21
+OFONO_VERSION = 1.28
 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
 OFONO_LICENSE = GPL-2.0
diff --git a/buildroot/package/olsr/S50olsr b/buildroot/package/olsr/S50olsr
old mode 100755
new mode 100644
diff --git a/buildroot/package/opencv/Config.in b/buildroot/package/opencv/Config.in
index b7c8c4168..54094b29c 100644
--- a/buildroot/package/opencv/Config.in
+++ b/buildroot/package/opencv/Config.in
@@ -266,18 +266,6 @@ config BR2_PACKAGE_OPENCV_WITH_PNG
 	help
 	  Use shared libpng from the target system.
 
-config BR2_PACKAGE_OPENCV_WITH_QT
-	bool "qt backend support"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_MMU # qt
-	depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI
-	select BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT_STL
-	select BR2_PACKAGE_QT_GUI_MODULE
-	select BR2_PACKAGE_QT_TEST
-	help
-	  Use Qt with QtTest module and STL support
-
 config BR2_PACKAGE_OPENCV_WITH_TIFF
 	bool "tiff support"
 	select BR2_PACKAGE_TIFF
diff --git a/buildroot/package/opencv/opencv.mk b/buildroot/package/opencv/opencv.mk
index d9813a041..ccc2d820d 100644
--- a/buildroot/package/opencv/opencv.mk
+++ b/buildroot/package/opencv/opencv.mk
@@ -160,6 +160,7 @@ OPENCV_CONF_OPTS += \
 	-DWITH_OPENGL=OFF \
 	-DWITH_OPENMP=OFF \
 	-DWITH_OPENNI=OFF \
+	-DWITH_QT=OFF \
 	-DWITH_UNICAP=OFF \
 	-DWITH_XINE=OFF
 
@@ -215,13 +216,6 @@ else
 OPENCV_CONF_OPTS += -DWITH_PNG=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y)
-OPENCV_CONF_OPTS += -DWITH_QT=4
-OPENCV_DEPENDENCIES += qt
-else
-OPENCV_CONF_OPTS += -DWITH_QT=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y)
 OPENCV_CONF_OPTS += -DWITH_TIFF=ON
 OPENCV_DEPENDENCIES += tiff
diff --git a/buildroot/package/opencv3/Config.in b/buildroot/package/opencv3/Config.in
index 80a297a90..61405a7c6 100644
--- a/buildroot/package/opencv3/Config.in
+++ b/buildroot/package/opencv3/Config.in
@@ -82,20 +82,6 @@ comment "gtk3 support needs libgtk3"
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_PACKAGE_LIBGTK3
 
-config BR2_PACKAGE_OPENCV3_WITH_QT
-	bool "qt4"
-	depends on BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT_STL
-	select BR2_PACKAGE_QT_GUI_MODULE
-	select BR2_PACKAGE_QT_TEST
-	help
-	  Use Qt4 with QtTest and QtGui modules and STL support, as
-	  GUI toolkit.
-
-comment "qt4 support needs qt"
-	depends on BR2_USE_MMU # qt
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
-
 config BR2_PACKAGE_OPENCV3_WITH_QT5
 	bool "qt5"
 	depends on BR2_PACKAGE_QT5
@@ -108,7 +94,7 @@ config BR2_PACKAGE_OPENCV3_WITH_QT5
 	  components, as GUI toolkit.
 
 comment "qt5 support needs qt5"
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
+	depends on !BR2_PACKAGE_QT5
 
 endchoice
 
diff --git a/buildroot/package/opencv3/opencv3.mk b/buildroot/package/opencv3/opencv3.mk
index 978f38c14..3a2594b58 100644
--- a/buildroot/package/opencv3/opencv3.mk
+++ b/buildroot/package/opencv3/opencv3.mk
@@ -288,18 +288,11 @@ else
 OPENCV3_CONF_OPTS += -DWITH_PNG=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT)$(BR2_PACKAGE_OPENCV3_WITH_QT5),)
-OPENCV3_CONF_OPTS += -DWITH_QT=OFF
-endif
-
-ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT),y)
-OPENCV3_CONF_OPTS += -DWITH_QT=4
-OPENCV3_DEPENDENCIES += qt
-endif
-
 ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)
 OPENCV3_CONF_OPTS += -DWITH_QT=5
 OPENCV3_DEPENDENCIES += qt5base
+else
+OPENCV3_CONF_OPTS += -DWITH_QT=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_OPENCV3_WITH_TIFF),y)
diff --git a/buildroot/package/openjpeg/0004-install-static-lib.patch b/buildroot/package/openjpeg/0004-install-static-lib.patch
deleted file mode 100644
index 4a3bbfa28..000000000
--- a/buildroot/package/openjpeg/0004-install-static-lib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Mon, 9 Oct 2017 11:40:43 +0200
-Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
- static-only build lacks the installation target for the library (#1019, fixes
- regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
-
-Downloaded from upstream commit
-https://github.com/uclouvain/openjpeg/commit/66297f07a43d2770a97c8456d20202f3d051d980
-
-Signed-off-by: Bernd Kuhls 
----
- src/lib/openjp2/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
-index 0b4520384..f8990ccf0 100644
---- a/src/lib/openjp2/CMakeLists.txt
-+++ b/src/lib/openjp2/CMakeLists.txt
-@@ -99,6 +99,7 @@ else()
-     set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
-   else()
-     add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
-+    set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
-   endif()
- endif()
- 
diff --git a/buildroot/package/openjpeg/openjpeg.hash b/buildroot/package/openjpeg/openjpeg.hash
index dd3cf26cf..8a6fda48c 100644
--- a/buildroot/package/openjpeg/openjpeg.hash
+++ b/buildroot/package/openjpeg/openjpeg.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256 3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a  openjpeg-2.3.0.tar.gz
+sha256 3389a1aa908c2b577863da213db3a170df3edbb1432e99ae5fd3f2ac721d69d3  openjpeg-51f097e6d5754ddae93e716276fe8176b44ec548.tar.gz
+sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6  LICENSE
diff --git a/buildroot/package/openjpeg/openjpeg.mk b/buildroot/package/openjpeg/openjpeg.mk
index 9a8fdab7a..6036ab95a 100644
--- a/buildroot/package/openjpeg/openjpeg.mk
+++ b/buildroot/package/openjpeg/openjpeg.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-OPENJPEG_VERSION = 2.3.0
-OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION))
+OPENJPEG_VERSION = 51f097e6d5754ddae93e716276fe8176b44ec548
+OPENJPEG_SITE = $(call github,uclouvain,openjpeg,$(OPENJPEG_VERSION))
 OPENJPEG_LICENSE = BSD-2-Clause
 OPENJPEG_LICENSE_FILES = LICENSE
 OPENJPEG_INSTALL_STAGING = YES
diff --git a/buildroot/package/openmpi/openmpi.hash b/buildroot/package/openmpi/openmpi.hash
index 4e967e658..4e76951c8 100644
--- a/buildroot/package/openmpi/openmpi.hash
+++ b/buildroot/package/openmpi/openmpi.hash
@@ -1,5 +1,6 @@
-# From: https://www.open-mpi.org/software/ompi/v1.10/
-md5 c87c613f9acb1a4eee21fa1ac8042579  openmpi-1.10.7.tar.bz2
-sha1 fe359d8caa4888625308cf03343d913dd5ac6198  openmpi-1.10.7.tar.bz2
+# From: https://www.open-mpi.org/software/ompi/v4.0/
+md5 e3da67df1e968c8798827e0e5fe9a510  openmpi-4.0.0.tar.bz2
+sha1 fee1d0287abfb150bae16957de342752c9bdd4e8  openmpi-4.0.0.tar.bz2
 # Locally computed
-sha256 a089ece151fec974905caa35b0a59039b227bdea4e7933069e94bee4ed0e5a90  openmpi-1.10.7.tar.bz2
+sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b  openmpi-4.0.0.tar.bz2
+sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac  LICENSE
diff --git a/buildroot/package/openmpi/openmpi.mk b/buildroot/package/openmpi/openmpi.mk
index df3270f50..8d9eafd63 100644
--- a/buildroot/package/openmpi/openmpi.mk
+++ b/buildroot/package/openmpi/openmpi.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-OPENMPI_VERSION_MAJOR = 1.10
-OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).7
+OPENMPI_VERSION_MAJOR = 4.0
+OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).0
 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads
 OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2
 OPENMPI_LICENSE = BSD-3-Clause
diff --git a/buildroot/package/openntpd/S49ntp b/buildroot/package/openntpd/S49ntp
old mode 100755
new mode 100644
diff --git a/buildroot/package/openocd/Config.in b/buildroot/package/openocd/Config.in
index 6cba7a04c..abba07e88 100644
--- a/buildroot/package/openocd/Config.in
+++ b/buildroot/package/openocd/Config.in
@@ -9,6 +9,17 @@ if BR2_PACKAGE_OPENOCD
 
 comment "Adapters"
 
+config BR2_PACKAGE_OPENOCD_CMSIS_DAP
+	bool "CMSIS-DAP compliant debuggers"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	depends on BR2_PACKAGE_HAS_UDEV # hidapi
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # hidapi
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_HIDAPI
+	help
+	  Enable support for CMSIS-DAP compliant debuggers (i.e
+	  Atmel/Microchip EDBG, etc.)
+
 config BR2_PACKAGE_OPENOCD_FTDI
 	bool "MPSSE mode of FTDI based devices"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
diff --git a/buildroot/package/openocd/openocd.mk b/buildroot/package/openocd/openocd.mk
index ca13d9936..d35ed77cd 100644
--- a/buildroot/package/openocd/openocd.mk
+++ b/buildroot/package/openocd/openocd.mk
@@ -35,7 +35,8 @@ OPENOCD_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \
 	$(if $(BR2_PACKAGE_LIBUSB),libusb) \
 	$(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \
-	$(if $(BR2_PACKAGE_LIBHID),libhid)
+	$(if $(BR2_PACKAGE_LIBHID),libhid) \
+	$(if $(BR2_PACKAGE_HIDAPI),hidapi)
 
 # Adapters
 OPENOCD_CONF_OPTS += \
diff --git a/buildroot/package/openpowerlink/0004-stack-src-kernel-edrv-edrv-rawsock_linux.c-add-missi.patch b/buildroot/package/openpowerlink/0004-stack-src-kernel-edrv-edrv-rawsock_linux.c-add-missi.patch
deleted file mode 100644
index 4e00ecdb6..000000000
--- a/buildroot/package/openpowerlink/0004-stack-src-kernel-edrv-edrv-rawsock_linux.c-add-missi.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 710e2b8ba2ecf51057a89de24e6f0d387614ea53 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Sat, 25 Aug 2018 23:36:39 +0200
-Subject: [PATCH] stack/src/kernel/edrv/edrv-rawsock_linux.c: add missing
-  include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is necessary to get the definition of the u_char type, otherwise
-the build fails with the musl C library with:
-
-stack/src/kernel/edrv/edrv-rawsock_linux.c:373:46: error: ‘u_char’ undeclared (first use in this function)
-
-Signed-off-by: Thomas Petazzoni 
-Upstream: https://github.com/OpenAutomationTechnologies/openPOWERLINK_V2/pull/371
----
- stack/src/kernel/edrv/edrv-rawsock_linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/stack/src/kernel/edrv/edrv-rawsock_linux.c b/stack/src/kernel/edrv/edrv-rawsock_linux.c
-index f8e0216f..e5230a52 100644
---- a/stack/src/kernel/edrv/edrv-rawsock_linux.c
-+++ b/stack/src/kernel/edrv/edrv-rawsock_linux.c
-@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include 
- #include 
- #include 
-+#include 
- 
- //============================================================================//
- //            G L O B A L   D E F I N I T I O N S                             //
--- 
-2.14.4
-
diff --git a/buildroot/package/openpowerlink/openpowerlink.hash b/buildroot/package/openpowerlink/openpowerlink.hash
index da9bdd2a7..13b5e9351 100644
--- a/buildroot/package/openpowerlink/openpowerlink.hash
+++ b/buildroot/package/openpowerlink/openpowerlink.hash
@@ -1,5 +1,5 @@
-# From http://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.7.0/
-md5	4843f857b8334c984827435fa9e1ab96	openPOWERLINK_V2.7.0.tar.gz
-sha1	a256e05d187b334651764ab21a827b3a4fa64e2f	openPOWERLINK_V2.7.0.tar.gz
+# From https://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.7.1/
+md5	04524d1b1f9946176dce0ccb0eecf537	openPOWERLINK_V2.7.1.tar.gz
+sha1	4ee9c6e26bbc729fdbbb272155b093ffa0d9cefd	openPOWERLINK_V2.7.1.tar.gz
 # sha256 locally computed
-sha256	64c23ee42e3852bf2316fd99c59eae9cdd634219f92b3ea70ce747dad1e05354	openPOWERLINK_V2.7.0.tar.gz
+sha256	d0d65f4fb8f2ad209cf9575714f88f33168a1cf71e8f1801e1e1ac4df6a37ffd	openPOWERLINK_V2.7.1.tar.gz
diff --git a/buildroot/package/openpowerlink/openpowerlink.mk b/buildroot/package/openpowerlink/openpowerlink.mk
index 90088cef5..f86978082 100644
--- a/buildroot/package/openpowerlink/openpowerlink.mk
+++ b/buildroot/package/openpowerlink/openpowerlink.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-OPENPOWERLINK_VERSION = V2.7.0
-OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/$(OPENPOWERLINK_VERSION)
+OPENPOWERLINK_VERSION = V2.7.1
+OPENPOWERLINK_SITE = https://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/$(OPENPOWERLINK_VERSION)
 OPENPOWERLINK_SOURCE = openPOWERLINK_$(OPENPOWERLINK_VERSION).tar.gz
 OPENPOWERLINK_LICENSE = BSD-2-Clause, GPL-2.0
 OPENPOWERLINK_LICENSE_FILES = license.md
diff --git a/buildroot/package/openresolv/Config.in b/buildroot/package/openresolv/Config.in
index 2a393c6bc..835fbf29e 100644
--- a/buildroot/package/openresolv/Config.in
+++ b/buildroot/package/openresolv/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_OPENRESOLV
 	  manages resolv.conf. This tool provides a dns management
 	  framework to track currently available nameservers.
 
-	  https://github.com/rsmarples/openresolv
+	  https://roy.marples.name/projects/openresolv
diff --git a/buildroot/package/openresolv/openresolv.mk b/buildroot/package/openresolv/openresolv.mk
index 6adf97352..3f9d603d4 100644
--- a/buildroot/package/openresolv/openresolv.mk
+++ b/buildroot/package/openresolv/openresolv.mk
@@ -10,8 +10,7 @@ OPENRESOLV_LICENSE = BSD-2-Clause
 OPENRESOLV_LICENSE_FILES = LICENSE
 
 define OPENRESOLV_CONFIGURE_CMDS
-	cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr \
-		--sysconfdir=/etc
+	cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure --sysconfdir=/etc
 endef
 
 define OPENRESOLV_BUILD_CMDS
diff --git a/buildroot/package/openssh/0001-upstream-disallow-empty-incoming-filename-or-ones-th.patch b/buildroot/package/openssh/0001-upstream-disallow-empty-incoming-filename-or-ones-th.patch
new file mode 100644
index 000000000..2b5a958d1
--- /dev/null
+++ b/buildroot/package/openssh/0001-upstream-disallow-empty-incoming-filename-or-ones-th.patch
@@ -0,0 +1,39 @@
+From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" 
+Date: Fri, 16 Nov 2018 03:03:10 +0000
+Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer
+ to the
+
+current directory; based on report/patch from Harry Sintonen
+
+OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
+Signed-off-by: Baruch Siach 
+---
+Upstream status (openssh-portable): commit 6010c0303a422
+
+ scp.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/scp.c b/scp.c
+index 60682c68769b..4f3fdcd3db89 100644
+--- a/scp.c
++++ b/scp.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */
++/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */
+ /*
+  * scp - secure remote copy.  This is basically patched BSD rcp which
+  * uses ssh to do the data transfer (instead of using rcmd).
+@@ -1106,7 +1106,8 @@ sink(int argc, char **argv)
+ 			SCREWUP("size out of range");
+ 		size = (off_t)ull;
+ 
+-		if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
++		if (*cp == '\0' || strchr(cp, '/') != NULL ||
++		    strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
+ 			run_err("error: unexpected filename: %s", cp);
+ 			exit(1);
+ 		}
+-- 
+2.20.1
+
diff --git a/buildroot/package/openssh/0002-upstream-Sanitize-scp-filenames-via-snmprintf.-To-do.patch b/buildroot/package/openssh/0002-upstream-Sanitize-scp-filenames-via-snmprintf.-To-do.patch
new file mode 100644
index 000000000..e5d137ef1
--- /dev/null
+++ b/buildroot/package/openssh/0002-upstream-Sanitize-scp-filenames-via-snmprintf.-To-do.patch
@@ -0,0 +1,275 @@
+From 5979bdfeca813dd7e997a1edb0f928d77ce70304 Mon Sep 17 00:00:00 2001
+From: "dtucker@openbsd.org" 
+Date: Wed, 23 Jan 2019 08:01:46 +0000
+Subject: [PATCH] upstream: Sanitize scp filenames via snmprintf. To do this we
+ move
+
+the progressmeter formatting outside of signal handler context and have the
+atomicio callback called for EINTR too.  bz#2434 with contributions from djm
+and jjelen at redhat.com, ok djm@
+
+OpenBSD-Commit-ID: 1af61c1f70e4f3bd8ab140b9f1fa699481db57d8
+Signed-off-by: Baruch Siach 
+---
+Upstream status (openssh-portable): backported from commit 8976f1c4b27
+---
+ atomicio.c      | 20 ++++++++++++++-----
+ progressmeter.c | 53 ++++++++++++++++++++++---------------------------
+ progressmeter.h |  3 ++-
+ scp.c           |  1 +
+ sftp-client.c   | 16 ++++++++-------
+ 5 files changed, 51 insertions(+), 42 deletions(-)
+
+diff --git a/atomicio.c b/atomicio.c
+index f854a06f5f50..d91bd7621c12 100644
+--- a/atomicio.c
++++ b/atomicio.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: atomicio.c,v 1.28 2016/07/27 23:18:12 djm Exp $ */
++/* $OpenBSD: atomicio.c,v 1.29 2019/01/23 08:01:46 dtucker Exp $ */
+ /*
+  * Copyright (c) 2006 Damien Miller. All rights reserved.
+  * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
+@@ -65,9 +65,14 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n,
+ 		res = (f) (fd, s + pos, n - pos);
+ 		switch (res) {
+ 		case -1:
+-			if (errno == EINTR)
++			if (errno == EINTR) {
++				/* possible SIGALARM, update callback */
++				if (cb != NULL && cb(cb_arg, 0) == -1) {
++					errno = EINTR;
++					return pos;
++				}
+ 				continue;
+-			if (errno == EAGAIN || errno == EWOULDBLOCK) {
++			} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ #ifndef BROKEN_READ_COMPARISON
+ 				(void)poll(&pfd, 1, -1);
+ #endif
+@@ -122,9 +127,14 @@ atomiciov6(ssize_t (*f) (int, const struct iovec *, int), int fd,
+ 		res = (f) (fd, iov, iovcnt);
+ 		switch (res) {
+ 		case -1:
+-			if (errno == EINTR)
++			if (errno == EINTR) {
++				/* possible SIGALARM, update callback */
++				if (cb != NULL && cb(cb_arg, 0) == -1) {
++					errno = EINTR;
++					return pos;
++				}
+ 				continue;
+-			if (errno == EAGAIN || errno == EWOULDBLOCK) {
++			} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ #ifndef BROKEN_READV_COMPARISON
+ 				(void)poll(&pfd, 1, -1);
+ #endif
+diff --git a/progressmeter.c b/progressmeter.c
+index fe9bf52e4c90..add462dde500 100644
+--- a/progressmeter.c
++++ b/progressmeter.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: progressmeter.c,v 1.45 2016/06/30 05:17:05 dtucker Exp $ */
++/* $OpenBSD: progressmeter.c,v 1.46 2019/01/23 08:01:46 dtucker Exp $ */
+ /*
+  * Copyright (c) 2003 Nils Nordman.  All rights reserved.
+  *
+@@ -31,6 +31,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -39,6 +40,7 @@
+ #include "progressmeter.h"
+ #include "atomicio.h"
+ #include "misc.h"
++#include "utf8.h"
+ 
+ #define DEFAULT_WINSIZE 80
+ #define MAX_WINSIZE 512
+@@ -61,7 +63,7 @@ static void setscreensize(void);
+ void refresh_progress_meter(void);
+ 
+ /* signal handler for updating the progress meter */
+-static void update_progress_meter(int);
++static void sig_alarm(int);
+ 
+ static double start;		/* start progress */
+ static double last_update;	/* last progress update */
+@@ -74,6 +76,7 @@ static long stalled;		/* how long we have been stalled */
+ static int bytes_per_second;	/* current speed in bytes per second */
+ static int win_size;		/* terminal window size */
+ static volatile sig_atomic_t win_resized; /* for window resizing */
++static volatile sig_atomic_t alarm_fired;
+ 
+ /* units for format_size */
+ static const char unit[] = " KMGT";
+@@ -126,9 +129,17 @@ refresh_progress_meter(void)
+ 	off_t bytes_left;
+ 	int cur_speed;
+ 	int hours, minutes, seconds;
+-	int i, len;
+ 	int file_len;
+ 
++	if ((!alarm_fired && !win_resized) || !can_output())
++		return;
++	alarm_fired = 0;
++
++	if (win_resized) {
++		setscreensize();
++		win_resized = 0;
++	}
++
+ 	transferred = *counter - (cur_pos ? cur_pos : start_pos);
+ 	cur_pos = *counter;
+ 	now = monotime_double();
+@@ -158,16 +169,11 @@ refresh_progress_meter(void)
+ 
+ 	/* filename */
+ 	buf[0] = '\0';
+-	file_len = win_size - 35;
++	file_len = win_size - 36;
+ 	if (file_len > 0) {
+-		len = snprintf(buf, file_len + 1, "\r%s", file);
+-		if (len < 0)
+-			len = 0;
+-		if (len >= file_len + 1)
+-			len = file_len;
+-		for (i = len; i < file_len; i++)
+-			buf[i] = ' ';
+-		buf[file_len] = '\0';
++		buf[0] = '\r';
++		snmprintf(buf+1, sizeof(buf)-1 , &file_len, "%*s",
++		    file_len * -1, file);
+ 	}
+ 
+ 	/* percent of transfer done */
+@@ -228,22 +234,11 @@ refresh_progress_meter(void)
+ 
+ /*ARGSUSED*/
+ static void
+-update_progress_meter(int ignore)
++sig_alarm(int ignore)
+ {
+-	int save_errno;
+-
+-	save_errno = errno;
+-
+-	if (win_resized) {
+-		setscreensize();
+-		win_resized = 0;
+-	}
+-	if (can_output())
+-		refresh_progress_meter();
+-
+-	signal(SIGALRM, update_progress_meter);
++	signal(SIGALRM, sig_alarm);
++	alarm_fired = 1;
+ 	alarm(UPDATE_INTERVAL);
+-	errno = save_errno;
+ }
+ 
+ void
+@@ -259,10 +254,9 @@ start_progress_meter(const char *f, off_t filesize, off_t *ctr)
+ 	bytes_per_second = 0;
+ 
+ 	setscreensize();
+-	if (can_output())
+-		refresh_progress_meter();
++	refresh_progress_meter();
+ 
+-	signal(SIGALRM, update_progress_meter);
++	signal(SIGALRM, sig_alarm);
+ 	signal(SIGWINCH, sig_winch);
+ 	alarm(UPDATE_INTERVAL);
+ }
+@@ -286,6 +280,7 @@ stop_progress_meter(void)
+ static void
+ sig_winch(int sig)
+ {
++	signal(SIGWINCH, sig_winch);
+ 	win_resized = 1;
+ }
+ 
+diff --git a/progressmeter.h b/progressmeter.h
+index bf179dca6518..8f6678060195 100644
+--- a/progressmeter.h
++++ b/progressmeter.h
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: progressmeter.h,v 1.3 2015/01/14 13:54:13 djm Exp $ */
++/* $OpenBSD: progressmeter.h,v 1.4 2019/01/23 08:01:46 dtucker Exp $ */
+ /*
+  * Copyright (c) 2002 Nils Nordman.  All rights reserved.
+  *
+@@ -24,4 +24,5 @@
+  */
+ 
+ void	start_progress_meter(const char *, off_t, off_t *);
++void	refresh_progress_meter(void);
+ void	stop_progress_meter(void);
+diff --git a/scp.c b/scp.c
+index 4f3fdcd3db89..4a342a63873c 100644
+--- a/scp.c
++++ b/scp.c
+@@ -585,6 +585,7 @@ scpio(void *_cnt, size_t s)
+ 	off_t *cnt = (off_t *)_cnt;
+ 
+ 	*cnt += s;
++	refresh_progress_meter();
+ 	if (limit_kbps > 0)
+ 		bandwidth_limit(&bwlimit, s);
+ 	return 0;
+diff --git a/sftp-client.c b/sftp-client.c
+index 4986d6d8d291..2bc698f868bc 100644
+--- a/sftp-client.c
++++ b/sftp-client.c
+@@ -101,7 +101,9 @@ sftpio(void *_bwlimit, size_t amount)
+ {
+ 	struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit;
+ 
+-	bandwidth_limit(bwlimit, amount);
++	refresh_progress_meter();
++	if (bwlimit != NULL)
++		bandwidth_limit(bwlimit, amount);
+ 	return 0;
+ }
+ 
+@@ -121,8 +123,8 @@ send_msg(struct sftp_conn *conn, struct sshbuf *m)
+ 	iov[1].iov_base = (u_char *)sshbuf_ptr(m);
+ 	iov[1].iov_len = sshbuf_len(m);
+ 
+-	if (atomiciov6(writev, conn->fd_out, iov, 2,
+-	    conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_out) !=
++	if (atomiciov6(writev, conn->fd_out, iov, 2, sftpio,
++	    conn->limit_kbps > 0 ? &conn->bwlimit_out : NULL) !=
+ 	    sshbuf_len(m) + sizeof(mlen))
+ 		fatal("Couldn't send packet: %s", strerror(errno));
+ 
+@@ -138,8 +140,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
+ 
+ 	if ((r = sshbuf_reserve(m, 4, &p)) != 0)
+ 		fatal("%s: buffer error: %s", __func__, ssh_err(r));
+-	if (atomicio6(read, conn->fd_in, p, 4,
+-	    conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) {
++	if (atomicio6(read, conn->fd_in, p, 4, sftpio,
++	    conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL) != 4) {
+ 		if (errno == EPIPE || errno == ECONNRESET)
+ 			fatal("Connection closed");
+ 		else
+@@ -157,8 +159,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
+ 
+ 	if ((r = sshbuf_reserve(m, msg_len, &p)) != 0)
+ 		fatal("%s: buffer error: %s", __func__, ssh_err(r));
+-	if (atomicio6(read, conn->fd_in, p, msg_len,
+-	    conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in)
++	if (atomicio6(read, conn->fd_in, p, msg_len, sftpio,
++	    conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL)
+ 	    != msg_len) {
+ 		if (errno == EPIPE)
+ 			fatal("Connection closed");
+-- 
+2.20.1
+
diff --git a/buildroot/package/openssh/0003-upstream-check-in-scp-client-that-filenames-sent-dur.patch b/buildroot/package/openssh/0003-upstream-check-in-scp-client-that-filenames-sent-dur.patch
new file mode 100644
index 000000000..98ce5cd87
--- /dev/null
+++ b/buildroot/package/openssh/0003-upstream-check-in-scp-client-that-filenames-sent-dur.patch
@@ -0,0 +1,186 @@
+From f853123eda6b279a87be48e18bbea8dec82a94f2 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" 
+Date: Sat, 26 Jan 2019 22:41:28 +0000
+Subject: [PATCH] upstream: check in scp client that filenames sent during
+
+remote->local directory copies satisfy the wildcard specified by the user.
+
+This checking provides some protection against a malicious server
+sending unexpected filenames, but it comes at a risk of rejecting wanted
+files due to differences between client and server wildcard expansion rules.
+
+For this reason, this also adds a new -T flag to disable the check.
+
+reported by Harry Sintonen
+fix approach suggested by markus@;
+has been in snaps for ~1wk courtesy deraadt@
+
+OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda
+Signed-off-by: Baruch Siach 
+---
+Upstream status (openssh-portable): backported from commit 8976f1c4b2
+---
+ scp.1 | 12 +++++++++++-
+ scp.c | 37 +++++++++++++++++++++++++++++--------
+ 2 files changed, 40 insertions(+), 9 deletions(-)
+
+diff --git a/scp.1 b/scp.1
+index 0e5cc1b2d675..397e7709195a 100644
+--- a/scp.1
++++ b/scp.1
+@@ -18,7 +18,7 @@
+ .Nd secure copy (remote file copy program)
+ .Sh SYNOPSIS
+ .Nm scp
+-.Op Fl 346BCpqrv
++.Op Fl 346BCpqrTv
+ .Op Fl c Ar cipher
+ .Op Fl F Ar ssh_config
+ .Op Fl i Ar identity_file
+@@ -208,6 +208,16 @@ to use for the encrypted connection.
+ The program must understand
+ .Xr ssh 1
+ options.
++.It Fl T
++Disable strict filename checking.
++By default when copying files from a remote host to a local directory
++.Nm
++checks that the received filenames match those requested on the command-line
++to prevent the remote end from sending unexpected or unwanted files.
++Because of differences in how various operating systems and shells interpret
++filename wildcards, these checks may cause wanted files to be rejected.
++This option disables these checks at the expense of fully trusting that
++the server will not send unexpected filenames.
+ .It Fl v
+ Verbose mode.
+ Causes
+diff --git a/scp.c b/scp.c
+index 4a342a63873c..7b0a08efb274 100644
+--- a/scp.c
++++ b/scp.c
+@@ -94,6 +94,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -375,14 +376,14 @@ void verifydir(char *);
+ struct passwd *pwd;
+ uid_t userid;
+ int errs, remin, remout;
+-int pflag, iamremote, iamrecursive, targetshouldbedirectory;
++int Tflag, pflag, iamremote, iamrecursive, targetshouldbedirectory;
+ 
+ #define	CMDNEEDS	64
+ char cmd[CMDNEEDS];		/* must hold "rcp -r -p -d\0" */
+ 
+ int response(void);
+ void rsource(char *, struct stat *);
+-void sink(int, char *[]);
++void sink(int, char *[], const char *);
+ void source(int, char *[]);
+ void tolocal(int, char *[]);
+ void toremote(int, char *[]);
+@@ -421,8 +422,9 @@ main(int argc, char **argv)
+ 	addargs(&args, "-oRemoteCommand=none");
+ 	addargs(&args, "-oRequestTTY=no");
+ 
+-	fflag = tflag = 0;
+-	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q12346S:o:F:")) != -1)
++	fflag = Tflag = tflag = 0;
++	while ((ch = getopt(argc, argv,
++	    "dfl:prtTvBCc:i:P:q12346S:o:F:")) != -1) {
+ 		switch (ch) {
+ 		/* User-visible flags. */
+ 		case '1':
+@@ -501,9 +503,13 @@ main(int argc, char **argv)
+ 			setmode(0, O_BINARY);
+ #endif
+ 			break;
++		case 'T':
++			Tflag = 1;
++			break;
+ 		default:
+ 			usage();
+ 		}
++	}
+ 	argc -= optind;
+ 	argv += optind;
+ 
+@@ -534,7 +540,7 @@ main(int argc, char **argv)
+ 	}
+ 	if (tflag) {
+ 		/* Receive data. */
+-		sink(argc, argv);
++		sink(argc, argv, NULL);
+ 		exit(errs != 0);
+ 	}
+ 	if (argc < 2)
+@@ -792,7 +798,7 @@ tolocal(int argc, char **argv)
+ 			continue;
+ 		}
+ 		free(bp);
+-		sink(1, argv + argc - 1);
++		sink(1, argv + argc - 1, src);
+ 		(void) close(remin);
+ 		remin = remout = -1;
+ 	}
+@@ -968,7 +974,7 @@ rsource(char *name, struct stat *statp)
+ 	 (sizeof(type) != 4 && sizeof(type) != 8))
+ 
+ void
+-sink(int argc, char **argv)
++sink(int argc, char **argv, const char *src)
+ {
+ 	static BUF buffer;
+ 	struct stat stb;
+@@ -984,6 +990,7 @@ sink(int argc, char **argv)
+ 	unsigned long long ull;
+ 	int setimes, targisdir, wrerrno = 0;
+ 	char ch, *cp, *np, *targ, *why, *vect[1], buf[2048], visbuf[2048];
++	char *src_copy = NULL, *restrict_pattern = NULL;
+ 	struct timeval tv[2];
+ 
+ #define	atime	tv[0]
+@@ -1008,6 +1015,17 @@ sink(int argc, char **argv)
+ 	(void) atomicio(vwrite, remout, "", 1);
+ 	if (stat(targ, &stb) == 0 && S_ISDIR(stb.st_mode))
+ 		targisdir = 1;
++	if (src != NULL && !iamrecursive && !Tflag) {
++		/*
++		 * Prepare to try to restrict incoming filenames to match
++		 * the requested destination file glob.
++		 */
++		if ((src_copy = strdup(src)) == NULL)
++			fatal("strdup failed");
++		if ((restrict_pattern = strrchr(src_copy, '/')) != NULL) {
++			*restrict_pattern++ = '\0';
++		}
++	}
+ 	for (first = 1;; first = 0) {
+ 		cp = buf;
+ 		if (atomicio(read, remin, cp, 1) != 1)
+@@ -1112,6 +1130,9 @@ sink(int argc, char **argv)
+ 			run_err("error: unexpected filename: %s", cp);
+ 			exit(1);
+ 		}
++		if (restrict_pattern != NULL &&
++		    fnmatch(restrict_pattern, cp, 0) != 0)
++			SCREWUP("filename does not match request");
+ 		if (targisdir) {
+ 			static char *namebuf;
+ 			static size_t cursize;
+@@ -1149,7 +1170,7 @@ sink(int argc, char **argv)
+ 					goto bad;
+ 			}
+ 			vect[0] = xstrdup(np);
+-			sink(1, vect);
++			sink(1, vect, src);
+ 			if (setimes) {
+ 				setimes = 0;
+ 				if (utimes(vect[0], tv) < 0)
+-- 
+2.20.1
+
diff --git a/buildroot/package/openssh/openssh.mk b/buildroot/package/openssh/openssh.mk
index 07f3e0d66..4fef5caed 100644
--- a/buildroot/package/openssh/openssh.mk
+++ b/buildroot/package/openssh/openssh.mk
@@ -11,6 +11,7 @@ OPENSSH_LICENSE_FILES = LICENCE
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPTS = \
 	--sysconfdir=/etc/ssh \
+	--with-default-path=$(BR2_SYSTEM_DEFAULT_PATH) \
 	--disable-lastlog \
 	--disable-utmp \
 	--disable-utmpx \
@@ -18,8 +19,8 @@ OPENSSH_CONF_OPTS = \
 	--disable-wtmpx \
 	--disable-strip
 
-define OPENSSH_USERS
-	sshd -1 sshd -1 * - - - SSH drop priv user
+define OPENSSH_PERMISSIONS
+	/var/empty d 755 root root - - - - -
 endef
 
 ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
@@ -56,12 +57,24 @@ else
 OPENSSH_CONF_OPTS += --without-selinux
 endif
 
+ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y)
+define OPENSSH_INSTALL_SYSTEMD_SYSUSERS
+	$(INSTALL) -m 0644 -D package/openssh/sshd-sysusers.conf \
+		$(TARGET_DIR)/usr/lib/sysusers.d/sshd.conf
+endef
+else
+define OPENSSH_USERS
+	sshd -1 sshd -1 * /var/empty - - SSH drop priv user
+endef
+endif
+
 define OPENSSH_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 644 package/openssh/sshd.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/sshd.service
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
 	ln -fs ../../../../usr/lib/systemd/system/sshd.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshd.service
+	$(OPENSSH_INSTALL_SYSTEMD_SYSUSERS)
 endef
 
 define OPENSSH_INSTALL_INIT_SYSV
diff --git a/buildroot/package/openssh/sshd-sysusers.conf b/buildroot/package/openssh/sshd-sysusers.conf
new file mode 100644
index 000000000..ac77aec06
--- /dev/null
+++ b/buildroot/package/openssh/sshd-sysusers.conf
@@ -0,0 +1 @@
+u sshd - "SSH drop priv user" /var/empty
diff --git a/buildroot/package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch b/buildroot/package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch
deleted file mode 100644
index 90a945bb2..000000000
--- a/buildroot/package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 9462847f23a25524fdc2112cbc8de3f2c02a1669 Mon Sep 17 00:00:00 2001
-From: Jan Heylen 
-Date: Fri, 22 Dec 2017 22:04:29 +0100
-Subject: [PATCH] CMake: make shared/static target a configurable option
-
-Signed-off-by: Jan Heylen 
----
- CMakeLists.txt | 40 ++++++++++++++++++++++++++++------------
- 1 file changed, 28 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aadf2f9..d03bd00 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,18 +70,36 @@ endif()
- include_directories(include)
- include_directories(SYSTEM 3rd_party/include)
- 
-+option(BUILD_SHARED_LIBS "Build as a shared library" ON)
-+option(BUILD_STATIC_LIBS "Build as a static library" ON)
-+
-+if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
-+    message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
-+endif()
-+
- set(SRCS src/propagation.cpp src/noop.cpp src/tracer.cpp)
--add_library(opentracing SHARED ${SRCS})
--target_include_directories(opentracing INTERFACE "$")
--set_target_properties(opentracing PROPERTIES VERSION ${OPENTRACING_VERSION_STRING}
-+
-+if (BUILD_SHARED_LIBS)
-+  add_library(opentracing SHARED ${SRCS})
-+  target_include_directories(opentracing INTERFACE "$")
-+  set_target_properties(opentracing PROPERTIES VERSION ${OPENTRACING_VERSION_STRING}
-                                              SOVERSION ${OPENTRACING_VERSION_MAJOR})
--add_library(opentracing-static STATIC ${SRCS})
--set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing)
--target_include_directories(opentracing-static INTERFACE "$")
--if (CLANG_TIDY_EXE)
--  set_target_properties(opentracing PROPERTIES
-+  install(TARGETS opentracing EXPORT OpenTracingTargets
-+          LIBRARY DESTINATION lib
-+          ARCHIVE DESTINATION lib)
-+  if (CLANG_TIDY_EXE)
-+    set_target_properties(opentracing PROPERTIES
-                                     CXX_CLANG_TIDY "${DO_CLANG_TIDY}")
--endif()
-+  endif()
-+endif(BUILD_SHARED_LIBS)
-+
-+if (BUILD_STATIC_LIBS)
-+  add_library(opentracing-static STATIC ${SRCS})
-+  set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing)
-+  target_include_directories(opentracing-static INTERFACE "$")
-+  install(TARGETS opentracing-static EXPORT OpenTracingTargets
-+          ARCHIVE DESTINATION lib)
-+endif(BUILD_STATIC_LIBS)
- 
- 
- install(DIRECTORY 3rd_party/include/opentracing DESTINATION include
-@@ -89,9 +107,7 @@ install(DIRECTORY 3rd_party/include/opentracing DESTINATION include
-                            PATTERN "*.h")
- install(DIRECTORY include/opentracing DESTINATION include
-             FILES_MATCHING PATTERN "*.h")
--install(TARGETS opentracing opentracing-static EXPORT OpenTracingTargets
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib)
-+
- 
- # ==============================================================================
- # Package configuration setup
--- 
-2.7.4
-
diff --git a/buildroot/package/opentracing-cpp/Config.in b/buildroot/package/opentracing-cpp/Config.in
index 4ee7b29de..ff3067b7d 100644
--- a/buildroot/package/opentracing-cpp/Config.in
+++ b/buildroot/package/opentracing-cpp/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_OPENTRACING_CPP
 	bool "opentracing-cpp"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	help
@@ -8,8 +10,9 @@ config BR2_PACKAGE_OPENTRACING_CPP
 
 	  http://opentracing.io
 
-comment "opentracing-cpp needs a toolchain w/ C++, gcc >= 4.8"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+comment "opentracing-cpp needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 
 comment "opentracing-cpp needs exception_ptr"
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/buildroot/package/opentracing-cpp/opentracing-cpp.hash b/buildroot/package/opentracing-cpp/opentracing-cpp.hash
index d25dbafee..c5085ba9c 100644
--- a/buildroot/package/opentracing-cpp/opentracing-cpp.hash
+++ b/buildroot/package/opentracing-cpp/opentracing-cpp.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 c77041cb2f147ac81b2b0702abfced5565a9cebc318d045c060a4c3e074009ee opentracing-cpp-v1.2.0.tar.gz
-sha256 b80bffcfee825a69645f7ca97ddba48714031ea5c845198d184714d5490798b6 COPYING
+sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-v1.5.1.tar.gz
+sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE
diff --git a/buildroot/package/opentracing-cpp/opentracing-cpp.mk b/buildroot/package/opentracing-cpp/opentracing-cpp.mk
index 4e296fc9f..a61993f7f 100644
--- a/buildroot/package/opentracing-cpp/opentracing-cpp.mk
+++ b/buildroot/package/opentracing-cpp/opentracing-cpp.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-OPENTRACING_CPP_VERSION = v1.2.0
+OPENTRACING_CPP_VERSION = v1.5.1
 OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,$(OPENTRACING_CPP_VERSION))
-OPENTRACING_CPP_LICENSE = MIT
-OPENTRACING_CPP_LICENSE_FILES = COPYING
+OPENTRACING_CPP_LICENSE = Apache-2.0
+OPENTRACING_CPP_LICENSE_FILES = LICENSE
 
 OPENTRACING_CPP_INSTALL_STAGING = YES
 
diff --git a/buildroot/package/openvmtools/0001-no_cflags_werror.patch b/buildroot/package/openvmtools/0001-no_cflags_werror.patch
index 1621574f8..3378cb8e7 100644
--- a/buildroot/package/openvmtools/0001-no_cflags_werror.patch
+++ b/buildroot/package/openvmtools/0001-no_cflags_werror.patch
@@ -4,8 +4,8 @@ Disable the mandatory flag -Werror in configure.ac.
 
 Signed-off-by: Karoly Kasza 
 
---- openvmtools-stable-9.10.0.orig/open-vm-tools/configure.ac	2015-06-17 10:02:00.000000000 +0200
-+++ openvmtools-stable-9.10.0/open-vm-tools/configure.ac	2015-06-17 10:02:00.000000000 +0200
+--- open-vm-tools/configure.ac	2015-06-17 10:02:00.000000000 +0200
++++ open-vm-tools/configure.ac	2015-06-17 10:02:00.000000000 +0200
 @@ -935,7 +935,7 @@
  
  ### General flags / actions
diff --git a/buildroot/package/openvmtools/0002-dont-force-cppflags.patch b/buildroot/package/openvmtools/0002-dont-force-cppflags.patch
index c8fa6b17c..eb2fe16ba 100644
--- a/buildroot/package/openvmtools/0002-dont-force-cppflags.patch
+++ b/buildroot/package/openvmtools/0002-dont-force-cppflags.patch
@@ -4,8 +4,8 @@ This is so horribly broken for cross-compilation. :-(
 
 Signed-off-by: "Yann E. MORIN" 
 
---- openvmtools-stable-9.10.0.orig/open-vm-tools/m4/vmtools.m4	2015-06-17 10:03:00.000000000 +0200
-+++ openvmtools-stable-9.10.0/open-vm-tools/m4/vmtools.m4	2015-06-17 10:03:00.000000000 +0200
+--- open-vm-tools/m4/vmtools.m4	2015-06-17 10:03:00.000000000 +0200
++++ open-vm-tools/m4/vmtools.m4	2015-06-17 10:03:00.000000000 +0200
 @@ -281,10 +281,10 @@
        if test "$os" = freebsd; then
           CUSTOM_$1_CPPFLAGS="-I/usr/local/include"
diff --git a/buildroot/package/openvmtools/0003-uclibc_secure_getenv.patch b/buildroot/package/openvmtools/0003-uclibc_secure_getenv.patch
deleted file mode 100644
index 6fb9ebd72..000000000
--- a/buildroot/package/openvmtools/0003-uclibc_secure_getenv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-lib/misc/idLinux.c: add uClibc support
-
-uClibc does not have a secure_getenv function, so we use the
-Android method.
-
-Signed-off-by: Karoly Kasza 
-
---- openvmtools-stable-9.10.0.orig/open-vm-tools/lib/misc/idLinux.c	2015-06-17 10:04:00.000000000 +0200
-+++ openvmtools-stable-9.10.0/open-vm-tools/lib/misc/idLinux.c		2015-06-17 10:04:00.000000000 +0200
-@@ -997,7 +997,7 @@
- static Bool
- IdIsSetUGid(void)
- {
--#if defined(__ANDROID__)
-+#if defined(__ANDROID__) || defined(__UCLIBC__)
-    /* Android does not have a secure_getenv, so be conservative. */
-    return TRUE;
- #else
diff --git a/buildroot/package/openvmtools/openvmtools.hash b/buildroot/package/openvmtools/openvmtools.hash
index 743b7dcad..bd81d1f05 100644
--- a/buildroot/package/openvmtools/openvmtools.hash
+++ b/buildroot/package/openvmtools/openvmtools.hash
@@ -1,2 +1,3 @@
 # locally computed
-sha256 c0ecd281d6113ca700b1ab0a10559db72e80d8fc03264d53ebfdc400578ab1b6  openvmtools-stable-10.3.5.tar.gz
+sha256  364cd0fdfa5a05e872d08609659e6231ec99788669f7ebba24bfb8c94168daef  open-vm-tools-10.3.5-10430147.tar.gz
+sha256  f734933bd7d49aef25aaf897ed7281ee822e8635056e69b895a7d2e668937fc5  COPYING
diff --git a/buildroot/package/openvmtools/openvmtools.mk b/buildroot/package/openvmtools/openvmtools.mk
index f331c0ebc..0dc2956d0 100644
--- a/buildroot/package/openvmtools/openvmtools.mk
+++ b/buildroot/package/openvmtools/openvmtools.mk
@@ -4,13 +4,14 @@
 #
 ################################################################################
 
-OPENVMTOOLS_VERSION = stable-10.3.5
-OPENVMTOOLS_SITE = $(call github,vmware,open-vm-tools,$(OPENVMTOOLS_VERSION))
-OPENVMTOOLS_SUBDIR = open-vm-tools
+OPENVMTOOLS_VERSION_MAJOR = 10.3.5
+OPENVMTOOLS_VERSION = $(OPENVMTOOLS_VERSION_MAJOR)-10430147
+OPENVMTOOLS_SITE = https://github.com/vmware/open-vm-tools/releases/download/stable-$(OPENVMTOOLS_VERSION_MAJOR)
+OPENVMTOOLS_SOURCE = open-vm-tools-$(OPENVMTOOLS_VERSION).tar.gz
 OPENVMTOOLS_LICENSE = LGPL-2.1
-OPENVMTOOLS_LICENSE_FILES = $(OPENVMTOOLS_SUBDIR)/COPYING
+OPENVMTOOLS_LICENSE_FILES = COPYING
 
-# Autoreconf needed or config/missing will run configure again at buildtime
+# configure.ac is patched
 OPENVMTOOLS_AUTORECONF = YES
 OPENVMTOOLS_CONF_OPTS = --with-dnet \
 	--without-icu --without-x --without-gtk2 \
diff --git a/buildroot/package/openvmtools/vmtoolsd.service b/buildroot/package/openvmtools/vmtoolsd.service
index cb97357ec..1d2a3566c 100644
--- a/buildroot/package/openvmtools/vmtoolsd.service
+++ b/buildroot/package/openvmtools/vmtoolsd.service
@@ -5,8 +5,8 @@ ConditionVirtualization=vmware
 
 [Service]
 Type=forking
-PIDFile=/var/run/vmtoolsd.pid
-ExecStart=/usr/bin/vmtoolsd -b /var/run/vmtoolsd.pid
+PIDFile=/run/vmtoolsd.pid
+ExecStart=/usr/bin/vmtoolsd -b /run/vmtoolsd.pid
 Restart=on-failure
 KillMode=process
 KillSignal=SIGKILL
diff --git a/buildroot/package/openvpn/S60openvpn b/buildroot/package/openvpn/S60openvpn
old mode 100755
new mode 100644
diff --git a/buildroot/package/opus-tools/Config.in b/buildroot/package/opus-tools/Config.in
index 2552d1951..c045239ea 100644
--- a/buildroot/package/opus-tools/Config.in
+++ b/buildroot/package/opus-tools/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_OPUS_TOOLS
 	bool "opus-tools"
-	select BR2_PACKAGE_OPUS
 	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBOPUSENC
+	select BR2_PACKAGE_OPUS
+	select BR2_PACKAGE_OPUSFILE
 	help
 	  Opus codec command line tools. This package provides the
 	  reference implementations of encoder and decoder utilities
diff --git a/buildroot/package/opus-tools/opus-tools.hash b/buildroot/package/opus-tools/opus-tools.hash
index c7759e559..1b87458f5 100644
--- a/buildroot/package/opus-tools/opus-tools.hash
+++ b/buildroot/package/opus-tools/opus-tools.hash
@@ -1,5 +1,5 @@
 # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt
-sha256 a2357532d19471b70666e0e0ec17d514246d8b3cb2eb168f68bb0f6fd372b28c  opus-tools-0.1.10.tar.gz
+sha256 b4e56cb00d3e509acfba9a9b627ffd8273b876b4e2408642259f6da28fa0ff86  opus-tools-0.2.tar.gz
 
 # Hash for license file
-sha256 88021117568c64038175d7fb3b8286056f7cdb54f09dc806578f6bd9342c62cc  COPYING
+sha256 c28016e58544119d6b93aea28297d040f17dcef7a9f548d3e6a4d0b558c5d248  COPYING
diff --git a/buildroot/package/opus-tools/opus-tools.mk b/buildroot/package/opus-tools/opus-tools.mk
index ab00ced70..f69c3bef8 100644
--- a/buildroot/package/opus-tools/opus-tools.mk
+++ b/buildroot/package/opus-tools/opus-tools.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-OPUS_TOOLS_VERSION = 0.1.10
+OPUS_TOOLS_VERSION = 0.2
 OPUS_TOOLS_SITE = https://downloads.xiph.org/releases/opus
 OPUS_TOOLS_LICENSE = BSD-2-Clause, GPL-2.0 (opusinfo)
 OPUS_TOOLS_LICENSE_FILES = COPYING
 OPUS_TOOLS_CONF_OPTS = --disable-oggtest --disable-opustest
-OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf
+OPUS_TOOLS_DEPENDENCIES = libogg libopusenc opus opusfile host-pkgconf
 
 ifeq ($(BR2_PACKAGE_LIBPCAP),y)
 OPUS_TOOLS_DEPENDENCIES += libpcap
diff --git a/buildroot/package/opus/opus.hash b/buildroot/package/opus/opus.hash
index c1a92d6b9..2a94d3723 100644
--- a/buildroot/package/opus/opus.hash
+++ b/buildroot/package/opus/opus.hash
@@ -1,5 +1,5 @@
 # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt
-sha256 cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732  opus-1.2.1.tar.gz
+sha256 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d  opus-1.3.1.tar.gz
 
 # Hash for license file
 sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682  COPYING
diff --git a/buildroot/package/opus/opus.mk b/buildroot/package/opus/opus.mk
index 44de5db25..3fb2d5d65 100644
--- a/buildroot/package/opus/opus.mk
+++ b/buildroot/package/opus/opus.mk
@@ -4,12 +4,20 @@
 #
 ################################################################################
 
-OPUS_VERSION = 1.2.1
+OPUS_VERSION = 1.3.1
 OPUS_SITE = https://downloads.xiph.org/releases/opus
 OPUS_LICENSE = BSD-3-Clause
 OPUS_LICENSE_FILES = COPYING
 OPUS_INSTALL_STAGING = YES
 
+OPUS_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+OPUS_CFLAGS += -O0
+endif
+
+OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)"
+
 ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y)
 OPUS_CONF_OPTS += --enable-fixed-point
 endif
diff --git a/buildroot/package/opusfile/opusfile.hash b/buildroot/package/opusfile/opusfile.hash
index f1fcf5f9d..e9ecf83fe 100644
--- a/buildroot/package/opusfile/opusfile.hash
+++ b/buildroot/package/opusfile/opusfile.hash
@@ -1,5 +1,5 @@
 # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt
-sha256 48e03526ba87ef9cf5f1c47b5ebe3aa195bd89b912a57060c36184a6cd19412f  opusfile-0.10.tar.gz
+sha256 74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf  opusfile-0.11.tar.gz
 
 # Hash for license file
 sha256 0267ae795ab744c4e0f9c45e249440fdf2e75dac8c804f36066b28649bf74aaf  COPYING
diff --git a/buildroot/package/opusfile/opusfile.mk b/buildroot/package/opusfile/opusfile.mk
index 0cfe62394..49a53b395 100644
--- a/buildroot/package/opusfile/opusfile.mk
+++ b/buildroot/package/opusfile/opusfile.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPUSFILE_VERSION = 0.10
+OPUSFILE_VERSION = 0.11
 OPUSFILE_SITE = https://downloads.xiph.org/releases/opus
 OPUSFILE_DEPENDENCIES = host-pkgconf libogg opus
 OPUSFILE_LICENSE = BSD-3-Clause
diff --git a/buildroot/package/orbit/Config.in b/buildroot/package/orbit/Config.in
index 8df42a838..7b6e9a43f 100644
--- a/buildroot/package/orbit/Config.in
+++ b/buildroot/package/orbit/Config.in
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_ORBIT
 	bool "orbit"
 	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
-	# These are runtime dependencies
-	select BR2_PACKAGE_LPEG
-	select BR2_PACKAGE_LUAFILESYSTEM
-	select BR2_PACKAGE_WSAPI_XAVANTE
+	select BR2_PACKAGE_LPEG # runtime
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
+	select BR2_PACKAGE_WSAPI_XAVANTE # runtime
 	help
 	  An MVC web framework for Lua. The design is inspired by
 	  lightweight Ruby frameworks such as Camping
diff --git a/buildroot/package/orbit/orbit.hash b/buildroot/package/orbit/orbit.hash
index 9662a650a..eb427b63b 100644
--- a/buildroot/package/orbit/orbit.hash
+++ b/buildroot/package/orbit/orbit.hash
@@ -1,2 +1,4 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 91e3c514d5b86918db83666c8889635bb2d50c71d1ab3aeb69c6469c9424089b  orbit-2.2.4-1.src.rock
+sha256 dd7d37caed0f4ee994e9e64ea4ab292dce549bb609412c84fc47ed079275ae98  orbit/doc/us/license.html
+sha256 140134369c1f041abf7d8cd39a5b0c42f8b5e827695ce7c1ef5ca8f0911a0246  orbit/doc/us/license.md
diff --git a/buildroot/package/orbit/orbit.mk b/buildroot/package/orbit/orbit.mk
index 3329439db..5cf7ac643 100644
--- a/buildroot/package/orbit/orbit.mk
+++ b/buildroot/package/orbit/orbit.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-ORBIT_VERSION_UPSTREAM = 2.2.4
-ORBIT_VERSION = $(ORBIT_VERSION_UPSTREAM)-1
+ORBIT_VERSION = 2.2.4-1
 ORBIT_SUBDIR = orbit
 ORBIT_LICENSE = MIT
-ORBIT_LICENSE_FILES = $(ORBIT_SUBDIR)/doc/us/license.md
+ORBIT_LICENSE_FILES = \
+	$(ORBIT_SUBDIR)/doc/us/license.html \
+	$(ORBIT_SUBDIR)/doc/us/license.md
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/orc/orc.hash b/buildroot/package/orc/orc.hash
index f47a9cfe5..71dd3007c 100644
--- a/buildroot/package/orc/orc.hash
+++ b/buildroot/package/orc/orc.hash
@@ -1,2 +1,5 @@
 # From https://gstreamer.freedesktop.org/src/orc/orc-0.4.27.tar.xz.sha256sum
-sha256 51e53e58fc8158e5986a1f1a49a6d970c5b16493841cf7b9de2c2bde7ce36b93 orc-0.4.27.tar.xz
+sha256 4f8901f9144b5ec17dffdb33548b5f4c7f8049b0d1023be3462cdd64ec5a3ab2  orc-0.4.29.tar.xz
+
+# Locally calculated
+sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf  COPYING
diff --git a/buildroot/package/orc/orc.mk b/buildroot/package/orc/orc.mk
index ab718296a..d121266bc 100644
--- a/buildroot/package/orc/orc.mk
+++ b/buildroot/package/orc/orc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ORC_VERSION = 0.4.27
+ORC_VERSION = 0.4.29
 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz
 ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc
 ORC_LICENSE = BSD-2-Clause, BSD-3-Clause
diff --git a/buildroot/package/owfs/0001-configure.ac-check-for-localtime_r.patch b/buildroot/package/owfs/0001-configure.ac-check-for-localtime_r.patch
deleted file mode 100644
index b25aa5987..000000000
--- a/buildroot/package/owfs/0001-configure.ac-check-for-localtime_r.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 75e92438bcdb78a90912366b07bf503646806686 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" 
-Date: Sun, 21 Feb 2016 17:02:06 +0100
-Subject: [PATCH] configure.ac: check for localtime_r
-
-HAVE_LOCALTIME_R is used in owftp.c, so it should be checked for.
-
-Without this, static build fails because localtime_r is defined twice.
-
-Upstream-Status: Submitted
-https://sourceforge.net/p/owfs/mailman/message/34873667/
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) 
-[Bernd: rebased against version 3.2p1]
-Signed-off-by: Bernd Kuhls 
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c22dde9..12fdd18 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1646,7 +1646,7 @@
- AC_FUNC_STRFTIME
- AC_FUNC_STRTOD
- AC_TYPE_SIGNAL
--AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gmtime_r gettimeofday localtime_r inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline])
-+AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gmtime_r gettimeofday localtime_r inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline localtime_r])
- 
- save_LIBS="$LIBS"
- LIBS=""
--- 
-2.7.0
-
diff --git a/buildroot/package/owfs/0002-include-sys-sysmacros.h-for-major.patch b/buildroot/package/owfs/0001-include-sys-sysmacros.h-for-major.patch
similarity index 100%
rename from buildroot/package/owfs/0002-include-sys-sysmacros.h-for-major.patch
rename to buildroot/package/owfs/0001-include-sys-sysmacros.h-for-major.patch
diff --git a/buildroot/package/owfs/S25owserver b/buildroot/package/owfs/S55owserver
old mode 100755
new mode 100644
similarity index 100%
rename from buildroot/package/owfs/S25owserver
rename to buildroot/package/owfs/S55owserver
diff --git a/buildroot/package/owfs/S30owfs b/buildroot/package/owfs/S60owfs
old mode 100755
new mode 100644
similarity index 100%
rename from buildroot/package/owfs/S30owfs
rename to buildroot/package/owfs/S60owfs
diff --git a/buildroot/package/owfs/owfs.mk b/buildroot/package/owfs/owfs.mk
index e12014715..fccc2efa5 100644
--- a/buildroot/package/owfs/owfs.mk
+++ b/buildroot/package/owfs/owfs.mk
@@ -9,7 +9,7 @@ OWFS_SITE = http://downloads.sourceforge.net/project/owfs/owfs/$(OWFS_VERSION)
 OWFS_DEPENDENCIES = host-pkgconf
 OWFS_CONF_OPTS = --disable-owperl --without-perl5 --disable-owtcl --without-tcl
 
-# 0001-configure.ac-check-for-localtime_r.patch touches configure.ac
+# We're patching configure.ac
 OWFS_AUTORECONF = YES
 
 # owtcl license is declared in module/ownet/c/src/include/ow_functions.h
@@ -31,8 +31,8 @@ OWFS_CONF_OPTS += \
 	--with-fuseinclude=$(STAGING_DIR)/usr/include \
 	--with-fuselib=$(STAGING_DIR)/usr/lib
 define OWFS_INSTALL_FUSE_INIT_SYSV
-	$(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S30owfs \
-		$(TARGET_DIR)/etc/init.d/S30owfs
+	$(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S60owfs \
+		$(TARGET_DIR)/etc/init.d/S60owfs
 endef
 define OWFS_CREATE_MOUNTPOINT
 	mkdir -p $(TARGET_DIR)/dev/1wire
@@ -42,6 +42,20 @@ else
 OWFS_CONF_OPTS += --disable-owfs
 endif
 
+ifeq ($(BR2_PACKAGE_LIBFTDI1),y)
+OWFS_CONF_OPTS += \
+	--enable-ftdi \
+	--with-libftdi-config=$(STAGING_DIR)/usr/bin/libftdi1-config
+OWFS_DEPENDENCIES += libftdi1
+else ifeq ($(BR2_PACKAGE_LIBFTDI),y)
+OWFS_CONF_OPTS += \
+	--enable-ftdi \
+	--with-libftdi-config=$(STAGING_DIR)/usr/bin/libftdi-config
+OWFS_DEPENDENCIES += libftdi
+else
+OWFS_CONF_OPTS += --disable-ftdi
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 OWFS_CONF_OPTS += --enable-usb
 OWFS_DEPENDENCIES += libusb
@@ -88,8 +102,8 @@ endif
 OWFS_MAKE = $(MAKE) $(OWFS_EXTRA_MAKE_OPTS)
 
 define OWFS_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S25owserver \
-		$(TARGET_DIR)/etc/init.d/S25owserver
+	$(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S55owserver \
+		$(TARGET_DIR)/etc/init.d/S55owserver
 	$(OWFS_INSTALL_FUSE_INIT_SYSV)
 endef
 
diff --git a/buildroot/package/paho-mqtt-c/0001-Declare-mqtt-tests-as-a-C-only-project.patch b/buildroot/package/paho-mqtt-c/0001-Declare-mqtt-tests-as-a-C-only-project.patch
deleted file mode 100644
index 9edb2c4a8..000000000
--- a/buildroot/package/paho-mqtt-c/0001-Declare-mqtt-tests-as-a-C-only-project.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6556e62a07972eafccaefdcdf32bd0d386c64ca2 Mon Sep 17 00:00:00 2001
-From: Yegor Yefremov 
-Date: Wed, 13 Sep 2017 07:59:50 +0200
-Subject: [PATCH] Declare mqtt-tests as a C-only project
-
-This way CMake doesn't break the build on the systems without
-C++ compiler.
-
-Signed-off-by: Yegor Yefremov 
-Reported-by: Marcus Hoffmann 
----
- test/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 5c88c44..3aca80f 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -1,4 +1,4 @@
--PROJECT(mqtt-tests)
-+PROJECT(mqtt-tests C)
- 
- IF (WIN32)
-   SET(MQTT_TEST_BROKER "tcp://mqtt.iotree.co.uk:1883" CACHE STRING "Hostname of a test MQTT broker to use")
--- 
-2.1.4
-
diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash
index 3bee8914f..d628d0661 100644
--- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash
+++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash
@@ -1,4 +1,4 @@
 # Locally computed:
-sha256  0cb0396554ebe0e8ac6b0de1cbc16601ef169b6a63baf6f0f3ddeb405f5471a5  paho-mqtt-c-v1.2.0.tar.gz
+sha256  87cf846b02dde6328b84832287d8725d91f12f41366eecb4d59eeda1d6c7efdf  paho-mqtt-c-v1.3.0.tar.gz
 sha256  83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c  edl-v10
 sha256  44277b2bec6093e4ac313afec251a4de599d24c4e768f8574d95b13a9d2d97b5  epl-v10
diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk
index 5df7a55c6..9e8ae2999 100644
--- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk
+++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PAHO_MQTT_C_VERSION = v1.2.0
+PAHO_MQTT_C_VERSION = v1.3.0
 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,$(PAHO_MQTT_C_VERSION))
 PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3-Clause
 PAHO_MQTT_C_LICENSE_FILES = epl-v10 edl-v10
diff --git a/buildroot/package/pamtester/Config.in b/buildroot/package/pamtester/Config.in
new file mode 100644
index 000000000..19b76d3f5
--- /dev/null
+++ b/buildroot/package/pamtester/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_PAMTESTER
+	bool "pamtester"
+	depends on BR2_PACKAGE_LINUX_PAM
+	help
+	  A tiny utility for testing pluggable authentication modules
+	  (PAM) facility. While specifically designed to help PAM module
+	  authors to test their modules, that might also be handy for
+	  system administrators interested in building a centralised
+	  authentication system using common standards such as NIS, SASL
+	  and LDAP.
+
+	  http://pamtester.sourceforge.net/
+
+comment "pamtester depends on linux-pam"
+	depends on !BR2_PACKAGE_LINUX_PAM
diff --git a/buildroot/package/pamtester/pamtester.hash b/buildroot/package/pamtester/pamtester.hash
new file mode 100644
index 000000000..17497e315
--- /dev/null
+++ b/buildroot/package/pamtester/pamtester.hash
@@ -0,0 +1,3 @@
+# from https://sourceforge.net/projects/pamtester/files/pamtester/0.1.2/
+sha1   33bcc610d7f208b50a0a23c144bdbd1e2cae4ac6  pamtester-0.1.2.tar.gz
+sha256 1e3922a8ab0907c1f3bcc3e00005ef88930e50d0890f40a6a39f5f83b05f05cc LICENSE
diff --git a/buildroot/package/pamtester/pamtester.mk b/buildroot/package/pamtester/pamtester.mk
new file mode 100644
index 000000000..b09e4d1cc
--- /dev/null
+++ b/buildroot/package/pamtester/pamtester.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# pamtester
+#
+################################################################################
+
+PAMTESTER_VERSION = 0.1.2
+PAMTESTER_SITE = https://download.sourceforge.net/project/pamtester/pamtester/$(PAMTESTER_VERSION)
+PAMTESTER_DEPENDENCIES = linux-pam
+PAMTESTER_LICENSE = BSD-3-Clause
+PAMTESTER_LICENSE_FILES = LICENSE
+
+$(eval $(autotools-package))
diff --git a/buildroot/package/pango/0002-Prevent-an-assertion-with-invalid-Unicode-sequences.patch b/buildroot/package/pango/0002-Prevent-an-assertion-with-invalid-Unicode-sequences.patch
new file mode 100644
index 000000000..010981e8b
--- /dev/null
+++ b/buildroot/package/pango/0002-Prevent-an-assertion-with-invalid-Unicode-sequences.patch
@@ -0,0 +1,38 @@
+From 71aaeaf020340412b8d012fe23a556c0420eda5f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen 
+Date: Fri, 17 Aug 2018 22:29:36 -0400
+Subject: [PATCH] Prevent an assertion with invalid Unicode sequences
+
+Invalid Unicode sequences, such as 0x2665 0xfe0e 0xfe0f,
+can trick the Emoji iter code into returning an empty
+segment, which then triggers an assertion in the itemizer.
+
+Prevent this by ensuring that we make progress.
+
+This issue was reported by Jeffrey M.
+
+Signed-off-by: Peter Korsgaard 
+---
+ pango/pango-emoji.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/pango/pango-emoji.c b/pango/pango-emoji.c
+index 0e332dff..29472452 100644
+--- a/pango/pango-emoji.c
++++ b/pango/pango-emoji.c
+@@ -253,6 +253,12 @@ _pango_emoji_iter_next (PangoEmojiIter *iter)
+     if (iter->is_emoji == PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type))
+     {
+       iter->is_emoji = !PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type);
++
++      /* Make sure we make progress.  Weird sequences, like a VC15 followed
++       * by VC16, can trick us into stalling otherwise. */
++      if (iter->start == iter->end)
++        iter->end = g_utf8_next_char (iter->end);
++
+       return TRUE;
+     }
+   }
+-- 
+2.11.0
+
diff --git a/buildroot/package/patchelf/patchelf.mk b/buildroot/package/patchelf/patchelf.mk
index 74e6cccdb..52912e295 100644
--- a/buildroot/package/patchelf/patchelf.mk
+++ b/buildroot/package/patchelf/patchelf.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 PATCHELF_VERSION = 0.9
-PATCHELF_SITE = http://releases.nixos.org/patchelf/patchelf-$(PATCHELF_VERSION)
+PATCHELF_SITE = https://nixos.org/releases/patchelf/patchelf-$(PATCHELF_VERSION)
 PATCHELF_SOURCE = patchelf-$(PATCHELF_VERSION).tar.bz2
 PATCHELF_LICENSE = GPL-3.0+
 PATCHELF_LICENSE_FILES = COPYING
diff --git a/buildroot/package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch b/buildroot/package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch
new file mode 100644
index 000000000..933eec023
--- /dev/null
+++ b/buildroot/package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch
@@ -0,0 +1,46 @@
+From 53b6161d2413406778fa222274069c82846f0297 Mon Sep 17 00:00:00 2001
+From: Carlos Santos 
+Date: Thu, 6 Dec 2018 21:17:02 -0200
+Subject: [PATCH] Look for pcm-core at the default path
+
+On Buildroot, pcm-core.x is installed as /usr/bin/pcm-core. Remove the
+platform test, since we know that it's neither CigWin nor Windows, and
+use the default path.
+
+It's not nice to have a Buildroot specific patch but let's use one while
+we look for a solution that is acceptable upstream.
+
+Signed-off-by: Carlos Santos 
+---
+ pmu-query.py | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/pmu-query.py b/pmu-query.py
+index 4c596c7..dc39df6 100755
+--- a/pmu-query.py
++++ b/pmu-query.py
+@@ -3,7 +3,6 @@ import urllib2
+ import json, csv
+ import subprocess
+ import sys
+-import platform
+ import getopt
+ 
+ all_flag = False
+@@ -38,12 +37,7 @@ if filename == None:
+         except StopIteration:
+             break
+ 
+-    if platform.system() == 'CYGWIN_NT-6.1':
+-        p = subprocess.Popen(['./pcm-core.exe -c'],stdout=subprocess.PIPE,shell=True) 
+-    elif platform.system() == 'Windows':
+-        p = subprocess.Popen(['pcm-core.exe -c'],stdout=subprocess.PIPE,shell=True)
+-    else:
+-        p = subprocess.Popen(['./pcm-core.x -c'],stdout=subprocess.PIPE,shell=True)
++    p = subprocess.Popen(['/usr/bin/pcm-core -c'],stdout=subprocess.PIPE,shell=True)
+ 
+     (output, err) = p.communicate()
+     p_status = p.wait()
+-- 
+2.19.2
+
diff --git a/buildroot/package/pcm-tools/Config.in b/buildroot/package/pcm-tools/Config.in
new file mode 100644
index 000000000..f347a265a
--- /dev/null
+++ b/buildroot/package/pcm-tools/Config.in
@@ -0,0 +1,33 @@
+comment "pcm-tools needs a toolchain w/ C++"
+	depends on BR2_i386 || BR2_x86_64
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_PCM_TOOLS
+	bool "pcm-tools"
+	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_HWDATA
+	select BR2_PACKAGE_HWDATA_PCI_IDS
+	help
+	  Processor Counter Monitor (PCM) is an application programming
+	  interface (API) and a set of tools based on the API to monitor
+	  performance and energy metrics of Intel(R) Core(TM), Xeon(R),
+	  Atom(TM) and Xeon Phi(TM) processors.
+
+	  https://github.com/opcm/pcm
+
+if BR2_PACKAGE_PCM_TOOLS
+
+# The pmu-query script is not compatible with Python 3
+config BR2_PACKAGE_PCM_TOOLS_PMU_QUERY
+	bool "install the pmu-query script"
+	default y
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_CA_CERTIFICATES # https
+	select BR2_PACKAGE_PYTHON_HASHLIB # urllib2
+	select BR2_PACKAGE_PYTHON_SSL # urllib2
+
+comment "pmu-query needs Python 2.x"
+	depends on !BR2_PACKAGE_PYTHON
+
+endif
diff --git a/buildroot/package/pcm-tools/pcm-tools.hash b/buildroot/package/pcm-tools/pcm-tools.hash
new file mode 100644
index 000000000..77f148246
--- /dev/null
+++ b/buildroot/package/pcm-tools/pcm-tools.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 798eb1bc5d9c34fa107de21b2100e8d4326cb45b613bc35baa1e1efb1dd13b04  pcm-tools-201812.tar.gz
+sha256 fac73f62c4d665c82622862a2be2b89713e0f480c93e593af2d8ef29a13d814b  LICENSE
diff --git a/buildroot/package/pcm-tools/pcm-tools.mk b/buildroot/package/pcm-tools/pcm-tools.mk
new file mode 100644
index 000000000..6d5938f94
--- /dev/null
+++ b/buildroot/package/pcm-tools/pcm-tools.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# pcm-tools
+#
+################################################################################
+
+PCM_TOOLS_VERSION = 201812
+PCM_TOOLS_SITE = $(call github,opcm,pcm,$(PCM_TOOLS_VERSION))
+PCM_TOOLS_LICENSE = BSD-3-Clause
+PCM_TOOLS_LICENSE_FILES = LICENSE
+
+PCM_TOOLS_EXE_FILES = \
+	pcm-core pcm-iio pcm-lspci pcm-memory pcm-msr pcm-numa \
+	pcm-pcicfg pcm-pcie pcm-power pcm-sensor pcm-tsx pcm
+
+define PCM_TOOLS_BUILD_CMDS
+	touch $(@D)/daemon-binaries
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \
+		UNAME=Linux HOST=_LINUX
+endef
+
+ifeq ($(BR2_PACKAGE_PCM_TOOLS_PMU_QUERY),y)
+define PCM_TOOLS_INSTALL_PMU_QUERY
+	$(INSTALL) -D -m 755 $(@D)/pmu-query.py $(TARGET_DIR)/usr/bin/pmu-query
+endef
+endif
+
+define PCM_TOOLS_INSTALL_TARGET_CMDS
+	$(foreach f,$(PCM_TOOLS_EXE_FILES),\
+		$(INSTALL) -D -m 755 $(@D)/$(f).x $(TARGET_DIR)/usr/bin/$(f)
+	)
+	$(PCM_TOOLS_INSTALL_PMU_QUERY)
+endef
+
+$(eval $(generic-package))
diff --git a/buildroot/package/pcre2/0001-fix-heapframe-alignment.patch b/buildroot/package/pcre2/0001-fix-heapframe-alignment.patch
deleted file mode 100644
index a10e9e793..000000000
--- a/buildroot/package/pcre2/0001-fix-heapframe-alignment.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-src/pcre2_intmodedep.h: fix alignment of fields in struct heapframe
-
-pcre2_intmodedep.h has a check to verify that the size of the struct
-heapframe is a multiple of 4 bytes. On most architectures this works
-fine, but not on m68k. Indeed, when building the 16-bit variant of
-pcre2, the heapframe structure contains:
-
- PCRE2_UCHAR occu[2];
- PCRE2_SPTR  eptr;
-
-Where PCRE2_UCHAR is a 16-bit data type, and PCRE2_SPTR is a
-pointer. The occu[] array starts at byte 0x32, so not aligned on a
-32-bit boundary. With 2 x 16-bit, the occur[] array ends at byte 0x36.
-
-Now, on most architectures, the alignment required for a pointer will
-make the eptr field start at 0x38 (on 32 bit architectures). However,
-on m68k, it is fine to have a pointer aligned only on a 16-bit
-boundary, and the eptr pointer will be at offset 0x36.
-
-This doesn't cause a problem per-se, but breaks the check that
-heapframe should be a multiple of 4 bytes.
-
-To fix this, we make sure eptr is aligned by introducing an unused
-field of 16 bits after the occu[] array (in the 16-bit variant) or
-after the occu[] array (in the 32-bit variant). These choices have
-been made to keep the structure layout unchanged.
-
-Fixes the following build failure on m68k:
-
-src/pcre2_intmodedep.h:818:14: error: size of array 'check_heapframe_size' is negative
- typedef char check_heapframe_size[
-              ^~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Thomas Petazzoni 
-Upstream: https://bugs.exim.org/show_bug.cgi?id=2247
-
-Index: src/pcre2_intmodedep.h
-===================================================================
---- a/src/pcre2_intmodedep.h	(revision 923)
-+++ b/src/pcre2_intmodedep.h	(working copy)
-@@ -797,7 +797,9 @@
-   PCRE2_UCHAR occu[6];       /* Used for other case code units */
- #elif PCRE2_CODE_UNIT_WIDTH == 16
-   PCRE2_UCHAR occu[2];       /* Used for other case code units */
-+  uint8_t     unused[2];     /* Ensure 32 bit alignment */
- #else
-+  uint8_t     unused[2];     /* Ensure 32 bit alignment */
-   PCRE2_UCHAR occu[1];       /* Used for other case code units */
- #endif
diff --git a/buildroot/package/pcre2/pcre2.hash b/buildroot/package/pcre2/pcre2.hash
index 210e2e58c..a3210b184 100644
--- a/buildroot/package/pcre2/pcre2.hash
+++ b/buildroot/package/pcre2/pcre2.hash
@@ -1,4 +1,4 @@
-# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.31.tar.bz2.sig
-sha256 e07d538704aa65e477b6a392b32ff9fc5edf75ab9a40ddfc876186c4ff4d68ac  pcre2-10.31.tar.bz2
+# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.32.tar.bz2.sig
+sha256 f29e89cc5de813f45786580101aaee3984a65818631d4ddbda7b32f699b87c2e  pcre2-10.32.tar.bz2
 # Locally computed
-sha256 4806d1c067bffe106d97dac68744373a866bfdd65486c0532ed1b41595ec4b64  LICENCE
+sha256 c4a8b89cd38d6a7501d5b11a472fa15e71a051b66d6331c6cda364101389d6ee  LICENCE
diff --git a/buildroot/package/pcre2/pcre2.mk b/buildroot/package/pcre2/pcre2.mk
index 49ece6b9d..ee3cacb9a 100644
--- a/buildroot/package/pcre2/pcre2.mk
+++ b/buildroot/package/pcre2/pcre2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PCRE2_VERSION = 10.31
+PCRE2_VERSION = 10.32
 PCRE2_SITE = https://ftp.pcre.org/pub/pcre
 PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2
 PCRE2_LICENSE = BSD-3-Clause
diff --git a/buildroot/package/pcsc-lite/0001-Add-disable-documentation-option.patch b/buildroot/package/pcsc-lite/0001-Add-disable-documentation-option.patch
new file mode 100644
index 000000000..6a083f5aa
--- /dev/null
+++ b/buildroot/package/pcsc-lite/0001-Add-disable-documentation-option.patch
@@ -0,0 +1,63 @@
+From 77ac8fcb78e3085577cd4eb5c4ac7746a5444f13 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 17 May 2019 15:48:35 +0200
+Subject: [PATCH] Add --disable-documentation option
+
+This option allows the user to disable man pages which can be useful if
+podman is not available
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/LudovicRousseau/PCSC/pull/60]
+---
+ configure.ac        | 7 +++++++
+ src/spy/Makefile.am | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0fa5168..7d20c6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -144,6 +144,12 @@ esac
+ AC_DEFINE_UNQUOTED(PCSC_ARCH, "$PCSC_ARCH", [PC/SC target architecture])
+ PCSCLITE_FEATURES="${PCSCLITE_FEATURES} $PCSC_ARCH $host"
+ 
++# --disable-documentation
++AC_ARG_ENABLE(documentation,
++	AS_HELP_STRING([--disable-documentation],[do not build documentation]),
++	[ enable_doc="${enableval}" ], [ enable_doc="yes" ] )
++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
++
+ # See if socket() is found from libsocket
+ AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
+ 
+@@ -446,6 +452,7 @@ use libsystemd:         ${use_libsystemd}
+ systemd unit directory: ${with_systemdsystemunitdir}
+ serial config dir.:     ${confdir_exp}
+ filter:                 ${use_filter}
++documentation:          ${enable_doc}
+ 
+ PCSCLITE_FEATURES:      ${PCSCLITE_FEATURES}
+ 
+diff --git a/src/spy/Makefile.am b/src/spy/Makefile.am
+index 3c3daee..0a83371 100644
+--- a/src/spy/Makefile.am
++++ b/src/spy/Makefile.am
+@@ -6,6 +6,7 @@ dist_bin_SCRIPTS = pcsc-spy
+ libpcscspy_la_SOURCES = \
+ 	libpcscspy.c
+ 
++if ENABLE_DOC
+ man_MANS = pcsc-spy.1
+ 
+ pcsc-spy.1: pcsc-spy.pod
+@@ -13,6 +14,7 @@ pcsc-spy.1: pcsc-spy.pod
+ 		--center="PC/SC lite" \
+ 		--release="$(PACKAGE_NAME) $(PACKAGE_VERSION)" \
+ 		$(srcdir)/pcsc-spy.pod > $@
++endif
+ 
+ EXTRA_DIST = install_spy.sh uninstall_spy.sh pcsc-spy.pod
+ CLEANFILES = pcsc-spy.1
+-- 
+2.20.1
+
diff --git a/buildroot/package/pcsc-lite/0001-pthread-needed-for-libusb.patch b/buildroot/package/pcsc-lite/0001-pthread-needed-for-libusb.patch
deleted file mode 100644
index acb777aa4..000000000
--- a/buildroot/package/pcsc-lite/0001-pthread-needed-for-libusb.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-configure.ac: explicitly add pthread cflags/libs in the libusb test
-
-If libusb-config does not exist, LIBUSB_CFLAGS and PTHREAD_CFLAGS will be
-empty, and the test for libusb will be performed without additional flags.
-However, when libusb needs threads, some extra flags are needed (depending
-on the platform), like -pthreads, -lpthread, etc. Without these flags, the
-test for libusb_init() will fail to link correctly, and pcsc-lite will fail
-detecting libusb.
-
-Signed-off-by: Thomas De Schampheleire 
-
-Upstream-status: will be submitted
-
----
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -254,8 +254,8 @@ if test "x$use_libusb" != xno ; then
- 	saved_CPPFLAGS="$CPPFLAGS"
- 	saved_LIBS="$LIBS"
- 
--	CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS"
--	LIBS="$LDFLAGS $LIBUSB_LIBS"
-+	CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS $PTHREAD_CFLAGS"
-+	LIBS="$LDFLAGS $LIBUSB_LIBS $PTHREAD_LIBS"
- 
- 	AC_CHECK_HEADERS(libusb.h, [],
- 		[ AC_MSG_ERROR([libusb.h not found, use ./configure LIBUSB_CFLAGS=...]) ])
diff --git a/buildroot/package/pcsc-lite/pcsc-lite.hash b/buildroot/package/pcsc-lite/pcsc-lite.hash
index fe5ce9469..7e209f8cd 100644
--- a/buildroot/package/pcsc-lite/pcsc-lite.hash
+++ b/buildroot/package/pcsc-lite/pcsc-lite.hash
@@ -1,3 +1,4 @@
 # Locally calculated
-sha256 5a27262586eff39cfd5c19aadc8891dd71c0818d3d629539bd631b958be689c9  pcsc-lite-1.8.23.tar.bz2
-sha256 2ce8f52bc5afa74f223121955e4e6328c432b16044ea535acd550435dda2b5db  COPYING
+sha256 d76d79edc31cf76e782b9f697420d3defbcc91778c3c650658086a1b748e8792  pcsc-lite-1.8.25.tar.bz2
+sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1  COPYING
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  GPL-3.0.txt
diff --git a/buildroot/package/pcsc-lite/pcsc-lite.mk b/buildroot/package/pcsc-lite/pcsc-lite.mk
index 0d55d4b70..e819a9391 100644
--- a/buildroot/package/pcsc-lite/pcsc-lite.mk
+++ b/buildroot/package/pcsc-lite/pcsc-lite.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-PCSC_LITE_VERSION = 1.8.23
+PCSC_LITE_VERSION = 1.8.25
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkgconf
-PCSC_LITE_LICENSE = BSD-3-Clause
-PCSC_LITE_LICENSE_FILES = COPYING
+PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (demo, spy, tests), ISC (simclist)
+PCSC_LITE_LICENSE_FILES = COPYING GPL-3.0.txt
 PCSC_LITE_AUTORECONF = YES
 
 # - libudev and libusb are optional
diff --git a/buildroot/package/perl-date-manip/perl-date-manip.hash b/buildroot/package/perl-date-manip/perl-date-manip.hash
index 6fb8a1896..b290e8ea2 100644
--- a/buildroot/package/perl-date-manip/perl-date-manip.hash
+++ b/buildroot/package/perl-date-manip/perl-date-manip.hash
@@ -1,6 +1,6 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    0f85b1d9236e22a53dcb1c7f4b4fed77 Date-Manip-6.73.tar.gz
-sha256 d39295c7c3f19b43470d1203dded8cb649b41a1098e51b5b7c7cf17b662ca255 Date-Manip-6.73.tar.gz
+md5    d922d5fe4a00521dc171ac3ee65a9d61 Date-Manip-6.75.tar.gz
+sha256 c1fbcfbe2ab1a84e57f191807e87c97985da00926f64d1aae598c8756acbb67d Date-Manip-6.75.tar.gz
 
 # computed by scancpan
 sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE
diff --git a/buildroot/package/perl-date-manip/perl-date-manip.mk b/buildroot/package/perl-date-manip/perl-date-manip.mk
index 5e34ba4da..cc668184e 100644
--- a/buildroot/package/perl-date-manip/perl-date-manip.mk
+++ b/buildroot/package/perl-date-manip/perl-date-manip.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_DATE_MANIP_VERSION = 6.73
+PERL_DATE_MANIP_VERSION = 6.75
 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz
 PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK
 PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+
diff --git a/buildroot/package/perl-file-slurp/perl-file-slurp.hash b/buildroot/package/perl-file-slurp/perl-file-slurp.hash
index 617973191..4ed670ec7 100644
--- a/buildroot/package/perl-file-slurp/perl-file-slurp.hash
+++ b/buildroot/package/perl-file-slurp/perl-file-slurp.hash
@@ -1,6 +1,6 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    5c08acb15544113657994960f16c8910 File-Slurp-9999.23.tar.gz
-sha256 9eb73287890e172c4e39ce069f0e6a82da90df20dc7e2d52c666e9b07489a7f7 File-Slurp-9999.23.tar.gz
+md5    52afbe79bbf2b86c11ac4986030a9275 File-Slurp-9999.25.tar.gz
+sha256 c7ea97bae61bc68404476ce69277f6f796d31ab58c9c40ee390d9d5a1c5ce3c1 File-Slurp-9999.25.tar.gz
 
 # computed by scancpan
-sha256 21eec4bf12d10c78042734c76873852aaffce278ad4fd90814d91b8c885e6ef3 README.md
+sha256 87744d1995d9a41ef32478c98f08167a13a1e09d96c3bb00ade315e3290facef README.md
diff --git a/buildroot/package/perl-file-slurp/perl-file-slurp.mk b/buildroot/package/perl-file-slurp/perl-file-slurp.mk
index fd80d4f6d..4ceba25f5 100644
--- a/buildroot/package/perl-file-slurp/perl-file-slurp.mk
+++ b/buildroot/package/perl-file-slurp/perl-file-slurp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_FILE_SLURP_VERSION = 9999.23
+PERL_FILE_SLURP_VERSION = 9999.25
 PERL_FILE_SLURP_SOURCE = File-Slurp-$(PERL_FILE_SLURP_VERSION).tar.gz
 PERL_FILE_SLURP_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CA/CAPOEIRAB
 PERL_FILE_SLURP_LICENSE = Artistic or GPL-1.0+
diff --git a/buildroot/package/perl-gd/perl-gd.hash b/buildroot/package/perl-gd/perl-gd.hash
index deeda0eb1..851aa6e57 100644
--- a/buildroot/package/perl-gd/perl-gd.hash
+++ b/buildroot/package/perl-gd/perl-gd.hash
@@ -1,6 +1,6 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    aa1488a54fd9baba7aadb53720675bdc GD-2.69.tar.gz
-sha256 ddb02d491cfd84d30448438c84239b0893d84e9576a90c3b5ed109420fae545d GD-2.69.tar.gz
+md5    d9596406f64e50b9ecef8d7cfbf0d99b GD-2.70.tar.gz
+sha256 66b26a322e1fd82ef874721dd5274effcc60eb0c0f3481bf88ddf91529b633e2 GD-2.70.tar.gz
 
 # computed by scancpan
 sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE
diff --git a/buildroot/package/perl-gd/perl-gd.mk b/buildroot/package/perl-gd/perl-gd.mk
index 751ea983e..755751713 100644
--- a/buildroot/package/perl-gd/perl-gd.mk
+++ b/buildroot/package/perl-gd/perl-gd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_GD_VERSION = 2.69
+PERL_GD_VERSION = 2.70
 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz
 PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
 PERL_GD_DEPENDENCIES = zlib libpng freetype gd
diff --git a/buildroot/package/perl-mojolicious/perl-mojolicious.hash b/buildroot/package/perl-mojolicious/perl-mojolicious.hash
index b406f6d82..e2eb158b1 100644
--- a/buildroot/package/perl-mojolicious/perl-mojolicious.hash
+++ b/buildroot/package/perl-mojolicious/perl-mojolicious.hash
@@ -1,6 +1,6 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    f1d22e9110f1b51f4be9a40a84391089 Mojolicious-8.04.tar.gz
-sha256 330e919f3caf62e03fdc545dda2e66f772f30192aed6c47e19fd78f67de557fb Mojolicious-8.04.tar.gz
+md5    00419dac75fec23d06fe8695e4bde303 Mojolicious-8.11.tar.gz
+sha256 d95f42aa901b9aba96880dae53fd77d89690cca65635ff93a47885a2c7b312f2 Mojolicious-8.11.tar.gz
 
 # computed by scancpan
 sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE
diff --git a/buildroot/package/perl-mojolicious/perl-mojolicious.mk b/buildroot/package/perl-mojolicious/perl-mojolicious.mk
index 8ea0c2e01..4ff942ce8 100644
--- a/buildroot/package/perl-mojolicious/perl-mojolicious.mk
+++ b/buildroot/package/perl-mojolicious/perl-mojolicious.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_MOJOLICIOUS_VERSION = 8.04
+PERL_MOJOLICIOUS_VERSION = 8.11
 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz
 PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI
 PERL_MOJOLICIOUS_LICENSE = Artistic-2.0
diff --git a/buildroot/package/perl-net-dns/perl-net-dns.hash b/buildroot/package/perl-net-dns/perl-net-dns.hash
index 7a2bba564..2a30ea7ba 100644
--- a/buildroot/package/perl-net-dns/perl-net-dns.hash
+++ b/buildroot/package/perl-net-dns/perl-net-dns.hash
@@ -1,6 +1,6 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    67af7e5c1c339f60c45c1054374bd8ee Net-DNS-1.18.tar.gz
-sha256 52ce1494fc9707fd5a60ed71db5cde727157b7f2363787d730d4d1bd9800a9d3 Net-DNS-1.18.tar.gz
+md5    8a40402888487b853f861d21433f341a Net-DNS-1.19.tar.gz
+sha256 206278bdd9a538bec3e45b50e80cc5a9d7dc6e70ebf0889ef78254f0f710ccd7 Net-DNS-1.19.tar.gz
 
 # computed by scancpan
 sha256 afa7d288df3e3edbdb34790407ba4a9c7750c2746059d9355f4168bfb3212583 README
diff --git a/buildroot/package/perl-net-dns/perl-net-dns.mk b/buildroot/package/perl-net-dns/perl-net-dns.mk
index 4e00b2f89..31db330b1 100644
--- a/buildroot/package/perl-net-dns/perl-net-dns.mk
+++ b/buildroot/package/perl-net-dns/perl-net-dns.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_NET_DNS_VERSION = 1.18
+PERL_NET_DNS_VERSION = 1.19
 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz
 PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS
 PERL_NET_DNS_LICENSE = MIT
diff --git a/buildroot/package/perl-package-stash/perl-package-stash.hash b/buildroot/package/perl-package-stash/perl-package-stash.hash
index 4d9b20287..be8760d2d 100644
--- a/buildroot/package/perl-package-stash/perl-package-stash.hash
+++ b/buildroot/package/perl-package-stash/perl-package-stash.hash
@@ -1,6 +1,6 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    7e47a8261312e1cf3d12bd2007916b66 Package-Stash-0.37.tar.gz
-sha256 06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c Package-Stash-0.37.tar.gz
+md5    dc2d802eea2cb0b52ed9c4dd178761dd Package-Stash-0.38.tar.gz
+sha256 c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f Package-Stash-0.38.tar.gz
 
 # computed by scancpan
-sha256 b4e0637ed96008ddcbf7e0ddeb73967df3d0b4dc62a6b7fdb86eac37018cb12e LICENSE
+sha256 13aab710649bae5a8bbb1ae725587ece773bf390537dba2da71247bd937d54b4 LICENSE
diff --git a/buildroot/package/perl-package-stash/perl-package-stash.mk b/buildroot/package/perl-package-stash/perl-package-stash.mk
index 26e8eb325..b1a83bd95 100644
--- a/buildroot/package/perl-package-stash/perl-package-stash.mk
+++ b/buildroot/package/perl-package-stash/perl-package-stash.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PERL_PACKAGE_STASH_VERSION = 0.37
+PERL_PACKAGE_STASH_VERSION = 0.38
 PERL_PACKAGE_STASH_SOURCE = Package-Stash-$(PERL_PACKAGE_STASH_VERSION).tar.gz
-PERL_PACKAGE_STASH_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DO/DOY
+PERL_PACKAGE_STASH_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER
 PERL_PACKAGE_STASH_LICENSE = Artistic or GPL-1.0+
 PERL_PACKAGE_STASH_LICENSE_FILES = LICENSE
 PERL_PACKAGE_STASH_DISTNAME = Package-Stash
diff --git a/buildroot/package/perl-time-hires/Config.in b/buildroot/package/perl-time-hires/Config.in
deleted file mode 100644
index db2ca039c..000000000
--- a/buildroot/package/perl-time-hires/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_PERL_TIME_HIRES
-	bool "perl-time-hires"
-	depends on !BR2_STATIC_LIBS
-	help
-	  High resolution alarm, sleep, gettimeofday, interval timers.
-
-	  https://metacpan.org/release/Time-HiRes
-
-comment "perl-time-hires needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
diff --git a/buildroot/package/perl-time-hires/perl-time-hires.hash b/buildroot/package/perl-time-hires/perl-time-hires.hash
deleted file mode 100644
index 426076668..000000000
--- a/buildroot/package/perl-time-hires/perl-time-hires.hash
+++ /dev/null
@@ -1,6 +0,0 @@
-# retrieved by scancpan from http://cpan.metacpan.org/
-md5    8f998cb60966c86e24c500016e4d1ce8 Time-HiRes-1.9758.tar.gz
-sha256 5bfa145bc11e70a8e337543b1084a293743a690691b568493455dedf58f34b1e Time-HiRes-1.9758.tar.gz
-
-# computed by scancpan
-sha256 ecc20782bd6c34d2d632356020f9ad0150c7ae1803ae9560258d76d4533030da README
diff --git a/buildroot/package/perl-time-hires/perl-time-hires.mk b/buildroot/package/perl-time-hires/perl-time-hires.mk
deleted file mode 100644
index 03322c3fb..000000000
--- a/buildroot/package/perl-time-hires/perl-time-hires.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# perl-time-hires
-#
-################################################################################
-
-PERL_TIME_HIRES_VERSION = 1.9758
-PERL_TIME_HIRES_SOURCE = Time-HiRes-$(PERL_TIME_HIRES_VERSION).tar.gz
-PERL_TIME_HIRES_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JH/JHI
-PERL_TIME_HIRES_LICENSE = Artistic or GPL-1.0+
-PERL_TIME_HIRES_LICENSE_FILES = README
-PERL_TIME_HIRES_DISTNAME = Time-HiRes
-
-$(eval $(perl-package))
diff --git a/buildroot/package/perl-type-tiny/perl-type-tiny.hash b/buildroot/package/perl-type-tiny/perl-type-tiny.hash
index a9e028f87..d6b3639dc 100644
--- a/buildroot/package/perl-type-tiny/perl-type-tiny.hash
+++ b/buildroot/package/perl-type-tiny/perl-type-tiny.hash
@@ -1,7 +1,7 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    fad12549fe5b904173e18a05e82e5166 Type-Tiny-1.004002.tar.gz
-sha256 e52c7e9593052aed157a15d473b5c25a1dbb3454bf3cd6913df94cc9bb2be707 Type-Tiny-1.004002.tar.gz
+md5    a7fe90a6d53d2cd57381e60e682f828f Type-Tiny-1.004004.tar.gz
+sha256 081281ea004cdd89003d938aa52c1398e24411dd8f7163b14d0977a13f7062be Type-Tiny-1.004004.tar.gz
 
 # computed by scancpan
-sha256 0caa5aef37fdb3eddc52419d193df594550c621b84f5990830482f9f8226adde COPYRIGHT
-sha256 c614dadb36b02257ab492e3d4341e52f3f03fe8147cafd2b7da03b3b5c0361e9 LICENSE
+sha256 57e58f271bf6bca0bb22ab9e72b04c9e12010b0a898453a2fcde49fb9ff28afc COPYRIGHT
+sha256 5c791221f0dde289392a38a5921b66d4a1be8248cc64ee6de15f3c2426892673 LICENSE
diff --git a/buildroot/package/perl-type-tiny/perl-type-tiny.mk b/buildroot/package/perl-type-tiny/perl-type-tiny.mk
index d3cdd28bd..aa7306416 100644
--- a/buildroot/package/perl-type-tiny/perl-type-tiny.mk
+++ b/buildroot/package/perl-type-tiny/perl-type-tiny.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_TYPE_TINY_VERSION = 1.004002
+PERL_TYPE_TINY_VERSION = 1.004004
 PERL_TYPE_TINY_SOURCE = Type-Tiny-$(PERL_TYPE_TINY_VERSION).tar.gz
 PERL_TYPE_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK
 PERL_TYPE_TINY_LICENSE = Artistic or GPL-1.0+
diff --git a/buildroot/package/perl-uri/perl-uri.hash b/buildroot/package/perl-uri/perl-uri.hash
index 4ef17ece6..02287a064 100644
--- a/buildroot/package/perl-uri/perl-uri.hash
+++ b/buildroot/package/perl-uri/perl-uri.hash
@@ -1,6 +1,6 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    892f7183b178af40f205ba37128225db URI-1.74.tar.gz
-sha256 a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d URI-1.74.tar.gz
+md5    c236e0142adecc1b1104da664bc43a79 URI-1.76.tar.gz
+sha256 b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e URI-1.76.tar.gz
 
 # computed by scancpan
 sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE
diff --git a/buildroot/package/perl-uri/perl-uri.mk b/buildroot/package/perl-uri/perl-uri.mk
index 5be440131..730b39052 100644
--- a/buildroot/package/perl-uri/perl-uri.mk
+++ b/buildroot/package/perl-uri/perl-uri.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PERL_URI_VERSION = 1.74
+PERL_URI_VERSION = 1.76
 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz
-PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER
+PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS
 PERL_URI_LICENSE = Artistic or GPL-1.0+
 PERL_URI_LICENSE_FILES = LICENSE
 PERL_URI_DISTNAME = URI
diff --git a/buildroot/package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch b/buildroot/package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch
deleted file mode 100644
index 5223b78c0..000000000
--- a/buildroot/package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ae65651eab053fc6dc4590dbb863a268215c1fc5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= 
-Date: Fri, 8 Jun 2018 11:45:40 +0100
-Subject: [PATCH] [PATCH] Remove existing files before overwriting them
-
-Archive should extract only the latest same-named entry.
-Extracted regular file should not be writtent into existing block
-device (or any other one).
-
-https://rt.cpan.org/Ticket/Display.html?id=125523
-
-[Peter: rewrite path to match perl tarball with sed 's|\(lib/Archive\)|cpan/Archive-Tar/\1|g']
-Signed-off-by: Chris 'BinGOs' Williams 
-Signed-off-by: Peter Korsgaard 
----
- cpan/Archive-Tar/lib/Archive/Tar.pm | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/cpan/Archive-Tar/lib/Archive/Tar.pm b/cpan/Archive-Tar/lib/Archive/Tar.pm
-index 6244369..a83975f 100644
---- a/cpan/Archive-Tar/lib/Archive/Tar.pm
-+++ b/cpan/Archive-Tar/lib/Archive/Tar.pm
-@@ -845,6 +845,20 @@ sub _extract_file {
-         return;
-     }
- 
-+    ### If a file system already contains a block device with the same name as
-+    ### the being extracted regular file, we would write the file's content
-+    ### to the block device. So remove the existing file (block device) now.
-+    ### If an archive contains multiple same-named entries, the last one
-+    ### should replace the previous ones. So remove the old file now.
-+    ### If the old entry is a symlink to a file outside of the CWD, the new
-+    ### entry would create a file there. This is CVE-2018-12015
-+    ### .
-+    if (-l $full || -e _) {
-+	if (!unlink $full) {
-+	    $self->_error( qq[Could not remove old file '$full': $!] );
-+	    return;
-+	}
-+    }
-     if( length $entry->type && $entry->is_file ) {
-         my $fh = IO::File->new;
-         $fh->open( $full, '>' ) or (
--- 
-2.11.0
-
diff --git a/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch b/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch
index 71560c5e0..178c7baa5 100644
--- a/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch
+++ b/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch
@@ -16,7 +16,7 @@ diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-M
 index d579256e86..48642e98fa 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-@@ -703,7 +703,7 @@ END
+@@ -702,7 +702,7 @@ END
          }
          if ($self->{PARENT}) {
              $self->{PARENT}->{CHILDREN}->{$newclass} = $self;
diff --git a/buildroot/package/perl/perl.hash b/buildroot/package/perl/perl.hash
index 6936b22e0..4604d2715 100644
--- a/buildroot/package/perl/perl.hash
+++ b/buildroot/package/perl/perl.hash
@@ -1,7 +1,7 @@
-# Hashes from: http://www.cpan.org/src/5.0/perl-5.26.2.tar.xz.{md5,sha1,sha256}.txt
-md5    1fa1b53eeff76aa37b17bfc9b2771671                                 perl-5.26.2.tar.xz
-sha1   bfa5c7921ed7bf5e035dbf2f7ff81367b81e372c                         perl-5.26.2.tar.xz
-sha256 0f8c0fb1b0db4681adb75c3ba0dd77a0472b1b359b9e80efd79fc27b4352132c perl-5.26.2.tar.xz
+# Hashes from: http://www.cpan.org/src/5.0/perl-5.28.2.tar.xz.{md5,sha1,sha256}.txt
+md5    6bb75770e9ba085b32bf13e4be71e4ac                                 perl-5.28.2.tar.xz
+sha1   e7be78eca9ac5596783e6abcf957408050a7b650                         perl-5.28.2.tar.xz
+sha256 0b0189bfa4b2da20e899b4bdd746ac402e8f746a58e4fcf5516484157f2aab07 perl-5.28.2.tar.xz
 
-# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.2/perl-cross-1.2.hash
-sha256	599077beb86af5e6097da8922a84474a5484f61475d2899eae0f8634e9619109  perl-cross-1.2.tar.gz
+# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.hash
+sha256 84583a1bb5f3a2c64d13d031386c114382e5c62955c6f84a27cec8318536627c perl-cross-1.2.3.tar.gz
diff --git a/buildroot/package/perl/perl.mk b/buildroot/package/perl/perl.mk
index b0eea3eff..ecb21c4b8 100644
--- a/buildroot/package/perl/perl.mk
+++ b/buildroot/package/perl/perl.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # When updating the version here, also update utils/scancpan
-PERL_VERSION_MAJOR = 26
+PERL_VERSION_MAJOR = 28
 PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2
 PERL_SITE = http://www.cpan.org/src/5.0
 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz
@@ -13,7 +13,7 @@ PERL_LICENSE = Artistic or GPL-1.0+
 PERL_LICENSE_FILES = Artistic Copying README
 PERL_INSTALL_STAGING = YES
 
-PERL_CROSS_VERSION = 1.2
+PERL_CROSS_VERSION = 1.2.3
 # DO NOT refactor with the github helper (the result is not the same)
 PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION)
 PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz
diff --git a/buildroot/package/php-amqp/php-amqp.hash b/buildroot/package/php-amqp/php-amqp.hash
index 10b16f1b4..c061efabb 100644
--- a/buildroot/package/php-amqp/php-amqp.hash
+++ b/buildroot/package/php-amqp/php-amqp.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 c79e52db33bf907dad7da8f350dbdf2937b0679a3dc44fb2a941efb6d4808da9  amqp-1.9.3.tgz
+sha256 b66b8b8264749cb7a69ae4d09665dad1559b6c4f01430206c8e4187bcd8c782d  amqp-1.9.4.tgz
 sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8  LICENSE
diff --git a/buildroot/package/php-amqp/php-amqp.mk b/buildroot/package/php-amqp/php-amqp.mk
index e9de4825a..c808ecdbd 100644
--- a/buildroot/package/php-amqp/php-amqp.mk
+++ b/buildroot/package/php-amqp/php-amqp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_AMQP_VERSION = 1.9.3
+PHP_AMQP_VERSION = 1.9.4
 PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz
 PHP_AMQP_SITE = https://pecl.php.net/get
 PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
diff --git a/buildroot/package/php-memcached/php-memcached.hash b/buildroot/package/php-memcached/php-memcached.hash
index 7a8ec2834..dd294f466 100644
--- a/buildroot/package/php-memcached/php-memcached.hash
+++ b/buildroot/package/php-memcached/php-memcached.hash
@@ -1,2 +1,5 @@
 # Locally calculated
-sha256 5d1c29a1d5e391d6bb7b736a07e063d2f0834800673dd246d64ce1b73e47645d  memcached-3.0.3.tgz
+sha256 20786213ff92cd7ebdb0d0ac10dde1e9580a2f84296618b666654fd76ea307d4  memcached-3.1.3.tgz
+sha256 24e8e3a9529204ead9422fa17cf3ddd75d292a8763b87fdb20591964f2e6ebe0  LICENSE
+sha256 a453a7a272fbd24105b39959f76996d50dad80b22d1c310f6c67f74f62ae4054  fastlz/LICENSE
+sha256 bba8cb50c660842c5ca459c5004395bdef8f01c1b64f97a9978f1053f173cb82  g_fmt.h
diff --git a/buildroot/package/php-memcached/php-memcached.mk b/buildroot/package/php-memcached/php-memcached.mk
index 224a34453..4607d099f 100644
--- a/buildroot/package/php-memcached/php-memcached.mk
+++ b/buildroot/package/php-memcached/php-memcached.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_MEMCACHED_VERSION = 3.0.3
+PHP_MEMCACHED_VERSION = 3.1.3
 PHP_MEMCACHED_SOURCE = memcached-$(PHP_MEMCACHED_VERSION).tgz
 PHP_MEMCACHED_SITE = https://pecl.php.net/get
 PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
diff --git a/buildroot/package/php-ssh2/0001-fix-php_url-fields-usage-for-PHP-7-3.patch b/buildroot/package/php-ssh2/0001-fix-php_url-fields-usage-for-PHP-7-3.patch
new file mode 100644
index 000000000..afc5de991
--- /dev/null
+++ b/buildroot/package/php-ssh2/0001-fix-php_url-fields-usage-for-PHP-7-3.patch
@@ -0,0 +1,302 @@
+From a8835aab2c15e794fce13bd927295719e384ad2d Mon Sep 17 00:00:00 2001
+From: Remi Collet 
+Date: Thu, 28 Jun 2018 07:10:35 +0200
+Subject: [PATCH] fix php_url fields usage for PHP 7.3
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/php/pecl-networking-ssh2/commit/a8835aab2c15e794fce13bd927295719e384ad2d]
+---
+ php_ssh2.h            |  8 +++++++
+ ssh2_fopen_wrappers.c | 55 +++++++++++++++++++++++++++----------------
+ ssh2_sftp.c           | 20 ++++++++--------
+ 3 files changed, 53 insertions(+), 30 deletions(-)
+
+diff --git a/php_ssh2.h b/php_ssh2.h
+index 734b795..d010ff9 100644
+--- a/php_ssh2.h
++++ b/php_ssh2.h
+@@ -166,6 +166,14 @@ extern php_stream_wrapper php_ssh2_sftp_wrapper;
+ extern int le_ssh2_session;
+ extern int le_ssh2_sftp;
+ 
++#if PHP_VERSION_ID < 70300
++#define SSH2_URL_STR(a) (a)
++#define SSH2_URL_LEN(a) strlen(a)
++#else
++#define SSH2_URL_STR(a) ZSTR_VAL(a)
++#define SSH2_URL_LEN(a) ZSTR_LEN(a)
++#endif
++
+ #endif	/* PHP_SSH2_H */
+ 
+ /*
+diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
+index 2f96ca4..f2f3475 100644
+--- a/ssh2_fopen_wrappers.c
++++ b/ssh2_fopen_wrappers.c
+@@ -215,7 +215,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 	php_url *resource;
+ 	zval *methods = NULL, *callbacks = NULL, zsession, *tmpzval;
+ 	zend_long resource_id;
+-	char *h, *s, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL;
++	char *h, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL;
+ 	int username_len = 0, password_len = 0;
+ 
+ 	h = strstr(path, "Resource id #");
+@@ -233,13 +233,13 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 		return NULL;
+ 	}
+ 
+-	if (strncmp(resource->scheme, "ssh2.", sizeof("ssh2.") - 1)) {
++	if (strncmp(SSH2_URL_STR(resource->scheme), "ssh2.", sizeof("ssh2.") - 1)) {
+ 		/* Not an ssh wrapper */
+ 		php_url_free(resource);
+ 		return NULL;
+ 	}
+ 
+-	if (strcmp(resource->scheme + sizeof("ssh2.") - 1, type)) {
++	if (strcmp(SSH2_URL_STR(resource->scheme) + sizeof("ssh2.") - 1, type)) {
+ 		/* Wrong ssh2. wrapper type */
+ 		php_url_free(resource);
+ 		return NULL;
+@@ -253,13 +253,27 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 		Find resource->path in the path string, then copy the entire string from the original path.
+ 		This includes ?query#fragment in the path string
+ 	*/
++// TODO copy seems uneeded
++#if PHP_VERSION_ID < 70300
++	{
++	char * s;
++
+ 	s = resource->path;
+ 	resource->path = estrdup(strstr(path, resource->path));
+ 	efree(s);
++	}
++#else
++	{
++	zend_string *tmp;
++
++	tmp = resource->path;
++	resource->path = zend_string_init(ZSTR_VAL(resource->path), ZSTR_LEN(resource->path), 0);
++	zend_string_release(tmp);
++	}
++#endif
+ 
+ 	/* Look for a resource ID to reuse a session */
+-	s = resource->host;
+-	if (is_numeric_string(s, strlen(s), &resource_id, NULL, 0) == IS_LONG) {
++	if (is_numeric_string(SSH2_URL_STR(resource->host), SSH2_URL_LEN(resource->host), &resource_id, NULL, 0) == IS_LONG) {
+ 		php_ssh2_sftp_data *sftp_data;
+ 		zval *zresource;
+ 
+@@ -309,7 +323,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 	}
+ 
+ 	/* Fallback on finding it in the context */
+-	if (resource->host[0] == 0 && context && psftp &&
++	if (SSH2_URL_STR(resource->host)[0] == 0 && context && psftp &&
+ 		(tmpzval = php_stream_context_get_option(context, "ssh2", "sftp")) != NULL &&
+ 		Z_TYPE_P(tmpzval) == IS_RESOURCE) {
+ 		php_ssh2_sftp_data *sftp_data;
+@@ -323,7 +337,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 			return resource;
+ 		}
+ 	}
+-	if (resource->host[0] == 0 && context &&
++	if (SSH2_URL_STR(resource->host)[0] == 0 && context &&
+ 		(tmpzval = php_stream_context_get_option(context, "ssh2", "session")) != NULL &&
+ 		Z_TYPE_P(tmpzval) == IS_RESOURCE) {
+ 		session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(tmpzval), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
+@@ -399,19 +413,19 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 	}
+ 
+ 	if (resource->user) {
+-		int len = strlen(resource->user);
++		int len = SSH2_URL_LEN(resource->user);
+ 
+ 		if (len) {
+-			username = resource->user;
++			username = SSH2_URL_STR(resource->user);
+ 			username_len = len;
+ 		}
+ 	}
+ 
+ 	if (resource->pass) {
+-		int len = strlen(resource->pass);
++		int len = SSH2_URL_LEN(resource->pass);
+ 
+ 		if (len) {
+-			password = resource->pass;
++			password = SSH2_URL_STR(resource->pass);
+ 			password_len = len;
+ 		}
+ 	}
+@@ -422,7 +436,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 		return NULL;
+ 	}
+ 
+-	session = php_ssh2_session_connect(resource->host, resource->port, methods, callbacks);
++	session = php_ssh2_session_connect(SSH2_URL_STR(resource->host), resource->port, methods, callbacks);
+ 	if (!session) {
+ 		/* Unable to connect! */
+ 		php_url_free(resource);
+@@ -482,6 +496,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 		*psftp = sftp;
+ 	}
+ 
++	//TODO may be undefined
+ 	*presource_id = Z_LVAL(zsession);
+ 	*psession = session;
+ 
+@@ -527,7 +542,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id
+ 					zval_copy_ctor(©val);
+ 					convert_to_string(©val);
+ 					if (libssh2_channel_setenv_ex(channel, key->val, key->len, Z_STRVAL(copyval), Z_STRLEN(copyval))) {
+-						php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", key, Z_STRVAL(copyval));
++						php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", ZSTR_VAL(key), Z_STRVAL(copyval));
+ 					}
+ 					zval_dtor(©val);
+ 				}
+@@ -631,7 +646,7 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con
+ 		zval_ptr_dtor(©val);
+ 	}
+ 
+-	s = resource->path ? resource->path : NULL;
++	s = resource->path ? SSH2_URL_STR(resource->path) : NULL;
+ 
+ 	if (s && s[0] == '/') {
+ 		/* Terminal type encoded into URL overrides context terminal type */
+@@ -766,7 +781,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_
+ 					zval_copy_ctor(©val);
+ 					convert_to_string(©val);
+ 					if (libssh2_channel_setenv_ex(channel, key->val, key->len, Z_STRVAL(copyval), Z_STRLEN(copyval))) {
+-						php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", key, Z_STRVAL(copyval));
++						php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", ZSTR_VAL(key), Z_STRVAL(copyval));
+ 					}
+ 					zval_dtor(©val);
+ 				}
+@@ -878,7 +893,7 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
+ 		zval_ptr_dtor(copyval);
+ 	}
+ 
+-	stream = php_ssh2_exec_command(session, resource_id, resource->path + 1, terminal, terminal_len, environment, width, height, type);
++	stream = php_ssh2_exec_command(session, resource_id, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type);
+ 	if (!stream) {
+ 		// TODO Sean-Der
+ 		//zend_list_delete(resource_id);
+@@ -1021,7 +1036,7 @@ static php_stream *php_ssh2_fopen_wrapper_scp(php_stream_wrapper *wrapper, const
+ 		return NULL;
+ 	}
+ 
+-	stream = php_ssh2_scp_xfer(session, resource_id, resource->path);
++	stream = php_ssh2_scp_xfer(session, resource_id, SSH2_URL_STR(resource->path));
+ 	if (!stream) {
+ 		//TODO Sean-Der
+ 		//zend_list_delete(resource_id);
+@@ -1147,7 +1162,7 @@ PHP_FUNCTION(ssh2_scp_send)
+ 		char *error_msg = NULL;
+ 
+ 		last_error = libssh2_session_last_error(session, &error_msg, NULL, 0);
+-		php_error_docref(NULL, E_WARNING, "Failure creating remote file: %s", error_msg);
++		php_error_docref(NULL, E_WARNING, "Failure creating remote file: %s (%d)", error_msg, last_error);
+ 		php_stream_close(local_file);
+ 		RETURN_FALSE;
+ 	}
+@@ -1262,10 +1277,10 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co
+ 		return NULL;
+ 	}
+ 
+-	if (resource->path && resource->path[0] == '/') {
++	if (resource->path && SSH2_URL_STR(resource->path)[0] == '/') {
+ 		char *colon;
+ 
+-		host = resource->path + 1;
++		host = SSH2_URL_STR(resource->path) + 1;
+ 		if (*host == '[') {
+ 			/* IPv6 Encapsulated Format */
+ 			host++;
+diff --git a/ssh2_sftp.c b/ssh2_sftp.c
+index 13f89f0..6332be8 100644
+--- a/ssh2_sftp.c
++++ b/ssh2_sftp.c
+@@ -238,7 +238,7 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons
+ 
+ 	flags = php_ssh2_parse_fopen_modes((char *)mode);
+ 
+-	handle = libssh2_sftp_open(sftp, resource->path, flags, perms);
++	handle = libssh2_sftp_open(sftp, SSH2_URL_STR(resource->path), flags, perms);
+ 	if (!handle) {
+ 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
+ 		php_url_free(resource);
+@@ -341,7 +341,7 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c
+ 		return NULL;
+ 	}
+ 
+-	handle = libssh2_sftp_opendir(sftp, resource->path);
++	handle = libssh2_sftp_opendir(sftp, SSH2_URL_STR(resource->path));
+ 	if (!handle) {
+ 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
+ 		php_url_free(resource);
+@@ -386,7 +386,7 @@ static int php_ssh2_sftp_urlstat(php_stream_wrapper *wrapper, const char *url, i
+ 		return -1;
+ 	}
+ 
+-	if (libssh2_sftp_stat_ex(sftp, resource->path, strlen(resource->path),
++	if (libssh2_sftp_stat_ex(sftp, SSH2_URL_STR(resource->path), SSH2_URL_LEN(resource->path),
+ 		(flags & PHP_STREAM_URL_STAT_LINK) ? LIBSSH2_SFTP_LSTAT : LIBSSH2_SFTP_STAT, &attrs)) {
+ 		php_url_free(resource);
+ 		//zend_list_delete(sftp_rsrcid);
+@@ -420,7 +420,7 @@ static int php_ssh2_sftp_unlink(php_stream_wrapper *wrapper, const char *url, in
+ 		return 0;
+ 	}
+ 
+-	result = libssh2_sftp_unlink(sftp, resource->path);
++	result = libssh2_sftp_unlink(sftp, SSH2_URL_STR(resource->path));
+ 	php_url_free(resource);
+ 
+ 	//zend_list_delete(sftp_rsrcid);
+@@ -462,7 +462,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro
+ 		return 0;
+ 	}
+ 
+-	result = libssh2_sftp_rename(sftp, resource->path, resource_to->path);
++	result = libssh2_sftp_rename(sftp, SSH2_URL_STR(resource->path), SSH2_URL_STR(resource_to->path));
+ 	php_url_free(resource);
+ 	php_url_free(resource_to);
+ 
+@@ -493,13 +493,13 @@ static int php_ssh2_sftp_mkdir(php_stream_wrapper *wrapper, const char *url, int
+ 
+ 	if (options & PHP_STREAM_MKDIR_RECURSIVE) {
+ 		/* Just attempt to make every directory, some will fail, but we only care about the last success/failure */
+-		char *p = resource->path;
++		char *p = SSH2_URL_STR(resource->path);
+ 		while ((p = strchr(p + 1, '/'))) {
+-			libssh2_sftp_mkdir_ex(sftp, resource->path, p - resource->path, mode);
++			libssh2_sftp_mkdir_ex(sftp, SSH2_URL_STR(resource->path), p - SSH2_URL_STR(resource->path), mode);
+ 		}
+ 	}
+ 
+-	result = libssh2_sftp_mkdir(sftp, resource->path, mode);
++	result = libssh2_sftp_mkdir(sftp, SSH2_URL_STR(resource->path), mode);
+ 	php_url_free(resource);
+ 
+ 	//zend_list_delete(sftp_rsrcid);
+@@ -527,7 +527,7 @@ static int php_ssh2_sftp_rmdir(php_stream_wrapper *wrapper, const char *url, int
+ 		return 0;
+ 	}
+ 
+-	result = libssh2_sftp_rmdir(sftp, resource->path);
++	result = libssh2_sftp_rmdir(sftp, SSH2_URL_STR(resource->path));
+ 	php_url_free(resource);
+ 
+ 	//zend_list_delete(sftp_rsrcid);
+@@ -836,7 +836,7 @@ PHP_FUNCTION(ssh2_sftp_readlink)
+ 	}
+ 
+ 	if ((targ_len = libssh2_sftp_symlink_ex(data->sftp, link->val, link->len, targ, 8192, LIBSSH2_SFTP_READLINK)) < 0) {
+-		php_error_docref(NULL, E_WARNING, "Unable to read link '%s'", link);
++		php_error_docref(NULL, E_WARNING, "Unable to read link '%s'", ZSTR_VAL(link));
+ 		RETURN_FALSE;
+ 	}
+ 
diff --git a/buildroot/package/php-ssh2/0002-dstogov-Fixed-PHP7-port-Restored-commented-reference-counting.patch b/buildroot/package/php-ssh2/0002-dstogov-Fixed-PHP7-port-Restored-commented-reference-counting.patch
new file mode 100644
index 000000000..d6d62947f
--- /dev/null
+++ b/buildroot/package/php-ssh2/0002-dstogov-Fixed-PHP7-port-Restored-commented-reference-counting.patch
@@ -0,0 +1,746 @@
+From 073067ba96ac99ed5696d27f13ca6c8124986e74 Mon Sep 17 00:00:00 2001
+From: Jan-E 
+Date: Thu, 28 Jun 2018 08:43:48 +0200
+Subject: [PATCH] @dstogov Fixed PHP7 port. Restored commented reference
+ counting.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/php/pecl-networking-ssh2/commit/073067ba96ac99ed5696d27f13ca6c8124986e74]
+---
+ php_ssh2.h            |  14 ++---
+ ssh2.c                |  26 ++++-----
+ ssh2_fopen_wrappers.c | 129 ++++++++++++++++++------------------------
+ ssh2_sftp.c           |  59 +++++++++----------
+ 4 files changed, 102 insertions(+), 126 deletions(-)
+
+diff --git a/php_ssh2.h b/php_ssh2.h
+index d010ff9..2bbaa26 100644
+--- a/php_ssh2.h
++++ b/php_ssh2.h
+@@ -73,14 +73,14 @@ typedef struct _php_ssh2_sftp_data {
+ 	LIBSSH2_SESSION *session;
+ 	LIBSSH2_SFTP *sftp;
+ 
+-	int session_rsrcid;
++	zend_resource *session_rsrc;
+ } php_ssh2_sftp_data;
+ 
+ typedef struct _php_ssh2_listener_data {
+ 	LIBSSH2_SESSION *session;
+ 	LIBSSH2_LISTENER *listener;
+ 
+-	int session_rsrcid;
++	zend_resource *session_rsrc;
+ } php_ssh2_listener_data;
+ 
+ #include "libssh2_publickey.h"
+@@ -89,7 +89,7 @@ typedef struct _php_ssh2_pkey_subsys_data {
+ 	LIBSSH2_SESSION *session;
+ 	LIBSSH2_PUBLICKEY *pkey;
+ 
+-	int session_rsrcid;
++	zend_resource *session_rsrc;
+ } php_ssh2_pkey_subsys_data;
+ 
+ #define SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession) \
+@@ -118,8 +118,8 @@ typedef struct _php_ssh2_channel_data {
+ 	char is_blocking;
+ 	long timeout;
+ 
+-	/* Resource ID */
+-	int session_rsrcid;
++	/* Resource */
++	zend_resource *session_rsrc;
+ 
+ 	/* Allow one stream to be closed while the other is kept open */
+ 	unsigned char *refcount;
+@@ -151,8 +151,8 @@ PHP_FUNCTION(ssh2_sftp_realpath);
+ LIBSSH2_SESSION *php_ssh2_session_connect(char *host, int port, zval *methods, zval *callbacks);
+ void php_ssh2_sftp_dtor(zend_resource *rsrc);
+ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context,
+-											LIBSSH2_SESSION **psession, int *presource_id,
+-											LIBSSH2_SFTP **psftp, int *psftp_rsrcid);
++											LIBSSH2_SESSION **psession, zend_resource **presource,
++											LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc);
+ 
+ extern php_stream_ops php_ssh2_channel_stream_ops;
+ 
+diff --git a/ssh2.c b/ssh2.c
+index e73867e..849766b 100644
+--- a/ssh2.c
++++ b/ssh2.c
+@@ -772,9 +772,8 @@ PHP_FUNCTION(ssh2_forward_listen)
+ 
+ 	data = emalloc(sizeof(php_ssh2_listener_data));
+ 	data->session = session;
+-	data->session_rsrcid = Z_LVAL_P(zsession);
+-	//TODO Sean-Der
+-	//zend_list_addref(data->session_rsrcid);
++	data->session_rsrc = Z_RES_P(zsession);
++	Z_ADDREF_P(zsession);
+ 	data->listener = listener;
+ 
+ 	RETURN_RES(zend_register_resource(data, le_ssh2_listener));
+@@ -810,7 +809,7 @@ PHP_FUNCTION(ssh2_forward_accept)
+ 	channel_data->channel = channel;
+ 	channel_data->streamid = 0;
+ 	channel_data->is_blocking = 0;
+-	channel_data->session_rsrcid = data->session_rsrcid;
++	channel_data->session_rsrc = data->session_rsrc;
+ 	channel_data->refcount = NULL;
+ 
+ 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
+@@ -820,8 +819,12 @@ PHP_FUNCTION(ssh2_forward_accept)
+ 		libssh2_channel_free(channel);
+ 		RETURN_FALSE;
+ 	}
+-	//TODO Sean-Der
+-	//zend_list_addref(channel_data->session_rsrcid);
++
++#if PHP_VERSION_ID < 70300
++	GC_REFCOUNT(channel_data->session_rsrc)++;
++#else
++	GC_ADDREF(channel_data->session_rsrc);
++#endif
+ 
+ 	php_stream_to_zval(stream, return_value);
+ }
+@@ -975,9 +978,8 @@ PHP_FUNCTION(ssh2_publickey_init)
+ 
+ 	data = emalloc(sizeof(php_ssh2_pkey_subsys_data));
+ 	data->session = session;
+-	data->session_rsrcid = Z_RES_P(zsession)->handle;
+-	//TODO Sean-Der
+-	//zend_list_addref(data->session_rsrcid);
++	data->session_rsrc = Z_RES_P(zsession);
++	Z_ADDREF_P(zsession);
+ 	data->pkey = pkey;
+ 
+ 	RETURN_RES(zend_register_resource(data, le_ssh2_pkey_subsys));
+@@ -1280,8 +1282,7 @@ static void php_ssh2_listener_dtor(zend_resource *rsrc)
+ 	LIBSSH2_LISTENER *listener = data->listener;
+ 
+ 	libssh2_channel_forward_cancel(listener);
+-	// TODO Sean-Der
+-	//zend_list_delete(data->session_rsrcid);
++	zend_list_delete(data->session_rsrc);
+ 	efree(data);
+ }
+ 
+@@ -1291,8 +1292,7 @@ static void php_ssh2_pkey_subsys_dtor(zend_resource *rsrc)
+ 	LIBSSH2_PUBLICKEY *pkey = data->pkey;
+ 
+ 	libssh2_publickey_shutdown(pkey);
+-	// TODO Sean-Der
+-	//zend_list_delete(data->session_rsrcid);
++	zend_list_delete(data->session_rsrc);
+ 	efree(data);
+ }
+ 
+diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
+index f2f3475..c4eb9dc 100644
+--- a/ssh2_fopen_wrappers.c
++++ b/ssh2_fopen_wrappers.c
+@@ -47,11 +47,9 @@ static size_t php_ssh2_channel_stream_write(php_stream *stream, const char *buf,
+ 	php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract;
+ 	size_t writestate;
+ 	LIBSSH2_SESSION *session;
+-	zval *zresource;
+ 
+ 	libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking);
+-	zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid);
+-	session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
++	session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
+ 
+ 
+ 
+@@ -90,12 +88,10 @@ static size_t php_ssh2_channel_stream_read(php_stream *stream, char *buf, size_t
+ 	php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract;
+ 	ssize_t readstate;
+ 	LIBSSH2_SESSION *session;
+-	zval *zresource;
+ 
+ 	stream->eof = libssh2_channel_eof(abstract->channel);
+ 	libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking);
+-	zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid);
+-	session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
++	session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
+ 
+ #ifdef PHP_SSH2_SESSION_TIMEOUT
+ 	if (abstract->is_blocking) {
+@@ -137,8 +133,7 @@ static int php_ssh2_channel_stream_close(php_stream *stream, int close_handle)
+ 		}
+ 		libssh2_channel_eof(abstract->channel);
+ 		libssh2_channel_free(abstract->channel);
+-		//TODO Sean-Der
+-		//zend_list_delete(abstract->session_rsrcid);
++		zend_list_delete(abstract->session_rsrc);
+ 	}
+ 	efree(abstract);
+ 
+@@ -207,8 +202,8 @@ php_stream_ops php_ssh2_channel_stream_ops = {
+  * Parse an ssh2.*:// path
+  */
+ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context,
+-											LIBSSH2_SESSION **psession, int *presource_id,
+-											LIBSSH2_SFTP **psftp, int *psftp_rsrcid)
++											LIBSSH2_SESSION **psession, zend_resource **presource,
++											LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc)
+ {
+ 	php_ssh2_sftp_data *sftp_data = NULL;
+ 	LIBSSH2_SESSION *session;
+@@ -283,11 +278,10 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 			sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp);
+ 			if (sftp_data) {
+ 				/* Want the sftp layer */
+-				//TODO Sean-Der
+-				//zend_list_addref(resource_id);
+-				*psftp_rsrcid = resource_id;
++				Z_ADDREF_P(zresource);
++				*psftp_rsrc = Z_RES_P(zresource);
+ 				*psftp = sftp_data->sftp;
+-				*presource_id = sftp_data->session_rsrcid;
++				*presource = sftp_data->session_rsrc;
+ 				*psession = sftp_data->session;
+ 				return resource;
+ 			}
+@@ -305,18 +299,16 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 				sftp_data = emalloc(sizeof(php_ssh2_sftp_data));
+ 				sftp_data->sftp = sftp;
+ 				sftp_data->session = session;
+-				sftp_data->session_rsrcid = resource_id;
+-				//TODO Sean-Der
+-				//zend_list_addref(resource_id);
+-				*psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle;
++				sftp_data->session_rsrc = Z_RES_P(zresource);
++				Z_ADDREF_P(zresource);
++				*psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp);
+ 				*psftp = sftp;
+-				*presource_id = resource_id;
++				*presource = Z_RES_P(zresource);
+ 				*psession = session;
+ 				return resource;
+ 			}
+-			//TODO Sean-Der
+-			//zend_list_addref(resource_id);
+-			*presource_id = resource_id;
++			Z_ADDREF_P(zresource);
++			*presource = Z_RES_P(zresource);
+ 			*psession = session;
+ 			return resource;
+ 		}
+@@ -330,9 +322,9 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 		sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(tmpzval), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp);
+ 		if (sftp_data) {
+ 			Z_ADDREF_P(tmpzval);
+-			*psftp_rsrcid = Z_LVAL_P(tmpzval);
++			*psftp_rsrc = Z_RES_P(tmpzval);
+ 			*psftp = sftp_data->sftp;
+-			*presource_id = sftp_data->session_rsrcid;
++			*presource = sftp_data->session_rsrc;
+ 			*psession = sftp_data->session;
+ 			return resource;
+ 		}
+@@ -354,17 +346,17 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 				sftp_data = emalloc(sizeof(php_ssh2_sftp_data));
+ 				sftp_data->sftp = sftp;
+ 				sftp_data->session = session;
+-				sftp_data->session_rsrcid = Z_LVAL_P(tmpzval);
++				sftp_data->session_rsrc = Z_RES_P(tmpzval);
+ 				Z_ADDREF_P(tmpzval);
+-				*psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle;
++				*psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp);
+ 				*psftp = sftp;
+-				*presource_id = Z_RES_P(tmpzval)->handle;
++				*presource = Z_RES_P(tmpzval);
+ 				*psession = session;
+ 				return resource;
+ 			}
+ 			Z_ADDREF_P(tmpzval);
+ 			*psession = session;
+-			*presource_id = Z_LVAL_P(tmpzval);
++			*presource = Z_RES_P(tmpzval);
+ 			return resource;
+ 		}
+ 	}
+@@ -465,8 +457,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 
+ 	/* Auth failure */
+ 	php_url_free(resource);
+-	//TODO Sean-Der
+-	//zend_list_delete(Z_LVAL(zsession));
++	zend_list_delete(Z_RES(zsession));
+ 	return NULL;
+ 
+ session_authed:
+@@ -480,24 +471,22 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ 		sftp = libssh2_sftp_init(session);
+ 		if (!sftp) {
+ 			php_url_free(resource);
+-			//TODO Sean-Der
+-			//zend_list_delete(Z_LVAL(zsession));
++			zend_list_delete(Z_RES(zsession));
+ 			return NULL;
+ 		}
+ 
+ 		sftp_data = emalloc(sizeof(php_ssh2_sftp_data));
+ 		sftp_data->session = session;
+ 		sftp_data->sftp = sftp;
+-		sftp_data->session_rsrcid = Z_LVAL(zsession);
++		sftp_data->session_rsrc = Z_RES(zsession);
+ 
+ 		//TODO Sean-Der
+ 		//ZEND_REGISTER_RESOURCE(sftp_data, le_ssh2_sftp);
+-		*psftp_rsrcid = Z_LVAL(zsftp);
++		*psftp_rsrc = Z_RES(zsftp);
+ 		*psftp = sftp;
+ 	}
+ 
+-	//TODO may be undefined
+-	*presource_id = Z_LVAL(zsession);
++	*presource = Z_RES(zsession);
+ 	*psession = session;
+ 
+ 	return resource;
+@@ -511,7 +500,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
+ /* {{{ php_ssh2_shell_open
+  * Make a stream from a session
+  */
+-static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id, char *term, int term_len, zval *environment, long width, long height, long type)
++static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, zend_resource *resource, char *term, int term_len, zval *environment, long width, long height, long type)
+ {
+ 	LIBSSH2_CHANNEL *channel;
+ 	php_ssh2_channel_data *channel_data;
+@@ -578,7 +567,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id
+ 	channel_data->streamid = 0;
+ 	channel_data->is_blocking = 0;
+ 	channel_data->timeout = 0;
+-	channel_data->session_rsrcid = resource_id;
++	channel_data->session_rsrc = resource;
+ 	channel_data->refcount = NULL;
+ 
+ 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
+@@ -599,11 +588,12 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con
+ 	zend_long width = PHP_SSH2_DEFAULT_TERM_WIDTH;
+ 	zend_long height = PHP_SSH2_DEFAULT_TERM_HEIGHT;
+ 	zend_long type = PHP_SSH2_DEFAULT_TERM_UNIT;
+-	int resource_id = 0, terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1;
++	zend_resource *rsrc = NULL;
++	int terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1;
+ 	php_url *resource;
+ 	char *s;
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &resource_id, NULL, NULL);
++	resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &rsrc, NULL, NULL);
+ 	if (!resource || !session) {
+ 		return NULL;
+ 	}
+@@ -677,10 +667,9 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con
+ 	/* TODO: Accept resolution and environment vars as URL style parameters
+ 	 * ssh2.shell://hostorresource/terminal/99x99c?envvar=envval&envvar=envval....
+ 	 */
+-	stream = php_ssh2_shell_open(session, resource_id, terminal, terminal_len, environment, width, height, type);
++	stream = php_ssh2_shell_open(session, rsrc, terminal, terminal_len, environment, width, height, type);
+ 	if (!stream) {
+-		//TODO Sean-Der
+-		//zend_list_delete(resource_id);
++		zend_list_delete(rsrc);
+ 	}
+ 	php_url_free(resource);
+ 
+@@ -730,7 +719,7 @@ PHP_FUNCTION(ssh2_shell)
+ 
+ 	SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession);
+ 
+-	stream = php_ssh2_shell_open(session, Z_RES_P(zsession)->handle, term, term_len, environment, width, height, type);
++	stream = php_ssh2_shell_open(session, Z_RES_P(zsession), term, term_len, environment, width, height, type);
+ 	if (!stream) {
+ 		RETURN_FALSE;
+ 	}
+@@ -749,7 +738,7 @@ PHP_FUNCTION(ssh2_shell)
+ /* {{{ php_ssh2_exec_command
+  * Make a stream from a session
+  */
+-static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_id, char *command, char *term, int term_len, zval *environment, long width, long height, long type)
++static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, zend_resource *rsrc, char *command, char *term, int term_len, zval *environment, long width, long height, long type)
+ {
+ 	LIBSSH2_CHANNEL *channel;
+ 	php_ssh2_channel_data *channel_data;
+@@ -819,7 +808,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_
+ 	channel_data->streamid = 0;
+ 	channel_data->is_blocking = 0;
+ 	channel_data->timeout = 0;
+-	channel_data->session_rsrcid = resource_id;
++	channel_data->session_rsrc = rsrc;
+ 	channel_data->refcount = NULL;
+ 
+ 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
+@@ -836,7 +825,7 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
+ 	LIBSSH2_SESSION *session = NULL;
+ 	php_stream *stream;
+ 	zval *tmpzval, *environment = NULL;
+-	int resource_id = 0;
++	zend_resource *rsrc = NULL;
+ 	php_url *resource;
+ 	char *terminal = NULL;
+ 	int terminal_len = 0;
+@@ -844,14 +833,13 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
+ 	long height = PHP_SSH2_DEFAULT_TERM_HEIGHT;
+ 	long type = PHP_SSH2_DEFAULT_TERM_UNIT;
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &resource_id, NULL, NULL);
++	resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &rsrc, NULL, NULL);
+ 	if (!resource || !session) {
+ 		return NULL;
+ 	}
+ 	if (!resource->path) {
+ 		php_url_free(resource);
+-		//TODO Sean-Der
+-		//zend_list_delete(resource_id);
++		zend_list_delete(rsrc);
+ 		return NULL;
+ 	}
+ 
+@@ -893,10 +881,9 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
+ 		zval_ptr_dtor(copyval);
+ 	}
+ 
+-	stream = php_ssh2_exec_command(session, resource_id, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type);
++	stream = php_ssh2_exec_command(session, rsrc, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type);
+ 	if (!stream) {
+-		// TODO Sean-Der
+-		//zend_list_delete(resource_id);
++		zend_list_delete(rsrc);
+ 	}
+ 	php_url_free(resource);
+ 
+@@ -963,7 +950,7 @@ PHP_FUNCTION(ssh2_exec)
+ 
+ 	SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession);
+ 
+-	stream = php_ssh2_exec_command(session, Z_RES_P(zsession)->handle, command, term, term_len, environment, width, height, type);
++	stream = php_ssh2_exec_command(session, Z_RES_P(zsession), command, term, term_len, environment, width, height, type);
+ 	if (!stream) {
+ 		RETURN_FALSE;
+ 	}
+@@ -982,7 +969,7 @@ PHP_FUNCTION(ssh2_exec)
+ /* {{{ php_ssh2_scp_xfer
+  * Make a stream from a session
+  */
+-static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id, char *filename)
++static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, zend_resource *rsrc, char *filename)
+ {
+ 	LIBSSH2_CHANNEL *channel;
+ 	php_ssh2_channel_data *channel_data;
+@@ -1002,7 +989,7 @@ static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id,
+ 	channel_data->streamid = 0;
+ 	channel_data->is_blocking = 0;
+ 	channel_data->timeout = 0;
+-	channel_data->session_rsrcid = resource_id;
++	channel_data->session_rsrc = rsrc;
+ 	channel_data->refcount = NULL;
+ 
+ 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r");
+@@ -1018,28 +1005,26 @@ static php_stream *php_ssh2_fopen_wrapper_scp(php_stream_wrapper *wrapper, const
+ {
+ 	LIBSSH2_SESSION *session = NULL;
+ 	php_stream *stream;
+-	int resource_id = 0;
++	zend_resource *rsrc = NULL;
+ 	php_url *resource;
+ 
+ 	if (strchr(mode, '+') || strchr(mode, 'a') || strchr(mode, 'w')) {
+ 		return NULL;
+ 	}
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &resource_id, NULL, NULL);
++	resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &rsrc, NULL, NULL);
+ 	if (!resource || !session) {
+ 		return NULL;
+ 	}
+ 	if (!resource->path) {
+ 		php_url_free(resource);
+-		//TODO Sean-Der
+-		//zend_list_delete(resource_id);
++		zend_list_delete(rsrc);
+ 		return NULL;
+ 	}
+ 
+-	stream = php_ssh2_scp_xfer(session, resource_id, SSH2_URL_STR(resource->path));
++	stream = php_ssh2_scp_xfer(session, rsrc, SSH2_URL_STR(resource->path));
+ 	if (!stream) {
+-		//TODO Sean-Der
+-		//zend_list_delete(resource_id);
++		zend_list_delete(rsrc);
+ 	}
+ 	php_url_free(resource);
+ 
+@@ -1231,7 +1216,7 @@ PHP_FUNCTION(ssh2_scp_send)
+ /* {{{ php_ssh2_direct_tcpip
+  * Make a stream from a session
+  */
+-static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_id, char *host, int port)
++static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, zend_resource *rsrc, char *host, int port)
+ {
+ 	LIBSSH2_CHANNEL *channel;
+ 	php_ssh2_channel_data *channel_data;
+@@ -1251,7 +1236,7 @@ static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_
+ 	channel_data->streamid = 0;
+ 	channel_data->is_blocking = 0;
+ 	channel_data->timeout = 0;
+-	channel_data->session_rsrcid = resource_id;
++	channel_data->session_rsrc = rsrc;
+ 	channel_data->refcount = NULL;
+ 
+ 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
+@@ -1270,9 +1255,9 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co
+ 	php_url *resource;
+ 	char *host = NULL;
+ 	int port = 0;
+-	int resource_id = 0;
++	zend_resource *rsrc;
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &resource_id, NULL, NULL);
++	resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &rsrc, NULL, NULL);
+ 	if (!resource || !session) {
+ 		return NULL;
+ 	}
+@@ -1303,15 +1288,13 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co
+ 	if ((port <= 0) || (port > 65535) || !host || (strlen(host) == 0)) {
+ 		/* Invalid connection criteria */
+ 		php_url_free(resource);
+-		//TODO Sean-Der
+-		//zend_list_delete(resource_id);
++		zend_list_delete(rsrc);
+ 		return NULL;
+ 	}
+ 
+-	stream = php_ssh2_direct_tcpip(session, resource_id, host, port);
++	stream = php_ssh2_direct_tcpip(session, rsrc, host, port);
+ 	if (!stream) {
+-		// TODO Sean-Der
+-		//zend_list_delete(resource_id);
++		zend_list_delete(rsrc);
+ 	}
+ 	php_url_free(resource);
+ 
+@@ -1352,7 +1335,7 @@ PHP_FUNCTION(ssh2_tunnel)
+ 
+ 	SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession);
+ 
+-	stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession)->handle, host, port);
++	stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession), host, port);
+ 	if (!stream) {
+ 		RETURN_FALSE;
+ 	}
+diff --git a/ssh2_sftp.c b/ssh2_sftp.c
+index 6332be8..256fc70 100644
+--- a/ssh2_sftp.c
++++ b/ssh2_sftp.c
+@@ -40,8 +40,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc)
+ 
+ 	libssh2_sftp_shutdown(data->sftp);
+ 
+-	// TODO Sean-Der
+-	//zend_list_delete(data->session_rsrcid);
++	zend_list_delete(data->session_rsrc);
+ 
+ 	efree(data);
+ }
+@@ -50,7 +49,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc)
+    * SFTP File Ops *
+    ***************** */
+ 
+-inline unsigned long php_ssh2_parse_fopen_modes(char *openmode) {
++unsigned long php_ssh2_parse_fopen_modes(char *openmode) {
+ 	unsigned long flags = 0;
+ 
+ 	if (strchr(openmode, 'a')) {
+@@ -101,7 +100,7 @@ inline int php_ssh2_sftp_attr2ssb(php_stream_statbuf *ssb, LIBSSH2_SFTP_ATTRIBUT
+ typedef struct _php_ssh2_sftp_handle_data {
+ 	LIBSSH2_SFTP_HANDLE *handle;
+ 
+-	long sftp_rsrcid;
++	zend_resource *sftp_rsrc;
+ } php_ssh2_sftp_handle_data;
+ 
+ /* {{{ php_ssh2_sftp_stream_write
+@@ -139,8 +138,7 @@ static int php_ssh2_sftp_stream_close(php_stream *stream, int close_handle)
+ 	php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract;
+ 
+ 	libssh2_sftp_close(data->handle);
+-	//TODO Sean-Der
+-	//zend_list_delete(data->sftp_rsrcid);
++	zend_list_delete(data->sftp_rsrc);
+ 	efree(data);
+ 
+ 	return 0;
+@@ -226,12 +224,12 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons
+ 	LIBSSH2_SFTP *sftp = NULL;
+ 	LIBSSH2_SFTP_HANDLE *handle;
+ 	php_stream *stream;
+-	int resource_id = 0, sftp_rsrcid = 0;
++	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
+ 	php_url *resource;
+ 	unsigned long flags;
+ 	long perms = 0644;
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
++	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
+ 	if (!resource || !session || !sftp) {
+ 		return NULL;
+ 	}
+@@ -242,20 +240,18 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons
+ 	if (!handle) {
+ 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
+ 		php_url_free(resource);
+-		//TODO Sean-Der
+-		//zend_list_delete(sftp_rsrcid);
++		zend_list_delete(sftp_rsrc);
+ 		return NULL;
+ 	}
+ 
+ 	data = emalloc(sizeof(php_ssh2_sftp_handle_data));
+ 	data->handle = handle;
+-	data->sftp_rsrcid = sftp_rsrcid;
++	data->sftp_rsrc = sftp_rsrc;
+ 
+ 	stream = php_stream_alloc(&php_ssh2_sftp_stream_ops, data, 0, mode);
+ 	if (!stream) {
+ 		libssh2_sftp_close(handle);
+-		// TODO Sean-Der
+-		//zend_list_delete(sftp_rsrcid);
++		zend_list_delete(sftp_rsrc);
+ 		efree(data);
+ 	}
+ 	php_url_free(resource);
+@@ -303,8 +299,7 @@ static int php_ssh2_sftp_dirstream_close(php_stream *stream, int close_handle)
+ 	php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract;
+ 
+ 	libssh2_sftp_close(data->handle);
+-	//TODO Sean_der
+-	//zend_list_delete(data->sftp_rsrcid);
++	zend_list_delete(data->sftp_rsrc);
+ 	efree(data);
+ 
+ 	return 0;
+@@ -333,10 +328,10 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c
+ 	LIBSSH2_SFTP *sftp = NULL;
+ 	LIBSSH2_SFTP_HANDLE *handle;
+ 	php_stream *stream;
+-	int resource_id = 0, sftp_rsrcid = 0;
++	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
+ 	php_url *resource;
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
++	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
+ 	if (!resource || !session || !sftp) {
+ 		return NULL;
+ 	}
+@@ -345,20 +340,18 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c
+ 	if (!handle) {
+ 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
+ 		php_url_free(resource);
+-		//TODO Sean-Der
+-		//zend_list_delete(sftp_rsrcid);
++		zend_list_delete(sftp_rsrc);
+ 		return NULL;
+ 	}
+ 
+ 	data = emalloc(sizeof(php_ssh2_sftp_handle_data));
+ 	data->handle = handle;
+-	data->sftp_rsrcid = sftp_rsrcid;
++	data->sftp_rsrc = sftp_rsrc;
+ 
+ 	stream = php_stream_alloc(&php_ssh2_sftp_dirstream_ops, data, 0, mode);
+ 	if (!stream) {
+ 		libssh2_sftp_close(handle);
+-		//TODO Sean-Der
+-		//zend_list_delete(sftp_rsrcid);
++		zend_list_delete(sftp_rsrc);
+ 		efree(data);
+ 	}
+ 	php_url_free(resource);
+@@ -378,10 +371,10 @@ static int php_ssh2_sftp_urlstat(php_stream_wrapper *wrapper, const char *url, i
+ 	LIBSSH2_SFTP_ATTRIBUTES attrs;
+ 	LIBSSH2_SESSION *session = NULL;
+ 	LIBSSH2_SFTP *sftp = NULL;
+-	int resource_id = 0, sftp_rsrcid = 0;
++	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
+ 	php_url *resource;
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
++	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
+ 	if (!resource || !session || !sftp || !resource->path) {
+ 		return -1;
+ 	}
+@@ -408,11 +401,11 @@ static int php_ssh2_sftp_unlink(php_stream_wrapper *wrapper, const char *url, in
+ {
+ 	LIBSSH2_SESSION *session = NULL;
+ 	LIBSSH2_SFTP *sftp = NULL;
+-	int resource_id = 0, sftp_rsrcid = 0;
++	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
+ 	php_url *resource;
+ 	int result;
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
++	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
+ 	if (!resource || !session || !sftp || !resource->path) {
+ 		if (resource) {
+ 			php_url_free(resource);
+@@ -436,7 +429,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro
+ {
+ 	LIBSSH2_SESSION *session = NULL;
+ 	LIBSSH2_SFTP *sftp = NULL;
+-	int resource_id = 0, sftp_rsrcid = 0;
++	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
+ 	php_url *resource, *resource_to;
+ 	int result;
+ 
+@@ -453,7 +446,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro
+ 		return 0;
+ 	}
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
++	resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
+ 	if (!resource || !session || !sftp || !resource->path) {
+ 		if (resource) {
+ 			php_url_free(resource);
+@@ -479,11 +472,11 @@ static int php_ssh2_sftp_mkdir(php_stream_wrapper *wrapper, const char *url, int
+ {
+ 	LIBSSH2_SESSION *session = NULL;
+ 	LIBSSH2_SFTP *sftp = NULL;
+-	int resource_id = 0, sftp_rsrcid = 0;
++	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
+ 	php_url *resource;
+ 	int result;
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
++	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
+ 	if (!resource || !session || !sftp || !resource->path) {
+ 		if (resource) {
+ 			php_url_free(resource);
+@@ -515,11 +508,11 @@ static int php_ssh2_sftp_rmdir(php_stream_wrapper *wrapper, const char *url, int
+ {
+ 	LIBSSH2_SESSION *session = NULL;
+ 	LIBSSH2_SFTP *sftp = NULL;
+-	int resource_id = 0, sftp_rsrcid = 0;
++	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
+ 	php_url *resource;
+ 	int result;
+ 
+-	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
++	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
+ 	if (!resource || !session || !sftp || !resource->path) {
+ 		if (resource) {
+ 			php_url_free(resource);
+@@ -591,7 +584,7 @@ PHP_FUNCTION(ssh2_sftp)
+ 	data = emalloc(sizeof(php_ssh2_sftp_data));
+ 	data->session = session;
+ 	data->sftp = sftp;
+-	data->session_rsrcid = Z_RES_P(zsession)->handle;
++	data->session_rsrc = Z_RES_P(zsession);
+ 	Z_ADDREF_P(zsession);
+ 
+ 	RETURN_RES(zend_register_resource(data, le_ssh2_sftp));
diff --git a/buildroot/package/php-yaml/php-yaml.hash b/buildroot/package/php-yaml/php-yaml.hash
index 21b507e18..c29c3e66a 100644
--- a/buildroot/package/php-yaml/php-yaml.hash
+++ b/buildroot/package/php-yaml/php-yaml.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 c3afb0dad47b6c3a5b7b449f57a4938df27bf974efbe188d85c4fb998eff0039  yaml-2.0.2.tgz
+sha256 9786b0386e648f12cc18a038358bd57bee4906e350a2e9ab776d6a5f18fc6680  yaml-2.0.4.tgz
+sha256 68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338  LICENSE
diff --git a/buildroot/package/php-yaml/php-yaml.mk b/buildroot/package/php-yaml/php-yaml.mk
index 086d575e9..e23d89797 100644
--- a/buildroot/package/php-yaml/php-yaml.mk
+++ b/buildroot/package/php-yaml/php-yaml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_YAML_VERSION = 2.0.2
+PHP_YAML_VERSION = 2.0.4
 PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz
 PHP_YAML_SITE = https://pecl.php.net/get
 PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
diff --git a/buildroot/package/php-zmq/0001-PHP-7.3-compatibility-and-bugfixes.patch b/buildroot/package/php-zmq/0001-PHP-7.3-compatibility-and-bugfixes.patch
new file mode 100644
index 000000000..83cdb0453
--- /dev/null
+++ b/buildroot/package/php-zmq/0001-PHP-7.3-compatibility-and-bugfixes.patch
@@ -0,0 +1,271 @@
+From 6ea688eff5157785267d2b671cf62d296288847f Mon Sep 17 00:00:00 2001
+From: Alex/AT 
+Date: Mon, 10 Dec 2018 06:02:27 +0300
+Subject: [PATCH] PHP 7.3 compatibility and bugfixes
+
+- Define new GC_ADDREF/DELREF/SET_REFCOUNT macros for older PHP versions and use them instead of direct GC reference counter access
+
+- Fixup all necessary 'long' type parameters to 'zend_long', PHP 7.3 makes it mandatory, also fixup some direct function implementations to accept the same
+
+- In php_zmq_recv(), zend_string_init() was wrongly called with third parameter as '1', marking new string with IS_STR_PERSISTENT, this caused heap corruption and/or segfaults with PHP 7.3 and could possibly cause other sorts of bugs under any 7.x version
+  With ZVAL_STRINGL macro, this last '1' parameter meant to copy the string and was seemingly erroneously moved to zend_string_init(). zend_string_init() copies string by default, and last parameter has totally different meaning here
+
+- In poll(), flag ZVAL separation on passed arrays (PHP 7.3 makes it mandatory)
+
+- Test 19 (exception on connect callback with forced reference parameter): skip on PHP 7.1 and higher, PHP >= 7.1 started to fallback to passing argument by value instead of failing
+
+- Test 21 (warning generation from callback): it is ok, but PHP 7.3 uses 'int' instead of 'integer' for constants, so allow any word in place of the word 'integer'
+
+[Frank: backport from upstream PR https://github.com/mkoppanen/php-zmq/pull/195]
+Signed-off-by: Frank Hunleth 
+---
+ php_zmq.h                               |  6 ++++
+ tests/019-callbackinvalidsignature.phpt |  3 +-
+ tests/021-callbackwarning.phpt          |  2 +-
+ zmq.c                                   | 40 ++++++++++++-------------
+ zmq_sockopt.c                           |  4 +--
+ 5 files changed, 30 insertions(+), 25 deletions(-)
+
+diff --git a/php_zmq.h b/php_zmq.h
+index ef50bfb..3833967 100644
+--- a/php_zmq.h
++++ b/php_zmq.h
+@@ -44,6 +44,12 @@
+ 
+ #include "php.h"
+ 
++#if PHP_VERSION_ID < 70300
++#define GC_ADDREF(p)              ++GC_REFCOUNT(p)
++#define GC_DELREF(p)              --GC_REFCOUNT(p)
++#define GC_SET_REFCOUNT(p, rc)    GC_REFCOUNT(p) = rc
++#endif
++
+ extern zend_module_entry zmq_module_entry;
+ #define phpext_zmq_ptr &zmq_module_entry
+ 
+diff --git a/tests/019-callbackinvalidsignature.phpt b/tests/019-callbackinvalidsignature.phpt
+index 753de31..b5bb20c 100644
+--- a/tests/019-callbackinvalidsignature.phpt
++++ b/tests/019-callbackinvalidsignature.phpt
+@@ -1,7 +1,8 @@
+ --TEST--
+ Test callback edge-cases
+ --SKIPIF--
+-
++= 70100) die("skip PHP 7.1 and higher fallback to passing argument by value even when forced to reference"); ?>
+ --FILE--
+ val, plist_key->len, &le, sizeof(le)) == NULL) {
+@@ -369,7 +369,7 @@ PHP_METHOD(zmq, curvekeypair)
+ PHP_METHOD(zmqcontext, __construct)
+ {
+ 	php_zmq_context_object *intern;
+-	long io_threads = 1;
++	zend_long io_threads = 1;
+ 	zend_bool is_persistent = 1;
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lb", &io_threads, &is_persistent) == FAILURE) {
+@@ -495,7 +495,7 @@ PHP_METHOD(zmqcontext, getOpt)
+ 	Create a new zmq socket
+ */
+ static
+-php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool is_persistent)
++php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, zend_long type, zend_bool is_persistent)
+ {
+ 	php_zmq_socket *zmq_sock;
+ 
+@@ -503,7 +503,7 @@ php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool
+ 	zmq_sock->z_socket    = zmq_socket(context->z_ctx, type);
+ 	zmq_sock->pid         = getpid();
+ 	zmq_sock->ctx         = context;
+-    zmq_sock->socket_type = type;
++	zmq_sock->socket_type = type;
+ 
+ 	if (!zmq_sock->z_socket) {
+ 		pefree(zmq_sock, is_persistent);
+@@ -535,7 +535,7 @@ void php_zmq_socket_store(php_zmq_socket *zmq_sock_p, zend_long type, zend_strin
+ 	le.type = php_zmq_socket_list_entry();
+ 	le.ptr  = zmq_sock_p;
+ 
+-	GC_REFCOUNT(&le) = 1;
++	GC_SET_REFCOUNT(&le, 1);
+ 
+ 	plist_key = php_zmq_socket_plist_key(type, persistent_id, use_shared_ctx);
+ 
+@@ -796,7 +796,7 @@ PHP_METHOD(zmqsocket, __construct)
+ 
+ /* {{{ static zend_bool php_zmq_send(php_zmq_socket_object *intern, char *message_param, long flags)
+ */
+-static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, long flags)
++static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, zend_long flags)
+ {
+ 	int rc, errno_;
+ 	zmq_msg_t message;
+@@ -828,7 +828,7 @@ static void php_zmq_sendmsg_impl(INTERNAL_FUNCTION_PARAMETERS)
+ {
+ 	php_zmq_socket_object *intern;
+ 	zend_string *message_param;
+-	long flags = 0;
++	zend_long flags = 0;
+ 	zend_bool ret;
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &message_param, &flags) == FAILURE) {
+@@ -890,7 +890,7 @@ PHP_METHOD(zmqsocket, sendmulti)
+ 	zval *messages;
+ 	php_zmq_socket_object *intern;
+ 	int to_send, ret = 0;
+-	long flags = 0;
++	zend_long flags = 0;
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|l", &messages, &flags) == FAILURE) {
+ 		return;
+@@ -910,7 +910,7 @@ PHP_METHOD(zmqsocket, sendmulti)
+ /* {{{ static zend_bool php_zmq_recv(php_zmq_socket_object *intern, long flags, zval *return_value)
+ */
+ static
+-zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags)
++zend_string *php_zmq_recv(php_zmq_socket_object *intern, zend_long flags)
+ {
+ 	int rc, errno_;
+ 	zmq_msg_t message;
+@@ -933,7 +933,7 @@ zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags)
+ 		return NULL;
+ 	}
+ 
+-	str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 1);
++	str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 0);
+ 	zmq_msg_close(&message);
+ 	return str;
+ }
+@@ -943,7 +943,7 @@ static void php_zmq_recvmsg_impl(INTERNAL_FUNCTION_PARAMETERS)
+ {
+ 	zend_string *str = NULL;
+ 	php_zmq_socket_object *intern;
+-	long flags = 0;
++	zend_long flags = 0;
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags) == FAILURE) {
+ 		return;
+@@ -974,7 +974,7 @@ PHP_METHOD(zmqsocket, recvmulti)
+ {
+ 	php_zmq_socket_object *intern;
+ 	size_t value_len;
+-	long flags = 0;
++	zend_long flags = 0;
+ #if ZMQ_VERSION_MAJOR < 3
+ 	int64_t value;
+ #else
+@@ -1303,7 +1303,7 @@ PHP_METHOD(zmqpoll, add)
+ {
+ 	php_zmq_poll_object *intern;
+ 	zval *object;
+-	long events;
++	zend_long events;
+ 	int error;
+ 	zend_string *key;
+ 
+@@ -1423,10 +1423,10 @@ PHP_METHOD(zmqpoll, poll)
+ 	php_zmq_poll_object *intern;
+ 	zval *r_array, *w_array;
+ 
+-	long timeout = -1;
++	zend_long timeout = -1;
+ 	int rc;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!a!|l", &r_array, &w_array, &timeout) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!/a!/|l", &r_array, &w_array, &timeout) == FAILURE) {
+ 		return;
+ 	}
+ 
+@@ -1592,7 +1592,7 @@ void s_clear_device_callback (php_zmq_device_cb_t *cb)
+ }
+ 
+ static
+-void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, long timeout, zval *user_data)
++void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, zend_long timeout, zval *user_data)
+ {
+ 	memcpy (&cb->fci, fci, sizeof (zend_fcall_info));
+ 	memcpy (&cb->fci_cache, fci_cache, sizeof (zend_fcall_info_cache));
+@@ -1615,7 +1615,7 @@ void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend
+ PHP_METHOD(zmqdevice, setidletimeout)
+ {
+ 	php_zmq_device_object *intern;
+-	long timeout;
++	zend_long timeout;
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) {
+ 		return;
+@@ -1644,7 +1644,7 @@ PHP_METHOD(zmqdevice, getidletimeout)
+ PHP_METHOD(zmqdevice, settimertimeout)
+ {
+ 	php_zmq_device_object *intern;
+-	long timeout;
++	zend_long timeout;
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) {
+ 		return;
+@@ -1676,7 +1676,7 @@ PHP_METHOD(zmqdevice, setidlecallback)
+ 	zval *user_data = NULL;
+ 	zend_fcall_info fci;
+ 	zend_fcall_info_cache fci_cache;
+-	long timeout = 0;
++	zend_long timeout = 0;
+ 
+ 	if (ZEND_NUM_ARGS() == 2) {
+ 		php_error_docref(NULL, E_DEPRECATED, "The signature for setIdleCallback has changed, please update your code");
+@@ -1718,7 +1718,7 @@ PHP_METHOD(zmqdevice, settimercallback)
+ 	zval *user_data = NULL;
+ 	zend_fcall_info fci;
+ 	zend_fcall_info_cache fci_cache;
+-	long timeout;
++	zend_long timeout;
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "fl|z!", &fci, &fci_cache, &timeout, &user_data) == FAILURE) {
+ 		return;
+diff --git a/zmq_sockopt.c b/zmq_sockopt.c
+index 1357032..3a00421 100644
+--- a/zmq_sockopt.c
++++ b/zmq_sockopt.c
+@@ -1,5 +1,3 @@
+-
+-
+ /*
+ +-----------------------------------------------------------------------------------+
+ |  ZMQ extension for PHP                                                            |
+@@ -2033,7 +2031,7 @@ PHP_METHOD(zmqsocket, getsockopt)
+ PHP_METHOD(zmqsocket, setsockopt)
+ {
+     php_zmq_socket_object *intern;
+-    long key;
++    zend_long key;
+     zval *zv;
+ 
+     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz/", &key, &zv) == FAILURE) {
+-- 
+2.17.1
+
diff --git a/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch b/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch
index b23911322..b25f66175 100644
--- a/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch
+++ b/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch
@@ -8,7 +8,7 @@ Terminate them with extreme prejudice.
 
 Signed-off-by: Gustavo Zacarias 
 Signed-off-by: Adam Duskett 
-[aduskett@gmail.com: Update for 7.2.2]
+[aduskett@gmail.com: Update for 7.3.0]
 ---
  acinclude.m4 | 4 ----
  1 file changed, 4 deletions(-)
@@ -17,7 +17,7 @@ diff --git a/acinclude.m4 b/acinclude.m4
 index 28506b6..af4aa06 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -1890,8 +1890,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
+@@ -1921,8 +1921,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
  dnl
  AC_DEFUN([PHP_CHECK_FUNC_LIB],[
    ifelse($2,,:,[
@@ -26,7 +26,7 @@ index 28506b6..af4aa06 100644
    unset found
    AC_CHECK_LIB($2, $1, [found=yes], [
      AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
-@@ -1923,8 +1921,6 @@ dnl in the default libraries and as a fall back in the specified library.
+@@ -1954,8 +1952,6 @@ dnl in the default libraries and as a fall back in the specified library.
  dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
  dnl
  AC_DEFUN([PHP_CHECK_FUNC],[
diff --git a/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch b/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch
index e921030d2..e4f2abbc0 100644
--- a/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch
+++ b/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch
@@ -14,7 +14,7 @@ Signed-off-by: Gustavo Zacarias 
 [Gustavo: convert to nice m4 instead of patching configure]
 [Gustavo: update for 5.6.10]
 Signed-off-by: Adam Duskett 
-[aduskett@gmail.com: Update for 7.2.2]
+[aduskett@gmail.com: Update for 7.3.0]
 ---
  acinclude.m4        |  2 +-
  ext/iconv/config.m4 | 22 ----------------------
@@ -24,7 +24,7 @@ diff --git a/acinclude.m4 b/acinclude.m4
 index af4aa06..1bd2652 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -2463,7 +2463,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
+@@ -2444,7 +2444,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
    dnl
    if test "$found_iconv" = "no"; then
  
@@ -34,10 +34,10 @@ index af4aa06..1bd2652 100644
          AC_DEFINE(HAVE_GICONV_H, 1, [ ])
          ICONV_DIR=$i
 diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
-index 6a05697..694fcb8 100644
+index 72334f79..29c358ad 100644
 --- a/ext/iconv/config.m4
 +++ b/ext/iconv/config.m4
-@@ -14,28 +14,6 @@ if test "$PHP_ICONV" != "no"; then
+@@ -12,28 +12,6 @@ if test "$PHP_ICONV" != "no"; then
    ])
  
    if test "$iconv_avail" != "no"; then
@@ -65,7 +65,7 @@ index 6a05697..694fcb8 100644
 -	fi
  
      AC_MSG_CHECKING([if iconv is glibc's])
-     AC_TRY_LINK([#include ],[gnu_get_libc_version();],
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[gnu_get_libc_version();]])],[
 -- 
 2.7.4
 
diff --git a/buildroot/package/php/0003-configure-disable-the-phar-tool.patch b/buildroot/package/php/0003-configure-disable-the-phar-tool.patch
index e41584e8e..396a80649 100644
--- a/buildroot/package/php/0003-configure-disable-the-phar-tool.patch
+++ b/buildroot/package/php/0003-configure-disable-the-phar-tool.patch
@@ -11,7 +11,7 @@ on the target.
 Signed-off-by: Gustavo Zacarias 
 [Gustavo: update for autoreconf/configure.in]
 Signed-off-by: Adam Duskett 
-[Aduskett: update for 7.2.2]
+[Aduskett: update for 7.3.0]
 ---
  configure.ac | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
@@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
 index d20af76..7f02f1a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1420,13 +1420,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
+@@ -1472,13 +1472,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
  INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
  
diff --git a/buildroot/package/php/0006-Call-apxs-with-correct-prefix.patch b/buildroot/package/php/0004-Call-apxs-with-correct-prefix.patch
similarity index 93%
rename from buildroot/package/php/0006-Call-apxs-with-correct-prefix.patch
rename to buildroot/package/php/0004-Call-apxs-with-correct-prefix.patch
index c81711d2a..60589b54f 100644
--- a/buildroot/package/php/0006-Call-apxs-with-correct-prefix.patch
+++ b/buildroot/package/php/0004-Call-apxs-with-correct-prefix.patch
@@ -16,7 +16,7 @@ To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
 
 Signed-off-by: Fabrice Fontaine 
 Signed-off-by: Adam Duskett 
-[aduskett@gmail.com: Update for 7.2.2]
+[aduskett@gmail.com: Update for 7.3.0]
 ---
  sapi/apache2handler/config.m4 | 3 +++
  1 file changed, 3 insertions(+)
@@ -25,7 +25,7 @@ diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
 index 2e64b21..f5bf002 100644
 --- a/sapi/apache2handler/config.m4
 +++ b/sapi/apache2handler/config.m4
-@@ -66,10 +66,12 @@ if test "$PHP_APXS2" != "no"; then
+@@ -64,10 +64,12 @@ if test "$PHP_APXS2" != "no"; then
      AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
    fi
  
@@ -38,7 +38,7 @@ index 2e64b21..f5bf002 100644
                         -i -n php7"
    else
      APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
-@@ -77,6 +79,7 @@ if test "$PHP_APXS2" != "no"; then
+@@ -75,6 +77,7 @@ if test "$PHP_APXS2" != "no"; then
                  \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                         -S SYSCONFDIR='$APXS_SYSCONFDIR' \
diff --git a/buildroot/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch b/buildroot/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch
deleted file mode 100644
index 2c08437e4..000000000
--- a/buildroot/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From bedbd41ef0a5ce80b83a6f6eaebd7c90f0bc5615 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias 
-Date: Tue, 9 Aug 2016 11:52:19 +0200
-Subject: [PATCH] OPcache: flock mechanism is obviously linux so force it.
-
-Signed-off-by: Gustavo Zacarias 
-Signed-off-by: Bernd Kuhls 
-[Bernd: update for 7.2.12]
----
- ext/opcache/config.m4 | 34 ++--------------------------------
- 1 file changed, 2 insertions(+), 32 deletions(-)
-
-diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
-index fbb9b21..ffddc8e 100644
---- a/ext/opcache/config.m4
-+++ b/ext/opcache/config.m4
-@@ -343,38 +343,8 @@ int main() {
-     msg=yes,msg=no,msg=no)
-   AC_MSG_RESULT([$msg])
- 
--flock_type=unknown
--AC_MSG_CHECKING("whether flock struct is linux ordered")
--AC_TRY_RUN([
--  #include 
--  struct flock lock = { 1, 2, 3, 4, 5 };
--  int main() {
--    if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
--		return 0;
--    }
--    return 1;
--  }
--], [
--	flock_type=linux
--    AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
--    AC_MSG_RESULT("yes")
--], AC_MSG_RESULT("no") )
--
--AC_MSG_CHECKING("whether flock struct is BSD ordered")
--AC_TRY_RUN([
--  #include 
--  struct flock lock = { 1, 2, 3, 4, 5 };
--  int main() {
--    if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
--		return 0;
--    }
--    return 1;
--  }
--], [
--	flock_type=bsd
--    AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
--    AC_MSG_RESULT("yes")
--], AC_MSG_RESULT("no") )
-+flock_type=linux
-+AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
- 
- if test "$flock_type" = "unknown"; then
- 	AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
--- 
-2.7.4
-
diff --git a/buildroot/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch b/buildroot/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
deleted file mode 100644
index 257ac70f4..000000000
--- a/buildroot/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a874ba472151c6811018de322a5787d0ca6148c9 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias 
-Date: Tue, 9 Aug 2016 11:52:51 +0200
-Subject: [PATCH] ext/fileinfo/config.m4: allow cache answer for strcasestr
- discovery
-
-Signed-off-by: Gustavo Zacarias 
-[aduskett@gmail.com: Update for 7.2.2]
-Signed-off-by: Adam Duskett 
----
- ext/fileinfo/config.m4 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
-index 7e98d62..8561962 100644
---- a/ext/fileinfo/config.m4
-+++ b/ext/fileinfo/config.m4
-@@ -15,6 +15,7 @@ libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c"
- 
-   AC_MSG_CHECKING([for strcasestr])
-+  AC_CACHE_VAL(ac_cv_func_strcasestr,
-   AC_TRY_RUN([
- #include 
- #include 
- #include 
-@@ -46,7 +47,7 @@ int main(void)
-     AC_MSG_RESULT(no)
-     AC_MSG_NOTICE(using libmagic strcasestr implementation)
-     libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
--  ])
-+  ]))
- 
-   PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
-   PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
--- 
-2.7.4
-
diff --git a/buildroot/package/php/Config.ext b/buildroot/package/php/Config.ext
index 7e6b3e0e2..d71cfb998 100644
--- a/buildroot/package/php/Config.ext
+++ b/buildroot/package/php/Config.ext
@@ -45,9 +45,14 @@ config BR2_PACKAGE_PHP_EXT_PHAR
 	help
 	  PHP Archive support
 
+comment "zip needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_PHP_EXT_ZIP
 	bool "zip"
+	depends on !BR2_STATIC_LIBS # libzip
 	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_LIBZIP
 	help
 	  Zip read/write support
 
@@ -170,10 +175,14 @@ config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
 
 config BR2_PACKAGE_PHP_EXT_PDO_UNIXODBC
 	bool "unixODBC"
+	depends on !BR2_STATIC_LIBS # unixodbc
 	select BR2_PACKAGE_UNIXODBC
 	help
 	  unixODBC driver for PDO
 
+comment "unixodbc driver needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 endif
 
 comment "Human language and character encoding support"
diff --git a/buildroot/package/php/php.hash b/buildroot/package/php/php.hash
index 094977c54..d88433e8c 100644
--- a/buildroot/package/php/php.hash
+++ b/buildroot/package/php/php.hash
@@ -1,5 +1,5 @@
 # From http://php.net/downloads.php
-sha256 14b0429abdb46b65c843e5882c9a8c46b31dfbf279c747293b8ab950c2644a4b  php-7.2.13.tar.xz
+sha256 fefc8967daa30ebc375b2ab2857f97da94ca81921b722ddac86b29e15c54a164  php-7.3.6.tar.xz
 
 # License file
 sha256 f689b8fa63bea7950ce6a21bf52ed88ea0d77673ee76e6de12f51191174d91b8  LICENSE
diff --git a/buildroot/package/php/php.mk b/buildroot/package/php/php.mk
index b95ceb5c9..7132f9591 100644
--- a/buildroot/package/php/php.mk
+++ b/buildroot/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_VERSION = 7.2.13
+PHP_VERSION = 7.3.6
 PHP_SITE = http://www.php.net/distributions
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES
@@ -22,7 +22,6 @@ PHP_CONF_OPTS = \
 	--disable-phpdbg \
 	--disable-rpath
 PHP_CONF_ENV = \
-	ac_cv_func_strcasestr=yes \
 	EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
 
 ifeq ($(BR2_STATIC_LIBS),y)
@@ -153,6 +152,10 @@ PHP_CONF_OPTS += \
 PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 endif
 
+ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y)
+PHP_DEPENDENCIES += libzip
+endif
+
 ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),)
 PHP_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr
 PHP_DEPENDENCIES += zlib
@@ -240,9 +243,9 @@ endef
 PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND
 
 ### Use external PCRE if it's available
-ifeq ($(BR2_PACKAGE_PCRE),y)
+ifeq ($(BR2_PACKAGE_PCRE2),y)
 PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr
-PHP_DEPENDENCIES += pcre
+PHP_DEPENDENCIES += pcre2
 else
 # The bundled pcre library is not configurable through ./configure options,
 # and by default is configured to be thread-safe, so it wants pthreads. So
@@ -259,7 +262,7 @@ endif
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y)
-PHP_CONF_OPTS += --with-curl=$(STAGING_DIR)/usr
+PHP_CONF_OPTS += --with-curl
 PHP_DEPENDENCIES += libcurl
 endif
 
diff --git a/buildroot/package/pigpio/pigpio.hash b/buildroot/package/pigpio/pigpio.hash
index db4390148..3df55faff 100644
--- a/buildroot/package/pigpio/pigpio.hash
+++ b/buildroot/package/pigpio/pigpio.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	4255310dd11ed81035b60711becad081a1eaad2905f704e3eb84e692ca7e4c3d  pigpio-V67.tar.gz
+sha256	ec980f5e672e8e9395b801fecec3fbbbc5c04182b16ee72eb9ca25a453e38062  pigpio-V68.tar.gz
 sha256	6a90b88421a0d9b090e121daa11b3c6d55eed5eeb3281a2fcc454d6a28b5547c  UNLICENCE
diff --git a/buildroot/package/pigpio/pigpio.mk b/buildroot/package/pigpio/pigpio.mk
index 48628a953..3071036db 100644
--- a/buildroot/package/pigpio/pigpio.mk
+++ b/buildroot/package/pigpio/pigpio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PIGPIO_VERSION = V67
+PIGPIO_VERSION = V68
 PIGPIO_SITE = $(call github,joan2937,pigpio,$(PIGPIO_VERSION))
 PIGPIO_LICENSE = Unlicense
 PIGPIO_LICENSE_FILES = UNLICENCE
diff --git a/buildroot/package/pinentry/Config.in b/buildroot/package/pinentry/Config.in
index 5f2cb58fb..22bc2bb43 100644
--- a/buildroot/package/pinentry/Config.in
+++ b/buildroot/package/pinentry/Config.in
@@ -7,7 +7,6 @@ menuconfig BR2_PACKAGE_PINENTRY
 	# At least one backend is needed to avoid build breakage
 	select BR2_PACKAGE_PINENTRY_NCURSES if \
 		!BR2_PACKAGE_PINENTRY_GTK2 && \
-		!BR2_PACKAGE_PINENTRY_QT4 && \
 		!BR2_PACKAGE_PINENTRY_QT5
 	help
 	  A collection of simple PIN or pass-phrase entry dialogs
@@ -42,28 +41,12 @@ comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++"
 	depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \
 		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_PINENTRY_QT4
-	bool "pinentry-qt4"
-	depends on BR2_USE_MMU # fork
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  The pinentry-qt4 tool
-
-comment "pinentry-qt4 needs a toolchain w/ C++, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-
 config BR2_PACKAGE_PINENTRY_QT5
 	bool "pinentry-qt5"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS
-	depends on !BR2_PACKAGE_PINENTRY_QT4
-	depends on !BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5BASE_WIDGETS
@@ -71,7 +54,6 @@ config BR2_PACKAGE_PINENTRY_QT5
 	  The pinentry-qt5 tool
 
 comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
-	depends on !BR2_PACKAGE_PINENTRY_QT4
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 
diff --git a/buildroot/package/pinentry/pinentry.mk b/buildroot/package/pinentry/pinentry.mk
index d0179728b..ce82f1090 100644
--- a/buildroot/package/pinentry/pinentry.mk
+++ b/buildroot/package/pinentry/pinentry.mk
@@ -52,15 +52,10 @@ else
 PINENTRY_CONF_OPTS += --disable-pinentry-gtk2
 endif
 
-# pinentry-qt4/5 backend
-ifeq ($(BR2_PACKAGE_PINENTRY_QT4)$(BR2_PACKAGE_PINENTRY_QT5),y)
-ifeq ($(BR2_PACKAGE_PINENTRY_QT4),y)
-# -pthread needs to be passed for certain toolchains
-# http://autobuild.buildroot.net/results/6be/6be109ccedec603a67cebdb31b55865dcce0e128/
-PINENTRY_CONF_OPTS += LIBS=-pthread MOC=$(HOST_DIR)/bin/moc
-endif
+# pinentry-qt5 backend
+ifeq ($(BR2_PACKAGE_PINENTRY_QT5),y)
 PINENTRY_CONF_OPTS += --enable-pinentry-qt
-PINENTRY_DEPENDENCIES += $(if $(BR2_PACKAGE_PINENTRY_QT4),qt,qt5base)
+PINENTRY_DEPENDENCIES += qt5base
 else
 PINENTRY_CONF_OPTS += --disable-pinentry-qt
 endif
diff --git a/buildroot/package/pkg-cmake.mk b/buildroot/package/pkg-cmake.mk
index 51a1929eb..b9ce8ff62 100644
--- a/buildroot/package/pkg-cmake.mk
+++ b/buildroot/package/pkg-cmake.mk
@@ -60,8 +60,6 @@ $(2)_INSTALL_OPTS		?= install
 $(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install/fast
 $(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR) install/fast
 
-$(2)_SRCDIR			= $$($(2)_DIR)/$$($(2)_SUBDIR)
-
 $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES
 
 
diff --git a/buildroot/package/pkg-download.mk b/buildroot/package/pkg-download.mk
index 0def845cb..7cd87c38f 100644
--- a/buildroot/package/pkg-download.mk
+++ b/buildroot/package/pkg-download.mk
@@ -15,7 +15,6 @@ export BZR := $(call qstrip,$(BR2_BZR))
 export GIT := $(call qstrip,$(BR2_GIT))
 export HG := $(call qstrip,$(BR2_HG))
 export SCP := $(call qstrip,$(BR2_SCP))
-SSH := $(call qstrip,$(BR2_SSH))
 export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES))
 
 DL_WRAPPER = support/download/dl-wrapper
diff --git a/buildroot/package/pkg-generic.mk b/buildroot/package/pkg-generic.mk
index 7a95ea19c..cbe885aaa 100644
--- a/buildroot/package/pkg-generic.mk
+++ b/buildroot/package/pkg-generic.mk
@@ -63,13 +63,21 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time
 # $(2): base directory to search in
 # $(3): suffix of file  (optional)
 define step_pkg_size_inner
+	@touch $(BUILD_DIR)/.files-list$(3).stat
 	@touch $(BUILD_DIR)/packages-file-list$(3).txt
 	$(SED) '/^$(1),/d' $(BUILD_DIR)/packages-file-list$(3).txt
 	cd $(2); \
-	find . \( -type f -o -type l \) \
-		-newer $($(PKG)_DIR)/.stamp_built \
-		-exec printf '$(1),%s\n' {} + \
+	LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \
+		| LC_ALL=C sort > $(BUILD_DIR)/.files-list$(3).new
+	LC_ALL=C comm -13 \
+		$(BUILD_DIR)/.files-list$(3).stat \
+		$(BUILD_DIR)/.files-list$(3).new \
+		> $($(PKG)_BUILDDIR)/.files-list$(3).txt
+	sed -r -e 's/^[^,]+/$(1)/' \
+		$($(PKG)_BUILDDIR)/.files-list$(3).txt \
 		>> $(BUILD_DIR)/packages-file-list$(3).txt
+	mv $(BUILD_DIR)/.files-list$(3).new \
+		$(BUILD_DIR)/.files-list$(3).stat
 endef
 
 define step_pkg_size
@@ -173,6 +181,7 @@ $(BUILD_DIR)/%/.stamp_extracted:
 $(BUILD_DIR)/%/.stamp_rsynced:
 	@$(call step_start,rsync)
 	@$(call MESSAGE,"Syncing from source dir $(SRCDIR)")
+	@mkdir -p $(@D)
 	$(foreach hook,$($(PKG)_PRE_RSYNC_HOOKS),$(call $(hook))$(sep))
 	@test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1)
 	rsync -au --chmod=u=rwX,go=rX $(RSYNC_VCS_EXCLUSIONS) $($(PKG)_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS) $(call qstrip,$(SRCDIR))/ $(@D)
@@ -238,6 +247,7 @@ $(BUILD_DIR)/%/.stamp_built::
 $(BUILD_DIR)/%/.stamp_host_installed:
 	@$(call step_start,install-host)
 	@$(call MESSAGE,"Installing to host directory")
+	@mkdir -p $(HOST_DIR)
 	$(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep))
 	+$($(PKG)_INSTALL_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))
@@ -267,22 +277,25 @@ $(BUILD_DIR)/%/.stamp_host_installed:
 $(BUILD_DIR)/%/.stamp_staging_installed:
 	@$(call step_start,install-staging)
 	@$(call MESSAGE,"Installing to staging directory")
+	@mkdir -p $(STAGING_DIR)
 	$(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
 	+$($(PKG)_INSTALL_STAGING_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
 	$(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
 		$(call MESSAGE,"Fixing package configuration files") ;\
-			$(SED)  "s,$(BASE_DIR),@BASE_DIR@,g" \
-				-e "s,$(STAGING_DIR),@STAGING_DIR@,g" \
+			$(SED)  "s,$(HOST_DIR),@HOST_DIR@,g" \
+				-e "s,$(BASE_DIR),@BASE_DIR@,g" \
 				-e "s,^\(exec_\)\?prefix=.*,\1prefix=@STAGING_DIR@/usr,g" \
 				-e "s,-I/usr/,-I@STAGING_DIR@/usr/,g" \
 				-e "s,-L/usr/,-L@STAGING_DIR@/usr/,g" \
-				-e "s,@STAGING_DIR@,$(STAGING_DIR),g" \
+				-e 's,@STAGING_DIR@,$$(dirname $$(readlink -e $$0))/../..,g' \
+				-e 's,@HOST_DIR@,$$(dirname $$(readlink -e $$0))/../../../..,g' \
 				-e "s,@BASE_DIR@,$(BASE_DIR),g" \
 				$(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ;\
 	fi
 	@$(call MESSAGE,"Fixing libtool files")
-	$(Q)find $(STAGING_DIR)/usr/lib* -name "*.la" | xargs --no-run-if-empty \
+	for la in $$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \
+		cp -a "$${la}" "$${la}.fixed" && \
 		$(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \
 			-e "s:$(STAGING_DIR):@STAGING_DIR@:g" \
 			$(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\
@@ -291,13 +304,21 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
 			$(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\
 				-e "s:@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):g") \
 			-e "s:@STAGING_DIR@:$(STAGING_DIR):g" \
-			-e "s:@BASE_DIR@:$(BASE_DIR):g"
+			-e "s:@BASE_DIR@:$(BASE_DIR):g" \
+			"$${la}.fixed" && \
+		if cmp -s "$${la}" "$${la}.fixed"; then \
+			rm -f "$${la}.fixed"; \
+		else \
+			mv "$${la}.fixed" "$${la}"; \
+		fi || exit 1; \
+	done
 	@$(call step_end,install-staging)
 	$(Q)touch $@
 
 # Install to images dir
 $(BUILD_DIR)/%/.stamp_images_installed:
 	@$(call step_start,install-image)
+	@mkdir -p $(BINARIES_DIR)
 	$(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep))
 	@$(call MESSAGE,"Installing to images directory")
 	+$($(PKG)_INSTALL_IMAGES_CMDS)
@@ -309,6 +330,7 @@ $(BUILD_DIR)/%/.stamp_images_installed:
 $(BUILD_DIR)/%/.stamp_target_installed:
 	@$(call step_start,install-target)
 	@$(call MESSAGE,"Installing to target")
+	@mkdir -p $(TARGET_DIR)
 	$(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
 	+$($(PKG)_INSTALL_TARGET_CMDS)
 	$(if $(BR2_INIT_SYSTEMD),\
@@ -583,7 +605,9 @@ $(2)_DEPENDENCIES += host-skeleton
 endif
 
 ifneq ($$(filter cvs git svn,$$($(2)_SITE_METHOD)),)
-$(2)_DOWNLOAD_DEPENDENCIES += $(BR2_TAR_HOST_DEPENDENCY)
+$(2)_DOWNLOAD_DEPENDENCIES += \
+	$(BR2_GZIP_HOST_DEPENDENCY) \
+	$(BR2_TAR_HOST_DEPENDENCY)
 endif
 
 ifeq ($$(filter host-tar host-skeleton host-fakedate,$(1)),)
@@ -591,12 +615,16 @@ $(2)_EXTRACT_DEPENDENCIES += $$(BR2_TAR_HOST_DEPENDENCY)
 endif
 
 ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),)
+ifneq ($$(filter .xz .lzma,$$(suffix $$($(2)_SOURCE))),)
 $(2)_EXTRACT_DEPENDENCIES += $$(BR2_XZCAT_HOST_DEPENDENCY)
 endif
+endif
 
 ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),)
+ifneq ($$(filter .lz,$$(suffix $$($(2)_SOURCE))),)
 $(2)_EXTRACT_DEPENDENCIES += $$(BR2_LZIP_HOST_DEPENDENCY)
 endif
+endif
 
 ifeq ($$(BR2_CCACHE),y)
 ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache,$(1)),)
@@ -621,14 +649,17 @@ $(2)_FINAL_ALL_DEPENDENCIES = \
 		$$($(2)_FINAL_DOWNLOAD_DEPENDENCIES) \
 		$$($(2)_FINAL_EXTRACT_DEPENDENCIES) \
 		$$($(2)_FINAL_PATCH_DEPENDENCIES))
-$(2)_FINAL_RECURSIVE_DEPENDENCIES = \
-	$$(sort \
-		$$(foreach p,\
-			$$($(2)_FINAL_ALL_DEPENDENCIES),\
-			$$(p)\
-			$$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES)\
-		)\
-	)
+$(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \
+	$$(if $$(filter undefined,$$(origin $(2)_FINAL_RECURSIVE_DEPENDENCIES__X)), \
+		$$(eval $(2)_FINAL_RECURSIVE_DEPENDENCIES__X := \
+			$$(foreach p, \
+				$$($(2)_FINAL_ALL_DEPENDENCIES), \
+				$$(p) \
+				$$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES) \
+			) \
+		) \
+	) \
+	$$($(2)_FINAL_RECURSIVE_DEPENDENCIES__X))
 
 $(2)_INSTALL_STAGING		?= NO
 $(2)_INSTALL_IMAGES		?= NO
@@ -735,7 +766,7 @@ $$($(2)_TARGET_BUILD):	$$($(2)_TARGET_CONFIGURE)
 $(1)-configure:			$$($(2)_TARGET_CONFIGURE)
 $$($(2)_TARGET_CONFIGURE):	| $$($(2)_FINAL_DEPENDENCIES)
 
-$$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dirs prepare
+$$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | prepare
 $$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dependencies
 
 ifeq ($$($(2)_OVERRIDE_SRCDIR),)
diff --git a/buildroot/package/pkg-kconfig.mk b/buildroot/package/pkg-kconfig.mk
index d6c95b897..d62be0fd0 100644
--- a/buildroot/package/pkg-kconfig.mk
+++ b/buildroot/package/pkg-kconfig.mk
@@ -24,9 +24,12 @@ define kconfig-package-update-config
 	fi
 	$(Q)mkdir -p $(dir $($(PKG)_KCONFIG_FILE))
 	cp -f $($(PKG)_DIR)/$(1) $($(PKG)_KCONFIG_FILE)
-	$(Q)touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_DOTCONFIG) $($(PKG)_KCONFIG_FILE)
+	$(Q)touch --reference $($(PKG)_DIR)/$($(PKG)_KCONFIG_STAMP_DOTCONFIG) $($(PKG)_KCONFIG_FILE)
 endef
 
+PKG_KCONFIG_COMMON_OPTS = \
+	HOSTCC=$(HOSTCC_NOCCACHE)
+
 ################################################################################
 # inner-kconfig-package -- generates the make targets needed to support a
 # kconfig package
@@ -58,6 +61,12 @@ $(2)_KCONFIG_FIXUP_CMDS ?=
 $(2)_KCONFIG_FRAGMENT_FILES ?=
 $(2)_KCONFIG_DOTCONFIG ?= .config
 
+# Do not use $(2)_KCONFIG_DOTCONFIG as stamp file, because the package
+# buildsystem (e.g. linux >= 4.19) may touch it, thus rendering our
+# timestamps out of date, thus re-trigerring the build of the package.
+# Instead, use a specific file of our own as timestamp.
+$(2)_KCONFIG_STAMP_DOTCONFIG = .stamp_dotconfig
+
 # The config file as well as the fragments could be in-tree, so before
 # depending on them the package should be extracted (and patched) first.
 #
@@ -79,7 +88,8 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch
 	done
 
 $(2)_KCONFIG_MAKE = \
-	$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS)
+	$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
+		$$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS)
 
 # $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax
 # of the shell conflicts with Make's own syntax, this means that backticks
@@ -112,23 +122,24 @@ endef
 # fragments are merged together to .config, after the package has been patched.
 # Since the file could be a defconfig file it needs to be expanded to a
 # full .config first.
-$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
+$$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
 	$$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \
 		$$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \
-		$$(INSTALL) -m 0644 -D $$($(2)_KCONFIG_FILE) $$(@))
+		$$(INSTALL) -m 0644 -D $$($(2)_KCONFIG_FILE) $$(@D)/$$($(2)_KCONFIG_DOTCONFIG))
 	$$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \
-		$$(@) $$($(2)_KCONFIG_FRAGMENT_FILES)
+		$$(@D)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FRAGMENT_FILES)
 	$$($(2)_REGEN_DOT_CONFIG)
+	$$(Q)touch $$(@D)/$$($(2)_KCONFIG_STAMP_DOTCONFIG)
 
 # If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is
 # already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add
 # it explicitly. It doesn't hurt to always have it though.
-$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): | $(1)-patch
+$$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG): | $(1)-patch
 
 # Some packages may need additional tools to be present by the time their
 # kconfig structure is parsed (e.g. the linux kernel may need to call to
 # the compiler to test its features).
-$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): | $$($(2)_KCONFIG_DEPENDENCIES)
+$$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG): | $$($(2)_KCONFIG_DEPENDENCIES)
 
 # In order to get a usable, consistent configuration, some fixup may be needed.
 # The exact rules are specified by the package .mk file.
@@ -138,7 +149,7 @@ define $(2)_FIXUP_DOT_CONFIG
 	$$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done
 endef
 
-$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG)
+$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG)
 	$$($(2)_FIXUP_DOT_CONFIG)
 
 # Before running configure, the configuration file should be present and fixed
@@ -175,7 +186,9 @@ endif
 # nconfig, gconfig, xconfig).
 # So we simply remove our PATH and PKG_CONFIG_* variables.
 $(2)_CONFIGURATOR_MAKE_ENV = \
-	$$(filter-out PATH=% PKG_CONFIG=% PKG_CONFIG_SYSROOT_DIR=% PKG_CONFIG_LIBDIR=%,$$($(2)_MAKE_ENV)) \
+	$$(filter-out PATH=% PKG_CONFIG=% PKG_CONFIG_SYSROOT_DIR=% \
+	   PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=% PKG_CONFIG_ALLOW_SYSTEM_LIBS=% \
+	   PKG_CONFIG_LIBDIR=%,$$($(2)_MAKE_ENV)) \
 	PKG_CONFIG_PATH="$(HOST_PKG_CONFIG_PATH)"
 
 # Configuration editors (menuconfig, ...)
@@ -195,7 +208,7 @@ $(2)_CONFIGURATOR_MAKE_ENV = \
 $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_%
 $$($(2)_DIR)/.kconfig_editor_%: $$($(2)_DIR)/.stamp_kconfig_fixup_done
 	$$($(2)_CONFIGURATOR_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
-		$$($(2)_KCONFIG_OPTS) $$(*)
+		$$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) $$(*)
 	rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built}
 	rm -f $$($(2)_DIR)/.stamp_{target,staging,images}_installed
 	$$($(2)_FIXUP_DOT_CONFIG)
@@ -224,7 +237,7 @@ $(1)-check-configuration-done:
 
 $(1)-savedefconfig: $(1)-check-configuration-done
 	$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
-		$$($(2)_KCONFIG_OPTS) savedefconfig
+		$$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) savedefconfig
 
 # Target to copy back the configuration to the source configuration file
 # Even though we could use 'cp --preserve-timestamps' here, the separate
diff --git a/buildroot/package/pkg-luarocks.mk b/buildroot/package/pkg-luarocks.mk
index e2b48cfb4..78d6c325f 100644
--- a/buildroot/package/pkg-luarocks.mk
+++ b/buildroot/package/pkg-luarocks.mk
@@ -42,7 +42,8 @@ $(2)_SITE		?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
 
 # Since we do not support host-luarocks-package, we know this is
 # a target package, and can just add the required dependencies
-$(2)_DEPENDENCIES	+= host-luarocks luainterpreter
+$(2)_DEPENDENCIES	+= luainterpreter
+$(2)_EXTRACT_DEPENDENCIES += host-luarocks
 
 #
 # Extract step. Extract into a temporary dir and move the relevant part to the
@@ -62,7 +63,7 @@ endif
 #
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
-	cd $$($(2)_SRCDIR) && $$(LUAROCKS_RUN_ENV) flock $$(TARGET_DIR) \
+	cd $$($(2)_SRCDIR) && $$(LUAROCKS_RUN_ENV) \
 		$$(LUAROCKS_RUN_CMD) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS)
 endef
 endif
@@ -71,9 +72,11 @@ endif
 # make targets
 $(call inner-generic-package,$(1),$(2),$(3),$(4))
 
-# $(2)_DEPENDENCIES are handled for configure step (too late)
-# but host-luarocks is required to do the extract
-$$($(2)_TARGET_EXTRACT): | host-luarocks
+# Upgrade helper
+$(1)-upgrade: host-luarocks
+	$$(LUAROCKS_RUN_CMD) buildroot $$($(2)_NAME_UPSTREAM) $(1)
+
+.PHONY: $(1)-upgrade
 
 endef
 
diff --git a/buildroot/package/pkg-meson.mk b/buildroot/package/pkg-meson.mk
index 507e68606..886fcf720 100644
--- a/buildroot/package/pkg-meson.mk
+++ b/buildroot/package/pkg-meson.mk
@@ -48,7 +48,6 @@ define inner-meson-package
 $(2)_CONF_ENV		?=
 $(2)_CONF_OPTS		?=
 $(2)_NINJA_ENV		?=
-$(2)_SRCDIR		= $$($(2)_DIR)/$$($(2)_SUBDIR)
 
 #
 # Configure step. Only define it if not already defined by the package
@@ -64,12 +63,22 @@ ifeq ($(4),target)
 define $(2)_CONFIGURE_CMDS
 	rm -rf $$($$(PKG)_SRCDIR)/build
 	mkdir -p $$($$(PKG)_SRCDIR)/build
+	sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \
+	    -e "s%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
+	    -e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \
+	    -e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \
+	    -e "s%@TARGET_CFLAGS@%$$(HOST_MESON_SED_CFLAGS)%g" \
+	    -e "s%@TARGET_LDFLAGS@%$$(HOST_MESON_SED_LDFLAGS)%g" \
+	    -e "s%@TARGET_CXXFLAGS@%$$(HOST_MESON_SED_CXXFLAGS)%g" \
+	    -e "s%@HOST_DIR@%$$(HOST_DIR)%g" \
+	    package/meson/cross-compilation.conf.in \
+	    > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf
 	PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \
 		--prefix=/usr \
 		--libdir=lib \
 		--default-library=$(if $(BR2_STATIC_LIBS),static,shared) \
 		--buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
-		--cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \
+		--cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \
 		$$($$(PKG)_CONF_OPTS) \
 		$$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build
 endef
@@ -103,12 +112,12 @@ ifndef $(2)_BUILD_CMDS
 ifeq ($(4),target)
 define $(2)_BUILD_CMDS
 	$$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \
-		$$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
+		$$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
 endef
 else
 define $(2)_BUILD_CMDS
 	$$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \
-		$$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
+		$$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
 endef
 endif
 endif
diff --git a/buildroot/package/pkg-python.mk b/buildroot/package/pkg-python.mk
index f57e486da..e90692041 100644
--- a/buildroot/package/pkg-python.mk
+++ b/buildroot/package/pkg-python.mk
@@ -42,10 +42,12 @@ PKG_PYTHON_DISTUTILS_BUILD_OPTS = \
 	--executable=/usr/bin/python
 
 PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
-	--prefix=$(TARGET_DIR)/usr
+	--prefix=/usr \
+	--root=$(TARGET_DIR)
 
 PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \
-	--prefix=$(STAGING_DIR)/usr
+	--prefix=/usr \
+	--root=$(STAGING_DIR)
 
 # Host distutils-based packages
 HOST_PKG_PYTHON_DISTUTILS_ENV = \
@@ -66,16 +68,16 @@ PKG_PYTHON_SETUPTOOLS_ENV = \
 	_python_exec_prefix=/usr
 
 PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \
-	--prefix=$(TARGET_DIR)/usr \
+	--prefix=/usr \
 	--executable=/usr/bin/python \
 	--single-version-externally-managed \
-	--root=/
+	--root=$(TARGET_DIR)
 
 PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--executable=/usr/bin/python \
 	--single-version-externally-managed \
-	--root=/
+	--root=$(STAGING_DIR)
 
 # Host setuptools-based packages
 HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
@@ -83,7 +85,9 @@ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
 	PYTHONNOUSERSITE=1
 
 HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
-	--prefix=$(HOST_DIR)
+	--prefix=$(HOST_DIR) \
+	--root=/ \
+	--single-version-externally-managed
 
 ################################################################################
 # inner-python-package -- defines how the configuration, compilation
@@ -101,9 +105,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
 
 define inner-python-package
 
-$(2)_SRCDIR	= $$($(2)_DIR)/$$($(2)_SUBDIR)
-$(2)_BUILDDIR	= $$($(2)_SRCDIR)
-
 $(2)_ENV         ?=
 $(2)_BUILD_OPTS   ?=
 $(2)_INSTALL_OPTS ?=
@@ -178,16 +179,35 @@ endif
 endif # ($$($(2)_NEEDS_HOST_PYTHON),)
 endif # ($(4),target)
 
-# Setuptools based packages will need host-python-setuptools (both
-# host and target). We need to have a special exclusion for the
-# host-setuptools package itself: it is setuptools-based, but
-# shouldn't depend on host-setuptools (because it would otherwise
-# depend on itself!).
+# Setuptools based packages will need setuptools for the host Python
+# interpreter (both host and target).
+#
+# If we have a host package that says "I need Python 3", we install
+# setuptools for python3.
+#
+# If we have a host packge that says "I need Python 2", we install
+# setuptools for python2.
+#
+# If we have a target package, or a host package that doesn't have any
+# _NEEDS_HOST_PYTHON, and BR2_PACKAGE_PYTHON3 is used, then
+# Python 3.x is the default Python interpreter, so we install
+# setuptools for python3.
+#
+# In all other cases, we install setuptools for python2. Those other
+# cases are: a target package or host package with
+# BR2_PACKAGE_PYTHON=y, or a host-package with neither
+# BR2_PACKAGE_PYTHON3=y or BR2_PACKAGE_PYTHON=y.
 ifeq ($$($(2)_SETUP_TYPE),setuptools)
-ifneq ($(2),HOST_PYTHON_SETUPTOOLS)
-$(2)_DEPENDENCIES += host-python-setuptools
-endif
+ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python3)
+$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools)
+else ifeq ($(4):$$($(2)_NEEDS_HOST_PYTHON),host:python2)
+$(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools)
+else ifeq ($$(BR2_PACKAGE_PYTHON3),y)
+$(2)_DEPENDENCIES += $$(if $$(filter host-python3-setuptools,$(1)),,host-python3-setuptools)
+else
+$(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools)
 endif
+endif # SETUP_TYPE
 
 # Python interpreter to use for building the package.
 #
diff --git a/buildroot/package/pkg-rebar.mk b/buildroot/package/pkg-rebar.mk
index e2b4a5868..e4e3f3bb6 100644
--- a/buildroot/package/pkg-rebar.mk
+++ b/buildroot/package/pkg-rebar.mk
@@ -94,6 +94,13 @@ define install-rebar-deps
 		$(REBAR_$(2)_DEPS_DIR)/$($(PKG)_ERLANG_APP)
 endef
 
+# Remove the "deps" statement from a rebar.config file
+define remove-rebar-config-dependencies
+	$(SED) '/^{deps.*}\.$$/d' -e '/^{deps/,/}\.$$/d' \
+		$($(PKG)_DIR)/rebar.config
+endef
+
+
 ################################################################################
 # inner-rebar-package -- defines how the configuration, compilation
 # and installation of a rebar package should be done, implements a few
@@ -227,6 +234,14 @@ $(2)_REBAR = rebar
 $(2)_DEPENDENCIES += host-erlang-rebar
 endif
 
+$(2)_KEEP_DEPENDENCIES ?= NO
+
+# Remove dependencies listed in rebar.config unless the package says
+# otherwise
+ifeq ($$($(2)_KEEP_DEPENDENCIES),NO)
+$(2)_POST_PATCH_HOOKS += remove-rebar-config-dependencies
+endif
+
 # The package sub-infra to use
 #
 ifeq ($$($(2)_USE_AUTOCONF),YES)
diff --git a/buildroot/package/pkg-waf.mk b/buildroot/package/pkg-waf.mk
index 3288dd63a..a32d5dab3 100644
--- a/buildroot/package/pkg-waf.mk
+++ b/buildroot/package/pkg-waf.mk
@@ -60,7 +60,7 @@ $(2)_WAF_OPTS				?=
 #
 ifndef $(2)_CONFIGURE_CMDS
 define $(2)_CONFIGURE_CMDS
-	cd $$(@D) && \
+	cd $$($$(PKG)_SRCDIR) && \
 	$$(TARGET_CONFIGURE_OPTS) \
 	$$($(2)_CONF_ENV) \
 	$$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \
@@ -77,7 +77,7 @@ endif
 #
 ifndef $(2)_BUILD_CMDS
 define $(2)_BUILD_CMDS
-	cd $$(@D) && \
+	cd $$($$(PKG)_SRCDIR) && \
 	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \
 		build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \
 		$$($(2)_WAF_OPTS)
@@ -90,7 +90,7 @@ endif
 #
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
-	cd $$(@D) && \
+	cd $$($$(PKG)_SRCDIR) && \
 	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \
 		install --destdir=$$(STAGING_DIR) \
 		$$($(2)_INSTALL_STAGING_OPTS) \
@@ -104,7 +104,7 @@ endif
 #
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
-	cd $$(@D) && \
+	cd $$($$(PKG)_SRCDIR) && \
 	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \
 		install --destdir=$$(TARGET_DIR) \
 		$$($(2)_INSTALL_TARGET_OPTS) \
diff --git a/buildroot/package/pkgconf/0001-Fix-all-variables-sysroot-prefix-problem.patch b/buildroot/package/pkgconf/0001-Fix-all-variables-sysroot-prefix-problem.patch
deleted file mode 100644
index bc2b5273c..000000000
--- a/buildroot/package/pkgconf/0001-Fix-all-variables-sysroot-prefix-problem.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From aa6bbc09e68426592faf722630fe92b6ede75bc8 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias 
-Date: Mon, 2 Nov 2015 18:38:00 -0300
-Subject: [PATCH] Fix all-variables sysroot prefix problem
-
-According to the pkg-config specifications (or rather documentation)
-only the -L/-I directory entries should be sysroot-prefixed.
-
-We also need to prefix the mapdir/sdkdir variables since they're used by
-xorg and expected that way.
-
-Also allow prefixing for includedir and libdir since in some silly cases
-the directories may be requested barebones via pkg-config
---variable=includedir libfool for example.
-
-Signed-off-by: Gustavo Zacarias 
-
-Added pkgdatadir to the list of to-be-prefixed variables.
-
-Signed-off-by: Bernd Kuhls 
----
- main.c | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/main.c b/main.c
-index 6947126..ce5e18f 100644
---- a/main.c
-+++ b/main.c
-@@ -313,9 +313,13 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags)
- 			memset(req->buf, 0, sizeof(req->buf));
- 
- 			if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) &&
--			    (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))))
--				strlcat(req->buf, sysroot_dir, sizeof(req->buf));
--
-+			    (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))) &&
-+			    	(!strcmp(req->variable, "includedir") || \
-+				    !strcmp(req->variable, "libdir") || \
-+				    !strcmp(req->variable, "mapdir") || \
-+				    !strcmp(req->variable, "pkgdatadir") || \
-+				    !strcmp(req->variable, "sdkdir")))
-+					strlcat(req->buf, sysroot_dir, sizeof(req->buf));
- 			strlcat(req->buf, var, sizeof(req->buf));
- 			return;
- 		}
-@@ -323,8 +327,13 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags)
- 		strlcat(req->buf, " ", sizeof(req->buf));
- 
- 		if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) &&
--		    (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))))
--			strlcat(req->buf, sysroot_dir, sizeof(req->buf));
-+		    (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))) &&
-+		    	(!strcmp(req->variable, "includedir") || \
-+			    !strcmp(req->variable, "libdir") || \
-+			    !strcmp(req->variable, "mapdir") || \
-+			    !strcmp(req->variable, "pkgdatadir") || \
-+			    !strcmp(req->variable, "sdkdir")))
-+				strlcat(req->buf, sysroot_dir, sizeof(req->buf));
- 
- 		strlcat(req->buf, var, sizeof(req->buf));
- 	}
--- 
-2.4.10
-
diff --git a/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
new file mode 100644
index 000000000..5a9713d65
--- /dev/null
+++ b/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
@@ -0,0 +1,142 @@
+From 267a57022699453e8d8f517519df25ac6bf6ac4e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni 
+Date: Sun, 16 Dec 2018 11:52:18 +0100
+Subject: [PATCH] Only prefix with the sysroot a subset of variables
+
+The standard logic of pkg-config is to prefix all absolute paths by
+the sysroot defined in PKG_CONFIG_SYSROOT_DIR. However, while some
+paths (like includedir, libdir, and paths used in -L and -I options)
+indeed need to be prefixed by the sysroot, it is not necessarily the
+case for paths that are used on the target. If they get prefixed by
+the sysroot, the runtime path on the target is incorrect.
+
+Unfortunately, pkg-config doesn't have a sense of which path needs to
+be prefixed by the sysroot, and which path should not be prefixed by
+the sysroot.
+
+So, let's simply have a whitelist of paths that should be prefixed:
+includedir, libdir, mapdir, pkgdatadir and sdkdir. This list of
+variables was collected over years of Buildroot development. All other
+paths are not prefixed by the sysroot.
+
+Signed-off-by: Thomas Petazzoni 
+---
+ libpkgconf/tuple.c | 60 ++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 42 insertions(+), 18 deletions(-)
+
+diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c
+index 8523709..7cd2fff 100644
+--- a/libpkgconf/tuple.c
++++ b/libpkgconf/tuple.c
+@@ -160,6 +160,18 @@ dequote(const char *value)
+ 	return buf;
+ }
+ 
++static char *
++pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, bool add_sysroot);
++
++const char *sysrooted_keys[] = {
++	"includedir",
++	"libdir",
++	"mapdir",
++	"pkgdatadir",
++	"sdkdir",
++	NULL,
++};
++
+ /*
+  * !doc
+  *
+@@ -180,6 +192,8 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch
+ {
+ 	char *dequote_value;
+ 	pkgconf_tuple_t *tuple = calloc(sizeof(pkgconf_tuple_t), 1);
++	bool add_sysroot = false;
++	int i;
+ 
+ 	pkgconf_tuple_find_delete(list, key);
+ 
+@@ -187,9 +201,13 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch
+ 
+ 	PKGCONF_TRACE(client, "adding tuple to @%p: %s => %s (parsed? %d)", list, key, dequote_value, parse);
+ 
++	for (i = 0; sysrooted_keys[i] != NULL; i++)
++		if (!strcmp(key, sysrooted_keys[i]))
++			add_sysroot = true;
++
+ 	tuple->key = strdup(key);
+ 	if (parse)
+-		tuple->value = pkgconf_tuple_parse(client, list, dequote_value);
++		tuple->value = pkgconf_tuple_parse_sysroot(client, list, dequote_value, add_sysroot);
+ 	else
+ 		tuple->value = strdup(dequote_value);
+ 
+@@ -233,27 +251,14 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c
+ 	return NULL;
+ }
+ 
+-/*
+- * !doc
+- *
+- * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
+- *
+- *    Parse an expression for variable substitution.
+- *
+- *    :param pkgconf_client_t* client: The pkgconf client object to access.
+- *    :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list).
+- *    :param char* value: The ``key=value`` string to parse.
+- *    :return: the variable data with any variables substituted
+- *    :rtype: char *
+- */
+-char *
+-pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
++static char *
++pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, bool add_sysroot)
+ {
+ 	char buf[PKGCONF_BUFSIZE];
+ 	const char *ptr;
+ 	char *bptr = buf;
+ 
+-	if (*value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir)))
++	if (add_sysroot && *value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir)))
+ 		bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf);
+ 
+ 	for (ptr = value; *ptr != '\0' && bptr - buf < PKGCONF_BUFSIZE; ptr++)
+@@ -293,7 +298,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
+ 
+ 				if (kv != NULL)
+ 				{
+-					parsekv = pkgconf_tuple_parse(client, vars, kv);
++					parsekv = pkgconf_tuple_parse_sysroot(client, vars, kv, add_sysroot);
+ 
+ 					strncpy(bptr, parsekv, PKGCONF_BUFSIZE - (bptr - buf));
+ 					bptr += strlen(parsekv);
+@@ -338,6 +343,25 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
+ 	return strdup(buf);
+ }
+ 
++/*
++ * !doc
++ *
++ * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
++ *
++ *    Parse an expression for variable substitution.
++ *
++ *    :param pkgconf_client_t* client: The pkgconf client object to access.
++ *    :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list).
++ *    :param char* value: The ``key=value`` string to parse.
++ *    :return: the variable data with any variables substituted
++ *    :rtype: char *
++ */
++char *
++pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value)
++{
++	return pkgconf_tuple_parse_sysroot(client, vars, value, true);
++}
++
+ /*
+  * !doc
+  *
+-- 
+2.19.2
+
diff --git a/buildroot/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch b/buildroot/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch
new file mode 100644
index 000000000..e79bea93a
--- /dev/null
+++ b/buildroot/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch
@@ -0,0 +1,45 @@
+From 4ccef40918a539905a2951bfb81cf8dba4a245c6 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni 
+Date: Wed, 2 Jan 2019 18:15:50 +0100
+Subject: [PATCH] Revert "main: assume --modversion insted of --version if
+ other flags or module names are provided"
+
+This reverts commit 12a0eb124cea85586e57f33c91a1e4c73459eef6, as it
+causes pkg-config to assume --modversion is used when something as
+simple as 'pkg-config --static --version' is used, leading to a
+failure instead of the expected behavior: the one of "pkg-config
+--version".
+
+Signed-off-by: Thomas Petazzoni 
+---
+ cli/main.c | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/cli/main.c b/cli/main.c
+index b52cc85..c5acc10 100644
+--- a/cli/main.c
++++ b/cli/main.c
+@@ -955,18 +955,8 @@ main(int argc, char *argv[])
+ 
+ 	if ((want_flags & PKG_VERSION) == PKG_VERSION)
+ 	{
+-		if (argc > 2)
+-		{
+-			fprintf(stderr, "%s: --version specified with other options or module names, assuming --modversion.\n", argv[0]);
+-
+-			want_flags &= ~PKG_VERSION;
+-			want_flags |= PKG_MODVERSION;
+-		}
+-		else
+-		{
+-			version();
+-			return EXIT_SUCCESS;
+-		}
++		version();
++		return EXIT_SUCCESS;
+ 	}
+ 
+ 	if ((want_flags & PKG_HELP) == PKG_HELP)
+-- 
+2.20.1
+
diff --git a/buildroot/package/pkgconf/Config.in b/buildroot/package/pkgconf/Config.in
index 76fa394c9..a9c5658da 100644
--- a/buildroot/package/pkgconf/Config.in
+++ b/buildroot/package/pkgconf/Config.in
@@ -7,4 +7,4 @@ config BR2_PACKAGE_PKGCONF
 	  2011 to replace pkg-config, which now needs itself to build
 	  itself
 
-	  https://github.com/pkgconf/pkgconf
+	  http://pkgconf.org/
diff --git a/buildroot/package/pkgconf/pkgconf.hash b/buildroot/package/pkgconf/pkgconf.hash
index 79191bc94..7ea7ff57a 100644
--- a/buildroot/package/pkgconf/pkgconf.hash
+++ b/buildroot/package/pkgconf/pkgconf.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f	pkgconf-0.9.12.tar.bz2
+sha256	d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715	pkgconf-1.5.3.tar.xz
diff --git a/buildroot/package/pkgconf/pkgconf.mk b/buildroot/package/pkgconf/pkgconf.mk
index 00b2d017e..e3c73fd40 100644
--- a/buildroot/package/pkgconf/pkgconf.mk
+++ b/buildroot/package/pkgconf/pkgconf.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PKGCONF_VERSION = 0.9.12
-PKGCONF_SITE = https://github.com/pkgconf/pkgconf/releases/download/pkgconf-$(PKGCONF_VERSION)
-PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2
+PKGCONF_VERSION = 1.5.3
+PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf
+PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz
 PKGCONF_LICENSE = pkgconf license
 PKGCONF_LICENSE_FILES = COPYING
 
diff --git a/buildroot/package/pngquant/Config.in b/buildroot/package/pngquant/Config.in
index c63f0f9d0..5fc93f60a 100644
--- a/buildroot/package/pngquant/Config.in
+++ b/buildroot/package/pngquant/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_PNGQUANT
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_ZLIB
 	help
-	  Lossy PNG compressor — pngquant command and libimagequant
+	  Lossy PNG compressor - pngquant command and libimagequant
 	  library
 
 	  https://pngquant.org
diff --git a/buildroot/package/pngquant/pngquant.hash b/buildroot/package/pngquant/pngquant.hash
index f525e466c..f27eda60d 100644
--- a/buildroot/package/pngquant/pngquant.hash
+++ b/buildroot/package/pngquant/pngquant.hash
@@ -1,5 +1,5 @@
 # From https://pngquant.org/releases.html
-sha1 f57ce0112e86ac966c55270ccf5971deff241d4f  pngquant-2.12.0-src.tar.gz
+sha1 24efa42105bf3d8d0f4cf699053d2701ea787bd5  pngquant-2.12.2-src.tar.gz
 # Locally computed
-sha256 0e540c64bb58c05f2a05b4eaf1d3d165f0d3278500f15abfeac47f93f8fa8fa8  pngquant-2.12.0-src.tar.gz
+sha256 bb031c48039ee73ea0e60709bb9ab80c55bfa3a5920b798ea37a03f2757b099c  pngquant-2.12.2-src.tar.gz
 sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826  COPYRIGHT
diff --git a/buildroot/package/pngquant/pngquant.mk b/buildroot/package/pngquant/pngquant.mk
index 26c293bec..0053b9a46 100644
--- a/buildroot/package/pngquant/pngquant.mk
+++ b/buildroot/package/pngquant/pngquant.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PNGQUANT_VERSION = 2.12.0
+PNGQUANT_VERSION = 2.12.2
 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz
 PNGQUANT_SITE = https://pngquant.org
 PNGQUANT_LICENSE = GPL-3.0+
diff --git a/buildroot/package/poco/Config.in b/buildroot/package/poco/Config.in
index 75e31b7e1..7e1257146 100644
--- a/buildroot/package/poco/Config.in
+++ b/buildroot/package/poco/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_POCO
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
-		|| BR2_or1k || BR2_xtensa)
+		|| BR2_or1k || BR2_riscv || BR2_xtensa)
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_PCRE
 	help
diff --git a/buildroot/package/poppler/Config.in b/buildroot/package/poppler/Config.in
index 9b03df8d2..4a553df72 100644
--- a/buildroot/package/poppler/Config.in
+++ b/buildroot/package/poppler/Config.in
@@ -13,14 +13,6 @@ config BR2_PACKAGE_POPPLER
 
 if BR2_PACKAGE_POPPLER
 
-config BR2_PACKAGE_POPPLER_QT
-	bool "Qt support"
-	depends on BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT_GUI_MODULE
-	select BR2_PACKAGE_QT_XML
-	help
-	  Build Qt support into the Poppler library
-
 config BR2_PACKAGE_POPPLER_QT5
 	bool "Qt5 support"
 	depends on BR2_PACKAGE_QT5
diff --git a/buildroot/package/poppler/poppler.mk b/buildroot/package/poppler/poppler.mk
index bad61a661..be1c0e482 100644
--- a/buildroot/package/poppler/poppler.mk
+++ b/buildroot/package/poppler/poppler.mk
@@ -12,7 +12,7 @@ POPPLER_LICENSE = GPL-2.0+
 POPPLER_LICENSE_FILES = COPYING
 POPPLER_INSTALL_STAGING = YES
 POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
-	--enable-xpdf-headers
+	--enable-xpdf-headers --disable-poppler-qt4
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic"
@@ -84,13 +84,6 @@ else
 POPPLER_CONF_OPTS += --without-x
 endif
 
-ifeq ($(BR2_PACKAGE_POPPLER_QT),y)
-POPPLER_DEPENDENCIES += qt
-POPPLER_CONF_OPTS += --enable-poppler-qt4
-else
-POPPLER_CONF_OPTS += --disable-poppler-qt4
-endif
-
 ifeq ($(BR2_PACKAGE_POPPLER_QT5),y)
 POPPLER_DEPENDENCIES += qt5base
 POPPLER_CONF_OPTS += --enable-poppler-qt5
diff --git a/buildroot/package/popt/popt.hash b/buildroot/package/popt/popt.hash
index 875bbae7a..1422f4b92 100644
--- a/buildroot/package/popt/popt.hash
+++ b/buildroot/package/popt/popt.hash
@@ -1,2 +1,3 @@
 # Locally calculated:
 sha256	e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8	popt-1.16.tar.gz
+sha256	518d4f2a05064cb9a8ec0ea02e86408af4feed6916f78ef42171465db8b383c5	COPYING
diff --git a/buildroot/package/postgresql/postgresql.hash b/buildroot/package/postgresql/postgresql.hash
index 28d4a988d..ba6e02d4d 100644
--- a/buildroot/package/postgresql/postgresql.hash
+++ b/buildroot/package/postgresql/postgresql.hash
@@ -1,7 +1,7 @@
-# From https://ftp.postgresql.org/pub/source/v11.1/postgresql-11.1.tar.bz2.md5
-md5 5e45f6d5b859cc76b5d62f1e328e9711  postgresql-11.1.tar.bz2
-# From https://ftp.postgresql.org/pub/source/v11.1/postgresql-11.1.tar.bz2.sha256
-sha256 90815e812874831e9a4bf6e1136bf73bc2c5a0464ef142e2dfea40cda206db08  postgresql-11.1.tar.bz2
+# From https://ftp.postgresql.org/pub/source/v11.3/postgresql-11.3.tar.bz2.md5
+md5 c2a729b754b8de86a969c86ec25db076  postgresql-11.3.tar.bz2
+# From https://ftp.postgresql.org/pub/source/v11.3/postgresql-11.3.tar.bz2.sha256
+sha256 2a85e082fc225944821dfd23990e32dfcd2284c19060864b0ad4ca537d30522d  postgresql-11.3.tar.bz2
 
 # License file, Locally calculated
-sha256	24cfc70cf16b3a23242c49ffce39510683bdd48cbedb8a46fe03976ee5f5c21e	COPYRIGHT
+sha256	c4c86d683970b22b9fab53320ee1b3a30ef4e8223122b4fb6be53ea62ecee8b3  COPYRIGHT
diff --git a/buildroot/package/postgresql/postgresql.mk b/buildroot/package/postgresql/postgresql.mk
index c4ba0daa1..e6e34f5c7 100644
--- a/buildroot/package/postgresql/postgresql.mk
+++ b/buildroot/package/postgresql/postgresql.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-POSTGRESQL_VERSION = 11.1
+POSTGRESQL_VERSION = 11.3
 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
 POSTGRESQL_LICENSE = PostgreSQL
@@ -14,8 +14,10 @@ POSTGRESQL_CONFIG_SCRIPTS = pg_config
 POSTGRESQL_CONF_ENV = \
 	ac_cv_type_struct_sockaddr_in6=yes \
 	pgac_cv_snprintf_long_long_int_modifier="ll" \
-	pgac_cv_snprintf_size_t_support=yes
+	pgac_cv_snprintf_size_t_support=yes \
+	LIBS=$(TARGET_NLS_LIBS)
 POSTGRESQL_CONF_OPTS = --disable-rpath
+POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 # https://www.postgresql.org/docs/11/static/install-procedure.html:
 # "If you want to invoke the build from another makefile rather than
@@ -83,6 +85,22 @@ else
 POSTGRESQL_CONF_OPTS += --without-libxml
 endif
 
+# required for postgresql.service Type=notify
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+POSTGRESQL_DEPENDENCIES += systemd
+POSTGRESQL_CONF_OPTS += --with-systemd
+else
+POSTGRESQL_CONF_OPTS += --without-systemd
+endif
+
+POSTGRESQL_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+POSTGRESQL_CFLAGS += -O0
+endif
+
+POSTGRESQL_CONF_ENV += CFLAGS="$(POSTGRESQL_CFLAGS)"
+
 define POSTGRESQL_USERS
 	postgres -1 postgres -1 * /var/lib/pgsql /bin/sh - PostgreSQL Server
 endef
diff --git a/buildroot/package/postgresql/postgresql.service b/buildroot/package/postgresql/postgresql.service
index 4a9625868..53e6f84f0 100644
--- a/buildroot/package/postgresql/postgresql.service
+++ b/buildroot/package/postgresql/postgresql.service
@@ -3,7 +3,7 @@ Description=PostgreSQL database server
 After=network.target
 
 [Service]
-Type=forking
+Type=notify
 
 # start timeout disabled because initdb may run a little
 # longer (eg. 5 minutes on RaspberryPi)
@@ -12,13 +12,17 @@ TimeoutStartSec=0
 User=postgres
 Group=postgres
 
+StandardOutput=syslog
+StandardError=syslog
 SyslogIdentifier=postgres
 PIDFile=/var/lib/pgsql/postmaster.pid
 
 ExecStartPre=/bin/sh -c "if [ ! -f /var/lib/pgsql/PG_VERSION ]; then /usr/bin/pg_ctl initdb -D /var/lib/pgsql; fi"
-ExecStart=/usr/bin/pg_ctl start -D /var/lib/pgsql -w -l /var/lib/pgsql/logfile
-ExecReload=/usr/bin/pg_ctl reload -D /var/lib/pgsql
-ExecStop=/usr/bin/pg_ctl stop -D /var/lib/pgsql -m fast
+ExecStart=/usr/bin/postgres -D /var/lib/pgsql
+ExecReload=/usr/bin/kill -HUP $MAINPID
+KillMode=mixed
+KillSignal=SIGINT
+TimeoutSec=0
 
 [Install]
 WantedBy=multi-user.target
diff --git a/buildroot/package/pound/0002-fix-openssl-1.1.0.patch b/buildroot/package/pound/0002-fix-openssl-1.1.0.patch
new file mode 100644
index 000000000..04eddb15d
--- /dev/null
+++ b/buildroot/package/pound/0002-fix-openssl-1.1.0.patch
@@ -0,0 +1,334 @@
+From a2c9dde4d055ea8942afb150b7fc3a807d4e5d60 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff 
+Date: Wed, 28 Feb 2018 13:44:01 +0000
+Subject: [PATCH] Support for Openssl 1.1
+
+Fixes
+http://autobuild.buildroot.net/results/ef2/ef2de6c280bf8622a00d4573bc5bd143e3baa002
+
+Downloaded from github fork:
+https://github.com/graygnuorg/pound/commit/a2c9dde4d055ea8942afb150b7fc3a807d4e5d60
+
+This patch was announced on the upstream mailinglist:
+http://www.apsis.ch/pound/pound_list/archive/2018/2018-03/1519920322000
+
+Signed-off-by: Bernd Kuhls 
+---
+ .gitignore |  15 ++++++++
+ config.c   |  17 +++++++--
+ http.c     |  12 ++++++-
+ pound.h    |   4 ++-
+ svc.c      | 101 +++++++++++++++++++++++++++++++++++++++++++----------
+ 5 files changed, 125 insertions(+), 24 deletions(-)
+ create mode 100644 .gitignore
+
+diff --git a/config.c b/config.c
+index d41a3ee..e8fec0f 100644
+--- a/config.c
++++ b/config.c
+@@ -174,6 +174,16 @@ conf_fgets(char *buf, const int max)
+     }
+ }
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++# define general_name_string(n) \
++	strndup(ASN1_STRING_get0_data(n->d.dNSName),	\
++	        ASN1_STRING_length(n->d.dNSName) + 1)
++#else
++# define general_name_string(n) \
++	strndup(ASN1_STRING_data(n->d.dNSName),	\
++	       ASN1_STRING_length(n->d.dNSName) + 1)
++#endif
++
+ unsigned char **
+ get_subjectaltnames(X509 *x509, unsigned int *count)
+ {
+@@ -194,8 +204,7 @@ get_subjectaltnames(X509 *x509, unsigned int *count)
+         name = sk_GENERAL_NAME_pop(san_stack);
+         switch(name->type) {
+             case GEN_DNS:
+-                temp[local_count] = strndup(ASN1_STRING_data(name->d.dNSName), ASN1_STRING_length(name->d.dNSName)
+-                                    + 1);
++ 	        temp[local_count] = general_name_string(name);
+                 if(temp[local_count] == NULL)
+                     conf_err("out of memory");
+                 local_count++;
+@@ -565,7 +574,9 @@ parse_service(const char *svc_name)
+     pthread_mutex_init(&res->mut, NULL);
+     if(svc_name)
+         strncpy(res->name, svc_name, KEY_SIZE);
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    if((res->sessions = lh_TABNODE_new(t_hash, t_cmp)) == NULL)    
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL)
+ #else
+     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL)
+diff --git a/http.c b/http.c
+index dd211e4..c8e756a 100644
+--- a/http.c
++++ b/http.c
+@@ -527,12 +527,22 @@ log_bytes(char *res, const LONG cnt)
+ 
+ /* Cleanup code. This should really be in the pthread_cleanup_push, except for bugs in some implementations */
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++# define clear_error()
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
++# define clear_error() \
++	if(ssl != NULL) { ERR_clear_error(); ERR_remove_thread_state(NULL); }
++#else
++# define clear_error() \
++	if(ssl != NULL) { ERR_clear_error(); ERR_remove_state(0); }
++#endif
++
+ #define clean_all() {   \
+     if(ssl != NULL) { BIO_ssl_shutdown(cl); } \
+     if(be != NULL) { BIO_flush(be); BIO_reset(be); BIO_free_all(be); be = NULL; } \
+     if(cl != NULL) { BIO_flush(cl); BIO_reset(cl); BIO_free_all(cl); cl = NULL; } \
+     if(x509 != NULL) { X509_free(x509); x509 = NULL; } \
+-    if(ssl != NULL) { ERR_clear_error(); ERR_remove_state(0); } \
++    clear_error(); \
+ }
+ 
+ /*
+diff --git a/pound.h b/pound.h
+index fa22c36..9603b91 100644
+--- a/pound.h
++++ b/pound.h
+@@ -344,7 +344,9 @@ typedef struct _tn {
+ /* maximal session key size */
+ #define KEY_SIZE    127
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  DEFINE_LHASH_OF(TABNODE);
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+ DECLARE_LHASH_OF(TABNODE);
+ #endif
+ 
+diff --git a/svc.c b/svc.c
+index 60ba488..063b92c 100644
+--- a/svc.c
++++ b/svc.c
+@@ -27,10 +27,17 @@
+ 
+ #include    "pound.h"
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++# define TABNODE_GET_DOWN_LOAD(t) lh_TABNODE_get_down_load(t)
++# define TABNODE_SET_DOWN_LOAD(t,n) lh_TABNODE_set_down_load(t,n)
++#else
+ #ifndef LHASH_OF
+ #define LHASH_OF(x) LHASH
+ #define CHECKED_LHASH_OF(type, h) h
+ #endif
++# define TABNODE_GET_DOWN_LOAD(t) (CHECKED_LHASH_OF(TABNODE, t)->down_load)
++# define TABNODE_SET_DOWN_LOAD(t,n) (CHECKED_LHASH_OF(TABNODE, t)->down_load = n)
++#endif
+ 
+ /*
+  * Add a new key/content pair to a hash table
+@@ -58,7 +65,9 @@ t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const
+     }
+     memcpy(t->content, content, cont_len);
+     t->last_acc = time(NULL);
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    if((old = lh_TABNODE_insert(tab, t)) != NULL) {
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
+ #else
+     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
+@@ -82,7 +91,9 @@ t_find(LHASH_OF(TABNODE) *const tab, char *const key)
+     TABNODE t, *res;
+ 
+     t.key = key;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    if((res = lh_TABNODE_retrieve(tab, &t)) != NULL) {
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     if((res = (TABNODE *)LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
+ #else
+     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
+@@ -102,7 +113,9 @@ t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
+     TABNODE t, *res;
+ 
+     t.key = key;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    if((res = lh_TABNODE_delete(tab, &t)) != NULL) {    
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
+ #else
+     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
+@@ -127,7 +140,9 @@ t_old_doall_arg(TABNODE *t, ALL_ARG *a)
+     TABNODE *res;
+ 
+     if(t->last_acc < a->lim)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++        if((res = lh_TABNODE_delete(a->tab, t)) != NULL) {	    
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+         if((res = LHM_lh_delete(TABNODE, a->tab, t)) != NULL) {
+ #else
+         if((res = lh_delete(a->tab, t)) != NULL) {
+@@ -145,6 +160,10 @@ IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
+ IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
+ #endif
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++IMPLEMENT_LHASH_DOALL_ARG(TABNODE,ALL_ARG);
++#endif
++
+ /*
+  * Expire all old nodes
+  */
+@@ -156,14 +175,16 @@ t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
+ 
+     a.tab = tab;
+     a.lim = lim;
+-    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
+-    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    down_load = TABNODE_GET_DOWN_LOAD(tab);
++    TABNODE_SET_DOWN_LOAD(tab, 0);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    lh_TABNODE_doall_ALL_ARG(tab, t_old_doall_arg, &a);
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
+ #else
+     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
+ #endif
+-    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
++    TABNODE_SET_DOWN_LOAD(tab, down_load);
+     return;
+ }
+ 
+@@ -173,7 +194,9 @@ t_cont_doall_arg(TABNODE *t, ALL_ARG *arg)
+     TABNODE *res;
+ 
+     if(memcmp(t->content, arg->content, arg->cont_len) == 0)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++        if((res = lh_TABNODE_delete(arg->tab, t)) != NULL) {
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+         if((res = LHM_lh_delete(TABNODE, arg->tab, t)) != NULL) {
+ #else
+         if((res = lh_delete(arg->tab, t)) != NULL) {
+@@ -203,15 +226,16 @@ t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len
+     a.tab = tab;
+     a.content = content;
+     a.cont_len = cont_len;
+-    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
+-    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    down_load = TABNODE_GET_DOWN_LOAD(tab);
++    TABNODE_SET_DOWN_LOAD(tab, 0);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    lh_TABNODE_doall_ALL_ARG(tab, t_cont_doall_arg, &a);
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
+ #else
+     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
+ #endif
+-    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
+-    return;
++    TABNODE_SET_DOWN_LOAD(tab, down_load);
+ }
+ 
+ /*
+@@ -1262,6 +1286,31 @@ RSA_tmp_callback(/* not used */SSL *ssl, /* not used */int is_export, int keylen
+     return res;
+ }
+ 
++static int
++generate_key(RSA **ret_rsa, unsigned long bits)
++{
++#if OPENSSL_VERSION_NUMBER > 0x00908000L
++    int rc = 0;
++    RSA *rsa;
++
++    rsa = RSA_new();
++    if (rsa) {
++	BIGNUM *bne = BN_new();
++	if (BN_set_word(bne, RSA_F4))
++	    rc = RSA_generate_key_ex(rsa, bits, bne, NULL);
++	BN_free(bne);
++	if (rc)
++	    *ret_rsa = rsa;
++	else
++	    RSA_free(rsa);
++    }
++    return rc;
++#else
++    *ret_rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
++    return *ret_rsa != NULL;
++#endif
++}
++
+ /*
+  * Periodically regenerate ephemeral RSA keys
+  * runs every T_RSA_KEYS seconds
+@@ -1274,8 +1323,9 @@ do_RSAgen(void)
+     RSA *t_RSA1024_keys[N_RSA_KEYS];
+ 
+     for(n = 0; n < N_RSA_KEYS; n++) {
+-        t_RSA512_keys[n] = RSA_generate_key(512, RSA_F4, NULL, NULL);
+-        t_RSA1024_keys[n] = RSA_generate_key(1024, RSA_F4, NULL, NULL);
++        /* FIXME: Error handling */
++        generate_key(&t_RSA512_keys[n], 512);
++	generate_key(&t_RSA1024_keys[n], 1024);
+     }
+     if(ret_val = pthread_mutex_lock(&RSA_mut))
+         logmsg(LOG_WARNING, "thr_RSAgen() lock: %s", strerror(ret_val));
+@@ -1329,11 +1379,11 @@ init_timer(void)
+      * Pre-generate ephemeral RSA keys
+      */
+     for(n = 0; n < N_RSA_KEYS; n++) {
+-        if((RSA512_keys[n] = RSA_generate_key(512, RSA_F4, NULL, NULL)) == NULL) {
++        if(!generate_key(&RSA512_keys[n], 512)) {
+             logmsg(LOG_WARNING,"RSA_generate(%d, 512) failed", n);
+             return;
+         }
+-        if((RSA1024_keys[n] = RSA_generate_key(1024, RSA_F4, NULL, NULL)) == NULL) {
++        if(!generate_key(&RSA1024_keys[n], 1024)) {
+             logmsg(LOG_WARNING,"RSA_generate(%d, 1024) failed", n);
+             return;
+         }
+@@ -1420,6 +1470,10 @@ IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
+ IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
+ #endif
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++IMPLEMENT_LHASH_DOALL_ARG(TABNODE,DUMP_ARG);
++#endif
++	
+ /*
+  * write sessions to the control socket
+  */
+@@ -1430,7 +1484,9 @@ dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const
+ 
+     a.control_sock = control_sock;
+     a.backends = backends;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    lh_TABNODE_doall_DUMP_ARG(sess, t_dump_doall_arg, &a);
++#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
+ #else
+     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
+@@ -1664,6 +1720,13 @@ thr_control(void *arg)
+     }
+ }
+ 
++#ifndef SSL3_ST_SR_CLNT_HELLO_A
++# define SSL3_ST_SR_CLNT_HELLO_A (0x110|SSL_ST_ACCEPT)
++#endif
++#ifndef SSL23_ST_SR_CLNT_HELLO_A
++# define SSL23_ST_SR_CLNT_HELLO_A (0x210|SSL_ST_ACCEPT)
++#endif
++		
+ void
+ SSLINFO_callback(const SSL *ssl, int where, int rc)
+ {
diff --git a/buildroot/package/pound/0003-Support-for-libressl-coexisting-with-openssl-1.1.x.patch b/buildroot/package/pound/0003-Support-for-libressl-coexisting-with-openssl-1.1.x.patch
new file mode 100644
index 000000000..3befc271d
--- /dev/null
+++ b/buildroot/package/pound/0003-Support-for-libressl-coexisting-with-openssl-1.1.x.patch
@@ -0,0 +1,140 @@
+From 145b88d0c1a71ba6f4d216768388e0c5853d3990 Mon Sep 17 00:00:00 2001
+From: Matt Weber 
+Date: Tue, 5 Feb 2019 10:34:55 -0600
+Subject: [PATCH] Support for libressl coexisting with openssl 1.1.x
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libressl needs to not follow the 1.1.x path of APIs
+
+Resolves build failure like
+In file included from svc.c:28:0:
+pound.h:348:3: warning: data definition has no type or storage class
+   DEFINE_LHASH_OF(TABNODE);
+   ^~~~~~~~~~~~~~~
+pound.h:348:3: warning: type defaults to ‘int’ in declaration of ‘DEFINE_LHASH_OF’ [-Wimplicit-int]
+svc.c: In function ‘t_add’:
+svc.c:69:15: warning: implicit declaration of function ‘lh_TABNODE_insert’; did you mean ‘lh_OBJ_NAME_insert’? [-Wimplicit-function-declaration]
+     if((old = lh_TABNODE_insert(tab, t)) != NULL) {
+               ^~~~~~~~~~~~~~~~~
+               lh_OBJ_NAME_insert
+
+Upstream: Site was down when I tried (http://www.apsis.ch/pound)
+
+Signed-off-by: Matthew Weber 
+---
+ config.c |  2 +-
+ svc.c    | 20 ++++++++++----------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/config.c b/config.c
+index 58b928e..3ad7fbb 100644
+--- a/config.c
++++ b/config.c
+@@ -574,7 +574,7 @@ parse_service(const char *svc_name)
+     pthread_mutex_init(&res->mut, NULL);
+     if(svc_name)
+         strncpy(res->name, svc_name, KEY_SIZE);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+     if((res->sessions = lh_TABNODE_new(t_hash, t_cmp)) == NULL)    
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL)
+diff --git a/svc.c b/svc.c
+index f125be4..8a2f62c 100644
+--- a/svc.c
++++ b/svc.c
+@@ -27,7 +27,7 @@
+ 
+ #include    "pound.h"
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+ # define TABNODE_GET_DOWN_LOAD(t) lh_TABNODE_get_down_load(t)
+ # define TABNODE_SET_DOWN_LOAD(t,n) lh_TABNODE_set_down_load(t,n)
+ #else
+@@ -65,7 +65,7 @@ t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const
+     }
+     memcpy(t->content, content, cont_len);
+     t->last_acc = time(NULL);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+     if((old = lh_TABNODE_insert(tab, t)) != NULL) {
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
+@@ -91,7 +91,7 @@ t_find(LHASH_OF(TABNODE) *const tab, char *const key)
+     TABNODE t, *res;
+ 
+     t.key = key;
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+     if((res = lh_TABNODE_retrieve(tab, &t)) != NULL) {
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     if((res = (TABNODE *)LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
+@@ -113,7 +113,7 @@ t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
+     TABNODE t, *res;
+ 
+     t.key = key;
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+     if((res = lh_TABNODE_delete(tab, &t)) != NULL) {    
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
+@@ -140,7 +140,7 @@ t_old_doall_arg(TABNODE *t, ALL_ARG *a)
+     TABNODE *res;
+ 
+     if(t->last_acc < a->lim)
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+         if((res = lh_TABNODE_delete(a->tab, t)) != NULL) {	    
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+         if((res = LHM_lh_delete(TABNODE, a->tab, t)) != NULL) {
+@@ -160,7 +160,7 @@ IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
+ IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+ IMPLEMENT_LHASH_DOALL_ARG(TABNODE,ALL_ARG);
+ #endif
+ 
+@@ -177,7 +177,7 @@ t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
+     a.lim = lim;
+     down_load = TABNODE_GET_DOWN_LOAD(tab);
+     TABNODE_SET_DOWN_LOAD(tab, 0);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+     lh_TABNODE_doall_ALL_ARG(tab, t_old_doall_arg, &a);
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
+@@ -194,7 +194,7 @@ t_cont_doall_arg(TABNODE *t, ALL_ARG *arg)
+     TABNODE *res;
+ 
+     if(memcmp(t->content, arg->content, arg->cont_len) == 0)
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+         if((res = lh_TABNODE_delete(arg->tab, t)) != NULL) {
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+         if((res = LHM_lh_delete(TABNODE, arg->tab, t)) != NULL) {
+@@ -228,7 +228,7 @@ t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len
+     a.cont_len = cont_len;
+     down_load = TABNODE_GET_DOWN_LOAD(tab);
+     TABNODE_SET_DOWN_LOAD(tab, 0);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+     lh_TABNODE_doall_ALL_ARG(tab, t_cont_doall_arg, &a);
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
+@@ -1514,7 +1514,7 @@ dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const
+ 
+     a.control_sock = control_sock;
+     a.backends = backends;
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+     lh_TABNODE_doall_DUMP_ARG(sess, t_dump_doall_arg, &a);
+ #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
+     LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
+-- 
+1.9.1
+
diff --git a/buildroot/package/pound/pound.mk b/buildroot/package/pound/pound.mk
index 9a62cf7a5..d6839fc2e 100644
--- a/buildroot/package/pound/pound.mk
+++ b/buildroot/package/pound/pound.mk
@@ -9,7 +9,7 @@ POUND_SITE = http://www.apsis.ch/pound
 POUND_SOURCE = Pound-$(POUND_VERSION).tgz
 POUND_LICENSE = GPL-3.0+
 POUND_LICENSE_FILES = GPL.txt
-POUND_DEPENDENCIES = openssl
+POUND_DEPENDENCIES = openssl host-openssl
 
 # Force owner/group to us, otherwise it will try proxy:proxy by
 # default.
diff --git a/buildroot/package/proftpd/Config.in b/buildroot/package/proftpd/Config.in
index 434dbb8bb..edec37c8d 100644
--- a/buildroot/package/proftpd/Config.in
+++ b/buildroot/package/proftpd/Config.in
@@ -31,6 +31,16 @@ config BR2_PACKAGE_PROFTPD_MOD_SQL
 	help
 	  Compile ProFTPD with mod_sql support.
 
+if BR2_PACKAGE_PROFTPD_MOD_SQL
+
+config BR2_PACKAGE_PROFTPD_MOD_SQL_SQLITE
+	bool "mod_sql_sqlite support"
+	select BR2_PACKAGE_SQLITE
+	help
+	  Compile ProFTPD with mod_sql_sqlite support.
+
+endif
+
 config BR2_PACKAGE_PROFTPD_MOD_QUOTATAB
 	bool "mod_quotatab support"
 	help
@@ -65,4 +75,17 @@ config BR2_PACKAGE_PROFTPD_MOD_QUOTATAB_SQL
 	  Compile mod_quotatab with mod_quotatab_sql table.
 
 endif
+
+config BR2_PACKAGE_PROFTPD_BUFFER_SIZE
+	int "buffer size in bytes (0 for default)"
+	default "0"
+	help
+	  By increasing the buffer size above the default of 1K,
+	  proftpd reads and writes data in larger chunks, and makes
+	  fewer expensive system calls. Use of this option to set buffer
+	  sizes of 8K or more has been reported to drastically increase
+	  transfer speeds (depending on network configurations).
+
+	  0 uses the default size of 1024.
+
 endif
diff --git a/buildroot/package/proftpd/S50proftpd b/buildroot/package/proftpd/S50proftpd
old mode 100755
new mode 100644
diff --git a/buildroot/package/proftpd/proftpd.mk b/buildroot/package/proftpd/proftpd.mk
index 8f3ff5088..67d8eb8c6 100644
--- a/buildroot/package/proftpd/proftpd.mk
+++ b/buildroot/package/proftpd/proftpd.mk
@@ -20,8 +20,10 @@ PROFTPD_CONF_OPTS = \
 	--disable-ncurses \
 	--disable-facl \
 	--disable-dso \
+	--enable-sendfile \
 	--enable-shadow \
-	--with-gnu-ld
+	--with-gnu-ld \
+	--without-openssl-cmdline
 
 ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
 PROFTPD_MODULES += mod_rewrite
@@ -46,6 +48,11 @@ ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SQL),y)
 PROFTPD_MODULES += mod_sql
 endif
 
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_SQL_SQLITE),y)
+PROFTPD_MODULES += mod_sql_sqlite
+PROFTPD_DEPENDENCIES += sqlite
+endif
+
 ifeq ($(BR2_PACKAGE_PROFTPD_MOD_QUOTATAB),y)
 PROFTPD_MODULES += mod_quotatab
 endif
@@ -121,4 +128,8 @@ define PROFTPD_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/proftpd.service
 endef
 
+ifneq ($(BR2_PACKAGE_PROFTPD_BUFFER_SIZE),0)
+PROFTPD_CONF_OPTS += --enable-buffer-size=$(BR2_PACKAGE_PROFTPD_BUFFER_SIZE)
+endif
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/prosody/0001-enable-syslog.patch b/buildroot/package/prosody/0001-enable-syslog.patch
index 4bd0a15ae..16acc89c5 100644
--- a/buildroot/package/prosody/0001-enable-syslog.patch
+++ b/buildroot/package/prosody/0001-enable-syslog.patch
@@ -11,7 +11,7 @@ diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
 index a0fc6c9e..af3cc0e4 100644
 --- a/prosody.cfg.lua.dist
 +++ b/prosody.cfg.lua.dist
-@@ -163,7 +163,7 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week
+@@ -155,7 +155,7 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week
  log = {
  	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
  	error = "prosody.err";
diff --git a/buildroot/package/prosody/0002-add-pidfile.patch b/buildroot/package/prosody/0002-add-pidfile.patch
index b6af8dd82..6221fd085 100644
--- a/buildroot/package/prosody/0002-add-pidfile.patch
+++ b/buildroot/package/prosody/0002-add-pidfile.patch
@@ -11,9 +11,9 @@ diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
 index af3cc0e4..675db12f 100644
 --- a/prosody.cfg.lua.dist
 +++ b/prosody.cfg.lua.dist
-@@ -181,6 +181,9 @@ log = {
- -- Location of directory to find certificates in (relative to main config file):
- certificates = "certs"
+@@ -176,6 +176,9 @@ log = {
+ -- HTTPS currently only supports a single certificate, specify it here:
+ --https_certificate = "certs/localhost.crt"
  
 +-- This must match the PIDFILE used in S50prosody
 +pidfile = "/var/run/prosody/prosody.pid"
diff --git a/buildroot/package/prosody/prosody.hash b/buildroot/package/prosody/prosody.hash
index b38414294..f3f9aa477 100644
--- a/buildroot/package/prosody/prosody.hash
+++ b/buildroot/package/prosody/prosody.hash
@@ -1,8 +1,8 @@
 # Locally computed:
-md5    4cb1ac0db2b739b933ded5038551d7c2  prosody-0.10.2.tar.gz
-sha1   1d51e542475c3f3e712eace29537b042c941d6ab  prosody-0.10.2.tar.gz
-sha256 75b5f035e7a74d5f208eeeaf8419b94a85d09b40252d444cff8033fde3c9768e  prosody-0.10.2.tar.gz
-sha512 9fc05e34b45b0c16835ba94a73532fb3b4ee335f27d56bb9260e1b3e22614f89f44eb5d04b4e90d016db0b5bee6f5c7e7d099e1defb027e6823ee7667c1fe28f  prosody-0.10.2.tar.gz
+md5    b4529e0cf8e0ee82a2f677e404c3df35  prosody-0.11.2.tar.gz
+sha1   0508cfc1c3c74a7eb8fdac2ed50435e190930f6a  prosody-0.11.2.tar.gz
+sha256 8911f6dc29b9e0c4edf9e61dc23fa22d77bc42c4caf28b809ab843b2f08e4831  prosody-0.11.2.tar.gz
+sha512 22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1  prosody-0.11.2.tar.gz
 
 # Hash for license file:
 sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef  COPYING
diff --git a/buildroot/package/prosody/prosody.mk b/buildroot/package/prosody/prosody.mk
index 8c0964521..c2111f6b8 100644
--- a/buildroot/package/prosody/prosody.mk
+++ b/buildroot/package/prosody/prosody.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PROSODY_VERSION = 0.10.2
+PROSODY_VERSION = 0.11.2
 PROSODY_SITE = https://prosody.im/downloads/source
 PROSODY_LICENSE = MIT
 PROSODY_LICENSE_FILES = COPYING
diff --git a/buildroot/package/ptpd/S65ptpd b/buildroot/package/ptpd/S65ptpd
old mode 100755
new mode 100644
diff --git a/buildroot/package/ptpd2/S65ptpd2 b/buildroot/package/ptpd2/S65ptpd2
old mode 100755
new mode 100644
diff --git a/buildroot/package/pugixml/Config.in b/buildroot/package/pugixml/Config.in
index c37b1df9e..6b7d2e325 100644
--- a/buildroot/package/pugixml/Config.in
+++ b/buildroot/package/pugixml/Config.in
@@ -18,5 +18,37 @@ config BR2_PACKAGE_PUGIXML
 	  http://pugixml.org/
 	  https://github.com/zeux/pugixml
 
+if BR2_PACKAGE_PUGIXML
+
+config BR2_PACKAGE_PUGIXML_XPATH_SUPPORT
+	bool "Enable XPath support"
+	default y
+	help
+	  When disabled, both XPath interfaces and XPath implementation
+	  are excluded from compilation. This option is provided in case
+	  you do not need XPath functionality and need to save code
+	  space.
+
+config BR2_PACKAGE_PUGIXML_COMPACT
+	bool "Enable compact mode"
+	help
+	  Activates a different internal representation of document
+	  storage that is much more memory efficient for documents with
+	  a lot of markup (i.e.  nodes and attributes), but is slightly
+	  slower to parse and access.
+
+	  http://pugixml.org/docs/manual.html#dom.memory.compact
+
+config BR2_PACKAGE_PUGIXML_HEADER_ONLY
+	bool "Enable header-only version"
+	help
+	  All source code for pugixml will be included in every
+	  translation unit that includes pugixml.hpp. This is how most
+	  of Boost and STL libraries work.
+
+	  http://pugixml.org/docs/manual.html#install.building.header
+
+endif
+
 comment "pugixml needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/buildroot/package/pugixml/pugixml.mk b/buildroot/package/pugixml/pugixml.mk
index e5188e5f5..8edaddd82 100644
--- a/buildroot/package/pugixml/pugixml.mk
+++ b/buildroot/package/pugixml/pugixml.mk
@@ -10,4 +10,24 @@ PUGIXML_LICENSE = MIT
 PUGIXML_LICENSE_FILES = readme.txt
 PUGIXML_INSTALL_STAGING = YES
 
+# Pugixml will automatically enable 'long long' support on C++11 compilers,
+# which means gcc 4.8+. As gcc always supports the 'long long' type,
+# force-enable this option to support older gcc versions. See also:
+# https://gcc.gnu.org/onlinedocs/gcc/Long-Long.html
+PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG
+
+ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),)
+PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY
+endif
+
+ifdef PUGIXML_BUILD_DEFINES
+PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))"
+endif
+
 $(eval $(cmake-package))
diff --git a/buildroot/package/pulseaudio/S50pulseaudio b/buildroot/package/pulseaudio/S50pulseaudio
old mode 100755
new mode 100644
index c1d88626f..ea343a716
--- a/buildroot/package/pulseaudio/S50pulseaudio
+++ b/buildroot/package/pulseaudio/S50pulseaudio
@@ -7,12 +7,19 @@
 start() {
 	printf "Starting pulseaudio: "
 	umask 077
-	/usr/bin/pulseaudio --system --daemonize
+	/usr/bin/pulseaudio \
+		--system \
+		--daemonize \
+		--disallow-module-loading \
+		--disallow-exit \
+		--exit-idle-time=-1 \
+		--use-pid-file \
+		--disable-shm
 	echo "OK"
 }
 stop() {
 	printf "Stopping pulseaudio: "
-	pulseaudio --kill
+	PULSE_RUNTIME_PATH=/var/run/pulse /usr/bin/pulseaudio --kill
 	echo "OK"
 }
 restart() {
diff --git a/buildroot/package/pulseaudio/pulseaudio.mk b/buildroot/package/pulseaudio/pulseaudio.mk
index d1c35654c..c91af2293 100644
--- a/buildroot/package/pulseaudio/pulseaudio.mk
+++ b/buildroot/package/pulseaudio/pulseaudio.mk
@@ -21,7 +21,7 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
 	$(if $(BR2_PACKAGE_DBUS),dbus) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
-	$(if $(BR2_PACKAGE_FFTW),fftw) \
+	$(if $(BR2_PACKAGE_FFTW_SINGLE),fftw-single) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
 
 ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
diff --git a/buildroot/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch b/buildroot/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
new file mode 100644
index 000000000..5cf0c446a
--- /dev/null
+++ b/buildroot/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
@@ -0,0 +1,37 @@
+From da124df864dd7555733d6690eacf856435d55b2d Mon Sep 17 00:00:00 2001
+From: Bartosz Golaszewski 
+Date: Mon, 3 Dec 2018 13:14:16 +0100
+Subject: [PATCH] mainbar: fix build without libsigrokdecode
+
+We must not include decodesignal.hpp if we're not using libsigrokdecode
+or the build will fail due to libsigrokdecode.hpp not being present in
+the system.
+
+Signed-off-by: Bartosz Golaszewski 
+---
+ pv/toolbars/mainbar.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
+index e6beb2b..7c4d0fb 100644
+--- a/pv/toolbars/mainbar.cpp
++++ b/pv/toolbars/mainbar.cpp
+@@ -35,7 +35,6 @@
+ 
+ #include 
+ 
+-#include 
+ #include 
+ #include 
+ #include 
+@@ -52,6 +51,7 @@
+ #include 
+ #ifdef ENABLE_DECODE
+ #include 
++#include 
+ #endif
+ 
+ #include 
+-- 
+2.19.1
+
diff --git a/buildroot/package/pulseview/Config.in b/buildroot/package/pulseview/Config.in
index 301acf7d9..01e522e1c 100644
--- a/buildroot/package/pulseview/Config.in
+++ b/buildroot/package/pulseview/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_PULSEVIEW
 	depends on !BR2_STATIC_LIBS
 	# libsigrok
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	depends on BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBSIGROK
 	select BR2_PACKAGE_LIBSIGROKCXX
 	select BR2_PACKAGE_QT5BASE_WIDGETS
@@ -18,7 +19,6 @@ config BR2_PACKAGE_PULSEVIEW
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_FILESYSTEM
 	select BR2_PACKAGE_BOOST_SYSTEM
-	select BR2_PACKAGE_BOOST_THREAD
 	select BR2_PACKAGE_BOOST_SERIALIZATION
 	help
 	  PulseView is a Qt based logic analyzer, oscilloscope
@@ -26,8 +26,9 @@ config BR2_PACKAGE_PULSEVIEW
 
 	  http://sigrok.org/wiki/PulseView
 
-comment "pulseview needs a toolchain w/ wchar, threads, dynamic library, C++, gcc >= 4.9"
+comment "pulseview needs a toolchain w/ locale, wchar, threads, dynamic library, C++, gcc >= 4.9"
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_QT5
 	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
-		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
+		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
+		|| BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE
diff --git a/buildroot/package/pulseview/pulseview.hash b/buildroot/package/pulseview/pulseview.hash
index 7883eabe5..09b9d67bc 100644
--- a/buildroot/package/pulseview/pulseview.hash
+++ b/buildroot/package/pulseview/pulseview.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	78f8291045c6f65b4827b12e83c8e68cea2d5e7268b15a51aaca9726c8100eb9	pulseview-0.4.0.tar.gz
+sha256	9ee7ce3dd1457c6a5f5e4e9c2469903a1f070ba077ea68535cc29ef1dfac6f2f	pulseview-0.4.1.tar.gz
diff --git a/buildroot/package/pulseview/pulseview.mk b/buildroot/package/pulseview/pulseview.mk
index e9bbf4f5c..67d525f62 100644
--- a/buildroot/package/pulseview/pulseview.mk
+++ b/buildroot/package/pulseview/pulseview.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PULSEVIEW_VERSION = 0.4.0
+PULSEVIEW_VERSION = 0.4.1
 PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview
 PULSEVIEW_LICENSE = GPL-3.0+
 PULSEVIEW_LICENSE_FILES = COPYING
diff --git a/buildroot/package/pure-ftpd/pure-ftpd.mk b/buildroot/package/pure-ftpd/pure-ftpd.mk
index ae3ca9d1f..6b85b0c65 100644
--- a/buildroot/package/pure-ftpd/pure-ftpd.mk
+++ b/buildroot/package/pure-ftpd/pure-ftpd.mk
@@ -31,12 +31,17 @@ ifeq ($(BR2_PACKAGE_LIBSODIUM),y)
 PURE_FTPD_DEPENDENCIES += libsodium
 endif
 
+ifeq ($(BR2_PACKAGE_OPENLDAP),y)
+PURE_FTPD_CONF_OPTS += --with-ldap
+PURE_FTPD_DEPENDENCIES += openldap
+else
+PURE_FTPD_CONF_OPTS += --without-ldap
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 PURE_FTPD_CONF_OPTS += --with-tls
-PURE_FTPD_DEPENDENCIES += openssl
-ifeq ($(BR2_STATIC_LIBS),y)
-PURE_FTPD_CONF_ENV += LIBS='-lssl -lcrypto -lz'
-endif
+PURE_FTPD_DEPENDENCIES += host-pkgconf openssl
+PURE_FTPD_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 else
 PURE_FTPD_CONF_OPTS += --without-tls
 endif
diff --git a/buildroot/package/putty/0001-Fix-compilation-with-NO_GSSAPI.patch b/buildroot/package/putty/0001-Fix-compilation-with-NO_GSSAPI.patch
new file mode 100644
index 000000000..56a29e19d
--- /dev/null
+++ b/buildroot/package/putty/0001-Fix-compilation-with-NO_GSSAPI.patch
@@ -0,0 +1,266 @@
+From 7ad08649a223a4cd61e67d8334a147f55c79399d Mon Sep 17 00:00:00 2001
+From: Jacob Nevins 
+Date: Mon, 25 Mar 2019 23:46:59 +0000
+Subject: [PATCH] Fix compilation with NO_GSSAPI.
+
+This is a fairly shallow patch, which removes the UI and interactions
+with external libraries. Some other machinery (which is dead code in
+this configuration) is left in place.
+
+Adapted by me from a patch by Jeroen Roovers.
+
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit 7ad08649a22
+
+ config.c        |  4 ++++
+ settings.c      | 12 ++++++++++--
+ ssh.c           | 16 +++++++++++++++-
+ ssh2transport.c |  3 +--
+ ssh2userauth.c  |  8 ++++++--
+ sshserver.c     | 13 ++++++++++++-
+ 6 files changed, 48 insertions(+), 8 deletions(-)
+
+diff --git a/config.c b/config.c
+index 9c299feecc21..6528a9696584 100644
+--- a/config.c
++++ b/config.c
+@@ -2442,10 +2442,12 @@ void setup_config_box(struct controlbox *b, bool midsession,
+ 			      HELPCTX(ssh_kexlist),
+ 			      kexlist_handler, P(NULL));
+             c->listbox.height = KEX_MAX;
++#ifndef NO_GSSAPI
+ 	    ctrl_checkbox(s, "Attempt GSSAPI key exchange",
+ 			  'k', HELPCTX(ssh_gssapi),
+ 			  conf_checkbox_handler,
+ 			  I(CONF_try_gssapi_kex));
++#endif
+ 
+ 	    s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
+ 			    "Options controlling key re-exchange");
+@@ -2455,11 +2457,13 @@ void setup_config_box(struct controlbox *b, bool midsession,
+ 			 conf_editbox_handler,
+ 			 I(CONF_ssh_rekey_time),
+ 			 I(-1));
++#ifndef NO_GSSAPI
+             ctrl_editbox(s, "Minutes between GSS checks (0 for never)", NO_SHORTCUT, 20,
+                          HELPCTX(ssh_kex_repeat),
+                          conf_editbox_handler,
+                          I(CONF_gssapirekey),
+                          I(-1));
++#endif
+ 	    ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
+ 			 HELPCTX(ssh_kex_repeat),
+ 			 conf_editbox_handler,
+diff --git a/settings.c b/settings.c
+index 8d56302677d9..54f5ab7b2919 100644
+--- a/settings.c
++++ b/settings.c
+@@ -592,21 +592,25 @@ void save_open_settings(settings_w *sesskey, Conf *conf)
+     write_setting_b(sesskey, "Compression", conf_get_bool(conf, CONF_compression));
+     write_setting_b(sesskey, "TryAgent", conf_get_bool(conf, CONF_tryagent));
+     write_setting_b(sesskey, "AgentFwd", conf_get_bool(conf, CONF_agentfwd));
++#ifndef NO_GSSAPI
+     write_setting_b(sesskey, "GssapiFwd", conf_get_bool(conf, CONF_gssapifwd));
++#endif
+     write_setting_b(sesskey, "ChangeUsername", conf_get_bool(conf, CONF_change_username));
+     wprefs(sesskey, "Cipher", ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist);
+     wprefs(sesskey, "KEX", kexnames, KEX_MAX, conf, CONF_ssh_kexlist);
+     wprefs(sesskey, "HostKey", hknames, HK_MAX, conf, CONF_ssh_hklist);
+     write_setting_i(sesskey, "RekeyTime", conf_get_int(conf, CONF_ssh_rekey_time));
++#ifndef NO_GSSAPI
+     write_setting_i(sesskey, "GssapiRekey", conf_get_int(conf, CONF_gssapirekey));
++#endif
+     write_setting_s(sesskey, "RekeyBytes", conf_get_str(conf, CONF_ssh_rekey_data));
+     write_setting_b(sesskey, "SshNoAuth", conf_get_bool(conf, CONF_ssh_no_userauth));
+     write_setting_b(sesskey, "SshBanner", conf_get_bool(conf, CONF_ssh_show_banner));
+     write_setting_b(sesskey, "AuthTIS", conf_get_bool(conf, CONF_try_tis_auth));
+     write_setting_b(sesskey, "AuthKI", conf_get_bool(conf, CONF_try_ki_auth));
++#ifndef NO_GSSAPI
+     write_setting_b(sesskey, "AuthGSSAPI", conf_get_bool(conf, CONF_try_gssapi_auth));
+     write_setting_b(sesskey, "AuthGSSAPIKEX", conf_get_bool(conf, CONF_try_gssapi_kex));
+-#ifndef NO_GSSAPI
+     wprefs(sesskey, "GSSLibs", gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
+     write_setting_filename(sesskey, "GSSCustom", conf_get_filename(conf, CONF_ssh_gss_custom));
+ #endif
+@@ -937,7 +941,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
+     gppb(sesskey, "TryAgent", true, conf, CONF_tryagent);
+     gppb(sesskey, "AgentFwd", false, conf, CONF_agentfwd);
+     gppb(sesskey, "ChangeUsername", false, conf, CONF_change_username);
++#ifndef NO_GSSAPI
+     gppb(sesskey, "GssapiFwd", false, conf, CONF_gssapifwd);
++#endif
+     gprefs(sesskey, "Cipher", "\0",
+ 	   ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist);
+     {
+@@ -990,7 +996,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
+     gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN",
+            hknames, HK_MAX, conf, CONF_ssh_hklist);
+     gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time);
++#ifndef NO_GSSAPI
+     gppi(sesskey, "GssapiRekey", GSS_DEF_REKEY_MINS, conf, CONF_gssapirekey);
++#endif
+     gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data);
+     {
+ 	/* SSH-2 only by default */
+@@ -1007,9 +1015,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
+     gppb(sesskey, "SshBanner", true, conf, CONF_ssh_show_banner);
+     gppb(sesskey, "AuthTIS", false, conf, CONF_try_tis_auth);
+     gppb(sesskey, "AuthKI", true, conf, CONF_try_ki_auth);
++#ifndef NO_GSSAPI
+     gppb(sesskey, "AuthGSSAPI", true, conf, CONF_try_gssapi_auth);
+     gppb(sesskey, "AuthGSSAPIKEX", true, conf, CONF_try_gssapi_kex);
+-#ifndef NO_GSSAPI
+     gprefs(sesskey, "GSSLibs", "\0",
+ 	   gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
+     gppfile(sesskey, "GSSCustom", conf, CONF_ssh_gss_custom);
+diff --git a/ssh.c b/ssh.c
+index e35ebc64e2b5..e8ad61b8085d 100644
+--- a/ssh.c
++++ b/ssh.c
+@@ -50,7 +50,9 @@ struct Ssh {
+     ssh_sharing_state *connshare;
+     bool attempting_connshare;
+ 
++#ifndef NO_GSSAPI
+     struct ssh_connection_shared_gss_state gss_state;
++#endif
+ 
+     char *savedhost;
+     int savedport;
+@@ -252,10 +254,18 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
+                     conf_get_bool(ssh->conf, CONF_tryagent), username,
+                     conf_get_bool(ssh->conf, CONF_change_username),
+                     conf_get_bool(ssh->conf, CONF_try_ki_auth),
++#ifndef NO_GSSAPI
+                     conf_get_bool(ssh->conf, CONF_try_gssapi_auth),
+                     conf_get_bool(ssh->conf, CONF_try_gssapi_kex),
+                     conf_get_bool(ssh->conf, CONF_gssapifwd),
+-                    &ssh->gss_state);
++                    &ssh->gss_state
++#else
++                    false,
++                    false,
++                    false,
++                    NULL
++#endif
++                    );
+                 ssh_connect_ppl(ssh, userauth_layer);
+                 transport_child_layer = userauth_layer;
+ 
+@@ -267,7 +277,11 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
+                 ssh->fullhostname,
+                 ssh_verstring_get_local(old_bpp),
+                 ssh_verstring_get_remote(old_bpp),
++#ifndef NO_GSSAPI
+                 &ssh->gss_state,
++#else
++                NULL,
++#endif
+                 &ssh->stats, transport_child_layer, false);
+             ssh_connect_ppl(ssh, ssh->base_layer);
+ 
+diff --git a/ssh2transport.c b/ssh2transport.c
+index 8640d89d4be4..5e8955a0275f 100644
+--- a/ssh2transport.c
++++ b/ssh2transport.c
+@@ -1781,6 +1781,7 @@ static void ssh2_transport_gss_update(struct ssh2_transport_state *s,
+     if (mins > 0 && s->gss_ctxt_lifetime <= mins * 60)
+         s->gss_status |= GSS_CTXT_EXPIRES;
+ }
++#endif /* NO_GSSAPI */
+ 
+ ptrlen ssh2_transport_get_session_id(PacketProtocolLayer *ppl)
+ {
+@@ -1805,8 +1806,6 @@ void ssh2_transport_notify_auth_done(PacketProtocolLayer *ppl)
+     queue_idempotent_callback(&s->ppl.ic_process_queue);
+ }
+ 
+-#endif /* NO_GSSAPI */
+-
+ static bool ssh2_transport_get_specials(
+     PacketProtocolLayer *ppl, add_special_fn_t add_special, void *ctx)
+ {
+diff --git a/ssh2userauth.c b/ssh2userauth.c
+index fc4139230557..7f5a129295ab 100644
+--- a/ssh2userauth.c
++++ b/ssh2userauth.c
+@@ -613,8 +613,10 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
+                  * Scan it for method identifiers we know about.
+                  */
+                 bool srv_pubkey = false, srv_passwd = false;
+-                bool srv_keyb_inter = false, srv_gssapi = false;
+-                bool srv_gssapi_keyex_auth = false;
++                bool srv_keyb_inter = false;
++#ifndef NO_GSSAPI
++                bool srv_gssapi = false, srv_gssapi_keyex_auth = false;
++#endif
+ 
+                 for (ptrlen method; get_commasep_word(&methods, &method) ;) {
+                     if (ptrlen_eq_string(method, "publickey"))
+@@ -623,10 +625,12 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
+                         srv_passwd = true;
+                     else if (ptrlen_eq_string(method, "keyboard-interactive"))
+                         srv_keyb_inter = true;
++#ifndef NO_GSSAPI
+                     else if (ptrlen_eq_string(method, "gssapi-with-mic"))
+                         srv_gssapi = true;
+                     else if (ptrlen_eq_string(method, "gssapi-keyex"))
+                         srv_gssapi_keyex_auth = true;
++#endif
+                 }
+ 
+                 /*
+diff --git a/sshserver.c b/sshserver.c
+index 5f6e7ddeeaec..5c34bb356757 100644
+--- a/sshserver.c
++++ b/sshserver.c
+@@ -50,7 +50,9 @@ struct server {
+     PacketProtocolLayer *base_layer;
+     ConnectionLayer *cl;
+ 
++#ifndef NO_GSSAPI
+     struct ssh_connection_shared_gss_state gss_state;
++#endif
+ };
+ 
+ static void ssh_server_free_callback(void *vsrv);
+@@ -245,9 +247,11 @@ Plug *ssh_server_plug(
+     bufchain_init(&srv->out_raw);
+     bufchain_init(&srv->dummy_user_input);
+ 
++#ifndef NO_GSSAPI
+     /* FIXME: replace with sensible */
+     srv->gss_state.libs = snew(struct ssh_gss_liblist);
+     srv->gss_state.libs->nlibraries = 0;
++#endif
+ 
+     return &srv->plug;
+ }
+@@ -297,7 +301,9 @@ static void ssh_server_free_callback(void *vsrv)
+     conf_free(srv->conf);
+     log_free(srv->logctx);
+ 
++#ifndef NO_GSSAPI
+     sfree(srv->gss_state.libs);        /* FIXME: replace with sensible */
++#endif
+ 
+     sfree(srv);
+ 
+@@ -442,7 +448,12 @@ static void server_got_ssh_version(struct ssh_version_receiver *rcv,
+             srv->conf, NULL, 0, NULL,
+             ssh_verstring_get_remote(old_bpp),
+             ssh_verstring_get_local(old_bpp),
+-            &srv->gss_state, &srv->stats, transport_child_layer, true);
++#ifndef NO_GSSAPI
++            &srv->gss_state,
++#else
++            NULL,
++#endif
++            &srv->stats, transport_child_layer, true);
+         ssh2_transport_provide_hostkeys(
+             srv->base_layer, srv->hostkeys, srv->nhostkeys);
+         if (userauth_layer)
+-- 
+2.20.1
+
diff --git a/buildroot/package/putty/0002-unix-uxpoll-need-_XOPEN_SOURCE.patch b/buildroot/package/putty/0002-unix-uxpoll-need-_XOPEN_SOURCE.patch
new file mode 100644
index 000000000..fb4b6c26e
--- /dev/null
+++ b/buildroot/package/putty/0002-unix-uxpoll-need-_XOPEN_SOURCE.patch
@@ -0,0 +1,39 @@
+From c1b9d07d39e33e40d2ad04be176367cf48271cfd Mon Sep 17 00:00:00 2001
+From: Baruch Siach 
+Date: Tue, 26 Mar 2019 20:00:45 +0200
+Subject: [PATCH] unix/uxpoll: need _XOPEN_SOURCE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The code needs _XOPEN_SOURCE for some poll() flags.
+
+Fix this build failure with uClibc:
+
+./../unix/uxpoll.c: In function ‘pollwrap_add_fd_rwx’:
+./../unix/uxpoll.c:75:32: error: ‘POLLRDNORM’ undeclared (first use in this function); did you mean ‘POLLNVAL’?
+ #define SELECT_R_IN (POLLIN  | POLLRDNORM | POLLRDBAND)
+                                ^
+./../unix/uxpoll.c:87:19: note: in expansion of macro ‘SELECT_R_IN’
+         events |= SELECT_R_IN;
+                   ^~~~~~~~~~~
+
+Signed-off-by: Baruch Siach 
+---
+Upstream status: issue reported to upstream developers
+
+ unix/uxpoll.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/unix/uxpoll.c b/unix/uxpoll.c
+index bbc5490d125d..6fe6ac7ba0c1 100644
+--- a/unix/uxpoll.c
++++ b/unix/uxpoll.c
+@@ -1,3 +1,4 @@
++#define _XOPEN_SOURCE
+ #include 
+ 
+ #include "putty.h"
+-- 
+2.20.1
+
diff --git a/buildroot/package/putty/0003-Fix-uClibc-build-issues.patch b/buildroot/package/putty/0003-Fix-uClibc-build-issues.patch
new file mode 100644
index 000000000..ceefded97
--- /dev/null
+++ b/buildroot/package/putty/0003-Fix-uClibc-build-issues.patch
@@ -0,0 +1,93 @@
+From 0554cfbb926a2ba26efda08865b270af8536e0bb Mon Sep 17 00:00:00 2001
+From: Simon Tatham 
+Date: Tue, 26 Mar 2019 20:03:09 +0200
+Subject: [PATCH] Fix uClibc build issues
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix two uClibc build failures.
+
+Missing sys/auxv.h header:
+
+./../unix/uxutils.c:5:10: fatal error: sys/auxv.h: No such file or directory
+ #include 
+          ^~~~~~~~~~~~
+
+Missing futimes() implementation:
+
+./../unix/uxsftpserver.c: In function ‘uss_fsetstat’:
+./../unix/uxsftpserver.c:441:25: warning: implicit declaration of function ‘futimes’; did you mean ‘lutimes’? [-Wimplicit-function-declaration]
+ #define FD_PREFIX(func) f ## func
+                         ^
+./../unix/uxsftpserver.c:435:17: note: in expansion of macro ‘FD_PREFIX’
+             if (api_prefix(utimes)(api_arg, tv) < 0)                    \
+                 ^~~~~~~~~~
+./../unix/uxsftpserver.c:470:5: note: in expansion of macro ‘SETSTAT_GUTS’
+     SETSTAT_GUTS(FD_PREFIX, fd, attrs, success);
+     ^~~~~~~~~~~~
+
+unix/uxsftpserver.o: In function `uss_fsetstat':
+uxsftpserver.c:(.text+0x1058): undefined reference to `futimes'
+
+Signed-off-by: Baruch Siach 
+---
+Upstream status: patch suggested by upstream developer Simon Tatham
+
+ configure.ac        |  3 ++-
+ unix/uxsftpserver.c | 10 ++++++++++
+ unix/uxutils.c      |  3 ++-
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 35552ed24dbe..1949ef62f219 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -173,8 +173,9 @@ AC_CHECK_LIB(X11, XOpenDisplay,
+              [GTK_LIBS="-lX11 $GTK_LIBS"
+               AC_DEFINE([HAVE_LIBX11],[],[Define if libX11.a is available])])
+ 
+-AC_CHECK_FUNCS([getaddrinfo posix_openpt ptsname setresuid strsignal updwtmpx fstatat dirfd])
++AC_CHECK_FUNCS([getaddrinfo posix_openpt ptsname setresuid strsignal updwtmpx fstatat dirfd futimes])
+ AC_CHECK_DECLS([CLOCK_MONOTONIC], [], [], [[#include ]])
++AC_CHECK_HEADERS([sys/auxv.h asm/hwcap.h])
+ AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME],[],[Define if clock_gettime() is available])])
+ 
+ AC_CACHE_CHECK([for SO_PEERCRED and dependencies], [x_cv_linux_so_peercred], [
+diff --git a/unix/uxsftpserver.c b/unix/uxsftpserver.c
+index 6fab0ba090d6..a90344e04219 100644
+--- a/unix/uxsftpserver.c
++++ b/unix/uxsftpserver.c
+@@ -412,6 +412,16 @@ static void uss_fstat(SftpServer *srv, SftpReplyBuilder *reply,
+     }
+ }
+ 
++#if !HAVE_FUTIMES
++static inline int futimes(int fd, const struct timeval tv[2])
++{
++    /* If the OS doesn't support futimes(3) then we have to pretend it
++     * always returns failure */
++    errno = EINVAL;
++    return -1;
++}
++#endif
++
+ /*
+  * The guts of setstat and fsetstat, macroised so that they can call
+  * fchown(fd,...) or chown(path,...) depending on parameters.
+diff --git a/unix/uxutils.c b/unix/uxutils.c
+index fcbcc4d422c1..f01bc2c14a2d 100644
+--- a/unix/uxutils.c
++++ b/unix/uxutils.c
+@@ -1,6 +1,7 @@
+ #include "ssh.h"
+ 
+-#if defined __linux__ && (defined __arm__ || defined __aarch64__)
++#if defined __linux__ && (defined __arm__ || defined __aarch64__) && \
++    HAVE_SYS_AUXV_H && HAVE_ASM_HWCAP_H
+ 
+ #include 
+ #include 
+-- 
+2.20.1
+
diff --git a/buildroot/package/putty/putty.hash b/buildroot/package/putty/putty.hash
index e0527105c..30f51848f 100644
--- a/buildroot/package/putty/putty.hash
+++ b/buildroot/package/putty/putty.hash
@@ -1,3 +1,6 @@
-# Hashes from: http://the.earth.li/~sgtatham/putty/0.70/{sha256,sha512}sums
-sha256 bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be                                                                 putty-0.70.tar.gz
-sha512 2aaf4fa2b4ad2d82eb5cdc4419ade79e0c5d8bd3c093db92b3c048e6107f85a5f1647f9d8203cda0906ce2b926725a75319f981cb32e6f1ebf50b1f738564fed putty-0.70.tar.gz
+# Hashes from: http://the.earth.li/~sgtatham/putty/0.71/{sha256,sha512}sums
+sha256 2f931ce2f89780cc8ca7bbed90fcd22c44515d2773f5fa954069e209b48ec6b8                                                                 putty-0.71.tar.gz
+sha512 f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07 putty-0.71.tar.gz
+
+# Locally calculated
+sha256 b517b4a9504ba0f651d5e590245197b88d9a81d073905cc798cc9464c5ca7ba8  LICENCE
diff --git a/buildroot/package/putty/putty.mk b/buildroot/package/putty/putty.mk
index 52f2d4c3d..68622a574 100644
--- a/buildroot/package/putty/putty.mk
+++ b/buildroot/package/putty/putty.mk
@@ -4,13 +4,14 @@
 #
 ################################################################################
 
-PUTTY_VERSION = 0.70
+PUTTY_VERSION = 0.71
 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION)
-PUTTY_SUBDIR = unix
 PUTTY_LICENSE = MIT
 PUTTY_LICENSE_FILES = LICENCE
 PUTTY_CONF_OPTS = --disable-gtktest
 PUTTY_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -Wno-error"
+# Patching configure.ac
+PUTTY_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_LIBGTK2),y)
 PUTTY_CONF_OPTS += --with-gtk=2
diff --git a/buildroot/package/python-aiodns/Config.in b/buildroot/package/python-aiodns/Config.in
new file mode 100644
index 000000000..aa5970598
--- /dev/null
+++ b/buildroot/package/python-aiodns/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_AIODNS
+	bool "python-aiodns"
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_PYCARES # runtime
+	help
+	  Simple DNS resolver for asyncio.
+
+	  http://github.com/saghul/aiodns
diff --git a/buildroot/package/python-aiodns/python-aiodns.hash b/buildroot/package/python-aiodns/python-aiodns.hash
new file mode 100644
index 000000000..b66693f86
--- /dev/null
+++ b/buildroot/package/python-aiodns/python-aiodns.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiodns/json
+md5	80e0419b49bb4c540b4857ec142219b8  aiodns-1.1.1.tar.gz
+sha256	d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea  aiodns-1.1.1.tar.gz
+# Locally computed sha256 checksums
+sha256	eb0455d35129425ed399883cd710923de3e246a510e2eb84d9f00032d0bbec97  LICENSE
diff --git a/buildroot/package/python-aiodns/python-aiodns.mk b/buildroot/package/python-aiodns/python-aiodns.mk
new file mode 100644
index 000000000..94f719d39
--- /dev/null
+++ b/buildroot/package/python-aiodns/python-aiodns.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiodns
+#
+################################################################################
+
+PYTHON_AIODNS_VERSION = 1.1.1
+PYTHON_AIODNS_SOURCE = aiodns-$(PYTHON_AIODNS_VERSION).tar.gz
+PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/3b/45/dcee156eabca900af3a1bab8acb9531636b13db4b677d44ba468a43969e0
+PYTHON_AIODNS_SETUP_TYPE = setuptools
+PYTHON_AIODNS_LICENSE = MIT
+PYTHON_AIODNS_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-aiohttp-jinja2/Config.in b/buildroot/package/python-aiohttp-jinja2/Config.in
new file mode 100644
index 000000000..dd4bb0d23
--- /dev/null
+++ b/buildroot/package/python-aiohttp-jinja2/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2
+	bool "python-aiohttp-jinja2"
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_AIOHTTP # runtime
+	select BR2_PACKAGE_PYTHON_JINJA2 # runtime
+	help
+	  Jinja2 template renderer for aiohttp.web (http server for
+	  asyncio).
+
+	  https://github.com/aio-libs/aiohttp_jinja2/
diff --git a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash
new file mode 100644
index 000000000..390b0e4ed
--- /dev/null
+++ b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiohttp-jinja2/json
+md5	de5e02056d1b48dc2fa4fc0c1a8b0e08  aiohttp-jinja2-1.1.0.tar.gz
+sha256	aef9b6595f962182ad00c990095fb51d731c280e1d183e2b28cf0bdb5a942d0c  aiohttp-jinja2-1.1.0.tar.gz
+# Locally computed sha256 checksums
+sha256	2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791  LICENSE
diff --git a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk
new file mode 100644
index 000000000..3b5359a06
--- /dev/null
+++ b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiohttp-jinja2
+#
+################################################################################
+
+PYTHON_AIOHTTP_JINJA2_VERSION = 1.1.0
+PYTHON_AIOHTTP_JINJA2_SOURCE = aiohttp-jinja2-$(PYTHON_AIOHTTP_JINJA2_VERSION).tar.gz
+PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/76/9d/68fa1e9ec3bafba572772eb385023de54096663bd6e302a24d7344c6a711
+PYTHON_AIOHTTP_JINJA2_SETUP_TYPE = setuptools
+PYTHON_AIOHTTP_JINJA2_LICENSE = Apache-2.0
+PYTHON_AIOHTTP_JINJA2_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-aiohttp-remotes/Config.in b/buildroot/package/python-aiohttp-remotes/Config.in
new file mode 100644
index 000000000..e44696ba1
--- /dev/null
+++ b/buildroot/package/python-aiohttp-remotes/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES
+	bool "python-aiohttp-remotes"
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_AIOHTTP # runtime
+	help
+	  Control remote side information.
+
+	  https://github.com/aio-libs/aiohttp-remotes
diff --git a/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.hash
new file mode 100644
index 000000000..069cdeda1
--- /dev/null
+++ b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json
+md5	70213413433ece4e2110ae90a070d279  aiohttp_remotes-0.1.2.tar.gz
+sha256	43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc  aiohttp_remotes-0.1.2.tar.gz
+# Locally computed sha256 checksums
+sha256	5240758b8a5c34a46c166294eaae7dc7034ec45c727fce889c9abf7ef5afc158  LICENSE
diff --git a/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.mk
new file mode 100644
index 000000000..5b38ae911
--- /dev/null
+++ b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiohttp-remotes
+#
+################################################################################
+
+PYTHON_AIOHTTP_REMOTES_VERSION = 0.1.2
+PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz
+PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/cd/2f/93e9198a01485f588d12e19c87cd277542dc28d8b31dc8e1c09fa1c75548
+PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils
+PYTHON_AIOHTTP_REMOTES_LICENSE = MIT
+PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-aiohttp-security/Config.in b/buildroot/package/python-aiohttp-security/Config.in
new file mode 100644
index 000000000..f92c45858
--- /dev/null
+++ b/buildroot/package/python-aiohttp-security/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY
+	bool "python-aiohttp-security"
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_AIOHTTP # runtime
+	help
+	  Security for aiohttp.web.
+
+	  https://github.com/aio-libs/aiohttp_security/
diff --git a/buildroot/package/python-aiohttp-security/python-aiohttp-security.hash b/buildroot/package/python-aiohttp-security/python-aiohttp-security.hash
new file mode 100644
index 000000000..1d2604c90
--- /dev/null
+++ b/buildroot/package/python-aiohttp-security/python-aiohttp-security.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiohttp-security/json
+md5	1624f982d7a779e6ed396ef2ed20acc7  aiohttp-security-0.4.0.tar.gz
+sha256	40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405  aiohttp-security-0.4.0.tar.gz
+# Locally computed sha256 checksums
+sha256	a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c  LICENSE
diff --git a/buildroot/package/python-aiohttp-security/python-aiohttp-security.mk b/buildroot/package/python-aiohttp-security/python-aiohttp-security.mk
new file mode 100644
index 000000000..9ab3b16b3
--- /dev/null
+++ b/buildroot/package/python-aiohttp-security/python-aiohttp-security.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiohttp-security
+#
+################################################################################
+
+PYTHON_AIOHTTP_SECURITY_VERSION = 0.4.0
+PYTHON_AIOHTTP_SECURITY_SOURCE = aiohttp-security-$(PYTHON_AIOHTTP_SECURITY_VERSION).tar.gz
+PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/36/01/d85be376b7c1773b3cb7849cd56dc7d38165664df7de2d3e20af507ef5bb
+PYTHON_AIOHTTP_SECURITY_SETUP_TYPE = setuptools
+PYTHON_AIOHTTP_SECURITY_LICENSE = Apache-2.0
+PYTHON_AIOHTTP_SECURITY_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-aiohttp-session/Config.in b/buildroot/package/python-aiohttp-session/Config.in
new file mode 100644
index 000000000..c148165f0
--- /dev/null
+++ b/buildroot/package/python-aiohttp-session/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_AIOHTTP_SESSION
+	bool "python-aiohttp-session"
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_AIOHTTP # runtime
+	help
+	  Sessions for aiohttp.web.
+
+	  https://github.com/aio-libs/aiohttp_session/
diff --git a/buildroot/package/python-aiohttp-session/python-aiohttp-session.hash b/buildroot/package/python-aiohttp-session/python-aiohttp-session.hash
new file mode 100644
index 000000000..fdccb20d1
--- /dev/null
+++ b/buildroot/package/python-aiohttp-session/python-aiohttp-session.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiohttp-session/json
+md5	a873141ee04ffc9fc948d9ee0ed47a8d  aiohttp-session-2.7.0.tar.gz
+sha256	18ae740845214086f783574edfee1bac36862332bd11d561e048b079d8f6ad34  aiohttp-session-2.7.0.tar.gz
+# Locally computed sha256 checksums
+sha256	2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791  LICENSE
diff --git a/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk b/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk
new file mode 100644
index 000000000..36c3180be
--- /dev/null
+++ b/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiohttp-session
+#
+################################################################################
+
+PYTHON_AIOHTTP_SESSION_VERSION = 2.7.0
+PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz
+PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/b5/5f/3f78fd4de2f9b17ad8cfe6c189bfaee3d0a5d2fe954aedad743edd08c813
+PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools
+PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0
+PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-aiohttp-sse/Config.in b/buildroot/package/python-aiohttp-sse/Config.in
new file mode 100644
index 000000000..781bbf4de
--- /dev/null
+++ b/buildroot/package/python-aiohttp-sse/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_AIOHTTP_SSE
+	bool "python-aiohttp-sse"
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_AIOHTTP # runtime
+	help
+	  Server-sent events support for aiohttp.
+
+	  https://github.com/aio-libs/aiohttp_sse/
diff --git a/buildroot/package/python-aiohttp-sse/python-aiohttp-sse.hash b/buildroot/package/python-aiohttp-sse/python-aiohttp-sse.hash
new file mode 100644
index 000000000..2f21da462
--- /dev/null
+++ b/buildroot/package/python-aiohttp-sse/python-aiohttp-sse.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiohttp-sse/json
+md5	d2f394fb75f591045b2c94fc17c8533d  aiohttp-sse-2.0.0.tar.gz
+sha256	547e1eaa129749f090d02b31956215edbcde74ce99721f5f0ac902a9ccb1202e  aiohttp-sse-2.0.0.tar.gz
+# Locally computed sha256 checksums
+sha256	cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14  LICENSE
diff --git a/buildroot/package/python-aiohttp-sse/python-aiohttp-sse.mk b/buildroot/package/python-aiohttp-sse/python-aiohttp-sse.mk
new file mode 100644
index 000000000..7a7a0d0a7
--- /dev/null
+++ b/buildroot/package/python-aiohttp-sse/python-aiohttp-sse.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiohttp-sse
+#
+################################################################################
+
+PYTHON_AIOHTTP_SSE_VERSION = 2.0.0
+PYTHON_AIOHTTP_SSE_SOURCE = aiohttp-sse-$(PYTHON_AIOHTTP_SSE_VERSION).tar.gz
+PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2b/50/e127729f7df53c32c96b5c71932a7262cad40c83f1e19c218b068c816d51
+PYTHON_AIOHTTP_SSE_SETUP_TYPE = setuptools
+PYTHON_AIOHTTP_SSE_LICENSE = Apache-2.0
+PYTHON_AIOHTTP_SSE_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-aiohttp/Config.in b/buildroot/package/python-aiohttp/Config.in
new file mode 100644
index 000000000..d75c44022
--- /dev/null
+++ b/buildroot/package/python-aiohttp/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_PYTHON_AIOHTTP
+	bool "python-aiohttp"
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_ATTRS # runtime
+	select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime
+	select BR2_PACKAGE_PYTHON_CHARDET if !BR2_INSTALL_LIBSTDCPP # runtime
+	select BR2_PACKAGE_PYTHON_MULTIDICT # runtime
+	select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime
+	select BR2_PACKAGE_PYTHON_YARL # runtime
+	select BR2_PACKAGE_PYTHON_AIODNS # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
+	help
+	  Async http client/server framework (asyncio).
+
+	  https://github.com/aio-libs/aiohttp
diff --git a/buildroot/package/python-aiohttp/python-aiohttp.hash b/buildroot/package/python-aiohttp/python-aiohttp.hash
new file mode 100644
index 000000000..bd9e2d7a6
--- /dev/null
+++ b/buildroot/package/python-aiohttp/python-aiohttp.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiohttp/json
+md5	85fe5c9037256c58d4678148bd91b3f3  aiohttp-3.5.4.tar.gz
+sha256	9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf  aiohttp-3.5.4.tar.gz
+# Locally computed sha256 checksums
+sha256	6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6  LICENSE.txt
diff --git a/buildroot/package/python-aiohttp/python-aiohttp.mk b/buildroot/package/python-aiohttp/python-aiohttp.mk
new file mode 100644
index 000000000..7a142a655
--- /dev/null
+++ b/buildroot/package/python-aiohttp/python-aiohttp.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiohttp
+#
+################################################################################
+
+PYTHON_AIOHTTP_VERSION = 3.5.4
+PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz
+PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/0f/58/c8b83f999da3b13e66249ea32f325be923791c0c10aee6cf16002a3effc1
+PYTHON_AIOHTTP_SETUP_TYPE = setuptools
+PYTHON_AIOHTTP_LICENSE = Apache-2.0
+PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-aiojobs/Config.in b/buildroot/package/python-aiojobs/Config.in
new file mode 100644
index 000000000..ab6198516
--- /dev/null
+++ b/buildroot/package/python-aiojobs/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_AIOJOBS
+	bool "python-aiojobs"
+	depends on BR2_PACKAGE_PYTHON3
+	help
+	  Jobs scheduler for managing background task (asyncio).
+
+	  https://github.com/aio-libs/aiojobs
diff --git a/buildroot/package/python-aiojobs/python-aiojobs.hash b/buildroot/package/python-aiojobs/python-aiojobs.hash
new file mode 100644
index 000000000..56a8bb111
--- /dev/null
+++ b/buildroot/package/python-aiojobs/python-aiojobs.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiojobs/json
+md5	8fd929e4ef9bc6560c675a5b11ac6077  aiojobs-0.2.2.tar.gz
+sha256	8e4b3e3d1bdb970bdaf8f8cd5eb4e4ff3e0e01a4abd22b4f73a87002a5ae4005  aiojobs-0.2.2.tar.gz
+# Locally computed sha256 checksums
+sha256	b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
diff --git a/buildroot/package/python-aiojobs/python-aiojobs.mk b/buildroot/package/python-aiojobs/python-aiojobs.mk
new file mode 100644
index 000000000..7a95f9908
--- /dev/null
+++ b/buildroot/package/python-aiojobs/python-aiojobs.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiojobs
+#
+################################################################################
+
+PYTHON_AIOJOBS_VERSION = 0.2.2
+PYTHON_AIOJOBS_SOURCE = aiojobs-$(PYTHON_AIOJOBS_VERSION).tar.gz
+PYTHON_AIOJOBS_SITE = https://files.pythonhosted.org/packages/57/c5/9eb091930d6574002d1721dab5ca15a1bd69ed5dc8e654159d27223cdd3b
+PYTHON_AIOJOBS_SETUP_TYPE = distutils
+PYTHON_AIOJOBS_LICENSE = Apache-2.0
+PYTHON_AIOJOBS_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-aiorwlock/Config.in b/buildroot/package/python-aiorwlock/Config.in
new file mode 100644
index 000000000..afdc27dd6
--- /dev/null
+++ b/buildroot/package/python-aiorwlock/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_AIORWLOCK
+	bool "python-aiorwlock"
+	depends on BR2_PACKAGE_PYTHON3
+	help
+	  Read write lock for asyncio.
+
+	  https://github.com/aio-libs/aiorwlock
diff --git a/buildroot/package/python-aiorwlock/python-aiorwlock.hash b/buildroot/package/python-aiorwlock/python-aiorwlock.hash
new file mode 100644
index 000000000..51d1a29f2
--- /dev/null
+++ b/buildroot/package/python-aiorwlock/python-aiorwlock.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiorwlock/json
+md5	ee741761e4c9b1612e9dccf7f8bccdd0  aiorwlock-0.5.0.tar.gz
+sha256	3cd892576d024934d72c3dd098033f276ace3495e71a1197daa8d21409a52174  aiorwlock-0.5.0.tar.gz
+# Locally computed sha256 checksums
+sha256	56fb2baf14d84c59c15abbfbb1fdf30a724017e2ce97894a8236764513d10397  LICENSE
diff --git a/buildroot/package/python-aiorwlock/python-aiorwlock.mk b/buildroot/package/python-aiorwlock/python-aiorwlock.mk
new file mode 100644
index 000000000..ca6aa2529
--- /dev/null
+++ b/buildroot/package/python-aiorwlock/python-aiorwlock.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiorwlock
+#
+################################################################################
+
+PYTHON_AIORWLOCK_VERSION = 0.5.0
+PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz
+PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/0c/20/d30f332e6ecb2be467ab5603e277b26e3a8eb2a72f75bf8d309bdd4c0c82
+PYTHON_AIORWLOCK_SETUP_TYPE = setuptools
+PYTHON_AIORWLOCK_LICENSE = Apache-2.0
+PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-autobahn/python-autobahn.hash b/buildroot/package/python-autobahn/python-autobahn.hash
index 522e28b5e..dce40f160 100644
--- a/buildroot/package/python-autobahn/python-autobahn.hash
+++ b/buildroot/package/python-autobahn/python-autobahn.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/autobahn/json
-md5	a3a0648371b41328282a9ab7fe48ccbe  autobahn-18.11.1.tar.gz
-sha256	c7e775e46fc033160fa89942de4953ca739f26167f74431dc2c8a3cd165b8755  autobahn-18.11.1.tar.gz
+md5	b296b8ae0f42e7df8052b28d574ede82  autobahn-19.1.1.tar.gz
+sha256	aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff  autobahn-19.1.1.tar.gz
 # Locally computed sha256 checksums
 sha256	0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef  LICENSE
diff --git a/buildroot/package/python-autobahn/python-autobahn.mk b/buildroot/package/python-autobahn/python-autobahn.mk
index c5faacf96..213e0314c 100644
--- a/buildroot/package/python-autobahn/python-autobahn.mk
+++ b/buildroot/package/python-autobahn/python-autobahn.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_AUTOBAHN_VERSION = 18.11.1
+PYTHON_AUTOBAHN_VERSION = 19.1.1
 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz
-PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/01/ee/d401d58dc7732fadf4fd12d7fb87dd2f3e5e2d0ba65865495565f97c2c31
+PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/66/cc/1e2b20dc6654d9a87fc30da36bfae687ec65428814378c44257a26fe5f2f
 PYTHON_AUTOBAHN_LICENSE = MIT
 PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE
 PYTHON_AUTOBAHN_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python-bcrypt/python-bcrypt.hash b/buildroot/package/python-bcrypt/python-bcrypt.hash
index 4c7c2eddf..3e4c303a1 100644
--- a/buildroot/package/python-bcrypt/python-bcrypt.hash
+++ b/buildroot/package/python-bcrypt/python-bcrypt.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/bcrypt/json
-md5	8408abc974446e64862a9742104e97b6  bcrypt-3.1.4.tar.gz
-sha256	67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d  bcrypt-3.1.4.tar.gz
+md5	4d8ab82e5e0c86b15f4ba5aff2bec6b5  bcrypt-3.1.6.tar.gz
+sha256	44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea  bcrypt-3.1.6.tar.gz
 # Locally computed sha256 checksums
 sha256	8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90  LICENSE
diff --git a/buildroot/package/python-bcrypt/python-bcrypt.mk b/buildroot/package/python-bcrypt/python-bcrypt.mk
index d2dfdf552..71bf036fc 100644
--- a/buildroot/package/python-bcrypt/python-bcrypt.mk
+++ b/buildroot/package/python-bcrypt/python-bcrypt.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_BCRYPT_VERSION = 3.1.4
+PYTHON_BCRYPT_VERSION = 3.1.6
 PYTHON_BCRYPT_SOURCE = bcrypt-$(PYTHON_BCRYPT_VERSION).tar.gz
-PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/f3/ec/bb6b384b5134fd881b91b6aa3a88ccddaad0103857760711a5ab8c799358
+PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/ce/3a/3d540b9f5ee8d92ce757eebacf167b9deedb8e30aedec69a2a072b2399bb
 PYTHON_BCRYPT_SETUP_TYPE = setuptools
 PYTHON_BCRYPT_LICENSE = Apache-2.0
 PYTHON_BCRYPT_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-cchardet/Config.in b/buildroot/package/python-cchardet/Config.in
new file mode 100644
index 000000000..74153126f
--- /dev/null
+++ b/buildroot/package/python-cchardet/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PYTHON_CCHARDET
+	bool "python-cchardet"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  cChardet is high speed universal character encoding
+	  detector.
+
+	  https://github.com/PyYoshi/cChardet
+
+comment "python-cchardet needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/buildroot/package/python-cchardet/python-cchardet.hash b/buildroot/package/python-cchardet/python-cchardet.hash
new file mode 100644
index 000000000..231804ee3
--- /dev/null
+++ b/buildroot/package/python-cchardet/python-cchardet.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/cchardet/json
+md5	17af20af67cb18e958854e273d857a88  cchardet-2.1.4.tar.gz
+sha256	cc9745e0400da4cfb49f075e7819f22473b66443f953427058fee2c7b9547cc0  cchardet-2.1.4.tar.gz
+# Locally computed sha256 checksums
+sha256	107a29ccdd2d778aa2df5462f85dddfa099059abd22e064e07ec2cc9bafc37cd  COPYING
diff --git a/buildroot/package/python-cchardet/python-cchardet.mk b/buildroot/package/python-cchardet/python-cchardet.mk
new file mode 100644
index 000000000..9ac170c22
--- /dev/null
+++ b/buildroot/package/python-cchardet/python-cchardet.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-cchardet
+#
+################################################################################
+
+PYTHON_CCHARDET_VERSION = 2.1.4
+PYTHON_CCHARDET_SOURCE = cchardet-$(PYTHON_CCHARDET_VERSION).tar.gz
+PYTHON_CCHARDET_SITE = https://files.pythonhosted.org/packages/74/64/3988d388315c1af3e24f447689dadf30edead43366fb2041cb103380b57f
+PYTHON_CCHARDET_SETUP_TYPE = setuptools
+PYTHON_CCHARDET_LICENSE = MPL-1.1
+PYTHON_CCHARDET_LICENSE_FILES = COPYING
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-certifi/python-certifi.hash b/buildroot/package/python-certifi/python-certifi.hash
index 596475fc2..3d0e48f6c 100644
--- a/buildroot/package/python-certifi/python-certifi.hash
+++ b/buildroot/package/python-certifi/python-certifi.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/certifi/json
-md5	3f4ca75a66bc65fea0693b8040f66d13  certifi-2018.10.15.tar.gz
-sha256	6d58c986d22b038c8c0df30d639f23a3e6d172a05c3583e766f4c0b785c0986a  certifi-2018.10.15.tar.gz
+md5	8160cf662212bc731eccf1af8042c0af  certifi-2018.11.29.tar.gz
+sha256	47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7  certifi-2018.11.29.tar.gz
 # Locally computed sha256 checksums
 sha256	6a70a4bf6b010016d59a64b8ae4ad8dc7f5ef16f1fb453cc2ecd771c5a341131  LICENSE
diff --git a/buildroot/package/python-certifi/python-certifi.mk b/buildroot/package/python-certifi/python-certifi.mk
index addb52fc1..29b646922 100644
--- a/buildroot/package/python-certifi/python-certifi.mk
+++ b/buildroot/package/python-certifi/python-certifi.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_CERTIFI_VERSION = 2018.10.15
+PYTHON_CERTIFI_VERSION = 2018.11.29
 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz
-PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/41/b6/4f0cefba47656583217acd6cd797bc2db1fede0d53090fdc28ad2c8e0716
+PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/55/54/3ce77783acba5979ce16674fc98b1920d00b01d337cfaaf5db22543505ed
 PYTHON_CERTIFI_SETUP_TYPE = setuptools
 PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem)
 PYTHON_CERTIFI_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-crossbar/python-crossbar.hash b/buildroot/package/python-crossbar/python-crossbar.hash
index aee07a738..f956dc27e 100644
--- a/buildroot/package/python-crossbar/python-crossbar.hash
+++ b/buildroot/package/python-crossbar/python-crossbar.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/crossbar/json
-md5	e3f0c51c6c496a3d7f1c62d7f64f23db  crossbar-18.11.1.tar.gz
-sha256	ab24031f40077ee283469aab5f270bdc223b29b1e6f45d69cf38bf4cad80df2a  crossbar-18.11.1.tar.gz
+md5	462a204da3c776cbb770b98f9047e8e7  crossbar-19.1.2.tar.gz
+sha256	269d534a65c136a5c952a6accccf256f457569f731ee65e201e5a14e69db471a  crossbar-19.1.2.tar.gz
 # Locally computed
 sha256  57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6  LICENSE
diff --git a/buildroot/package/python-crossbar/python-crossbar.mk b/buildroot/package/python-crossbar/python-crossbar.mk
index de5dcea93..064d2d92b 100644
--- a/buildroot/package/python-crossbar/python-crossbar.mk
+++ b/buildroot/package/python-crossbar/python-crossbar.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_CROSSBAR_VERSION = 18.11.1
+PYTHON_CROSSBAR_VERSION = 19.1.2
 PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz
-PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/99/02/7f7f7dee3e8787e44d9452cc1d712183e5903d8a76455693b15a900385eb
+PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/86/19/54c7bd9da1ac70643b9ae7d3d4592a73391f62fcb376fcd30f8328c1c5ce
 PYTHON_CROSSBAR_LICENSE = AGPL-3.0
 PYTHON_CROSSBAR_LICENSE_FILES = LICENSE
 PYTHON_CROSSBAR_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python-cython/python-cython.hash b/buildroot/package/python-cython/python-cython.hash
index 8326dfe13..87aa56552 100644
--- a/buildroot/package/python-cython/python-cython.hash
+++ b/buildroot/package/python-cython/python-cython.hash
@@ -1,6 +1,6 @@
 # md5, sha256 from https://pypi.org/pypi/cython/json
-md5	5cb227772fbb0318be3c73b532d249ac  Cython-0.29.tar.gz
-sha256	94916d1ede67682638d3cc0feb10648ff14dc51fb7a7f147f4fedce78eaaea97  Cython-0.29.tar.gz
+md5	bc0cca4658947bf2fb3fc10e8d090182  Cython-0.29.9.tar.gz
+sha256	b88e033c06d29f3f3c760a3fb9837dce6e124d627bd562d1cdf93e9da16df215  Cython-0.29.9.tar.gz
 # Locally computed sha256 checksums
 sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9  LICENSE.txt
 sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7  COPYING.txt
diff --git a/buildroot/package/python-cython/python-cython.mk b/buildroot/package/python-cython/python-cython.mk
index f4cff975f..bd9f322d5 100644
--- a/buildroot/package/python-cython/python-cython.mk
+++ b/buildroot/package/python-cython/python-cython.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_CYTHON_VERSION = 0.29
+PYTHON_CYTHON_VERSION = 0.29.9
 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz
-PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/f0/66/6309291b19b498b672817bd237caec787d1b18013ee659f17b1ec5844887
+PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/69/ab/b18f7f2e61c12e5e859c86b6d37f73971679d5f5c5c97d6cc7ff8916468a
 PYTHON_CYTHON_SETUP_TYPE = setuptools
 PYTHON_CYTHON_LICENSE = Apache-2.0
 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt
diff --git a/buildroot/package/python-dateutil/python-dateutil.hash b/buildroot/package/python-dateutil/python-dateutil.hash
index 353b6e576..eecba7d35 100644
--- a/buildroot/package/python-dateutil/python-dateutil.hash
+++ b/buildroot/package/python-dateutil/python-dateutil.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/python-dateutil/json
-md5	6357f8f42cbe0e0e0b1e543f3aad07b7  python-dateutil-2.7.5.tar.gz
-sha256	88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02  python-dateutil-2.7.5.tar.gz
+md5	354db28843d949f1bc3e49e8458e22df  python-dateutil-2.8.0.tar.gz
+sha256	c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e  python-dateutil-2.8.0.tar.gz
 # Locally computed sha256 checksums
 sha256	ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e  LICENSE
diff --git a/buildroot/package/python-dateutil/python-dateutil.mk b/buildroot/package/python-dateutil/python-dateutil.mk
index 5e9039833..4c915c8e8 100644
--- a/buildroot/package/python-dateutil/python-dateutil.mk
+++ b/buildroot/package/python-dateutil/python-dateutil.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-PYTHON_DATEUTIL_VERSION = 2.7.5
-PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0
+PYTHON_DATEUTIL_VERSION = 2.8.0
+PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/ad/99/5b2e99737edeb28c71bcbec5b5dda19d0d9ef3ca3e92e3e925e7c0bb364c
 PYTHON_DATEUTIL_SETUP_TYPE = setuptools
 PYTHON_DATEUTIL_LICENSE = BSD-3-Clause
 PYTHON_DATEUTIL_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-django/python-django.hash b/buildroot/package/python-django/python-django.hash
index 1b8ee8368..c32511677 100644
--- a/buildroot/package/python-django/python-django.hash
+++ b/buildroot/package/python-django/python-django.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/django/json
-md5	1a447e95c81e1c9b2a7ad61f4681f022  Django-2.1.3.tar.gz
-sha256	1ffab268ada3d5684c05ba7ce776eaeedef360712358d6a6b340ae9f16486916  Django-2.1.3.tar.gz
+md5	909c2e7761893a922dcf721521d9239e  Django-2.1.9.tar.gz
+sha256	5052def4ff0a84bdf669827fdbd7b7cc1ac058f10232be6b21f37c6824f578da  Django-2.1.9.tar.gz
 # Locally computed sha256 checksums
 sha256	b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669  LICENSE
diff --git a/buildroot/package/python-django/python-django.mk b/buildroot/package/python-django/python-django.mk
index 29eb0b616..041822ea1 100644
--- a/buildroot/package/python-django/python-django.mk
+++ b/buildroot/package/python-django/python-django.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_DJANGO_VERSION = 2.1.3
+PYTHON_DJANGO_VERSION = 2.1.9
 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz
 # The official Django site has an unpractical URL
-PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/93/b1/0d6febb88712c39aced7df232d432fa22f5613c4bff246a1f4841248a60d
+PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/c1/b3/3cdc60dc2e3c11236539f9470e42c5075a2e9c9f4885f5b4b912e9f19992
 PYTHON_DJANGO_LICENSE = BSD-3-Clause
 PYTHON_DJANGO_LICENSE_FILES = LICENSE
 PYTHON_DJANGO_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python-docker-pycreds/python-docker-pycreds.hash b/buildroot/package/python-docker-pycreds/python-docker-pycreds.hash
index 9e1182d4a..d93a3a1d3 100644
--- a/buildroot/package/python-docker-pycreds/python-docker-pycreds.hash
+++ b/buildroot/package/python-docker-pycreds/python-docker-pycreds.hash
@@ -1,4 +1,4 @@
-# md5 from https://pypi.python.org/pypi/docker-pycreds/json, sha256 locally computed
-md5	ae63c7def3e58cb51a4d8f5810683030  docker-pycreds-0.2.2.tar.gz
-sha256	c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299  docker-pycreds-0.2.2.tar.gz
+# md5 and sha256 from https://pypi.python.org/pypi/docker-pycreds/json
+md5	322f570cea6b4661c6ac335683988e18  docker-pycreds-0.4.0.tar.gz
+sha256	6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4  docker-pycreds-0.4.0.tar.gz
 sha256	cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/buildroot/package/python-docker-pycreds/python-docker-pycreds.mk b/buildroot/package/python-docker-pycreds/python-docker-pycreds.mk
index e7ffd0eb5..6575ada08 100644
--- a/buildroot/package/python-docker-pycreds/python-docker-pycreds.mk
+++ b/buildroot/package/python-docker-pycreds/python-docker-pycreds.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_DOCKER_PYCREDS_VERSION = 0.2.2
+PYTHON_DOCKER_PYCREDS_VERSION = 0.4.0
 PYTHON_DOCKER_PYCREDS_SOURCE = docker-pycreds-$(PYTHON_DOCKER_PYCREDS_VERSION).tar.gz
-PYTHON_DOCKER_PYCREDS_SITE = https://pypi.python.org/packages/db/73/42d4c698e70633d99f7f7c4c87c6de45ead5ad7b36dcfccd998fd1556ac9
+PYTHON_DOCKER_PYCREDS_SITE = https://files.pythonhosted.org/packages/c5/e6/d1f6c00b7221e2d7c4b470132c931325c8b22c51ca62417e300f5ce16009
 PYTHON_DOCKER_PYCREDS_SETUP_TYPE = setuptools
 PYTHON_DOCKER_PYCREDS_LICENSE = Apache-2.0
 PYTHON_DOCKER_PYCREDS_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-docker/0001-setup.py-make-pip-optional.patch b/buildroot/package/python-docker/0001-setup.py-make-pip-optional.patch
deleted file mode 100644
index d9c958311..000000000
--- a/buildroot/package/python-docker/0001-setup.py-make-pip-optional.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 978643b7222db66837d39037f884be01fb9af234 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard 
-Date: Fri, 9 Mar 2018 18:40:16 +0100
-Subject: [PATCH] setup.py: make pip optional
-
-pip may not be available on the build host, and it is only used to check if
-docker-py is already installed, so skip the check if pip isn't available.
-
-[Upstream-status: submitted (https://github.com/docker/docker-py/pull/1948)]
-Signed-off-by: Peter Korsgaard 
----
- setup.py | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 271d94f..c9b91a3 100644
---- a/setup.py
-+++ b/setup.py
-@@ -5,16 +5,20 @@ import codecs
- import os
- import sys
- 
--import pip
--
- from setuptools import setup, find_packages
- 
--if 'docker-py' in [x.project_name for x in pip.get_installed_distributions()]:
--    print(
--        'ERROR: "docker-py" needs to be uninstalled before installing this'
--        ' package:\npip uninstall docker-py', file=sys.stderr
--    )
--    sys.exit(1)
-+try:
-+    import pip
-+
-+    if 'docker-py' in \
-+            [x.project_name for x in pip.get_installed_distributions()]:
-+        print(
-+            'ERROR: "docker-py" needs to be uninstalled before installing this'
-+            ' package:\npip uninstall docker-py', file=sys.stderr
-+        )
-+        sys.exit(1)
-+except ImportError:
-+    pass
- 
- ROOT_DIR = os.path.dirname(__file__)
- SOURCE_DIR = os.path.join(ROOT_DIR)
--- 
-2.11.0
-
diff --git a/buildroot/package/python-docker/python-docker.hash b/buildroot/package/python-docker/python-docker.hash
index e811d3a8a..37fda94f0 100644
--- a/buildroot/package/python-docker/python-docker.hash
+++ b/buildroot/package/python-docker/python-docker.hash
@@ -1,4 +1,4 @@
-# md5 from https://pypi.python.org/pypi/docker/json, sha256 locally computed
-md5	981b23b41fd2346efcae977244b7188e  docker-3.1.4.tar.gz
-sha256	753251b142d56f243fba53ba321a37740a6b6583c528437f45df4d28ba3d4d5d  docker-3.1.4.tar.gz
+# md5 and sha256 from https://pypi.python.org/pypi/docker/json
+md5	496237b9e0826eff8436b1a786943a86  docker-3.5.1.tar.gz
+sha256	fbe82af9b94ccced752527c8de07fa20267f9634b48674ba478a0bb4000a0b1e  docker-3.5.1.tar.gz
 sha256	f2f0b07fa5e492c11d27aa0d2f3f1a0e64b9d17f32d8aa489ae2af9609af33b2  LICENSE
diff --git a/buildroot/package/python-docker/python-docker.mk b/buildroot/package/python-docker/python-docker.mk
index 6a818ebae..01ae2da9b 100644
--- a/buildroot/package/python-docker/python-docker.mk
+++ b/buildroot/package/python-docker/python-docker.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_DOCKER_VERSION = 3.1.4
+PYTHON_DOCKER_VERSION = 3.5.1
 PYTHON_DOCKER_SOURCE = docker-$(PYTHON_DOCKER_VERSION).tar.gz
-PYTHON_DOCKER_SITE = https://pypi.python.org/packages/7f/22/fd6e97c99a512f74d46dab2b450fe370eb2f83404ef790298e3fd012cd5c
+PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/b1/4f/d4f646843335430701d459fea08b0285a2c0a364150dd5b9c5f27f723121
 PYTHON_DOCKER_SETUP_TYPE = setuptools
 PYTHON_DOCKER_LICENSE = Apache-2.0
 PYTHON_DOCKER_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-engineio/python-engineio.hash b/buildroot/package/python-engineio/python-engineio.hash
index 7bf1a4941..09e004ac4 100644
--- a/buildroot/package/python-engineio/python-engineio.hash
+++ b/buildroot/package/python-engineio/python-engineio.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/python-engineio/json
-md5	92d2e1b62083ce8f0dcd8fd905b0dd9d  python-engineio-2.3.2.tar.gz
-sha256	871f4d022eb9171e380281266ba2aef0759b264ba862350bc94e7a597a98a443  python-engineio-2.3.2.tar.gz
+md5	ad32353278d0576bfa7d7a2f9b97dec5  python-engineio-3.3.0.tar.gz
+sha256	e4ac17c04c32ccca67287dfdbbe4ee1e9eec3a0a1a9a6070f3ab784db08407dd  python-engineio-3.3.0.tar.gz
 # Locally computed sha256 checksums
 sha256	c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c  LICENSE
diff --git a/buildroot/package/python-engineio/python-engineio.mk b/buildroot/package/python-engineio/python-engineio.mk
index e730c39cd..c20101984 100644
--- a/buildroot/package/python-engineio/python-engineio.mk
+++ b/buildroot/package/python-engineio/python-engineio.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-PYTHON_ENGINEIO_VERSION = 2.3.2
-PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/66/18/09516793c68e0f7fb759d54c109a09a86e31c3e685eb77884613a1c1a7b3
+PYTHON_ENGINEIO_VERSION = 3.3.0
+PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/2f/09/83d627ad3dadd064bfb875c7767e93f3568354fe82cebe298b4e07f79238
 PYTHON_ENGINEIO_SETUP_TYPE = setuptools
 PYTHON_ENGINEIO_LICENSE = MIT
 PYTHON_ENGINEIO_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-gunicorn/Config.in b/buildroot/package/python-gunicorn/Config.in
index 098c3fa6b..518157bf9 100644
--- a/buildroot/package/python-gunicorn/Config.in
+++ b/buildroot/package/python-gunicorn/Config.in
@@ -3,8 +3,8 @@ config BR2_PACKAGE_PYTHON_GUNICORN
 	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
 	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
 	help
-	  Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP Server for
-	  UNIX. It’s a pre-fork worker model ported from Ruby’s
+	  Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for
+	  UNIX. It's a pre-fork worker model ported from Ruby's
 	  Unicorn project. The Gunicorn server is broadly compatible
 	  with various web frameworks, simply implemented, light on
 	  server resource usage, and fairly speedy.
diff --git a/buildroot/package/python-idna/Config.in b/buildroot/package/python-idna/Config.in
index 4ff4581d5..1fd56ceaf 100644
--- a/buildroot/package/python-idna/Config.in
+++ b/buildroot/package/python-idna/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_PYTHON_IDNA
 	help
 	  A library to support the Internationalised Domain Names in
 	  Applications (IDNA) protocol as specified in RFC 5891. This
-	  version of the protocol is often referred to as “IDNA2008â€
+	  version of the protocol is often referred to as 'IDNA2008'
 	  and can produce different results from the earlier standard
 	  from 2003.
 
diff --git a/buildroot/package/python-idna/python-idna.hash b/buildroot/package/python-idna/python-idna.hash
index 4b3c84e5d..ddfd44e97 100644
--- a/buildroot/package/python-idna/python-idna.hash
+++ b/buildroot/package/python-idna/python-idna.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/idna/json
-md5	0e5bb69018ddef1b9d95f681182be82c  idna-2.7.tar.gz
-sha256	684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16  idna-2.7.tar.gz
+md5    2e9ae0b4a0b26d1747c6127cdb060bc1  idna-2.8.tar.gz
+sha256 c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407  idna-2.8.tar.gz
 # Locally computed sha256 checksums
 sha256	0d4bc7abd48dcfb14e24254ee404066737ff0167144e222914a2113b8794683e  LICENSE.rst
diff --git a/buildroot/package/python-idna/python-idna.mk b/buildroot/package/python-idna/python-idna.mk
index d5c57955a..1dae47bb2 100644
--- a/buildroot/package/python-idna/python-idna.mk
+++ b/buildroot/package/python-idna/python-idna.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_IDNA_VERSION = 2.7
+PYTHON_IDNA_VERSION = 2.8
 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz
-PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935
+PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/ad/13/eb56951b6f7950cadb579ca166e448ba77f9d24efc03edd7e55fa57d04b7
 PYTHON_IDNA_LICENSE =  BSD-3-Clause
 PYTHON_IDNA_LICENSE_FILES = LICENSE.rst
 PYTHON_IDNA_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python-jsonmodels/python-jsonmodels.hash b/buildroot/package/python-jsonmodels/python-jsonmodels.hash
index f5b1ac5ef..16e200b03 100644
--- a/buildroot/package/python-jsonmodels/python-jsonmodels.hash
+++ b/buildroot/package/python-jsonmodels/python-jsonmodels.hash
@@ -1,4 +1,5 @@
-# md5 from https://pypi.python.org/pypi/jsonmodels/json, sha256 locally computed
-md5	e42b6c0078e731035ec3f1bf8a6cdc92  jsonmodels-2.3.tar.gz
-sha256	09e9639c85531e0f37991bb23a363494e37a2e89fb480dbc03d9556258f4ea47  jsonmodels-2.3.tar.gz
+# md5, sha256 from https://pypi.org/pypi/jsonmodels/json
+md5	96132e252887f840d23792c03fad2039  jsonmodels-2.4.tar.gz
+sha256	abc8dc334a1794513e511a75639f77c271ef6a2992b6793f3753c7335dd18775  jsonmodels-2.4.tar.gz
+# Locally computed sha256 checksums
 sha256	3b1219763eec6924ddd4c4d61dee6a53c5fc9ab62707a9ad763ee363d3050cc5  LICENSE
diff --git a/buildroot/package/python-jsonmodels/python-jsonmodels.mk b/buildroot/package/python-jsonmodels/python-jsonmodels.mk
index 4d4da8796..4e4eecf23 100644
--- a/buildroot/package/python-jsonmodels/python-jsonmodels.mk
+++ b/buildroot/package/python-jsonmodels/python-jsonmodels.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_JSONMODELS_VERSION = 2.3
+PYTHON_JSONMODELS_VERSION = 2.4
 PYTHON_JSONMODELS_SOURCE = jsonmodels-$(PYTHON_JSONMODELS_VERSION).tar.gz
-PYTHON_JSONMODELS_SITE = https://pypi.python.org/packages/ab/0f/e214845b49881d3b2bebd1f387eedc5b26ac5580353a0a38074e94439957
+PYTHON_JSONMODELS_SITE = https://files.pythonhosted.org/packages/68/00/524668dc751f9ef91e73c795b2073bf2ddb79728a474d1bcab9c6dc426d8
 PYTHON_JSONMODELS_SETUP_TYPE = setuptools
 PYTHON_JSONMODELS_LICENSE = BSD-3-Clause
 PYTHON_JSONMODELS_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-logbook/python-logbook.hash b/buildroot/package/python-logbook/python-logbook.hash
index a32ff3bde..0db9def1b 100644
--- a/buildroot/package/python-logbook/python-logbook.hash
+++ b/buildroot/package/python-logbook/python-logbook.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/logbook/json
-md5	c9fab07b6a91aa7358155baa16802707  Logbook-1.4.1.tar.gz
-sha256	32375ce706d04a46886f9818bb953e53e0eda636552d7c0a2e482dd670fa56db  Logbook-1.4.1.tar.gz
+md5	352d66684713fc323febe60c9244270e  Logbook-1.4.3.tar.gz
+sha256	a5a96792abd8172c80d61b7530e134524f20e2841981038031e602ed5920fef5  Logbook-1.4.3.tar.gz
 # Locally computed sha256 checksums
 sha256	2ca266337cc6947578654ab0dd6438de4d01fa78b2e6eb554b09757df1178f98  LICENSE
diff --git a/buildroot/package/python-logbook/python-logbook.mk b/buildroot/package/python-logbook/python-logbook.mk
index ab1b2703e..4e9a5306d 100644
--- a/buildroot/package/python-logbook/python-logbook.mk
+++ b/buildroot/package/python-logbook/python-logbook.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_LOGBOOK_VERSION = 1.4.1
+PYTHON_LOGBOOK_VERSION = 1.4.3
 PYTHON_LOGBOOK_SOURCE = Logbook-$(PYTHON_LOGBOOK_VERSION).tar.gz
-PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/74/fc/3e7557ed1ef1bd4e3ee189fc670416abfc7192b550e8d3c1d858a63f41ab
+PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/f6/83/20fc0270614919cb799f76e32cf143a54c58ce2fa45c19fd38ac2e4f9977
 PYTHON_LOGBOOK_SETUP_TYPE = setuptools
 PYTHON_LOGBOOK_LICENSE = BSD-3-Clause
 PYTHON_LOGBOOK_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-lxml/python-lxml.hash b/buildroot/package/python-lxml/python-lxml.hash
index 610c0d6db..6558f107e 100644
--- a/buildroot/package/python-lxml/python-lxml.hash
+++ b/buildroot/package/python-lxml/python-lxml.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256  36720698c29e7a9626a0dc802ef8885f8f0239bfd1689628ecd459a061f2807f  lxml-4.2.5.tgz
+sha256  7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2  lxml-4.2.6.tar.gz
 sha256  41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392  LICENSES.txt
 sha256  69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a  doc/licenses/BSD.txt
 sha256  0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e  doc/licenses/elementtree.txt
diff --git a/buildroot/package/python-lxml/python-lxml.mk b/buildroot/package/python-lxml/python-lxml.mk
index 61f81e636..1b46670ff 100644
--- a/buildroot/package/python-lxml/python-lxml.mk
+++ b/buildroot/package/python-lxml/python-lxml.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_LXML_VERSION = 4.2.5
-PYTHON_LXML_SITE = http://lxml.de/files
-PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tgz
+PYTHON_LXML_VERSION = 4.2.6
+PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/b0/06/37437e348cd296c56a8bac0396007960abb2bcdaf77e8a3bde52bb68e550
+PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz
 
 # Not including the GPL, because it is used only for the test scripts.
 PYTHON_LXML_LICENSE = BSD-3-Clause, Others
diff --git a/buildroot/package/python-msgpack/python-msgpack.hash b/buildroot/package/python-msgpack/python-msgpack.hash
index 74785837d..cb3b75d5f 100644
--- a/buildroot/package/python-msgpack/python-msgpack.hash
+++ b/buildroot/package/python-msgpack/python-msgpack.hash
@@ -1,5 +1,5 @@
-# md5, sha256 from https://pypi.org/pypi/msgpack-python/json
-md5	6d644c06a87a5a111bbbf5b34b4be440  msgpack-python-0.5.6.tar.gz
-sha256	378cc8a6d3545b532dfd149da715abae4fda2a3adb6d74e525d0d5e51f46909b  msgpack-python-0.5.6.tar.gz
+# md5, sha256 from https://pypi.org/pypi/msgpack/json
+md5	1b96537be6f5186fed0d131aaa59ef26  msgpack-0.6.1.tar.gz
+sha256	4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972  msgpack-0.6.1.tar.gz
 # Locally computed sha256
 sha256  492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427  COPYING
diff --git a/buildroot/package/python-msgpack/python-msgpack.mk b/buildroot/package/python-msgpack/python-msgpack.mk
index e0544f5d3..517166db6 100644
--- a/buildroot/package/python-msgpack/python-msgpack.mk
+++ b/buildroot/package/python-msgpack/python-msgpack.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_MSGPACK_VERSION = 0.5.6
-PYTHON_MSGPACK_SOURCE = msgpack-python-$(PYTHON_MSGPACK_VERSION).tar.gz
-PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/8a/20/6eca772d1a5830336f84aca1d8198e5a3f4715cd1c7fc36d3cc7f7185091
+PYTHON_MSGPACK_VERSION = 0.6.1
+PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz
+PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/81/9c/0036c66234482044070836cc622266839e2412f8108849ab0bfdeaab8578
 PYTHON_MSGPACK_LICENSE = Apache-2.0
 PYTHON_MSGPACK_LICENSE_FILES = COPYING
 PYTHON_MSGPACK_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python-multidict/python-multidict.hash b/buildroot/package/python-multidict/python-multidict.hash
index aa15eed1c..a98c4553d 100644
--- a/buildroot/package/python-multidict/python-multidict.hash
+++ b/buildroot/package/python-multidict/python-multidict.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/multidict/json
-md5	55d19168f955e5463c6f6b530e913da3  multidict-4.4.2.tar.gz
-sha256	3c11e92c3dfc321014e22fb442bc9eb70e01af30d6ce442026b0c35723448c66  multidict-4.4.2.tar.gz
+md5	5e9d8f7e1ada9a22932aed6a72f88e43  multidict-4.5.2.tar.gz
+sha256	024b8129695a952ebd93373e45b5d341dbb87c17ce49637b34000093f243dd4f  multidict-4.5.2.tar.gz
 # Locally computed sha256 checksums
 sha256	a1c5825513279d3085a0ba46880e148ea3710c149bbaedcf2d11605a5ed3c4ad  LICENSE
diff --git a/buildroot/package/python-multidict/python-multidict.mk b/buildroot/package/python-multidict/python-multidict.mk
index f88135cb6..7b9cd3928 100644
--- a/buildroot/package/python-multidict/python-multidict.mk
+++ b/buildroot/package/python-multidict/python-multidict.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_MULTIDICT_VERSION = 4.4.2
+PYTHON_MULTIDICT_VERSION = 4.5.2
 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz
-PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/b3/5f/5c29cde8511c95fad045b9ecaf2e76f0da18761e8363a82594f5a58c2ced
+PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/7f/8f/b3c8c5b062309e854ce5b726fc101195fbaa881d306ffa5c2ba19efa3af2
 PYTHON_MULTIDICT_SETUP_TYPE = setuptools
 PYTHON_MULTIDICT_LICENSE = Apache-2.0
 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-mutagen/Config.in b/buildroot/package/python-mutagen/Config.in
index 470cd996a..3c95e3744 100644
--- a/buildroot/package/python-mutagen/Config.in
+++ b/buildroot/package/python-mutagen/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_PYTHON_MUTAGEN
 	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
 	help
 	  Mutagen is a Python module to handle audio metadata.  It
-	  supports ASF, FLAC, MP4, Monkey’s Audio, MP3, Musepack, Ogg
+	  supports ASF, FLAC, MP4, Monkey's Audio, MP3, Musepack, Ogg
 	  Opus, Ogg FLAC, Ogg Speex, Ogg Theora, Ogg Vorbis, True
 	  Audio, WavPack, OptimFROG, and AIFF audio files. All
 	  versions of ID3v2 are supported, and all standard ID3v2.4
diff --git a/buildroot/package/python-networkmanager/python-networkmanager.hash b/buildroot/package/python-networkmanager/python-networkmanager.hash
index 1fed4befb..83621761c 100644
--- a/buildroot/package/python-networkmanager/python-networkmanager.hash
+++ b/buildroot/package/python-networkmanager/python-networkmanager.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/python-networkmanager/json, sha256 locally computed
-md5	5fc644a65463031295c6b7dd51a0f1bd  python-networkmanager-2.0.1.tar.gz
-sha256	bc36507506ad29bfdac941b0987ebd1cc9633c9a9291d7378e229e4515a0a517  python-networkmanager-2.0.1.tar.gz
+# md5 and sha256 from https://pypi.python.org/pypi/python-networkmanager/json
+md5	f638d854a3639fb37c0e06d1092a771e  python-networkmanager-2.1.tar.gz
+sha256	aef1e34d98d7bec7cc368e0ca0f2e97493f9b5ebe6d7103f8f6460cfca3dc6fc  python-networkmanager-2.1.tar.gz
diff --git a/buildroot/package/python-networkmanager/python-networkmanager.mk b/buildroot/package/python-networkmanager/python-networkmanager.mk
index 29afb5e56..de893f757 100644
--- a/buildroot/package/python-networkmanager/python-networkmanager.mk
+++ b/buildroot/package/python-networkmanager/python-networkmanager.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-PYTHON_NETWORKMANAGER_VERSION = 2.0.1
-PYTHON_NETWORKMANAGER_SITE = https://pypi.python.org/packages/d7/f9/5cbd99fd24a072875ce048e48d1754285f137aab447de8fee63b6cba990a
+PYTHON_NETWORKMANAGER_VERSION = 2.1
+PYTHON_NETWORKMANAGER_SITE = https://files.pythonhosted.org/packages/73/ec/2cc46290cedc99f59df3633d428dfa91d95946ca49af96fdb53514ee195f
 PYTHON_NETWORKMANAGER_SETUP_TYPE = setuptools
 PYTHON_NETWORKMANAGER_LICENSE = Zlib
 PYTHON_NETWORKMANAGER_LICENSE_FILES = COPYING
diff --git a/buildroot/package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch b/buildroot/package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch
new file mode 100644
index 000000000..f2ed4f6f9
--- /dev/null
+++ b/buildroot/package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch
@@ -0,0 +1,42 @@
+From ae217b0e77a52f08f46ef66fa88820946984507a Mon Sep 17 00:00:00 2001
+From: Evgeniy Didin 
+Date: Tue, 6 Feb 2018 15:59:22 +0300
+Subject: [PATCH] FIX: no FPU exceptions bits on ARC glibc
+
+The FPU exceptions bits are missing in fenv.h in glibc for ARC architecture.
+
+Signed-off-by: Evgeniy Didin 
+---
+ numpy/core/include/numpy/ufuncobject.h | 2 +-
+ numpy/core/src/npymath/ieee754.c.src   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h
+index 89f72fcea..29e05b179 100644
+--- a/numpy/core/include/numpy/ufuncobject.h
++++ b/numpy/core/include/numpy/ufuncobject.h
+@@ -319,7 +319,7 @@ typedef struct _loop1d_info {
+ #if defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || \
+       (defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || \
+       defined(__NetBSD__) || \
+-      (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
++      (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__arc__)) || defined(__APPLE__) || \
+       defined(__CYGWIN__) || defined(__MINGW32__) || \
+       (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) || \
+       defined(_AIX) || \
+diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src
+index 8dc4d77ef..78e646470 100644
+--- a/numpy/core/src/npymath/ieee754.c.src
++++ b/numpy/core/src/npymath/ieee754.c.src
+@@ -627,7 +627,7 @@ void npy_set_floatstatus_invalid(void)
+ }
+ 
+ 
+-#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
++#elif (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__arc__)) || defined(__APPLE__) || \
+       defined(__CYGWIN__) || defined(__MINGW32__) || \
+       (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
+ #  include 
+-- 
+2.16.2
+
diff --git a/buildroot/package/python-numpy/Config.in b/buildroot/package/python-numpy/Config.in
index 067085bf4..c337675ce 100644
--- a/buildroot/package/python-numpy/Config.in
+++ b/buildroot/package/python-numpy/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	bool
 	# Numpy has some CPU specific code
-	# 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_arc
 	default y if BR2_aarch64
 	default y if BR2_arm
 	default y if BR2_armeb
diff --git a/buildroot/package/python-pathlib2/python-pathlib2.hash b/buildroot/package/python-pathlib2/python-pathlib2.hash
index 4d2b02f8d..b17517b44 100644
--- a/buildroot/package/python-pathlib2/python-pathlib2.hash
+++ b/buildroot/package/python-pathlib2/python-pathlib2.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/pathlib2/json
-md5	fd76fb5d0baa798bfe12fb7965da97f8  pathlib2-2.3.2.tar.gz
-sha256	8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83  pathlib2-2.3.2.tar.gz
+md5	f9ede5c162ea6fc6a3b1d26db53bb6a2  pathlib2-2.3.3.tar.gz
+sha256	25199318e8cc3c25dcb45cbe084cc061051336d5a9ea2a12448d3d8cb748f742  pathlib2-2.3.3.tar.gz
 # Locally computed sha256 checksums
 sha256	f8e02f1a07e4c6fc59a4bee831ddde26b97064105c423b9e24340f35aaa80262  LICENSE.rst
diff --git a/buildroot/package/python-pathlib2/python-pathlib2.mk b/buildroot/package/python-pathlib2/python-pathlib2.mk
index dadc97513..256d9b81e 100644
--- a/buildroot/package/python-pathlib2/python-pathlib2.mk
+++ b/buildroot/package/python-pathlib2/python-pathlib2.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PATHLIB2_VERSION = 2.3.2
+PYTHON_PATHLIB2_VERSION = 2.3.3
 PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz
-PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/db/a8/7d6439c1aec525ed70810abee5b7d7f3aa35347f59bc28343e8f62019aa2
+PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/bf/d7/a2568f4596b75d2c6e2b4094a7e64f620decc7887f69a1f2811931ea15b9
 PYTHON_PATHLIB2_LICENSE = MIT
 PYTHON_PATHLIB2_LICENSE_FILES = LICENSE.rst
 PYTHON_PATHLIB2_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python-pexpect/Config.in b/buildroot/package/python-pexpect/Config.in
index 58a3af578..cee4606c1 100644
--- a/buildroot/package/python-pexpect/Config.in
+++ b/buildroot/package/python-pexpect/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_PYTHON_PEXPECT
 	help
 	  Pexpect is a pure Python module for spawning child
 	  applications; controlling them; and responding to expected
-	  patterns in their output. Pexpect works like Don Libes’
+	  patterns in their output. Pexpect works like Don Libes'
 	  Expect. Pexpect allows your script to spawn a child
 	  application and control it as if a human were typing
 	  commands.
diff --git a/buildroot/package/python-pigpio/Config.in b/buildroot/package/python-pigpio/Config.in
index 08c37cb9b..4c9152a62 100644
--- a/buildroot/package/python-pigpio/Config.in
+++ b/buildroot/package/python-pigpio/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_PYTHON_PIGPIO
 	  which talks to the pigpio daemon to allow control
 	  of the general purpose input outputs (GPIO).
 
-	  http://abyz.co.uk/rpi/pigpio/python.html
+	  http://abyz.me.uk/rpi/pigpio/python.html
diff --git a/buildroot/package/python-pigpio/python-pigpio.hash b/buildroot/package/python-pigpio/python-pigpio.hash
index a0ef093ec..41ac25c35 100644
--- a/buildroot/package/python-pigpio/python-pigpio.hash
+++ b/buildroot/package/python-pigpio/python-pigpio.hash
@@ -1,3 +1,3 @@
 # md5, sha256 from https://pypi.org/pypi/pigpio/json
-md5	32d7d5e2e042fb4f503b93858712e7ad  pigpio-1.40.post1.tar.gz
-sha256	38bdc1b4d58898e7b4a69de3b0d90e8e8ccd851ac7d03e30791769475ffd941f  pigpio-1.40.post1.tar.gz
+md5	f63ca89fdc733a5bad784155e6c1b9ff  pigpio-1.42.tar.gz
+sha256	274fc6df10a787e6a34b748a61a142f38dbf812b386f5b1762c66ad6a67b7873  pigpio-1.42.tar.gz
diff --git a/buildroot/package/python-pigpio/python-pigpio.mk b/buildroot/package/python-pigpio/python-pigpio.mk
index 7c4527ad9..7da1b6f4b 100644
--- a/buildroot/package/python-pigpio/python-pigpio.mk
+++ b/buildroot/package/python-pigpio/python-pigpio.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PIGPIO_VERSION = 1.40.post1
+PYTHON_PIGPIO_VERSION = 1.42
 PYTHON_PIGPIO_SOURCE = pigpio-$(PYTHON_PIGPIO_VERSION).tar.gz
-PYTHON_PIGPIO_SITE = https://files.pythonhosted.org/packages/da/91/80c893c398bc6805592f44267bbf4bf88323de3db0f5e8f94b0fa8e28426
+PYTHON_PIGPIO_SITE = https://files.pythonhosted.org/packages/f6/c1/73d7b4287e2edc7e06ac34a4ec0c73d4758ba755a8d2ecc2aaf57bf7d54c
 PYTHON_PIGPIO_SETUP_TYPE = setuptools
 PYTHON_PIGPIO_LICENSE = Unlicense
 
diff --git a/buildroot/package/python-pip/python-pip.hash b/buildroot/package/python-pip/python-pip.hash
index 1a70f0f7c..149099b11 100644
--- a/buildroot/package/python-pip/python-pip.hash
+++ b/buildroot/package/python-pip/python-pip.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/pip/json
-md5	75cad449ad62c88b22de317a26781714  pip-18.1.tar.gz
-sha256	c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1  pip-18.1.tar.gz
+md5    b6919f1a368138f73b367abccc06f5ae  pip-19.0.1.tar.gz
+sha256 e81ddd35e361b630e94abeda4a1eddd36d47a90e71eb00f38f46b57f787cd1a5  pip-19.0.1.tar.gz
 # Locally computed sha256 checksums
-sha256	391a8784e319dae5431477d4cc9bc504fc5d71fd9e89e1c80f1cd3855f5d7cfa  LICENSE.txt
+sha256 5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431  LICENSE.txt
diff --git a/buildroot/package/python-pip/python-pip.mk b/buildroot/package/python-pip/python-pip.mk
index 9ae7e7324..22562cc93 100644
--- a/buildroot/package/python-pip/python-pip.mk
+++ b/buildroot/package/python-pip/python-pip.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PIP_VERSION = 18.1
+PYTHON_PIP_VERSION = 19.0.1
 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz
-PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/45/ae/8a0ad77defb7cc903f09e551d88b443304a9bd6e6f124e75c0fbbf6de8f7
+PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/c8/89/ad7f27938e59db1f0f55ce214087460f65048626e2226531ba6cb6da15f0
 PYTHON_PIP_SETUP_TYPE = setuptools
 PYTHON_PIP_LICENSE = MIT
 PYTHON_PIP_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/python-ply/python-ply.mk b/buildroot/package/python-ply/python-ply.mk
index 95a290a7c..5dc7964d5 100644
--- a/buildroot/package/python-ply/python-ply.mk
+++ b/buildroot/package/python-ply/python-ply.mk
@@ -12,3 +12,4 @@ PYTHON_PLY_LICENSE = BSD-3-Clause
 PYTHON_PLY_LICENSE_FILES = README.md
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/buildroot/package/python-psutil/python-psutil.hash b/buildroot/package/python-psutil/python-psutil.hash
index 1f44281e2..12d53f95c 100644
--- a/buildroot/package/python-psutil/python-psutil.hash
+++ b/buildroot/package/python-psutil/python-psutil.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/psutil/json
-md5	0f08bf02400f81c28c4581619ca3e6cb  psutil-5.4.8.tar.gz
-sha256	6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3  psutil-5.4.8.tar.gz
+md5	0502dad59fcbe047baebe07165b1376a  psutil-5.5.0.tar.gz
+sha256	1aba93430050270750d046a179c5f3d6e1f5f8b96c20399ba38c596b28fc4d37  psutil-5.5.0.tar.gz
 # Locally computed sha256 checksums
 sha256	bb073826b0dfb43b631c38ad5d9844cda74cc631d2a5569ad8798be4274a3e17  LICENSE
diff --git a/buildroot/package/python-psutil/python-psutil.mk b/buildroot/package/python-psutil/python-psutil.mk
index 18567702b..2a7084548 100644
--- a/buildroot/package/python-psutil/python-psutil.mk
+++ b/buildroot/package/python-psutil/python-psutil.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PSUTIL_VERSION = 5.4.8
+PYTHON_PSUTIL_VERSION = 5.5.0
 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e3/58/0eae6e4466e5abf779d7e2b71fac7fba5f59e00ea36ddb3ed690419ccb0f
+PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/6e/a0/833bcbcede5141cc5615e50c7cc5b960ce93d9c9b885fbe3b7d36e48a2d4
 PYTHON_PSUTIL_SETUP_TYPE = setuptools
 PYTHON_PSUTIL_LICENSE = BSD-3-Clause
 PYTHON_PSUTIL_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-psycopg2/python-psycopg2.hash b/buildroot/package/python-psycopg2/python-psycopg2.hash
index 5dedd61ab..c6e199769 100644
--- a/buildroot/package/python-psycopg2/python-psycopg2.hash
+++ b/buildroot/package/python-psycopg2/python-psycopg2.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/psycopg2/json
-md5	9e7d6f695fc7f8d1c42a7905449246c9  psycopg2-2.7.5.tar.gz
-sha256	eccf962d41ca46e6326b97c8fe0a6687b58dfc1a5f6540ed071ff1474cea749e  psycopg2-2.7.5.tar.gz
+md5	598e2f43c1b26361ae2d3a3254dae414  psycopg2-2.7.7.tar.gz
+sha256	f4526d078aedd5187d0508aa5f9a01eae6a48a470ed678406da94b4cd6524b7e  psycopg2-2.7.7.tar.gz
 # Locally computed sha256 checksums
 sha256	3c2b037df24cb85ca1a48739dcab60a5037644b436f87173f6db0d101636b525  LICENSE
diff --git a/buildroot/package/python-psycopg2/python-psycopg2.mk b/buildroot/package/python-psycopg2/python-psycopg2.mk
index c8c328d80..e297d6e2b 100644
--- a/buildroot/package/python-psycopg2/python-psycopg2.mk
+++ b/buildroot/package/python-psycopg2/python-psycopg2.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PSYCOPG2_VERSION = 2.7.5
+PYTHON_PSYCOPG2_VERSION = 2.7.7
 PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz
-PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/b2/c1/7bf6c464e903ffc4f3f5907c389e5a4199666bf57f6cd6bf46c17912a1f9
+PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/63/54/c039eb0f46f9a9406b59a638415c2012ad7be9b4b97bfddb1f48c280df3a
 PYTHON_PSYCOPG2_SETUP_TYPE = setuptools
 PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+
 PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash
index 7c7f02461..f8af9a4bb 100644
--- a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash
+++ b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/pyasn1-modules/json
-md5	65ce1ea1021679bffe96065baab232de  pyasn1-modules-0.2.2.tar.gz
-sha256	a0cf3e1842e7c60fde97cb22d275eb6f9524f5c5250489e292529de841417547  pyasn1-modules-0.2.2.tar.gz
+md5	0116a480c28e1ab00587ba3a6fd7c335  pyasn1-modules-0.2.4.tar.gz
+sha256	a52090e8c5841ebbf08ae455146792d9ef3e8445b21055d3a3b7ed9c712b7c7c  pyasn1-modules-0.2.4.tar.gz
 # Locally computed sha256 checksums
-sha256	f82128f64d567c333936a12b99a21d0e8cd66ce628d51ce0a7770cc38dc7fe43  LICENSE.txt
+sha256	22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5  LICENSE.txt
diff --git a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk
index dbdf82e6e..a67d46956 100644
--- a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk
+++ b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYASN1_MODULES_VERSION = 0.2.2
+PYTHON_PYASN1_MODULES_VERSION = 0.2.4
 PYTHON_PYASN1_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz
-PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/37/33/74ebdc52be534e683dc91faf263931bc00ae05c6073909fde53999088541
+PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/bd/a5/ef7bf693e8a8f015386c9167483199f54f8a8ec01d1c737e05524f16e792
 PYTHON_PYASN1_MODULES_SETUP_TYPE = setuptools
 PYTHON_PYASN1_MODULES_LICENSE = BSD-2-Clause
 PYTHON_PYASN1_MODULES_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/python-pyasn1/python-pyasn1.hash b/buildroot/package/python-pyasn1/python-pyasn1.hash
index fd3462152..bd21cebd7 100644
--- a/buildroot/package/python-pyasn1/python-pyasn1.hash
+++ b/buildroot/package/python-pyasn1/python-pyasn1.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/pyasn1/json
-md5	0d182b71e1f72fe147d7957bc90be7f2  pyasn1-0.4.4.tar.gz
-sha256	f58f2a3d12fd754aa123e9fa74fb7345333000a035f3921dbdaa08597aa53137  pyasn1-0.4.4.tar.gz
+md5	f3c0cfbf882a20811be5ad5a41f74b82  pyasn1-0.4.5.tar.gz
+sha256	da2420fe13a9452d8ae97a0e478adde1dee153b11ba832a95b223a2ba01c10f7  pyasn1-0.4.5.tar.gz
 # Locally computed sha256 checksums
-sha256	f82128f64d567c333936a12b99a21d0e8cd66ce628d51ce0a7770cc38dc7fe43  LICENSE.rst
+sha256	22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5  LICENSE.rst
diff --git a/buildroot/package/python-pyasn1/python-pyasn1.mk b/buildroot/package/python-pyasn1/python-pyasn1.mk
index f658fc918..3f79cc2e7 100644
--- a/buildroot/package/python-pyasn1/python-pyasn1.mk
+++ b/buildroot/package/python-pyasn1/python-pyasn1.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYASN1_VERSION = 0.4.4
+PYTHON_PYASN1_VERSION = 0.4.5
 PYTHON_PYASN1_SOURCE = pyasn1-$(PYTHON_PYASN1_VERSION).tar.gz
-PYTHON_PYASN1_SITE = https://files.pythonhosted.org/packages/10/46/059775dc8e50f722d205452bced4b3cc965d27e8c3389156acd3b1123ae3
+PYTHON_PYASN1_SITE = https://files.pythonhosted.org/packages/46/60/b7e32f6ff481b8a1f6c8f02b0fd9b693d1c92ddd2efb038ec050d99a7245
 PYTHON_PYASN1_SETUP_TYPE = setuptools
 PYTHON_PYASN1_LICENSE = BSD-2-Clause
 PYTHON_PYASN1_LICENSE_FILES = LICENSE.rst
diff --git a/buildroot/package/python-pycares/Config.in b/buildroot/package/python-pycares/Config.in
new file mode 100644
index 000000000..4144952d8
--- /dev/null
+++ b/buildroot/package/python-pycares/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_PYCARES
+	bool "python-pycares"
+	help
+	  Python interface for c-ares.
+
+	  http://github.com/saghul/pycares
diff --git a/buildroot/package/python-pycares/python-pycares.hash b/buildroot/package/python-pycares/python-pycares.hash
new file mode 100644
index 000000000..2e80a974d
--- /dev/null
+++ b/buildroot/package/python-pycares/python-pycares.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/pycares/json
+md5	74893b2b380fbb45329a406ae4b1ae89  pycares-2.3.0.tar.gz
+sha256	36f4c03df57c41a87eb3d642201684eb5a8bc194f4bafaa9f60ee6dc0aef8e40  pycares-2.3.0.tar.gz
+# Locally computed sha256 checksums
+sha256	427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee  LICENSE
diff --git a/buildroot/package/python-pycares/python-pycares.mk b/buildroot/package/python-pycares/python-pycares.mk
new file mode 100644
index 000000000..961c87eaf
--- /dev/null
+++ b/buildroot/package/python-pycares/python-pycares.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-pycares
+#
+################################################################################
+
+PYTHON_PYCARES_VERSION = 2.3.0
+PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz
+PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/89/5c/3a7e1a52d6abb52b9ca1a56d2df699936e89d8b98f75cfd60d03363e7c10
+PYTHON_PYCARES_SETUP_TYPE = setuptools
+PYTHON_PYCARES_LICENSE = MIT
+PYTHON_PYCARES_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash b/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash
index 3d98d19f6..2caf97a29 100644
--- a/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash
+++ b/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash
@@ -1,6 +1,6 @@
 # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json
-md5	80019e535efb0575b38217dd3c6c41bb  pycryptodomex-3.7.0.tar.gz
-sha256	9f11823636128acbe4e17c35ff668f4d0a9f3133450753a0675525b6413aa1b0  pycryptodomex-3.7.0.tar.gz
+md5	ae7083008139cf9372322dcd99e92db0  pycryptodomex-3.7.1.tar.gz
+sha256	4ba053bea752ddc89b94d1f9f87008ef296a644b8dec0201c021d9636c069322  pycryptodomex-3.7.1.tar.gz
 # Locally computed sha256 checksums
-sha256	fc884f6492490d0f227613ee900ff2a27e6879b79ee637c53a4697238bf12970  LICENSE.rst
+sha256	d1af3fab2ef8cc53b6c7f48bdeb178ac874b04faf4ba0159a96b6109f1d393e2  LICENSE.rst
 sha256	8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549  Doc/LEGAL/COPYRIGHT.pycrypto
diff --git a/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk b/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk
index 1dcdb8418..3d3b97ca4 100644
--- a/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk
+++ b/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYCRYPTODOMEX_VERSION = 3.7.0
+PYTHON_PYCRYPTODOMEX_VERSION = 3.7.1
 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz
-PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/69/e7/5c50af65e3d46a161181089aed939bce185ad61f6cc86779994e9d8280d0
+PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/f6/be/9f65b7db183628bdb36401105a3fc9f1688909f5184c115902a7bdd333bd
 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools
 PYTHON_PYCRYPTODOMEX_LICENSE = \
 	BSD-2-Clause, \
diff --git a/buildroot/package/python-pydal/python-pydal.hash b/buildroot/package/python-pydal/python-pydal.hash
index 8e6fa90e6..27f2e6c7a 100644
--- a/buildroot/package/python-pydal/python-pydal.hash
+++ b/buildroot/package/python-pydal/python-pydal.hash
@@ -1,2 +1,3 @@
 # sha256 from https://pypi.org/project/pyDAL/#files
-sha256 59b28cbad92743c76134fc078b62f49d5c02b86c55cbdee527f75995d2681735  pyDAL-17.11.tar.gz
+sha256 763ed017f431fc3d9fa9243f6be2519ff49b8a260d15763c4733762d9c086904  python-pydal-v18.09.tar.gz
+sha256 ae7d7b6888bb72f26af2bcbee69ae6f8a49e12f66c99e78f2a8b806effc5219d  LICENSE
diff --git a/buildroot/package/python-pydal/python-pydal.mk b/buildroot/package/python-pydal/python-pydal.mk
index 9de56bff6..4ff58def6 100644
--- a/buildroot/package/python-pydal/python-pydal.mk
+++ b/buildroot/package/python-pydal/python-pydal.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-PYTHON_PYDAL_VERSION = 17.11
-PYTHON_PYDAL_SOURCE = pyDAL-$(PYTHON_PYDAL_VERSION).tar.gz
-PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/d2/64/a119cb70ed91a6273aad811fd250b8a55d4bc8b0d900757723ec5a4f0ba9
+PYTHON_PYDAL_VERSION = v18.09
+PYTHON_PYDAL_SITE = $(call github,web2py,pydal,$(PYTHON_PYDAL_VERSION))
 PYTHON_PYDAL_LICENSE = BSD-3-Clause
 PYTHON_PYDAL_LICENSE_FILES = LICENSE
 PYTHON_PYDAL_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python-pyopenssl/python-pyopenssl.hash b/buildroot/package/python-pyopenssl/python-pyopenssl.hash
index ebd16cf28..30071cf9f 100644
--- a/buildroot/package/python-pyopenssl/python-pyopenssl.hash
+++ b/buildroot/package/python-pyopenssl/python-pyopenssl.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/pyopenssl/json
-md5 c92e9c85b520b7e153fef0f7f3c5dda7  pyOpenSSL-18.0.0.tar.gz
-sha256 6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580  pyOpenSSL-18.0.0.tar.gz
+md5 b9876625dc1d5a5a662d748689191537  pyOpenSSL-19.0.0.tar.gz
+sha256 aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200  pyOpenSSL-19.0.0.tar.gz
 # Locally computed sha256
 sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/buildroot/package/python-pyopenssl/python-pyopenssl.mk b/buildroot/package/python-pyopenssl/python-pyopenssl.mk
index afdd06500..d341ef124 100644
--- a/buildroot/package/python-pyopenssl/python-pyopenssl.mk
+++ b/buildroot/package/python-pyopenssl/python-pyopenssl.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYOPENSSL_VERSION = 18.0.0
+PYTHON_PYOPENSSL_VERSION = 19.0.0
 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz
-PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/9b/7c/ee600b2a9304d260d96044ab5c5e57aa489755b92bbeb4c0803f9504f480
+PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/40/d0/8efd61531f338a89b4efa48fcf1972d870d2b67a7aea9dcf70783c8464dc
 PYTHON_PYOPENSSL_LICENSE = Apache-2.0
 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE
 PYTHON_PYOPENSSL_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python-pyqt/0001-configure-skip-qtdetail.patch b/buildroot/package/python-pyqt/0001-configure-skip-qtdetail.patch
deleted file mode 100644
index 08e99d026..000000000
--- a/buildroot/package/python-pyqt/0001-configure-skip-qtdetail.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Do not run qtdetail
-
-qtdetail is a tool that generates qtdetail.out. Since this program is
-cross-compiled, it's not possible to run it on the host.
-
-Consequently, python-pyqt.mk generates the qtdetail.out file before
-calling configure-ng.py.
-
-Therefore, this patch makes sure that the pre-generated qtdetail.out
-file is kept, and that qtdetail is not executed.
-
-Signed-off-by: Gwenhael Goavec-Merou 
-Signed-off-by: Sergey Kostanbaev 
----
-Index: PyQt-x11-gpl-4.11.3/configure-ng.py
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/configure-ng.py
-+++ PyQt-x11-gpl-4.11.3/configure-ng.py
-@@ -672,10 +672,6 @@ int main(int argc, char **argv)
-         if cmd is None:
-             error("Failed to determine the detail of your Qt installation. Try again using the --verbose flag to see more detail about the problem.")
- 
--        # Create the output file, first making sure it doesn't exist.
--        remove_file(out_file)
--        run_command(cmd, verbose)
--
-         if not os.access(out_file, os.F_OK):
-             error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file))
- 
diff --git a/buildroot/package/python-pyqt/0002-configure-set-qws.patch b/buildroot/package/python-pyqt/0002-configure-set-qws.patch
deleted file mode 100644
index 33a5648be..000000000
--- a/buildroot/package/python-pyqt/0002-configure-set-qws.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Add support for several Qt flavors
-
-Qt has two flavors: X11 and embedded (QWS). QWS has some limitations
-compared to X11. This patch adds an option to select which version to
-use.
-
-Signed-off-by: Gwenhael Goavec-Merou 
----
-Index: PyQt-x11-gpl-4.11.3/configure-ng.py
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/configure-ng.py
-+++ PyQt-x11-gpl-4.11.3/configure-ng.py
-@@ -960,6 +960,9 @@ int main(int argc, char **argv)
-         if opts.vendlibdir is not None:
-             self.vend_lib_dir = opts.vendlibdir
- 
-+        if opts.qtflavor is not None:
-+            self.qt_flavor = opts.qtflavor
-+
-         # Handle any conflicts.
-         if self.qt_shared:
-             if len(self.static_plugins) != 0:
-@@ -1177,6 +1180,11 @@ def create_optparser(target_config):
-             dest="notools",
-             help="disable the building of pyuic5, pyrcc5 and pylupdate5 "
-                     "[default: enabled]")
-+    g.add_option("--qt-flavor", dest='qtflavor', type='string',
-+            default="WS_X11", metavar='QTFLAVOR', action='store',
-+            help="select Qt flavor beetween WS_X11 and WS_QWS "
-+                    "only available on Linux)"
-+                    "[default: WS_X11]")
-     p.add_option_group(g)
- 
-     # Vendor ID.
-@@ -2088,7 +2096,7 @@ def get_sip_flags(target_config):
-     elif target_config.py_platform == 'darwin':
-         plattag = 'WS_MACX'
-     else:
--        plattag = 'WS_X11'
-+        plattag = target_config.qt_flavor
- 
-     sip_flags.append('-t')
-     sip_flags.append(plattag)
diff --git a/buildroot/package/python-pyqt/0003-sip-add_qws.patch b/buildroot/package/python-pyqt/0003-sip-add_qws.patch
deleted file mode 100644
index 1ff706f62..000000000
--- a/buildroot/package/python-pyqt/0003-sip-add_qws.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Add WS_QWS in the Platforms variable and to define some types
-
-Signed-off-by: Gwenhael Goavec-Merou 
-Signed-off-by: Sergey Kostanbaev 
----
-Index: PyQt-x11-gpl-4.11.3/sip/QtCore/QtCoremod.sip
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/QtCoremod.sip
-+++ PyQt-x11-gpl-4.11.3/sip/QtCore/QtCoremod.sip
-@@ -29,7 +29,7 @@
- 
- %Timeline {Qt_4_1_0 Qt_4_1_1 Qt_4_1_2 Qt_4_1_3 Qt_4_2_0 Qt_4_2_1 Qt_4_2_2 Qt_4_2_3 Qt_4_3_0 Qt_4_3_1 Qt_4_3_2 Qt_4_3_3 Qt_4_3_4 Qt_4_4_0 Qt_4_4_1 Qt_4_4_2 Qt_4_5_0 Qt_4_5_1 Qt_4_5_2 Qt_4_5_3 Qt_4_6_0 Qt_4_6_1 Qt_4_6_2 Qt_4_6_3 Qt_4_7_0 Qt_4_7_1 Qt_4_7_2 Qt_4_7_3 Qt_4_7_4 Qt_4_8_0 Qt_4_8_1 Qt_4_8_2 Qt_4_8_3 Qt_4_8_4 Qt_4_8_5 Qt_4_8_6 Qt_5_0_0}
- 
--%Platforms {WS_X11 WS_WIN WS_MACX}
-+%Platforms {WS_X11 WS_QWS WS_WIN WS_MACX}
- 
- %Feature PyQt_Accessibility
- %Feature PyQt_SessionManager
-Index: PyQt-x11-gpl-4.11.3/sip/QtCore/qprocess.sip
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/qprocess.sip
-+++ PyQt-x11-gpl-4.11.3/sip/QtCore/qprocess.sip
-@@ -28,7 +28,7 @@
- %If (WS_WIN)
- typedef void *Q_PID;
- %End
--%If (WS_X11 || WS_MACX)
-+%If (WS_X11 || WS_QWS || WS_MACX)
- typedef qint64 Q_PID;
- %End
- 
-Index: PyQt-x11-gpl-4.11.3/sip/QtGui/qwindowdefs.sip
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/sip/QtGui/qwindowdefs.sip
-+++ PyQt-x11-gpl-4.11.3/sip/QtGui/qwindowdefs.sip
-@@ -27,7 +27,7 @@
- 
- typedef QList QWidgetList;
- %If (- Qt_5_0_0)
--%If (WS_X11)
-+%If (WS_X11 || WS_QWS)
- // X11 specific definitions.
- typedef unsigned long WId;
- %End
diff --git a/buildroot/package/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch b/buildroot/package/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch
deleted file mode 100644
index c07bea777..000000000
--- a/buildroot/package/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Hide QFont::cacheStatistics which isn't available in QWS
-
-Signed-off-by: Sergey Kostanbaev 
----
-
-diff -ur PyQt-x11-gpl-4.9.6/sip/QtGui/qfont.sip pyqt-4.9.6/sip/QtGui/qfont.sip
---- PyQt-x11-gpl-4.9.6/sip/QtGui/qfont.sip	2012-12-08 13:51:38.000000000 +0400
-+++ pyqt-4.9.6/sip/QtGui/qfont.sip	2013-05-22 14:06:38.335000022 +0400
-@@ -185,7 +185,9 @@
- %End
-     static void initialize();
-     static void cleanup();
-+%If (!WS_QWS)
-     static void cacheStatistics();
-+%End
-     QString defaultFamily() const;
-     QString lastResortFamily() const;
-     QString lastResortFont() const;
diff --git a/buildroot/package/python-pyqt/0005-sip-fix_qws_handle.patch b/buildroot/package/python-pyqt/0005-sip-fix_qws_handle.patch
deleted file mode 100644
index 80623d112..000000000
--- a/buildroot/package/python-pyqt/0005-sip-fix_qws_handle.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix build issue in QWS flavor
-
-Change HANDLE to void* to get rid of :
-buildroot/output/build/python-pyqt-4.11.3/QtCore/sipQtCoreQThread.cpp:318:50:
-error: invalid conversion from 'Qt::HANDLE {aka void*}' to 'long
-unsigned int' [-fpermissive] error during compilation.
-
-Signed-off-by: Gwenhael Goavec-Merou 
-Signed-off-by: Sergey Kostanbaev 
----
-Index: PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/qnamespace.sip
-+++ PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip
-@@ -1673,6 +1673,9 @@ namespace Qt
- %If (WS_X11)
-     typedef unsigned long HANDLE;
- %End
-+%If (WS_QWS)
-+    typedef void* HANDLE;
-+%End
- %End
- %If (PyQt_Deprecated_5_0)
-     typedef Qt::WindowFlags WFlags;
diff --git a/buildroot/package/python-pyqt/Config.in b/buildroot/package/python-pyqt/Config.in
deleted file mode 100644
index 6934a4c4a..000000000
--- a/buildroot/package/python-pyqt/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-comment "python-pyqt needs Qt4"
-	depends on !BR2_PACKAGE_QT
-
-config BR2_PACKAGE_PYTHON_PYQT
-	bool "python-pyqt"
-	depends on BR2_PACKAGE_QT
-	select BR2_PACKAGE_PYTHON_SIP
-	help
-	  PyQt4 for Qt Embedded 4 bindings.
-
-	  http://www.riverbankcomputing.com/software/pyqt/
-
-if BR2_PACKAGE_PYTHON_PYQT
-
-config BR2_PACKAGE_PYTHON_PYQT_ARCH_USES_QREAL_FLOAT
-	bool
-	default y if BR2_arm || BR2_armeb
-	default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb
-	default y if (BR2_mipsel || BR2_mips) && BR2_PACKAGE_QT_EMBEDDED
-
-endif
diff --git a/buildroot/package/python-pyqt/python-pyqt.hash b/buildroot/package/python-pyqt/python-pyqt.hash
deleted file mode 100644
index 1709b66ab..000000000
--- a/buildroot/package/python-pyqt/python-pyqt.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# From http://http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.3/
-md5 997c3e443165a89a559e0d96b061bf70 PyQt-x11-gpl-4.11.3.tar.gz
-
-# Locally calculated:
-sha256 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686 PyQt-x11-gpl-4.11.3.tar.gz
diff --git a/buildroot/package/python-pyqt/python-pyqt.mk b/buildroot/package/python-pyqt/python-pyqt.mk
deleted file mode 100644
index e8ae64166..000000000
--- a/buildroot/package/python-pyqt/python-pyqt.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-################################################################################
-#
-# python-pyqt
-#
-################################################################################
-
-PYTHON_PYQT_VERSION = 4.11.3
-PYTHON_PYQT_SOURCE = PyQt-x11-gpl-$(PYTHON_PYQT_VERSION).tar.gz
-PYTHON_PYQT_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt4/PyQt-$(PYTHON_PYQT_VERSION)
-PYTHON_PYQT_LICENSE = GPL-2.0 or GPL-3.0
-PYTHON_PYQT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3
-
-PYTHON_PYQT_DEPENDENCIES = python-sip host-python-sip qt
-
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_PYQT_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR)
-PYTHON_PYQT_RM_PORT_BASE = port_v3
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
-PYTHON_PYQT_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR)
-PYTHON_PYQT_RM_PORT_BASE = port_v2
-endif
-
-ifeq ($(BR2_PACKAGE_QT_EMBEDDED),y)
-PYTHON_PYQT_QTFLAVOR = WS_QWS
-else
-PYTHON_PYQT_QTFLAVOR = WS_X11
-endif
-
-PYTHON_PYQT_QTDETAIL_LICENSE = Open Source
-
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-PYTHON_PYQT_QTDETAIL_TYPE = shared
-endif
-
-# Turn off features that aren't available in QWS and current qt
-# configuration.
-PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES = \
-	PyQt_Accessibility PyQt_SessionManager \
-	PyQt_Shortcut PyQt_RawFont
-
-ifeq ($(BR2_PACKAGE_QT_OPENSSL),)
-PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_OpenSSL
-endif
-
-# Yes, this looks a bit weird: when OpenGL ES is available, we have to
-# disable the feature that consists in not having OpenGL ES support.
-ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
-PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_NoOpenGLES
-endif
-
-# PyQt_qreal_double must be disabled on a number of architectures that
-# use float for qreal.
-ifeq ($(BR2_PACKAGE_PYTHON_PYQT_ARCH_USES_QREAL_FLOAT),y)
-PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_qreal_double
-endif
-
-define PYTHON_PYQT_QTDETAIL
-	echo $(1) >> $(2)/qtdetail.out
-endef
-
-# Since we can't run generate qtdetail.out by running qtdetail on target device
-# we must generate the configuration.
-define PYTHON_PYQT_GENERATE_QTDETAIL
-	$(RM) -f $(1)/qtdetail.out
-	$(call PYTHON_PYQT_QTDETAIL,$(PYTHON_PYQT_QTDETAIL_LICENSE),$(1))
-	$(call PYTHON_PYQT_QTDETAIL,$(PYTHON_PYQT_QTDETAIL_TYPE),$(1))
-	$(foreach f,$(PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES),
-		$(call PYTHON_PYQT_QTDETAIL,$(f),$(1)) \
-	)
-endef
-
-PYTHON_PYQT_CONF_OPTS = \
-	--bindir $(TARGET_DIR)/usr/bin \
-	--destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages \
-	--qmake $(HOST_DIR)/bin/qmake \
-	--sysroot $(STAGING_DIR)/usr \
-	-w --confirm-license \
-	--no-designer-plugin \
-	--no-docstrings \
-	--no-sip-files \
-	--qt-flavor=$(PYTHON_PYQT_QTFLAVOR)
-
-# The VendorID related information is only needed for Python 2.x, not
-# Python 3.x.
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_PYQT_CONF_OPTS += \
-	--vendorid-incdir $(STAGING_DIR)/usr/include/$(PYTHON_PYQT_PYTHON_DIR) \
-	--vendorid-libdir $(STAGING_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/config
-endif
-
-define PYTHON_PYQT_CONFIGURE_CMDS
-	$(call PYTHON_PYQT_GENERATE_QTDETAIL,$(@D))
-	(cd $(@D); \
-		$(TARGET_MAKE_ENV) \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(HOST_DIR)/bin/python configure-ng.py \
-			$(PYTHON_PYQT_CONF_OPTS) \
-	)
-endef
-
-define PYTHON_PYQT_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
-endef
-
-# __init__.py is needed to import PyQt4
-# __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set
-define PYTHON_PYQT_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install
-	touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/__init__.py
-	$(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/uic/$(PYTHON_PYQT_RM_PORT_BASE)
-endef
-
-$(eval $(generic-package))
diff --git a/buildroot/package/python-pyqt5/python-pyqt5.mk b/buildroot/package/python-pyqt5/python-pyqt5.mk
index cde026ef6..4955936ae 100644
--- a/buildroot/package/python-pyqt5/python-pyqt5.mk
+++ b/buildroot/package/python-pyqt5/python-pyqt5.mk
@@ -25,9 +25,9 @@ PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source
 PYTHON_PYQT5_QTDETAIL_TYPE = shared
 
 # Turn off features that aren't available in current qt configuration
-PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL)
 PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL)
 PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL)
+PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),,PyQt_SSL)
 
 define PYTHON_PYQT5_QTDETAIL
 	echo $(1) >> $(2)/qtdetail.out
diff --git a/buildroot/package/python-pysmi/python-pysmi.hash b/buildroot/package/python-pysmi/python-pysmi.hash
index ea4d7633e..3127d2057 100644
--- a/buildroot/package/python-pysmi/python-pysmi.hash
+++ b/buildroot/package/python-pysmi/python-pysmi.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/pysmi/json
-md5	8df6d5ebc5d71bffb09f47787d8c7b9e  pysmi-0.3.2.tar.gz
-sha256	309039ab9bd458cc721692ffff10b4ad2c4a8e731e6507c34866ca2727323353  pysmi-0.3.2.tar.gz
+md5	7ca6a849ea51929cfd44c4e5bc316b0e  pysmi-0.3.3.tar.gz
+sha256	4e35c2b935ba5a68e086d7781dae1b508c228a960279620d182e876448acf02f  pysmi-0.3.3.tar.gz
 # Locally computed sha256 checksums
-sha256	ac2f8f67cae76e36a25496fbdf3293dd14b3d6db63f1ce4242ae9dd4fb7b90fd  LICENSE.rst
+sha256	c43704eafcfa2bc33e56168f2b498c3c34a1d7865855626a52b5af411fc5837f  LICENSE.rst
diff --git a/buildroot/package/python-pysmi/python-pysmi.mk b/buildroot/package/python-pysmi/python-pysmi.mk
index d4f2ef1cd..a686b6fba 100644
--- a/buildroot/package/python-pysmi/python-pysmi.mk
+++ b/buildroot/package/python-pysmi/python-pysmi.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYSMI_VERSION = 0.3.2
+PYTHON_PYSMI_VERSION = 0.3.3
 PYTHON_PYSMI_SOURCE = pysmi-$(PYTHON_PYSMI_VERSION).tar.gz
-PYTHON_PYSMI_SITE = https://files.pythonhosted.org/packages/46/be/8c1b68ec30992dd9f5127fff7bf518110ad4de8ae8533f921ad605d09a01
+PYTHON_PYSMI_SITE = https://files.pythonhosted.org/packages/71/32/182dd4fa0c4e20c2a14154d3133cc08374694c2518a7c5445a918332b113
 PYTHON_PYSMI_SETUP_TYPE = setuptools
 PYTHON_PYSMI_LICENSE = BSD-2-Clause
 PYTHON_PYSMI_LICENSE_FILES = LICENSE.rst
diff --git a/buildroot/package/python-pytz/python-pytz.hash b/buildroot/package/python-pytz/python-pytz.hash
index 78234ace8..525d45258 100644
--- a/buildroot/package/python-pytz/python-pytz.hash
+++ b/buildroot/package/python-pytz/python-pytz.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/pytz/json
-md5	4b91594c440aa20c76ac92043efa75e1  pytz-2018.7.tar.gz
-sha256	31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca  pytz-2018.7.tar.gz
+md5	0f57d76c64d0965e7429c9b871f6b711  pytz-2018.9.tar.gz
+sha256	d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c  pytz-2018.9.tar.gz
 # Locally computed sha256 checksums
 sha256	39f07c72a1bfda349cbd27bac9bcb1e6f8c5b4e5cc3fadf56900406e8cc0b792  LICENSE.txt
diff --git a/buildroot/package/python-pytz/python-pytz.mk b/buildroot/package/python-pytz/python-pytz.mk
index dc6046d03..a93a12c08 100644
--- a/buildroot/package/python-pytz/python-pytz.mk
+++ b/buildroot/package/python-pytz/python-pytz.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYTZ_VERSION = 2018.7
+PYTHON_PYTZ_VERSION = 2018.9
 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz
-PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/cd/71/ae99fc3df1b1c5267d37ef2c51b7d79c44ba8a5e37b48e3ca93b4d74d98b
+PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/af/be/6c59e30e208a5f28da85751b93ec7b97e4612268bb054d0dff396e758a90
 PYTHON_PYTZ_SETUP_TYPE = setuptools
 PYTHON_PYTZ_LICENSE = MIT
 PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt
diff --git a/buildroot/package/python-pyyaml/python-pyyaml.hash b/buildroot/package/python-pyyaml/python-pyyaml.hash
index 47a379ce6..256742feb 100644
--- a/buildroot/package/python-pyyaml/python-pyyaml.hash
+++ b/buildroot/package/python-pyyaml/python-pyyaml.hash
@@ -1,3 +1,3 @@
 # md5, sha256 from https://pypi.python.org/pypi/pyyaml/json
-md5 b78b96636d68ac581c0e2f38158c224f PyYAML-3.13.tar.gz
-sha256 3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf PyYAML-3.13.tar.gz
+md5 a842bc7391e145bbe4e7fd0d32da1132 PyYAML-4.2b4.tar.gz
+sha256 3c17fb92c8ba2f525e4b5f7941d850e7a48c3a59b32d331e2502a3cdc6648e76 PyYAML-4.2b4.tar.gz
diff --git a/buildroot/package/python-pyyaml/python-pyyaml.mk b/buildroot/package/python-pyyaml/python-pyyaml.mk
index cbf8df7b2..b73b4356a 100644
--- a/buildroot/package/python-pyyaml/python-pyyaml.mk
+++ b/buildroot/package/python-pyyaml/python-pyyaml.mk
@@ -4,12 +4,14 @@
 #
 ################################################################################
 
-PYTHON_PYYAML_VERSION = 3.13
+PYTHON_PYYAML_VERSION = 4.2b4
 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz
-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/9e/a3/1d13970c3f36777c583f136c136f804d70f500168edc1edea6daa7200769
+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a8/c6/a8d1555e795dbd0375c3c93b576ca13bbf139db51ea604afa19a2c35fc03
 PYTHON_PYYAML_SETUP_TYPE = distutils
 PYTHON_PYYAML_LICENSE = MIT
 PYTHON_PYYAML_LICENSE_FILES = LICENSE
 PYTHON_PYYAML_DEPENDENCIES = libyaml
+HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/buildroot/package/python-pyzmq/python-pyzmq.mk b/buildroot/package/python-pyzmq/python-pyzmq.mk
index 1f7cb5d61..b977cca92 100644
--- a/buildroot/package/python-pyzmq/python-pyzmq.mk
+++ b/buildroot/package/python-pyzmq/python-pyzmq.mk
@@ -22,4 +22,8 @@ endef
 
 PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION
 
+ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y)
+PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts
+endif
+
 $(eval $(python-package))
diff --git a/buildroot/package/python-requests/python-requests.hash b/buildroot/package/python-requests/python-requests.hash
index e3b77744a..46f62c75c 100644
--- a/buildroot/package/python-requests/python-requests.hash
+++ b/buildroot/package/python-requests/python-requests.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/requests/json
-md5	2918817ea4688f4ea21cb4b11e353448  requests-2.20.1.tar.gz
-sha256	ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263  requests-2.20.1.tar.gz
+md5	1bcd0e0977c3f8db1848ba0e2b7ab904  requests-2.21.0.tar.gz
+sha256	502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e  requests-2.21.0.tar.gz
 # Locally computed sha256 checksums
 sha256	be41abac2c40f8530307e8d172c590b476f4a488bc6a68f8de57b7cf64786687  LICENSE
diff --git a/buildroot/package/python-requests/python-requests.mk b/buildroot/package/python-requests/python-requests.mk
index 0c327759b..3d8542fcd 100644
--- a/buildroot/package/python-requests/python-requests.mk
+++ b/buildroot/package/python-requests/python-requests.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_REQUESTS_VERSION = 2.20.1
+PYTHON_REQUESTS_VERSION = 2.21.0
 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz
-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/40/35/298c36d839547b50822985a2cf0611b3b978a5ab7a5af5562b8ebe3e1369
+PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/52/2c/514e4ac25da2b08ca5a464c50463682126385c4272c18193876e91f4bc38
 PYTHON_REQUESTS_SETUP_TYPE = setuptools
 PYTHON_REQUESTS_LICENSE = Apache-2.0
 PYTHON_REQUESTS_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-sentry-sdk/Config.in b/buildroot/package/python-sentry-sdk/Config.in
new file mode 100644
index 000000000..5bddabe28
--- /dev/null
+++ b/buildroot/package/python-sentry-sdk/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_SENTRY_SDK
+	bool "python-sentry-sdk"
+	select BR2_PACKAGE_PYTHON_URLLIB3 # runtime
+	select BR2_PACKAGE_PYTHON_CERTIFI # runtime
+	help
+	  Python client for Sentry (https://getsentry.com).
+
+	  https://github.com/getsentry/sentry-python
diff --git a/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash b/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash
new file mode 100644
index 000000000..34acf6ec1
--- /dev/null
+++ b/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/sentry-sdk/json
+md5	78642322818c1ce47e80938fe1f40b5f  sentry-sdk-0.6.2.tar.gz
+sha256	56118f4c3bd3412e47d1969997580df2f27ae951df949d07f0c2120cefe40b00  sentry-sdk-0.6.2.tar.gz
+# Locally computed sha256 checksums
+sha256	59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c  LICENSE
diff --git a/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk b/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk
new file mode 100644
index 000000000..ae218de1c
--- /dev/null
+++ b/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-sentry-sdk
+#
+################################################################################
+
+PYTHON_SENTRY_SDK_VERSION = 0.6.2
+PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz
+PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/92/6f/b7b74d7635e220660c06897213fc6df894d291900c8e2710d72fb67528a7
+PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools
+PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause
+PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-setuptools/python-setuptools.hash b/buildroot/package/python-setuptools/python-setuptools.hash
index 05d9312c7..53d77f57d 100644
--- a/buildroot/package/python-setuptools/python-setuptools.hash
+++ b/buildroot/package/python-setuptools/python-setuptools.hash
@@ -1,4 +1,4 @@
 # From https://pypi.org/pypi/setuptools/json
-md5  12f8546ead968a0c237732d53fe7fcb1  setuptools-40.5.0.zip
-sha256  2a2a200f4a760adbded23a091a00be2eca4e28efed65c6120ea275f7e89a1eab  setuptools-40.5.0.zip
+md5  1fbcbe45c7fb1d21041e676ba68d2dec  setuptools-40.6.3.zip
+sha256  3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8  setuptools-40.6.3.zip
 sha256  c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a  LICENSE
diff --git a/buildroot/package/python-setuptools/python-setuptools.mk b/buildroot/package/python-setuptools/python-setuptools.mk
index 3dca7094e..015347d49 100644
--- a/buildroot/package/python-setuptools/python-setuptools.mk
+++ b/buildroot/package/python-setuptools/python-setuptools.mk
@@ -4,12 +4,15 @@
 #
 ################################################################################
 
-PYTHON_SETUPTOOLS_VERSION = 40.5.0
+# Please keep in sync with
+# package/python3-setuptools/python3-setuptools.mk
+PYTHON_SETUPTOOLS_VERSION = 40.6.3
 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip
-PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/26/e5/9897eee1100b166a61f91b68528cb692e8887300d9cbdaa1a349f6304b79
+PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/37/1b/b25507861991beeade31473868463dad0e58b1978c209de27384ae541b0b
 PYTHON_SETUPTOOLS_LICENSE = MIT
 PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE
 PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
+HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2
 
 define PYTHON_SETUPTOOLS_EXTRACT_CMDS
 	$(UNZIP) -d $(@D) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE)
diff --git a/buildroot/package/python-sip/Config.in b/buildroot/package/python-sip/Config.in
index 1f8961d0d..8a43b8b17 100644
--- a/buildroot/package/python-sip/Config.in
+++ b/buildroot/package/python-sip/Config.in
@@ -1,18 +1,6 @@
-comment "python-sip needs a toolchain w/ C++, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-
-comment "python-sip needs qt or qt5"
-	depends on BR2_USE_MMU
-	depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
-
 config BR2_PACKAGE_PYTHON_SIP
 	bool "python-sip"
-	depends on BR2_INSTALL_LIBSTDCPP # qt
-	depends on BR2_TOOLCHAIN_HAS_THREADS # qt
-	depends on BR2_USE_MMU # qt
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
 	help
 	  SIP is a tool that makes it very easy to create Python
 	  bindings for C and C++ libraries. It was originally
diff --git a/buildroot/package/python-sip/python-sip.mk b/buildroot/package/python-sip/python-sip.mk
index 76d7d0418..69019f5f1 100644
--- a/buildroot/package/python-sip/python-sip.mk
+++ b/buildroot/package/python-sip/python-sip.mk
@@ -10,11 +10,7 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON
 PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0
 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3
 
-ifeq ($(BR2_PACKAGE_QT5),y)
 PYTHON_SIP_DEPENDENCIES = qt5base
-else
-PYTHON_SIP_DEPENDENCIES = qt
-endif
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 PYTHON_SIP_DEPENDENCIES += python
diff --git a/buildroot/package/python-six/python-six.hash b/buildroot/package/python-six/python-six.hash
index f9dbf09ea..b7262b12b 100644
--- a/buildroot/package/python-six/python-six.hash
+++ b/buildroot/package/python-six/python-six.hash
@@ -1,4 +1,5 @@
-# md5 from https://pypi.python.org/pypi/six/json, sha256 locally computed
-md5	d12789f9baf7e9fb2524c0c64f1773f8  six-1.11.0.tar.gz
-sha256	70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9  six-1.11.0.tar.gz
-sha256  63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328  LICENSE
+# md5, sha256 from https://pypi.org/pypi/six/json
+md5	9ae5d1feed8c0215f4ae4adcd9207fcb  six-1.12.0.tar.gz
+sha256	d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73  six-1.12.0.tar.gz
+# Locally computed sha256 checksums
+sha256	e732f54da58f3e9cf0c48e8b512948936fcf7361bd58afa63a9a3c392bf794ad  LICENSE
diff --git a/buildroot/package/python-six/python-six.mk b/buildroot/package/python-six/python-six.mk
index cd8063423..95817fa34 100644
--- a/buildroot/package/python-six/python-six.mk
+++ b/buildroot/package/python-six/python-six.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_SIX_VERSION = 1.11.0
+PYTHON_SIX_VERSION = 1.12.0
 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz
-PYTHON_SIX_SITE = https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe
+PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca
 PYTHON_SIX_SETUP_TYPE = setuptools
 PYTHON_SIX_LICENSE = MIT
 PYTHON_SIX_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-sortedcontainers/python-sortedcontainers.hash b/buildroot/package/python-sortedcontainers/python-sortedcontainers.hash
index c68d78a17..311bb77e1 100644
--- a/buildroot/package/python-sortedcontainers/python-sortedcontainers.hash
+++ b/buildroot/package/python-sortedcontainers/python-sortedcontainers.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/sortedcontainers/json
-md5	5f079b1131d8b1a3ed025e7e679b1497  sortedcontainers-2.0.5.tar.gz
-sha256	b74f2756fb5e23512572cc76f0fe0832fd86310f77dfee54335a35fb33f6b950  sortedcontainers-2.0.5.tar.gz
+md5	41a4a1eaf7b85e6b3beb14cfb160bc27  sortedcontainers-2.1.0.tar.gz
+sha256	974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a  sortedcontainers-2.1.0.tar.gz
 # Locally computed sha256 checksums
 sha256	7dcf4a5137118a925727b8a1690bc6ea70b156ee6739dbb51fd4d386718d6ce5  LICENSE
diff --git a/buildroot/package/python-sortedcontainers/python-sortedcontainers.mk b/buildroot/package/python-sortedcontainers/python-sortedcontainers.mk
index c32f9e404..43f662a89 100644
--- a/buildroot/package/python-sortedcontainers/python-sortedcontainers.mk
+++ b/buildroot/package/python-sortedcontainers/python-sortedcontainers.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_SORTEDCONTAINERS_VERSION = 2.0.5
+PYTHON_SORTEDCONTAINERS_VERSION = 2.1.0
 PYTHON_SORTEDCONTAINERS_SOURCE = sortedcontainers-$(PYTHON_SORTEDCONTAINERS_VERSION).tar.gz
-PYTHON_SORTEDCONTAINERS_SITE = https://files.pythonhosted.org/packages/b9/30/accbf5c09c5fa25a3d5f762761e0d7ece6fdb12f2a9c43b840f73cef43ef
+PYTHON_SORTEDCONTAINERS_SITE = https://files.pythonhosted.org/packages/29/e0/135df2e733790a3d3bcda970fd080617be8cea3bd98f411e76e6847c17ef
 PYTHON_SORTEDCONTAINERS_SETUP_TYPE = setuptools
 PYTHON_SORTEDCONTAINERS_LICENSE = Apache-2.0
 PYTHON_SORTEDCONTAINERS_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-txtorcon/python-txtorcon.hash b/buildroot/package/python-txtorcon/python-txtorcon.hash
index d46a7769d..ffc4e8379 100644
--- a/buildroot/package/python-txtorcon/python-txtorcon.hash
+++ b/buildroot/package/python-txtorcon/python-txtorcon.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/txtorcon/json
-md5    31492e847973710f6533e9979a134ffa  txtorcon-18.3.0.tar.gz
-sha256 5601956b3a2452526cd1ea31662696a51ddbf8ed6452633ee464fc1ff275f8b0  txtorcon-18.3.0.tar.gz
+md5	7e6ef4d29c2cc51e85614cd2d57bf8df  txtorcon-19.0.0.tar.gz
+sha256	3731b740653e3f551412744f1fcd7fa6f04aa9fa37c90dc6c9152e619886bf3b  txtorcon-19.0.0.tar.gz
 # Locally computed sha256 checksums
 sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b  LICENSE
diff --git a/buildroot/package/python-txtorcon/python-txtorcon.mk b/buildroot/package/python-txtorcon/python-txtorcon.mk
index 6ebcdb4f9..7bf1c252b 100644
--- a/buildroot/package/python-txtorcon/python-txtorcon.mk
+++ b/buildroot/package/python-txtorcon/python-txtorcon.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_TXTORCON_VERSION = 18.3.0
+PYTHON_TXTORCON_VERSION = 19.0.0
 PYTHON_TXTORCON_SOURCE = txtorcon-$(PYTHON_TXTORCON_VERSION).tar.gz
-PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/a2/71/2fe0c7d9350ff95cd22128f375dbf2b49438ca1a5d8ca0795311a964586b
+PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/b7/93/e16d8160bac3a19d13c9ead9ac6b38f837f2534d40884109a334be1f849c
 PYTHON_TXTORCON_SETUP_TYPE = setuptools
 PYTHON_TXTORCON_LICENSE = MIT
 PYTHON_TXTORCON_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-typing/python-typing.mk b/buildroot/package/python-typing/python-typing.mk
index acb531612..663227dfc 100644
--- a/buildroot/package/python-typing/python-typing.mk
+++ b/buildroot/package/python-typing/python-typing.mk
@@ -12,3 +12,4 @@ PYTHON_TYPING_LICENSE = Python-2.0, others
 PYTHON_TYPING_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/buildroot/package/python-urllib3/python-urllib3.hash b/buildroot/package/python-urllib3/python-urllib3.hash
index 098c7940a..ec075cb4f 100644
--- a/buildroot/package/python-urllib3/python-urllib3.hash
+++ b/buildroot/package/python-urllib3/python-urllib3.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/urllib3/json
-md5	f3d8b1841539200c949a33e87e551d8e  urllib3-1.24.1.tar.gz
-sha256	de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22  urllib3-1.24.1.tar.gz
+md5	20bb5a170a534bd0acd98bfc007fcc22  urllib3-1.24.2.tar.gz
+sha256	9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3  urllib3-1.24.2.tar.gz
 # Locally computed sha256 checksums
 sha256	11db569430ca5ad793f1399297b8df5041a22137abaf90642ea71da21d59121c  LICENSE.txt
diff --git a/buildroot/package/python-urllib3/python-urllib3.mk b/buildroot/package/python-urllib3/python-urllib3.mk
index a2c3096a9..893d32d97 100644
--- a/buildroot/package/python-urllib3/python-urllib3.mk
+++ b/buildroot/package/python-urllib3/python-urllib3.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_URLLIB3_VERSION = 1.24.1
+PYTHON_URLLIB3_VERSION = 1.24.2
 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz
-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/b1/53/37d82ab391393565f2f831b8eedbffd57db5a718216f82f1a8b4d381a1c1
+PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/fd/fa/b21f4f03176463a6cccdb612a5ff71b927e5224e83483012747c12fc5d62
 PYTHON_URLLIB3_LICENSE = MIT
 PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt
 PYTHON_URLLIB3_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python-uvloop/python-uvloop.hash b/buildroot/package/python-uvloop/python-uvloop.hash
index ac65fbaac..2eaa92d6d 100644
--- a/buildroot/package/python-uvloop/python-uvloop.hash
+++ b/buildroot/package/python-uvloop/python-uvloop.hash
@@ -1,6 +1,6 @@
 # md5, sha256 from https://pypi.org/pypi/uvloop/json
-md5	7d509d78b18a5863cc06697ccfd835ad  uvloop-0.11.2.tar.gz
-sha256	a97bd62ebbdf7e6e84bf44afe439d9b24ce4d8661a29a639626a8c03748f6f98  uvloop-0.11.2.tar.gz
+md5	9584c5e372755f752e47c2ff8419efe1  uvloop-0.11.3.tar.gz
+sha256	fd5042d0a2ea07b92d0e2190f7711feb91cde31cf2bf1829e2e8c4c0fdd1f1aa  uvloop-0.11.3.tar.gz
 # Locally computed sha256 checksums
 sha256	2fdc436a67077941295c58647f521fbef8f50e46db0970552fa1a4dd8ae261c6  LICENSE-APACHE
 sha256	9185f3c77e9f6ef8859a6ba4c94128ac1329876be3e813aad32d7645e51ae409  LICENSE-MIT
diff --git a/buildroot/package/python-uvloop/python-uvloop.mk b/buildroot/package/python-uvloop/python-uvloop.mk
index a835a9952..037cca388 100644
--- a/buildroot/package/python-uvloop/python-uvloop.mk
+++ b/buildroot/package/python-uvloop/python-uvloop.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_UVLOOP_VERSION = 0.11.2
+PYTHON_UVLOOP_VERSION = 0.11.3
 PYTHON_UVLOOP_SOURCE = uvloop-$(PYTHON_UVLOOP_VERSION).tar.gz
-PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/5c/37/6daa39aac42b2deda6ee77f408bec0419b600e27b89b374b0d440af32b10
+PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/46/60/8e46188acba22369848d5e9bcbee3ca04b68a12d0598bd625c1a3994f5df
 PYTHON_UVLOOP_SETUP_TYPE = setuptools
 PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT
 PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
diff --git a/buildroot/package/python-web2py/python-web2py.hash b/buildroot/package/python-web2py/python-web2py.hash
index d23da1ea6..9a1df0c2a 100644
--- a/buildroot/package/python-web2py/python-web2py.hash
+++ b/buildroot/package/python-web2py/python-web2py.hash
@@ -1,2 +1,3 @@
 # sha256 locally computed
-sha256 d9ed52676e9becd53d2d73a849dea3d55b8b61231abf3428cf516dcc0083d451  python-web2py-R-2.16.1.tar.gz
+sha256 8205a7a08595ca1a41919750a8dc4e431258966cb46c8021564b25003cf90863  python-web2py-R-2.17.2.tar.gz
+sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe  LICENSE
diff --git a/buildroot/package/python-web2py/python-web2py.mk b/buildroot/package/python-web2py/python-web2py.mk
index 1e02fb7ca..922b267b8 100644
--- a/buildroot/package/python-web2py/python-web2py.mk
+++ b/buildroot/package/python-web2py/python-web2py.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_WEB2PY_VERSION = R-2.16.1
+PYTHON_WEB2PY_VERSION = R-2.17.2
 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION))
 PYTHON_WEB2PY_LICENSE = LGPL-3.0
 PYTHON_WEB2PY_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/python-wtforms/Config.in b/buildroot/package/python-wtforms/Config.in
new file mode 100644
index 000000000..96ed96da0
--- /dev/null
+++ b/buildroot/package/python-wtforms/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_WTFORMS
+	bool "python-wtforms"
+	help
+	  A flexible forms validation and rendering library for
+	  Python web development.
+
+	  https://wtforms.readthedocs.io/
diff --git a/buildroot/package/python-wtforms/python-wtforms.hash b/buildroot/package/python-wtforms/python-wtforms.hash
new file mode 100644
index 000000000..34beb0801
--- /dev/null
+++ b/buildroot/package/python-wtforms/python-wtforms.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/wtforms/json
+md5	41c0008dbe7bd98892c58f7457a46a4a  WTForms-2.2.1.tar.gz
+sha256	0cdbac3e7f6878086c334aa25dc5a33869a3954e9d1e015130d65a69309b3b61  WTForms-2.2.1.tar.gz
+# Locally computed sha256 checksums
+sha256	64cba207423f4478e3262c2e54209f8cd2057d687e200a50e0203db5659947a5  LICENSE.rst
diff --git a/buildroot/package/python-wtforms/python-wtforms.mk b/buildroot/package/python-wtforms/python-wtforms.mk
new file mode 100644
index 000000000..2715320d2
--- /dev/null
+++ b/buildroot/package/python-wtforms/python-wtforms.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-wtforms
+#
+################################################################################
+
+PYTHON_WTFORMS_VERSION = 2.2.1
+PYTHON_WTFORMS_SOURCE = WTForms-$(PYTHON_WTFORMS_VERSION).tar.gz
+PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/cd/1d/7221354ebfc32b868740d02e44225c2ce00769b0d3dc370e463e2bc4b446
+PYTHON_WTFORMS_SETUP_TYPE = setuptools
+PYTHON_WTFORMS_LICENSE = BSD-3-Clause
+PYTHON_WTFORMS_LICENSE_FILES = LICENSE.rst
+
+$(eval $(python-package))
diff --git a/buildroot/package/python-yarl/python-yarl.hash b/buildroot/package/python-yarl/python-yarl.hash
index 118c7225d..1cb070843 100644
--- a/buildroot/package/python-yarl/python-yarl.hash
+++ b/buildroot/package/python-yarl/python-yarl.hash
@@ -1,5 +1,5 @@
-# md5, sha256 from https://pypi.python.org/pypi/yarl/json
-md5	43380667129ebc52ac3c442daabb3f6d  yarl-1.2.6.tar.gz
-sha256	c8cbc21bbfa1dd7d5386d48cc814fe3d35b80f60299cdde9279046f399c3b0d8  yarl-1.2.6.tar.gz
+# md5, sha256 from https://pypi.org/pypi/yarl/json
+md5	92889c31fce4c8f82b7ee9c2b2ed9cd1  yarl-1.3.0.tar.gz
+sha256	024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388ba7aa9  yarl-1.3.0.tar.gz
 # Locally computed sha256 checksums
 sha256	14c0820503ceef15e814a89b037d9efc066870087018294b6ae0f27163872cc5  LICENSE
diff --git a/buildroot/package/python-yarl/python-yarl.mk b/buildroot/package/python-yarl/python-yarl.mk
index 591131e4a..f18572478 100644
--- a/buildroot/package/python-yarl/python-yarl.mk
+++ b/buildroot/package/python-yarl/python-yarl.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_YARL_VERSION = 1.2.6
+PYTHON_YARL_VERSION = 1.3.0
 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz
-PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/43/b8/057c3e5b546ff4b24263164ecda13f6962d85c9dc477fcc0bcdcb3adb658
+PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/fb/84/6d82f6be218c50b547aa29d0315e430cf8a23c52064c92d0a8377d7b7357
 PYTHON_YARL_LICENSE = Apache-2.0
 PYTHON_YARL_LICENSE_FILES = LICENSE
 PYTHON_YARL_SETUP_TYPE = setuptools
diff --git a/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch b/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
index db5bfe1a1..9e05af2e3 100644
--- a/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
+++ b/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
@@ -1,4 +1,4 @@
-From 0ef0d4ddd3f2261e381f22061a9a451dfbb1dc9e Mon Sep 17 00:00:00 2001
+From e3f3c454ec4992a2283640cef0a35da5a05fb399 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:17:59 +0100
 Subject: [PATCH] Change the install location of _sysconfigdata.py
@@ -19,16 +19,18 @@ this directory gets added to the PYTHONPATH of the host Python
 interpreter when building Python modules for the target.
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in | 12 ++++++++++--
  configure.ac    |  2 +-
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index e288964..5367df7 100644
+index 9297e7fc89..49d3c0926f 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -529,6 +529,9 @@ pybuilddir.txt: $(BUILDPYTHON)
+@@ -509,6 +509,9 @@ pybuilddir.txt: $(BUILDPYTHON)
  		rm -f ./pybuilddir.txt ; \
  		exit 1 ; \
  	fi
@@ -38,7 +40,7 @@ index e288964..5367df7 100644
  
  # This is shared by the math and cmath modules
  Modules/_math.o: Modules/_math.c Modules/_math.h
-@@ -1080,7 +1083,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+@@ -1091,7 +1094,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  		else	true; \
  		fi; \
  	done
@@ -47,7 +49,7 @@ index e288964..5367df7 100644
  	do \
  		if test -x $$i; then \
  			$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -1090,6 +1093,11 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+@@ -1101,6 +1104,11 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  			echo $(INSTALL_DATA) $$i $(LIBDEST); \
  		fi; \
  	done
@@ -59,7 +61,7 @@ index e288964..5367df7 100644
  	@for d in $(LIBSUBDIRS); \
  	do \
  		a=$(srcdir)/Lib/$$d; \
-@@ -1418,7 +1426,7 @@ distclean: clobber
+@@ -1426,7 +1434,7 @@ distclean: clobber
  		Modules/Setup Modules/Setup.local Modules/Setup.config \
  		Modules/ld_so_aix Modules/python.exp Misc/python.pc
  	-rm -f python*-gdb.py
@@ -69,18 +71,18 @@ index e288964..5367df7 100644
  	# Expansion is performed here by shell (spawned by make) itself before
  	# arguments are passed to find. So LC_ALL=C must be set as a separate
 diff --git a/configure.ac b/configure.ac
-index 1273465..5f89797 100644
+index aecf6066e8..7143172b98 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then
+@@ -36,7 +36,7 @@ if test "$cross_compiling" = yes; then
  	    AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
  	fi
          AC_MSG_RESULT($interp)
 -	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
 +	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
      fi
-     # Used to comment out stuff for rebuilding generated files
-     GENERATED_COMMENT='#'
+ elif test "$cross_compiling" = maybe; then
+     AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch b/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
index 3bf407d54..ef1eb0404 100644
--- a/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
+++ b/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
@@ -1,4 +1,4 @@
-From 168e6c594e80395583de5ab0d082be119b2061fc Mon Sep 17 00:00:00 2001
+From 57ab41fa019d3ce276decd488938e5a00049cb9d Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:18:57 +0100
 Subject: [PATCH] Make the compilation of .pyc and .pyo conditional
@@ -7,16 +7,18 @@ This commit adds --{enable,disable}-{pyc,pyo} options to enable/disable
 the compilation of pyc/pyo files.
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in |  8 ++++++++
  configure.ac    | 11 +++++++++++
  2 files changed, 19 insertions(+)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 5367df7..96fc718 100644
+index 49d3c0926f..247d3c2902 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1128,24 +1128,32 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+@@ -1139,24 +1139,32 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
  			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
  	fi
@@ -50,10 +52,10 @@ index 5367df7..96fc718 100644
  		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 diff --git a/configure.ac b/configure.ac
-index 5f89797..4aafc82 100644
+index 7143172b98..6bd8369105 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -759,6 +759,17 @@ SunOS*)
+@@ -773,6 +773,17 @@ SunOS*)
      ;;
  esac
  
@@ -72,5 +74,5 @@ index 5f89797..4aafc82 100644
  AC_SUBST(LIBRARY)
  AC_MSG_CHECKING(LIBRARY)
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch b/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
index e0a24ec80..c910ae718 100644
--- a/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
+++ b/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
@@ -1,4 +1,4 @@
-From 2d971c3cdca9ecc55f2da8aba12ca89e1a66519a Mon Sep 17 00:00:00 2001
+From e674e29ceba34e55c9149ce99489e543aa4ebb01 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:19:47 +0100
 Subject: [PATCH] Adjust getaddrinfo() test for cross-compilation
@@ -7,15 +7,17 @@ The getaddrinfo() test in configure.ac uses AC_RUN_IFELSE(), which isn't
 cross-compilation friendly.
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 4aafc82..63e6918 100644
+index 6bd8369105..77ca6d86ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3527,7 +3527,7 @@ fi
+@@ -3563,7 +3563,7 @@ fi
  
  AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
  
@@ -25,5 +27,5 @@ index 4aafc82..63e6918 100644
  	if test $ipv6 = yes
  	then
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch b/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
index 44a8ae2cc..b1a20eb04 100644
--- a/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
+++ b/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
@@ -1,4 +1,4 @@
-From 977de9474c1fb46359ab6a487e153fbd91a2b568 Mon Sep 17 00:00:00 2001
+From 94ec96dd8827adfb5e272d28a4d76510e28657b3 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:21:28 +0100
 Subject: [PATCH] Add minimal infrastructure to be able to disable extensions
@@ -8,6 +8,8 @@ disable Python extensions. Follow-up commits actually add options to
 disable specific extensions.
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in | 6 +++++-
  configure.ac    | 2 ++
@@ -15,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 
  3 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 96fc718..33b994d 100644
+index 247d3c2902..c1c98ecc5a 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -161,6 +161,8 @@ FILEMODE=	644
+@@ -160,6 +160,8 @@ FILEMODE=	644
  # configure script arguments
  CONFIG_ARGS=	@CONFIG_ARGS@
  
@@ -27,7 +29,7 @@ index 96fc718..33b994d 100644
  
  # Subdirectories with code
  SRCDIRS= 	@SRCDIRS@
-@@ -548,6 +550,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -528,6 +530,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
  	esac; \
  	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
  		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -35,7 +37,7 @@ index 96fc718..33b994d 100644
  		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
  
  # Build static library
-@@ -1269,7 +1272,8 @@ libainstall:	all python-config
+@@ -1280,7 +1283,8 @@ libainstall:	@DEF_MAKE_RULE@ python-config
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
@@ -46,10 +48,10 @@ index 96fc718..33b994d 100644
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
 diff --git a/configure.ac b/configure.ac
-index 63e6918..5d4232f 100644
+index 77ca6d86ca..13f90b3ddd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2462,6 +2462,8 @@ LIBS="$withval $LIBS"
+@@ -2491,6 +2491,8 @@ LIBS="$withval $LIBS"
  
  PKG_PROG_PKG_CONFIG
  
@@ -59,7 +61,7 @@ index 63e6918..5d4232f 100644
  AC_MSG_CHECKING(for --with-system-expat)
  AC_ARG_WITH(system_expat,
 diff --git a/setup.py b/setup.py
-index 64001e2..3b51c0a 100644
+index 812d53d560..d426dd02ea 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -33,7 +33,10 @@ host_platform = get_platform()
@@ -75,5 +77,5 @@ index 64001e2..3b51c0a 100644
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch b/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
index 761d6d929..3cf8797c0 100644
--- a/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
+++ b/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
@@ -1,4 +1,4 @@
-From e5b0d225f4343e82791cb80e4e0c01a9b49eeff4 Mon Sep 17 00:00:00 2001
+From 1522c6c00ee88eb1148d3b2021d32d819b416375 Mon Sep 17 00:00:00 2001
 From: Gustavo Zacarias 
 Date: Tue, 7 Mar 2017 22:23:14 +0100
 Subject: [PATCH] Fix python-config for cross-builds
@@ -14,6 +14,8 @@ data/results.
 Signed-off-by: Gustavo Zacarias 
 [Bernd: rebased for Python 2.7.15]
 Signed-off-by: Bernd Kuhls 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in          |  13 +++---
  Misc/python-config.sh.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,10 +24,10 @@ Signed-off-by: Bernd Kuhls 
  create mode 100644 Misc/python-config.sh.in
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 33b994d..beb0837 100644
+index c1c98ecc5a..727a92af42 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -171,7 +171,7 @@ SRCDIRS= 	@SRCDIRS@
+@@ -170,7 +170,7 @@ SRCDIRS= 	@SRCDIRS@
  SUBDIRSTOO=	Include Lib Misc Demo
  
  # Files and directories to be distributed
@@ -34,16 +36,16 @@ index 33b994d..beb0837 100644
  DISTFILES=	README ChangeLog $(CONFIGFILES)
  DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
  DIST=		$(DISTFILES) $(DISTDIRS)
-@@ -431,7 +431,7 @@ LIBRARY_OBJS=	\
+@@ -403,7 +403,7 @@ LIBRARY_OBJS=	\
  
  # Default target
  all:		@DEF_MAKE_ALL_RULE@
 -build_all:	check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
 +build_all:	check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
  
- # Compile a binary with profile guided optimization.
- profile-opt:
-@@ -1179,10 +1179,12 @@ $(srcdir)/Lib/$(PLATDIR):
+ # Check that the source is clean when building out of source.
+ check-clean-src:
+@@ -1190,10 +1190,12 @@ $(srcdir)/Lib/$(PLATDIR):
  	fi; \
  	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
  
@@ -58,7 +60,7 @@ index 33b994d..beb0837 100644
  
  # Install the include files
  INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1241,7 +1243,7 @@ libainstall:	all python-config
+@@ -1252,7 +1254,7 @@ libainstall:	@DEF_MAKE_RULE@ python-config
  	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
  	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
  	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -67,7 +69,7 @@ index 33b994d..beb0837 100644
  	@if [ -s Modules/python.exp -a \
  		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
  		echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1426,6 +1428,7 @@ clobber: clean profile-removal
+@@ -1434,6 +1436,7 @@ clobber: clean profile-removal
  		config.cache config.log pyconfig.h Modules/config.c
  	-rm -rf build platform
  	-rm -rf $(PYTHONFRAMEWORKDIR)
@@ -77,7 +79,7 @@ index 33b994d..beb0837 100644
  # remove all generated files, even Makefile[.pre]
 diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
 new file mode 100644
-index 0000000..10db4c1
+index 0000000000..10db4c12eb
 --- /dev/null
 +++ b/Misc/python-config.sh.in
 @@ -0,0 +1,102 @@
@@ -184,10 +186,10 @@ index 0000000..10db4c1
 +esac
 +done
 diff --git a/configure.ac b/configure.ac
-index 5d4232f..183a903 100644
+index 13f90b3ddd..3f28ef1371 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -905,6 +905,7 @@ fi
+@@ -919,6 +919,7 @@ fi
  
  # Other platforms follow
  if test $enable_shared = "yes"; then
@@ -195,7 +197,7 @@ index 5d4232f..183a903 100644
    AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
    case $ac_sys_system in
      BeOS*)
-@@ -965,6 +966,7 @@ if test $enable_shared = "yes"; then
+@@ -979,6 +980,7 @@ if test $enable_shared = "yes"; then
  
    esac
  else # shared is disabled
@@ -203,7 +205,7 @@ index 5d4232f..183a903 100644
    case $ac_sys_system in
      CYGWIN*)
            BLDLIBRARY='$(LIBRARY)'
-@@ -2096,6 +2098,9 @@ AC_SUBST(LDCXXSHARED)
+@@ -2128,6 +2130,9 @@ AC_SUBST(LDCXXSHARED)
  AC_SUBST(BLDSHARED)
  AC_SUBST(CCSHARED)
  AC_SUBST(LINKFORSHARED)
@@ -213,7 +215,7 @@ index 5d4232f..183a903 100644
  # SO is the extension of shared libraries `(including the dot!)
  # -- usually .so, .sl on HP-UX, .dll on Cygwin
  AC_MSG_CHECKING(SO)
-@@ -4818,7 +4823,7 @@ AC_MSG_RESULT($ENSUREPIP)
+@@ -4944,7 +4949,7 @@ AC_MSG_RESULT($ENSUREPIP)
  AC_SUBST(ENSUREPIP)
  
  # generate output files
@@ -223,5 +225,5 @@ index 5d4232f..183a903 100644
  AC_OUTPUT
  
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch b/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
index 864ccbfb7..4a2116b1b 100644
--- a/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
+++ b/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
@@ -1,4 +1,4 @@
-From bddfcbb8a4c011ca2fe471f7a4124cd64b5b0f00 Mon Sep 17 00:00:00 2001
+From 706d62599fb3c3cb9b9941364aaf4a1ef4ebd276 Mon Sep 17 00:00:00 2001
 From: Samuel Martin 
 Date: Tue, 7 Mar 2017 22:23:58 +0100
 Subject: [PATCH] Remove the python symlink install rules
@@ -10,15 +10,17 @@ or python3) the python symlink points to.
 Signed-off-by: Samuel Martin 
 [Bernd: rebased against version 2.7.12.]
 Signed-off-by: Bernd Kuhls 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in | 7 -------
  1 file changed, 7 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index beb0837..dedcf61 100644
+index 727a92af42..37b2ff3a5f 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -968,17 +968,10 @@ bininstall:	altbininstall
+@@ -978,17 +978,10 @@ bininstall:	altbininstall
  		echo "Creating directory $(LIBPC)"; \
  		$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
  	fi
@@ -37,5 +39,5 @@ index beb0837..dedcf61 100644
  	-rm -f $(DESTDIR)$(LIBPC)/python2.pc
  	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch b/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
index 2e1a054f3..600fc40b6 100644
--- a/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
+++ b/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
@@ -1,4 +1,4 @@
-From 0eac7789c0dd4aebe9e69d3c73d0c95e96922ea3 Mon Sep 17 00:00:00 2001
+From 2c1810fb002128a6d33cc3a391a157e316479d15 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:27:16 +0100
 Subject: [PATCH] Add an option to disable installation of test modules
@@ -10,16 +10,18 @@ Signed-off-by: Thomas Petazzoni 
 Signed-off-by: Samuel Martin 
 [Bernd: rebased against version 2.7.14]
 Signed-off-by: Bernd Kuhls 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
- Makefile.pre.in | 48 ++++++++++++++++++++++++++++++++----------------
+ Makefile.pre.in | 50 +++++++++++++++++++++++++++++++++-----------------
  configure.ac    |  6 ++++++
- 2 files changed, 38 insertions(+), 16 deletions(-)
+ 2 files changed, 39 insertions(+), 17 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index dedcf61..280cc4e 100644
+index 37b2ff3a5f..2a5e8adc61 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1032,28 +1032,44 @@
+@@ -1048,28 +1048,44 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
  	plat-mac/lib-scriptpackages/SystemEvents \
  	plat-mac/lib-scriptpackages/Terminal
  PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -82,10 +84,10 @@ index dedcf61..280cc4e 100644
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 diff --git a/configure.ac b/configure.ac
-index 183a903..a1a35f6 100644
+index 3f28ef1371..f257a25620 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2806,6 +2806,12 @@ if test "$posix_threads" = "yes"; then
+@@ -2835,6 +2835,12 @@ if test "$posix_threads" = "yes"; then
  fi
  
  
@@ -99,5 +101,5 @@ index 183a903..a1a35f6 100644
  AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
  AC_MSG_CHECKING([if --enable-ipv6 is specified])
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch b/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
index 18582f189..48c1b570d 100644
--- a/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
+++ b/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
@@ -1,4 +1,4 @@
-From 52463745b6c46a46a6f2e2bc17983bb3f7bdac6e Mon Sep 17 00:00:00 2001
+From f98c3f981643411449aba6f93178b2ca14f9a68c Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:27:34 +0100
 Subject: [PATCH] Add an option to disable pydoc
@@ -8,6 +8,8 @@ itself.
 
 Signed-off-by: Thomas Petazzoni 
 Signed-off-by: Samuel Martin 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in |  6 +++++-
  configure.ac    |  5 +++++
@@ -15,10 +17,10 @@ Signed-off-by: Samuel Martin 
  3 files changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 280cc4e..84d5fc6 100644
+index 2a5e8adc61..d3ba1aeb4e 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1052,7 +1052,7 @@ LIBSUBDIRS=	lib-tk site-packages \
+@@ -1062,7 +1062,7 @@ LIBSUBDIRS=	lib-tk site-packages \
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		lib-old \
@@ -27,7 +29,7 @@ index 280cc4e..84d5fc6 100644
  
  TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
  	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-@@ -1075,6 +1075,10 @@ ifeq (@TEST_MODULES@,yes)
+@@ -1086,6 +1086,10 @@ ifeq (@TEST_MODULES@,yes)
  LIBSUBDIRS += $(TESTSUBDIRS)
  endif
  
@@ -39,10 +41,10 @@ index 280cc4e..84d5fc6 100644
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 diff --git a/configure.ac b/configure.ac
-index a1a35f6..8bab160 100644
+index f257a25620..2ed4119478 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2805,6 +2805,11 @@ if test "$posix_threads" = "yes"; then
+@@ -2834,6 +2834,11 @@ if test "$posix_threads" = "yes"; then
        AC_CHECK_FUNCS(pthread_atfork)
  fi
  
@@ -55,10 +57,10 @@ index a1a35f6..8bab160 100644
  AC_SUBST(TEST_MODULES)
  
 diff --git a/setup.py b/setup.py
-index 9a5c2b8..69771e2 100644
+index 2ef5b07189..49f810f72e 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2233,6 +2233,12 @@ def main():
+@@ -2277,6 +2277,12 @@ def main():
      # turn off warnings when deprecated modules are imported
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -71,7 +73,7 @@ index 9a5c2b8..69771e2 100644
      setup(# PyPI Metadata (PEP 301)
            name = "Python",
            version = sys.version.split()[0],
-@@ -2253,9 +2259,7 @@ def main():
+@@ -2297,9 +2303,7 @@ def main():
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
@@ -83,5 +85,5 @@ index 9a5c2b8..69771e2 100644
  
  # --install-platlib
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch b/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
index 765b05d97..2c539fac3 100644
--- a/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
+++ b/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
@@ -1,4 +1,4 @@
-From d0cf9ebed6d34d820cf594578cf513797fb52772 Mon Sep 17 00:00:00 2001
+From d7f419246681e12f05e2eefc79286959c6aa18ab Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:27:49 +0100
 Subject: [PATCH] Add an option to disable lib2to3
@@ -8,6 +8,8 @@ such, it is probably not very useful on embedded system targets.
 
 Signed-off-by: Thomas Petazzoni 
 Signed-off-by: Samuel Martin 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in | 11 ++++++++---
  configure.ac    |  6 ++++++
@@ -15,10 +17,10 @@ Signed-off-by: Samuel Martin 
  3 files changed, 17 insertions(+), 5 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 84d5fc6..b2a0490 100644
+index d3ba1aeb4e..0e15b6d6f4 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1045,7 +1045,6 @@ LIBSUBDIRS=	lib-tk site-packages \
+@@ -1055,7 +1055,6 @@ LIBSUBDIRS=	lib-tk site-packages \
  		json \
  		sqlite3  \
  		logging bsddb csv importlib wsgiref \
@@ -26,7 +28,7 @@ index 84d5fc6..b2a0490 100644
  		ctypes ctypes/macholib \
  		idlelib idlelib/Icons \
  		distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1064,8 +1063,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
+@@ -1075,8 +1074,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
  	json/tests \
  	sqlite3/test \
  	bsddb/test \
@@ -35,7 +37,7 @@ index 84d5fc6..b2a0490 100644
  	ctypes/test \
  	idlelib/idle_test \
  	distutils/tests \
-@@ -1079,6 +1076,14 @@ ifeq (@PYDOC@,yes)
+@@ -1090,6 +1087,14 @@ ifeq (@PYDOC@,yes)
  LIBSUBDIRS += pydoc_data
  endif
  
@@ -51,10 +53,10 @@ index 84d5fc6..b2a0490 100644
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 diff --git a/configure.ac b/configure.ac
-index 8bab160..270f337 100644
+index 2ed4119478..a2810ab8ed 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2817,6 +2817,12 @@ AC_ARG_ENABLE(test-modules,
+@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(test-modules,
  	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
  	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
  
@@ -68,10 +70,10 @@ index 8bab160..270f337 100644
  AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
  AC_MSG_CHECKING([if --enable-ipv6 is specified])
 diff --git a/setup.py b/setup.py
-index 69771e2..f51ef8c 100644
+index 49f810f72e..9130819454 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2234,10 +2234,11 @@ def main():
+@@ -2278,10 +2278,11 @@ def main():
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
  
@@ -86,5 +88,5 @@ index 69771e2..f51ef8c 100644
      setup(# PyPI Metadata (PEP 301)
            name = "Python",
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch b/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
index bffe3faab..433bb2973 100644
--- a/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
+++ b/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
@@ -1,20 +1,22 @@
-From 570e1e81484d9bcbd30a7719b07d02785a5cab24 Mon Sep 17 00:00:00 2001
+From 123ecc50932e3ad3f7a2d90d430b74822c9695d4 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:28:06 +0100
 Subject: [PATCH] Add option to disable the sqlite3 module
 
 Signed-off-by: Thomas Petazzoni 
 Signed-off-by: Samuel Martin 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in | 7 +++++--
  configure.ac    | 9 +++++++++
  2 files changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index b2a0490..974a052 100644
+index 0e15b6d6f4..a2e5ac6d41 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1043,7 +1043,6 @@ LIBSUBDIRS=	lib-tk site-packages \
+@@ -1053,7 +1053,6 @@ LIBSUBDIRS=	lib-tk site-packages \
  		email email/mime \
  		ensurepip ensurepip/_bundled \
  		json \
@@ -22,7 +24,7 @@ index b2a0490..974a052 100644
  		logging bsddb csv importlib wsgiref \
  		ctypes ctypes/macholib \
  		idlelib idlelib/Icons \
-@@ -1061,7 +1060,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
+@@ -1072,7 +1071,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
  	test/tracedmodules \
  	email/test email/test/data \
  	json/tests \
@@ -30,7 +32,7 @@ index b2a0490..974a052 100644
  	bsddb/test \
  	ctypes/test \
  	idlelib/idle_test \
-@@ -1084,6 +1082,11 @@ TESTSUBDIRS += 	lib2to3/tests				\
+@@ -1095,6 +1093,11 @@ TESTSUBDIRS += 	lib2to3/tests				\
  		lib2to3/tests/data/fixers/myfixes
  endif
  
@@ -43,10 +45,10 @@ index b2a0490..974a052 100644
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 diff --git a/configure.ac b/configure.ac
-index 270f337..e9e1897 100644
+index a2810ab8ed..4ee3c60501 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2805,6 +2805,15 @@ if test "$posix_threads" = "yes"; then
+@@ -2834,6 +2834,15 @@ if test "$posix_threads" = "yes"; then
        AC_CHECK_FUNCS(pthread_atfork)
  fi
  
@@ -63,5 +65,5 @@ index 270f337..e9e1897 100644
  
  AC_ARG_ENABLE(pydoc,
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch b/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
index 82df405e4..26ae1799f 100644
--- a/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
+++ b/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
@@ -1,20 +1,22 @@
-From 05fbe2527b6f87edeef11f288c36bcbaa378ca02 Mon Sep 17 00:00:00 2001
+From f0dc1198360c6875ed846a961e85dc41e239aa29 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:28:57 +0100
 Subject: [PATCH] Add an option to disable the tk module
 
 Signed-off-by: Thomas Petazzoni 
 Signed-off-by: Samuel Martin 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in | 11 ++++++++---
  configure.ac    |  9 +++++++++
  2 files changed, 17 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 974a052..f7f025f 100644
+index a2e5ac6d41..37ed70ab1d 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1038,7 +1038,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
+@@ -1048,7 +1048,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
  	plat-mac/lib-scriptpackages/SystemEvents \
  	plat-mac/lib-scriptpackages/Terminal
  PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -23,7 +25,7 @@ index 974a052..f7f025f 100644
  		encodings compiler hotshot \
  		email email/mime \
  		ensurepip ensurepip/_bundled \
-@@ -1052,8 +1052,7 @@ LIBSUBDIRS=	lib-tk site-packages \
+@@ -1062,8 +1062,7 @@ LIBSUBDIRS=	lib-tk site-packages \
  		lib-old \
  		curses $(MACHDEPS)
  
@@ -33,7 +35,7 @@ index 974a052..f7f025f 100644
  	test/cjkencodings test/decimaltestdata test/xmltestdata \
  	test/imghdrdata \
  	test/subprocessdata \
-@@ -1087,6 +1086,12 @@ LIBSUBDIRS += sqlite3
+@@ -1098,6 +1097,12 @@ LIBSUBDIRS += sqlite3
  TESTSUBDIRS += sqlite3/test
  endif
  
@@ -47,10 +49,10 @@ index 974a052..f7f025f 100644
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 diff --git a/configure.ac b/configure.ac
-index e9e1897..d0f032c 100644
+index 4ee3c60501..2c20f826c5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2814,6 +2814,15 @@ if test "$SQLITE3" = "no" ; then
+@@ -2843,6 +2843,15 @@ if test "$SQLITE3" = "no" ; then
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
  fi
  
@@ -67,5 +69,5 @@ index e9e1897..d0f032c 100644
  
  AC_ARG_ENABLE(pydoc,
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch b/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
index c36942ad6..3b1ab7fb4 100644
--- a/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
+++ b/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
@@ -1,20 +1,22 @@
-From dba12f15baad06cc7e17a275201cc022bb6c84f7 Mon Sep 17 00:00:00 2001
+From 3e51eef24c51b986c37b354f3de98218eb76909c Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:29:06 +0100
 Subject: [PATCH] Add an option to disable the curses module
 
 Signed-off-by: Thomas Petazzoni 
 Signed-off-by: Samuel Martin 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in | 6 +++++-
  configure.ac    | 9 +++++++++
  2 files changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index f7f025f..bd537d9 100644
+index 37ed70ab1d..458f4ad55b 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1050,7 +1050,7 @@ LIBSUBDIRS=	site-packages \
+@@ -1060,7 +1060,7 @@ LIBSUBDIRS=	site-packages \
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		lib-old \
@@ -23,7 +25,7 @@ index f7f025f..bd537d9 100644
  
  TESTSUBDIRS = test test/audiodata test/capath test/data \
  	test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1092,6 +1092,10 @@ TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter	\
+@@ -1103,6 +1103,10 @@ TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter	\
  	      lib-tk/test/test_ttk
  endif
  
@@ -35,10 +37,10 @@ index f7f025f..bd537d9 100644
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 diff --git a/configure.ac b/configure.ac
-index d0f032c..ab081bc 100644
+index 2c20f826c5..a7ebcd091e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2823,6 +2823,15 @@ if test "$TK" = "no"; then
+@@ -2852,6 +2852,15 @@ if test "$TK" = "no"; then
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
  fi
  
@@ -55,5 +57,5 @@ index d0f032c..ab081bc 100644
  
  AC_ARG_ENABLE(pydoc,
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch b/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
index 8253f112f..2ebe7eabd 100644
--- a/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
+++ b/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
@@ -1,4 +1,4 @@
-From 5f0f30bf342cd2b13f98513c39fd8f17351b1a2f Mon Sep 17 00:00:00 2001
+From 548413a659cc5320560d6b794fe8edd06dd1d22e Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:29:20 +0100
 Subject: [PATCH] Add an option to disable expat
@@ -11,6 +11,8 @@ installation of XML modules).
 
 Signed-off-by: Thomas Petazzoni 
 Signed-off-by: Samuel Martin 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in |  6 +++++-
  configure.ac    | 18 +++++++++++++-----
@@ -18,10 +20,10 @@ Signed-off-by: Samuel Martin 
  3 files changed, 19 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index bd537d9..e5d0dd7 100644
+index 458f4ad55b..8dee345539 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1046,7 +1046,7 @@ LIBSUBDIRS=	site-packages \
+@@ -1056,7 +1056,7 @@ LIBSUBDIRS=	site-packages \
  		logging bsddb csv importlib wsgiref \
  		ctypes ctypes/macholib \
  		idlelib idlelib/Icons \
@@ -30,7 +32,7 @@ index bd537d9..e5d0dd7 100644
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		lib-old \
-@@ -1096,6 +1096,10 @@ ifeq (@CURSES@,yes)
+@@ -1107,6 +1107,10 @@ ifeq (@CURSES@,yes)
  LIBSUBDIRS += curses
  endif
  
@@ -42,10 +44,10 @@ index bd537d9..e5d0dd7 100644
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 diff --git a/configure.ac b/configure.ac
-index ab081bc..63ee545 100644
+index a7ebcd091e..2f5759a890 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2470,13 +2470,21 @@ PKG_PROG_PKG_CONFIG
+@@ -2499,13 +2499,21 @@ PKG_PROG_PKG_CONFIG
  AC_SUBST(DISABLED_EXTENSIONS)
  
  # Check for use of the system expat library
@@ -73,10 +75,10 @@ index ab081bc..63ee545 100644
  # Check for use of the system libffi library
  AC_MSG_CHECKING(for --with-system-ffi)
 diff --git a/setup.py b/setup.py
-index f51ef8c..c68f6b4 100644
+index 9130819454..f439cbadc2 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1483,7 +1483,7 @@ class PyBuildExt(build_ext):
+@@ -1475,7 +1475,7 @@ class PyBuildExt(build_ext):
          #
          # More information on Expat can be found at www.libexpat.org.
          #
@@ -86,5 +88,5 @@ index f51ef8c..c68f6b4 100644
              define_macros = []
              expat_lib = ['expat']
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch b/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
index e2c2d98b3..3ee77fec3 100644
--- a/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
+++ b/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
@@ -1,18 +1,20 @@
-From cb848dae763a3f57e31d734d3be6889f660fa0d0 Mon Sep 17 00:00:00 2001
+From 6761066addfb6028e183d7fe4322b283af18117f Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:29:31 +0100
 Subject: [PATCH] Add an option to disable CJK codecs
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 63ee545..6a854ab 100644
+index 2f5759a890..862c8ae516 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2822,6 +2822,12 @@ if test "$SQLITE3" = "no" ; then
+@@ -2851,6 +2851,12 @@ if test "$SQLITE3" = "no" ; then
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
  fi
  
@@ -26,5 +28,5 @@ index 63ee545..6a854ab 100644
  AC_ARG_ENABLE(tk,
  	AS_HELP_STRING([--disable-tk], [disable tk]),
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch b/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
index 877dfd965..bad4ba68d 100644
--- a/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
+++ b/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
@@ -1,4 +1,4 @@
-From 133776d396b8eaf0243484dc990a53576de9685f Mon Sep 17 00:00:00 2001
+From ecd8e926bd364d866f492df87d7c46d029445480 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:29:41 +0100
 Subject: [PATCH] Add an option to disable NIS
@@ -7,15 +7,17 @@ NIS is not necessarily available in uClibc, so we need an option to
 not compile support for it.
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 6a854ab..4c2cbc1 100644
+index 862c8ae516..354212fb16 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2828,6 +2828,12 @@ AC_ARG_ENABLE(codecs-cjk,
+@@ -2857,6 +2857,12 @@ AC_ARG_ENABLE(codecs-cjk,
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
    	  fi])
  
@@ -29,5 +31,5 @@ index 6a854ab..4c2cbc1 100644
  AC_ARG_ENABLE(tk,
  	AS_HELP_STRING([--disable-tk], [disable tk]),
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch b/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
index a1255e568..687ea5027 100644
--- a/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
+++ b/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
@@ -1,18 +1,20 @@
-From aa78e3684c0e8f7a5e910e838f9eca2631262048 Mon Sep 17 00:00:00 2001
+From dc99b7a0331fe75d70ccb87dc0877ac5bbba51ca Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:29:52 +0100
 Subject: [PATCH] Add an option to disable unicodedata
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 4c2cbc1..09cb3de 100644
+index 354212fb16..4e430d82b8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2834,6 +2834,12 @@ AC_ARG_ENABLE(nis,
+@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis,
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
@@ -26,5 +28,5 @@ index 4c2cbc1..09cb3de 100644
  AC_ARG_ENABLE(tk,
  	AS_HELP_STRING([--disable-tk], [disable tk]),
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch b/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
index e3ccd4498..f216e8bb5 100644
--- a/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
+++ b/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
@@ -1,4 +1,4 @@
-From cfad2bcae8f572a9422ce5a6adb4caa7c0e521ad Mon Sep 17 00:00:00 2001
+From a4bbbf0c5f1f68298d5f4e2c2cd80de7e758763c Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:30:06 +0100
 Subject: [PATCH] Add an option to disable bsddb
@@ -9,16 +9,18 @@ the build/installation of this Python module.
 
 Signed-off-by: Thomas Petazzoni 
 Signed-off-by: Samuel Martin 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in |  8 ++++++--
  configure.ac    | 22 ++++++++++++++++++++++
  2 files changed, 28 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index e5d0dd7..2582574 100644
+index 8dee345539..a0473096c1 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1043,7 +1043,7 @@ LIBSUBDIRS=	site-packages \
+@@ -1053,7 +1053,7 @@ LIBSUBDIRS=	site-packages \
  		email email/mime \
  		ensurepip ensurepip/_bundled \
  		json \
@@ -27,7 +29,7 @@ index e5d0dd7..2582574 100644
  		ctypes ctypes/macholib \
  		idlelib idlelib/Icons \
  		distutils distutils/command \
-@@ -1059,7 +1059,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
+@@ -1070,7 +1070,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
  	test/tracedmodules \
  	email/test email/test/data \
  	json/tests \
@@ -35,7 +37,7 @@ index e5d0dd7..2582574 100644
  	ctypes/test \
  	idlelib/idle_test \
  	distutils/tests \
-@@ -1100,6 +1099,11 @@ ifeq (@EXPAT@,yes)
+@@ -1111,6 +1110,11 @@ ifeq (@EXPAT@,yes)
  LIBSUBDIRS += $(XMLLIBSUBDIRS)
  endif
  
@@ -48,10 +50,10 @@ index e5d0dd7..2582574 100644
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 diff --git a/configure.ac b/configure.ac
-index 09cb3de..524614c 100644
+index 4e430d82b8..361e8c120e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2834,6 +2834,28 @@ AC_ARG_ENABLE(nis,
+@@ -2863,6 +2863,28 @@ AC_ARG_ENABLE(nis,
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
@@ -81,5 +83,5 @@ index 09cb3de..524614c 100644
  	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
  	[ if test "$enableval" = "no"; then
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch b/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
index 5f2fb87b1..d62408e4e 100644
--- a/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
+++ b/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
@@ -1,18 +1,20 @@
-From fc16ab40e3e6a5b4deed2fa7c5475fa216ff8d17 Mon Sep 17 00:00:00 2001
+From a0e56b96c3bfb04a5c8ecc0987cdd294d8ce116b Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:30:22 +0100
 Subject: [PATCH] Add an option to disable the ssl module
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 524614c..cadac82 100644
+index 361e8c120e..8fe47d8c37 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2834,6 +2834,12 @@ AC_ARG_ENABLE(nis,
+@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis,
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
@@ -26,5 +28,5 @@ index 524614c..cadac82 100644
  	AS_HELP_STRING([--disable-dbm], [disable DBM]),
  	[ if test "$enableval" = "no"; then
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch b/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
index da914b478..5b89e8ef8 100644
--- a/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
+++ b/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
@@ -1,19 +1,21 @@
-From 6b10788fa040442ace100c3a28cbfff29c9db471 Mon Sep 17 00:00:00 2001
+From d1236c6f4d8d893709fa36f751af47b8ad9055c1 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:30:33 +0100
 Subject: [PATCH] Add an option to disable the bz2 module
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 743707a..f1762e9 100644
+index 8fe47d8c37..85df7b1478 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2840,6 +2840,12 @@ AC_ARG_ENABLE(ssl,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
+@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
    	  fi])
  
 +AC_ARG_ENABLE(bz2,
@@ -26,5 +28,5 @@ index 743707a..f1762e9 100644
  	AS_HELP_STRING([--disable-dbm], [disable DBM]),
  	[ if test "$enableval" = "no"; then
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch b/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
index b4354e27d..95da586e4 100644
--- a/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
+++ b/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
@@ -1,18 +1,20 @@
-From af2c56aa0a5900272cc2d04ce667d4b38e34b596 Mon Sep 17 00:00:00 2001
+From a9c7314e069036f74b503dfaef261e5f45477b7e Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:30:45 +0100
 Subject: [PATCH] Add an option to disable the zlib module
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index f1762e9..291ba35 100644
+index 85df7b1478..3848b16b9f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(bz2,
+@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(bz2,
              DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
           fi])
  
@@ -26,5 +28,5 @@ index f1762e9..291ba35 100644
  	AS_HELP_STRING([--disable-dbm], [disable DBM]),
  	[ if test "$enableval" = "no"; then
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch b/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
index 60e64c885..e101e6a12 100644
--- a/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
+++ b/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
@@ -1,4 +1,4 @@
-From 4b7c45c756dccfd3b5ece36fe572042353d1c2f0 Mon Sep 17 00:00:00 2001
+From e789487c783f75c17a8951bd5324c86ceefde407 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:30:56 +0100
 Subject: [PATCH] Do not install the idle editor
@@ -10,16 +10,18 @@ idle and the related Python modules. It saves 800 KB-900 KB of
 installed .pyc files.
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  Makefile.pre.in | 2 --
  setup.py        | 2 +-
  2 files changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 2582574..3cfc590 100644
+index a0473096c1..750057fb96 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1045,7 +1045,6 @@ LIBSUBDIRS=	site-packages \
+@@ -1055,7 +1055,6 @@ LIBSUBDIRS=	site-packages \
  		json \
  		logging csv importlib wsgiref \
  		ctypes ctypes/macholib \
@@ -27,7 +29,7 @@ index 2582574..3cfc590 100644
  		distutils distutils/command \
  		multiprocessing multiprocessing/dummy \
  		unittest \
-@@ -1060,7 +1059,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
+@@ -1071,7 +1070,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
  	email/test email/test/data \
  	json/tests \
  	ctypes/test \
@@ -36,10 +38,10 @@ index 2582574..3cfc590 100644
  	unittest/test
  
 diff --git a/setup.py b/setup.py
-index c68f6b4..8045a9b 100644
+index f439cbadc2..227187681e 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2234,7 +2234,7 @@ def main():
+@@ -2278,7 +2278,7 @@ def main():
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
  
@@ -49,5 +51,5 @@ index c68f6b4..8045a9b 100644
          scripts += [ 'Tools/scripts/pydoc' ]
      if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch b/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
index c2aea5ede..9768faf67 100644
--- a/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
+++ b/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
@@ -1,18 +1,20 @@
-From 6af0f179d3db956146bbabac8748675e3abc1f78 Mon Sep 17 00:00:00 2001
+From 4ab280b8a7626de2565cf4ef6cf08a5c7326574b Mon Sep 17 00:00:00 2001
 From: Zoltan Gyarmati 
 Date: Tue, 7 Mar 2017 22:31:22 +0100
 Subject: [PATCH] Add an option to disable the ossaudiodev module
 
 Signed-off-by: Zoltan Gyarmati 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 291ba35..8dc573e 100644
+index 3848b16b9f..6d19cdee95 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2898,6 +2898,12 @@ if test "$CURSES" = "no"; then
+@@ -2927,6 +2927,12 @@ if test "$CURSES" = "no"; then
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
  fi
  
@@ -26,5 +28,5 @@ index 291ba35..8dc573e 100644
  
  AC_ARG_ENABLE(pydoc,
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch b/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
index bb3ccfa76..82ef3a13f 100644
--- a/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
+++ b/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
@@ -1,19 +1,21 @@
-From f11dc326ae216911a67bd563b619f39522c14bf2 Mon Sep 17 00:00:00 2001
+From 479bef8182c4f6b678a86820ccc06760ca60c286 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:33:02 +0100
 Subject: [PATCH] Add option to disable the hashlib module
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 8dc573e..854724d 100644
+index 6d19cdee95..ddccc79c2c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2840,6 +2840,12 @@ AC_ARG_ENABLE(ssl,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
+@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
    	  fi])
  
 +AC_ARG_ENABLE(hashlib,
@@ -26,5 +28,5 @@ index 8dc573e..854724d 100644
         AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
         [ if test "$enableval" = "no"; then
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch b/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
index ade729fb3..02b131517 100644
--- a/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
+++ b/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
@@ -1,18 +1,20 @@
-From 6b461f698bd33b3493207baf79f4ee02286be8e8 Mon Sep 17 00:00:00 2001
+From abea92958b073dfbf0c78bcb31ce9cfc709c20ca Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni 
 Date: Tue, 7 Mar 2017 22:33:55 +0100
 Subject: [PATCH] Add an option to disable readline module
 
 Signed-off-by: Thomas Petazzoni 
+[Peter: update for 2.7.16]
+Signed-off-by: Peter Korsgaard 
 ---
  configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 854724d..0a06497 100644
+index ddccc79c2c..dae266326e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(hashlib,
+@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(hashlib,
  	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
  	  fi])
  
@@ -26,5 +28,5 @@ index 854724d..0a06497 100644
         AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
         [ if test "$enableval" = "no"; then
 -- 
-2.7.4
+2.11.0
 
diff --git a/buildroot/package/python/python.hash b/buildroot/package/python/python.hash
index feadcfdcb..52b9984b0 100644
--- a/buildroot/package/python/python.hash
+++ b/buildroot/package/python/python.hash
@@ -1,5 +1,5 @@
-# From https://www.python.org/downloads/release/python-2715/
-md5 a80ae3cc478460b922242f43a1b4094d Python-2.7.15.tar.xz
+# From https://www.python.org/downloads/release/python-2716/
+md5 30157d85a2c0479c09ea2cbe61f2aaf5 Python-2.7.16.tar.xz
 # Locally calculated
-sha256 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574  Python-2.7.15.tar.xz
-sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2  LICENSE
+sha256 f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7  Python-2.7.16.tar.xz
+sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c  LICENSE
diff --git a/buildroot/package/python/python.mk b/buildroot/package/python/python.mk
index 79df3c462..d1e70a015 100644
--- a/buildroot/package/python/python.mk
+++ b/buildroot/package/python/python.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).15
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).16
 PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
 PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION)
 PYTHON_LICENSE = Python-2.0, others
diff --git a/buildroot/package/python3-setuptools/0001-add-executable.patch b/buildroot/package/python3-setuptools/0001-add-executable.patch
new file mode 120000
index 000000000..5bab3d96a
--- /dev/null
+++ b/buildroot/package/python3-setuptools/0001-add-executable.patch
@@ -0,0 +1 @@
+../python-setuptools/0001-add-executable.patch
\ No newline at end of file
diff --git a/buildroot/package/python3-setuptools/python3-setuptools.hash b/buildroot/package/python3-setuptools/python3-setuptools.hash
new file mode 120000
index 000000000..a3af7f0fb
--- /dev/null
+++ b/buildroot/package/python3-setuptools/python3-setuptools.hash
@@ -0,0 +1 @@
+../python-setuptools/python-setuptools.hash
\ No newline at end of file
diff --git a/buildroot/package/python3-setuptools/python3-setuptools.mk b/buildroot/package/python3-setuptools/python3-setuptools.mk
new file mode 100644
index 000000000..b6de5d4b2
--- /dev/null
+++ b/buildroot/package/python3-setuptools/python3-setuptools.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# python3-setuptools
+#
+################################################################################
+
+# Please keep in sync with
+# package/python-setuptools/python-setuptools.mk
+PYTHON3_SETUPTOOLS_VERSION = 40.6.3
+PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).zip
+PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/37/1b/b25507861991beeade31473868463dad0e58b1978c209de27384ae541b0b
+PYTHON3_SETUPTOOLS_LICENSE = MIT
+PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE
+PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools
+HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools
+HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3
+
+define HOST_PYTHON3_SETUPTOOLS_EXTRACT_CMDS
+	$(UNZIP) -d $(@D) $(HOST_PYTHON3_SETUPTOOLS_DL_DIR)/$(PYTHON3_SETUPTOOLS_SOURCE)
+	mv $(@D)/setuptools-$(PYTHON3_SETUPTOOLS_VERSION)/* $(@D)
+	$(RM) -r $(@D)/setuptools-$(PYTHON3_SETUPTOOLS_VERSION)
+endef
+
+$(eval $(host-python-package))
diff --git a/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
index 406f873aa..f6fa3d755 100644
--- a/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
+++ b/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
@@ -18,7 +18,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 82e830727e..b38bd79121 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1385,6 +1385,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+@@ -1393,6 +1393,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
  		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
  			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
  	fi
@@ -26,7 +26,7 @@ index 82e830727e..b38bd79121 100644
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
  		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
  		-d $(LIBDEST) -f \
-@@ -1412,6 +1413,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+@@ -1420,6 +1421,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
  		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
  		-d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
diff --git a/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
index 537e23cbf..36b5af033 100644
--- a/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
+++ b/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
@@ -13,7 +13,7 @@ diff --git a/configure.ac b/configure.ac
 index a76b5444df..5f87c4db5a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3985,7 +3985,7 @@ fi
+@@ -4056,7 +4056,7 @@ fi
  
  AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
  
diff --git a/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
index 6e07b292e..647f3251d 100644
--- a/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
+++ b/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
@@ -47,7 +47,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index b38bd79121..4ce917ab8d 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -196,6 +196,8 @@ FILEMODE=	644
+@@ -204,6 +204,8 @@ FILEMODE=	644
  # configure script arguments
  CONFIG_ARGS=	@CONFIG_ARGS@
  
@@ -56,7 +56,7 @@ index b38bd79121..4ce917ab8d 100644
  
  # Subdirectories with code
  SRCDIRS= 	@SRCDIRS@
-@@ -609,6 +611,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -617,6 +619,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
  	esac; \
  	echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
  		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -64,7 +64,7 @@ index b38bd79121..4ce917ab8d 100644
  		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
  	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
  		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
-@@ -1508,7 +1511,8 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+@@ -1526,7 +1529,8 @@ libainstall:	@DEF_MAKE_RULE@ python-config
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
@@ -78,7 +78,7 @@ diff --git a/configure.ac b/configure.ac
 index 5f87c4db5a..d5ee2aedfb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2902,6 +2902,8 @@ LIBS="$withval $LIBS"
+@@ -2966,6 +2966,8 @@ LIBS="$withval $LIBS"
  
  PKG_PROG_PKG_CONFIG
  
@@ -91,7 +91,7 @@ diff --git a/setup.py b/setup.py
 index fe477974bd..86643ae8bf 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -43,7 +43,11 @@ host_platform = get_platform()
+@@ -48,7 +48,11 @@ host_platform = get_platform()
  COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
  
  # This global variable is used to hold the list of modules to be disabled.
diff --git a/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
index 649ab2058..b3a0e5328 100644
--- a/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
+++ b/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
@@ -24,7 +24,7 @@ diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ex
 index 74de782d8a..d0c847b365 100644
 --- a/Lib/distutils/command/build_ext.py
 +++ b/Lib/distutils/command/build_ext.py
-@@ -233,7 +233,10 @@ class build_ext(Command):
+@@ -234,7 +234,10 @@ class build_ext(Command):
          if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
              if not sysconfig.python_build:
                  # building third party extensions
diff --git a/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
index 1579415be..d8c5b0faf 100644
--- a/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
+++ b/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
@@ -12,7 +12,7 @@ diff --git a/setup.py b/setup.py
 index 86643ae8bf..cd00fbdbda 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -850,12 +850,9 @@ class PyBuildExt(build_ext):
+@@ -855,12 +855,9 @@ class PyBuildExt(build_ext):
                  pass # Issue 7384: Already linked against curses or tinfo.
              elif curses_library:
                  readline_libs.append(curses_library)
diff --git a/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch b/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch
index 71c064ad9..e55640d41 100644
--- a/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch
+++ b/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch
@@ -20,7 +20,7 @@ diff --git a/setup.py b/setup.py
 index cd00fbdbda..c956fa08d1 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -547,10 +547,10 @@ class PyBuildExt(build_ext):
+@@ -552,10 +552,10 @@ class PyBuildExt(build_ext):
          if not cross_compiling:
              add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
              add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
diff --git a/buildroot/package/python3/0007-Abort-on-failed-module-build.patch b/buildroot/package/python3/0007-Abort-on-failed-module-build.patch
index f95889df6..a7071e199 100644
--- a/buildroot/package/python3/0007-Abort-on-failed-module-build.patch
+++ b/buildroot/package/python3/0007-Abort-on-failed-module-build.patch
@@ -17,7 +17,7 @@ diff --git a/setup.py b/setup.py
 index c956fa08d1..b3add2be76 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -358,6 +358,7 @@ class PyBuildExt(build_ext):
+@@ -363,6 +363,7 @@ class PyBuildExt(build_ext):
              print("Failed to build these modules:")
              print_three_column(failed)
              print()
diff --git a/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
index c5b301d43..5c645201e 100644
--- a/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
+++ b/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
@@ -23,7 +23,7 @@ diff --git a/setup.py b/setup.py
 index b3add2be76..29bfd174d2 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -514,7 +514,7 @@ class PyBuildExt(build_ext):
+@@ -519,7 +519,7 @@ class PyBuildExt(build_ext):
          tmpfile = os.path.join(self.build_temp, 'gccpaths')
          if not os.path.exists(self.build_temp):
              os.makedirs(self.build_temp)
diff --git a/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
index 35aa73c36..8180880e1 100644
--- a/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
+++ b/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
@@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 4ce917ab8d..4110fff4ac 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1251,8 +1251,28 @@ maninstall:	altmaninstall
+@@ -1259,8 +1259,28 @@ maninstall:	altmaninstall
  
  # Install the library
  XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
@@ -54,7 +54,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 1ff2362..194dbfc 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1326,26 +1326,24 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+@@ -1334,26 +1334,24 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
  		test/test_importlib/source \
  		test/test_importlib/zipdata01 \
  		test/test_importlib/zipdata02 \
@@ -99,7 +99,7 @@ diff --git a/configure.ac b/configure.ac
 index d5ee2aedfb..f924937fe1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3162,6 +3162,11 @@ if test "$posix_threads" = "yes"; then
+@@ -3226,6 +3226,11 @@ if test "$posix_threads" = "yes"; then
        AC_CHECK_FUNCS(pthread_getcpuclockid)
  fi
  
diff --git a/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch
index 8055009d6..6f6e265c7 100644
--- a/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch
+++ b/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch
@@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 4110fff4ac..badb2af35d 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1221,7 +1221,9 @@ bininstall: altbininstall
+@@ -1229,7 +1229,9 @@ bininstall: altbininstall
  	-rm -f $(DESTDIR)$(BINDIR)/idle3
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
  	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
@@ -30,7 +30,7 @@ index 4110fff4ac..badb2af35d 100644
  	-rm -f $(DESTDIR)$(BINDIR)/2to3
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
  	-rm -f $(DESTDIR)$(BINDIR)/pyvenv
-@@ -1269,7 +1271,7 @@ LIBSUBDIRS=	tkinter site-packages \
+@@ -1277,7 +1279,7 @@ LIBSUBDIRS=	tkinter site-packages \
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		venv venv/scripts venv/scripts/common venv/scripts/posix \
@@ -39,7 +39,7 @@ index 4110fff4ac..badb2af35d 100644
  
  TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
  		tkinter/test/test_ttk test \
-@@ -1344,6 +1346,10 @@ ifeq (@TEST_MODULES@,yes)
+@@ -1352,6 +1354,10 @@ ifeq (@TEST_MODULES@,yes)
  LIBSUBDIRS += $(TESTSUBDIRS)
  endif
  
@@ -54,7 +54,7 @@ diff --git a/configure.ac b/configure.ac
 index f924937fe1..1621fa1611 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3162,6 +3162,12 @@ if test "$posix_threads" = "yes"; then
+@@ -3226,6 +3226,12 @@ if test "$posix_threads" = "yes"; then
        AC_CHECK_FUNCS(pthread_getcpuclockid)
  fi
  
@@ -71,7 +71,7 @@ diff --git a/setup.py b/setup.py
 index 29bfd174d2..94dd337fef 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2332,6 +2332,12 @@ def main():
+@@ -2337,6 +2337,12 @@ def main():
      # turn off warnings when deprecated modules are imported
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -84,7 +84,7 @@ index 29bfd174d2..94dd337fef 100644
      setup(# PyPI Metadata (PEP 301)
            name = "Python",
            version = sys.version.split()[0],
-@@ -2356,8 +2362,7 @@ def main():
+@@ -2361,8 +2367,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in
diff --git a/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
index 3d3c5de3b..d2ce91775 100644
--- a/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
+++ b/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
@@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index badb2af35d..931cc3ed07 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1225,7 +1225,9 @@ ifeq (@PYDOC@,yes)
+@@ -1233,7 +1233,9 @@ ifeq (@PYDOC@,yes)
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
  endif
  	-rm -f $(DESTDIR)$(BINDIR)/2to3
@@ -30,7 +30,7 @@ index badb2af35d..931cc3ed07 100644
  	-rm -f $(DESTDIR)$(BINDIR)/pyvenv
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
  	if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -1262,7 +1264,6 @@ LIBSUBDIRS=	tkinter site-packages \
+@@ -1270,7 +1272,6 @@ LIBSUBDIRS=	tkinter site-packages \
  		html json http dbm xmlrpc \
  		sqlite3 \
  		logging csv wsgiref urllib \
@@ -38,7 +38,7 @@ index badb2af35d..931cc3ed07 100644
  		ctypes ctypes/macholib \
  		idlelib idlelib/Icons \
  		distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1332,9 +1333,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+@@ -1340,9 +1341,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
  		test/test_email test/test_email/data \
  		test/test_json \
  		sqlite3/test \
@@ -48,7 +48,7 @@ index badb2af35d..931cc3ed07 100644
  		ctypes/test \
  		idlelib/idle_test \
  		distutils/tests \
-@@ -1342,6 +1340,14 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+@@ -1350,6 +1348,14 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
  		test/test_tools test/test_warnings test/test_warnings/data \
  		unittest/test unittest/test/testmock
  
@@ -63,7 +63,7 @@ index badb2af35d..931cc3ed07 100644
  ifeq (@TEST_MODULES@,yes)
  LIBSUBDIRS += $(TESTSUBDIRS)
  endif
-@@ -1441,10 +1447,12 @@ ifeq (@PYC_BUILD@,yes)
+@@ -1449,10 +1455,12 @@ ifeq (@PYC_BUILD@,yes)
  		-d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
  endif
@@ -80,7 +80,7 @@ diff --git a/configure.ac b/configure.ac
 index 1621fa1611..13b2edf8b7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3174,6 +3174,12 @@ AC_ARG_ENABLE(test-modules,
+@@ -3238,6 +3238,12 @@ AC_ARG_ENABLE(test-modules,
  	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
  	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
  
@@ -97,7 +97,7 @@ diff --git a/setup.py b/setup.py
 index 94dd337fef..76429e1326 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2333,10 +2333,11 @@ def main():
+@@ -2338,10 +2338,11 @@ def main():
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
  
diff --git a/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
index e5192cc47..134a7ef8b 100644
--- a/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
+++ b/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
@@ -16,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 931cc3ed07..a1ce0712cd 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1262,7 +1262,6 @@ LIBSUBDIRS=	tkinter site-packages \
+@@ -1270,7 +1270,6 @@ LIBSUBDIRS=	tkinter site-packages \
  		email email/mime \
  		ensurepip ensurepip/_bundled \
  		html json http dbm xmlrpc \
@@ -24,7 +24,7 @@ index 931cc3ed07..a1ce0712cd 100644
  		logging csv wsgiref urllib \
  		ctypes ctypes/macholib \
  		idlelib idlelib/Icons \
-@@ -1332,7 +1331,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+@@ -1340,7 +1339,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
  		test/test_asyncio \
  		test/test_email test/test_email/data \
  		test/test_json \
@@ -32,7 +32,7 @@ index 931cc3ed07..a1ce0712cd 100644
  		ctypes/test \
  		idlelib/idle_test \
  		distutils/tests \
-@@ -1348,6 +1346,11 @@ TESTSUBDIRS += lib2to3/tests			\
+@@ -1356,6 +1354,11 @@ TESTSUBDIRS += lib2to3/tests			\
  	lib2to3/tests/data/fixers/myfixes
  endif
  
@@ -48,7 +48,7 @@ diff --git a/configure.ac b/configure.ac
 index 13b2edf8b7..d7582cfea4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3162,6 +3162,15 @@ if test "$posix_threads" = "yes"; then
+@@ -3226,6 +3226,15 @@ if test "$posix_threads" = "yes"; then
        AC_CHECK_FUNCS(pthread_getcpuclockid)
  fi
  
diff --git a/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
index 96918f022..57d45a22f 100644
--- a/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
+++ b/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
@@ -16,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index a1ce0712cd..dc1e917cc3 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1256,7 +1256,7 @@ maninstall:	altmaninstall
+@@ -1264,7 +1264,7 @@ maninstall:	altmaninstall
  # Install the library
  XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
  
@@ -25,7 +25,7 @@ index a1ce0712cd..dc1e917cc3 100644
  		asyncio \
  		collections concurrent concurrent/futures encodings \
  		email email/mime \
-@@ -1273,8 +1273,7 @@ LIBSUBDIRS=	tkinter site-packages \
+@@ -1281,8 +1281,7 @@ LIBSUBDIRS=	tkinter site-packages \
  		venv venv/scripts venv/scripts/common venv/scripts/posix \
  		curses
  
@@ -35,7 +35,7 @@ index a1ce0712cd..dc1e917cc3 100644
  		test/audiodata \
  		test/capath test/data \
  		test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1338,6 +1337,12 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+@@ -1346,6 +1345,12 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
  		test/test_tools test/test_warnings test/test_warnings/data \
  		unittest/test unittest/test/testmock
  
@@ -52,7 +52,7 @@ diff --git a/configure.ac b/configure.ac
 index d7582cfea4..6a56a5b0c1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3171,6 +3171,15 @@ if test "$SQLITE3" = "no" ; then
+@@ -3235,6 +3235,15 @@ if test "$SQLITE3" = "no" ; then
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
  fi
  
diff --git a/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
index 8205d2fe9..767ded5a7 100644
--- a/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
+++ b/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
@@ -16,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index dc1e917cc3..6a6bc082cd 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1270,8 +1270,7 @@ LIBSUBDIRS=	site-packages \
+@@ -1278,8 +1278,7 @@ LIBSUBDIRS=	site-packages \
  		turtledemo \
  		multiprocessing multiprocessing/dummy \
  		unittest \
@@ -26,7 +26,7 @@ index dc1e917cc3..6a6bc082cd 100644
  
  TESTSUBDIRS=	test \
  		test/audiodata \
-@@ -1343,6 +1342,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
+@@ -1351,6 +1350,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
  	tkinter/test/test_ttk
  endif
  
@@ -41,7 +41,7 @@ diff --git a/configure.ac b/configure.ac
 index 6a56a5b0c1..5896b39ff9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3180,6 +3180,15 @@ if test "$TK" = "no"; then
+@@ -3244,6 +3244,15 @@ if test "$TK" = "no"; then
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
  fi
  
diff --git a/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch b/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch
index 6057a7f71..6667eaf61 100644
--- a/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch
+++ b/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch
@@ -23,7 +23,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 6a6bc082cd..dc4b92b6fe 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1265,7 +1265,7 @@ LIBSUBDIRS=	site-packages \
+@@ -1273,7 +1273,7 @@ LIBSUBDIRS=	site-packages \
  		logging csv wsgiref urllib \
  		ctypes ctypes/macholib \
  		idlelib idlelib/Icons \
@@ -32,7 +32,7 @@ index 6a6bc082cd..dc4b92b6fe 100644
  		importlib \
  		turtledemo \
  		multiprocessing multiprocessing/dummy \
-@@ -1346,6 +1346,10 @@ ifeq (@CURSES@,yes)
+@@ -1354,6 +1354,10 @@ ifeq (@CURSES@,yes)
  LIBSUBDIRS += curses
  endif
  
@@ -47,7 +47,7 @@ diff --git a/configure.ac b/configure.ac
 index 5896b39ff9..6f21482207 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2905,13 +2905,21 @@ PKG_PROG_PKG_CONFIG
+@@ -2969,13 +2969,21 @@ PKG_PROG_PKG_CONFIG
  AC_SUBST(DISABLED_EXTENSIONS)
  
  # Check for use of the system expat library
@@ -78,7 +78,7 @@ diff --git a/setup.py b/setup.py
 index 76429e1326..38aa5e605e 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1485,7 +1485,7 @@ class PyBuildExt(build_ext):
+@@ -1490,7 +1490,7 @@ class PyBuildExt(build_ext):
          #
          # More information on Expat can be found at www.libexpat.org.
          #
diff --git a/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
index 096278ca4..ee81e0bcf 100644
--- a/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
+++ b/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
 index 6f21482207..c7742faf41 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3179,6 +3179,12 @@ if test "$SQLITE3" = "no" ; then
+@@ -3243,6 +3243,12 @@ if test "$SQLITE3" = "no" ; then
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
  fi
  
diff --git a/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch b/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch
index ecddd46ec..d38f858be 100644
--- a/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch
+++ b/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch
@@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
 index c7742faf41..42a871bb09 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3185,6 +3185,12 @@ AC_ARG_ENABLE(codecs-cjk,
+@@ -3249,6 +3249,12 @@ AC_ARG_ENABLE(codecs-cjk,
  		DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
  	fi])
  
diff --git a/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
index 8d2469215..17e9861e0 100644
--- a/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
+++ b/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
 index 42a871bb09..1d610e132b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3191,6 +3191,12 @@ AC_ARG_ENABLE(nis,
+@@ -3255,6 +3255,12 @@ AC_ARG_ENABLE(nis,
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
diff --git a/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch
index 068ff2c1f..98607c5e1 100644
--- a/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch
+++ b/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch
@@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index dc4b92b6fe..3e43066d90 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1219,7 +1219,9 @@ bininstall: altbininstall
+@@ -1227,7 +1227,9 @@ bininstall: altbininstall
  	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
  	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
  	-rm -f $(DESTDIR)$(BINDIR)/idle3
@@ -29,7 +29,7 @@ index dc4b92b6fe..3e43066d90 100644
  	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
  ifeq (@PYDOC@,yes)
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
-@@ -1264,7 +1266,6 @@ LIBSUBDIRS=	site-packages \
+@@ -1272,7 +1274,6 @@ LIBSUBDIRS=	site-packages \
  		html json http dbm xmlrpc \
  		logging csv wsgiref urllib \
  		ctypes ctypes/macholib \
@@ -37,7 +37,7 @@ index dc4b92b6fe..3e43066d90 100644
  		distutils distutils/command \
  		importlib \
  		turtledemo \
-@@ -1350,6 +1351,10 @@ ifeq (@EXPAT@,yes)
+@@ -1358,6 +1359,10 @@ ifeq (@EXPAT@,yes)
  LIBSUBDIRS += $(XMLLIBSUBDIRS)
  endif
  
@@ -52,7 +52,7 @@ diff --git a/configure.ac b/configure.ac
 index 1d610e132b..2699e7ceb1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3233,6 +3233,12 @@ AC_ARG_ENABLE(lib2to3,
+@@ -3297,6 +3297,12 @@ AC_ARG_ENABLE(lib2to3,
  	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
  	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
  
@@ -69,7 +69,7 @@ diff --git a/setup.py b/setup.py
 index 38aa5e605e..d642825c1e 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2333,11 +2333,13 @@ def main():
+@@ -2338,11 +2338,13 @@ def main():
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
  
diff --git a/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch b/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch
index 3dcaac968..31ffbc6b3 100644
--- a/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch
+++ b/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch
@@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
 index 2699e7ceb1..e2c3b6f25c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2956,13 +2956,20 @@ fi
+@@ -3020,13 +3020,20 @@ fi
  AC_SUBST(LIBFFI_INCLUDEDIR)
  
  # Check for use of the system libmpdec library
@@ -50,7 +50,7 @@ diff --git a/setup.py b/setup.py
 index d642825c1e..5b98255857 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2010,7 +2010,7 @@ class PyBuildExt(build_ext):
+@@ -2015,7 +2015,7 @@ class PyBuildExt(build_ext):
      def _decimal_ext(self):
          extra_compile_args = []
          undef_macros = []
diff --git a/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
index 83e1e3491..b7b195a15 100644
--- a/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
+++ b/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
 index e2c3b6f25c..8e3dded25e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2971,6 +2971,12 @@ else
+@@ -3035,6 +3035,12 @@ else
  fi
  AC_SUBST(MPDEC)
  
diff --git a/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
index ad4da1ada..2d569e92d 100644
--- a/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
+++ b/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
 index 8e3dded25e..28bcdabd67 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3210,6 +3210,12 @@ AC_ARG_ENABLE(unicodedata,
+@@ -3274,6 +3274,12 @@ AC_ARG_ENABLE(unicodedata,
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
    	  fi])
  
diff --git a/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
index ec399a8d3..1a28dd827 100644
--- a/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
+++ b/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
 index 28bcdabd67..484f6ebaca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3216,6 +3216,12 @@ AC_ARG_ENABLE(openssl,
+@@ -3280,6 +3280,12 @@ AC_ARG_ENABLE(openssl,
  	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib"
  	  fi])
  
diff --git a/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
index 7753acf72..4bf60fd6c 100644
--- a/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
+++ b/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
 index 484f6ebaca..79538df0cf 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3222,6 +3222,24 @@ AC_ARG_ENABLE(readline,
+@@ -3286,6 +3286,24 @@ AC_ARG_ENABLE(readline,
  	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
  	  fi])
  
diff --git a/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
index 93df02f6a..8b4dca912 100644
--- a/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
+++ b/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
@@ -23,7 +23,7 @@ diff --git a/setup.py b/setup.py
 index 1a7085c5c4..f33d0b57b8 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1627,7 +1627,8 @@ class PyBuildExt(build_ext):
+@@ -1632,7 +1632,8 @@ class PyBuildExt(build_ext):
              missing.append('_tkinter')
  
          # Build the _uuid module if possible
diff --git a/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
index c429c59a3..1c674b544 100644
--- a/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
+++ b/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
@@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac
 index b022460e73..505b7c9be0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3258,6 +3258,15 @@ if test "$CURSES" = "no"; then
+@@ -3322,6 +3322,15 @@ if test "$CURSES" = "no"; then
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
  fi
  
diff --git a/buildroot/package/python3/python3.hash b/buildroot/package/python3/python3.hash
index 7cd9d750a..d5209c23c 100644
--- a/buildroot/package/python3/python3.hash
+++ b/buildroot/package/python3/python3.hash
@@ -1,5 +1,5 @@
-# From https://www.python.org/downloads/release/python-371/
-md5		0a57e9022c07fad3dadb2eef58568edb Python-3.7.1.tar.xz
+# From https://www.python.org/downloads/release/python-373/
+md5		93df27aec0cd18d6d42173e601ffbbfd Python-3.7.3.tar.xz
 # Locally computed
-sha256 fa7e2b8e8c9402f192ad56dc4f814089d1c4466c97d780f5e5acc02c04243d6d Python-3.7.1.tar.xz
-sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 LICENSE
+sha256 da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318 Python-3.7.3.tar.xz
+sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c LICENSE
diff --git a/buildroot/package/python3/python3.mk b/buildroot/package/python3/python3.mk
index 8fbb95b9a..2211cfed8 100644
--- a/buildroot/package/python3/python3.mk
+++ b/buildroot/package/python3/python3.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 PYTHON3_VERSION_MAJOR = 3.7
-PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1
+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).3
 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
 PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
 PYTHON3_LICENSE = Python-2.0, others
diff --git a/buildroot/package/qemu/0002-configure-improve-usbfs-check.patch b/buildroot/package/qemu/0002-configure-improve-usbfs-check.patch
new file mode 100644
index 000000000..d693b5d7e
--- /dev/null
+++ b/buildroot/package/qemu/0002-configure-improve-usbfs-check.patch
@@ -0,0 +1,60 @@
+From 9672cccd64c446369b5649fe23d575917638be46 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni 
+Date: Tue, 5 Feb 2019 15:07:43 +0100
+Subject: [PATCH] configure: improve usbfs check
+
+The current check to test if usbfs support should be compiled or not
+solely relies on the presence of , without
+actually checking that all definition used by Qemu are provided by
+this header file.
+
+With sufficiently old kernel headers,  may be
+present, but some of the definitions needed by Qemu may not be
+available.
+
+This commit improves the check by building a small program that
+actually tests whether the necessary definitions are available.
+
+In addition, it fixes a bug where have_usbfs was set to "yes"
+regardless of the result of the test.
+
+Signed-off-by: Thomas Petazzoni 
+---
+ configure | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 3d89870d99..799c8e3b08 100755
+--- a/configure
++++ b/configure
+@@ -4266,10 +4266,25 @@ fi
+ # check for usbfs
+ have_usbfs=no
+ if test "$linux_user" = "yes"; then
+-  if check_include linux/usbdevice_fs.h; then
++  cat > $TMPC << EOF
++#include 
++
++#ifndef USBDEVFS_GET_CAPABILITIES
++#error "USBDEVFS_GET_CAPABILITIES undefined"
++#endif
++
++#ifndef USBDEVFS_DISCONNECT_CLAIM
++#error "USBDEVFS_DISCONNECT_CLAIM undefined"
++#endif
++
++int main(void)
++{
++    return 0;
++}
++EOF
++  if compile_prog "" ""; then
+     have_usbfs=yes
+   fi
+-  have_usbfs=yes
+ fi
+ 
+ # check for fallocate
+-- 
+2.20.1
+
diff --git a/buildroot/package/qemu/Config.in.host b/buildroot/package/qemu/Config.in.host
index 957c7d2ae..f99f3e05c 100644
--- a/buildroot/package/qemu/Config.in.host
+++ b/buildroot/package/qemu/Config.in.host
@@ -67,4 +67,10 @@ config BR2_PACKAGE_HOST_QEMU_VDE2
 	  Ethernet and can be used to create virtual switches to
 	  "plug" both physical and virtual machines in them.
 
+config BR2_PACKAGE_HOST_QEMU_VIRTFS
+	bool "Virtual filesystem support"
+	help
+	  Enables support for virtual filesystem in Qemu allowing
+	  shared filesystem between Qemu and its emulated target.
+
 endif
diff --git a/buildroot/package/qemu/qemu.hash b/buildroot/package/qemu/qemu.hash
index 2b27008b7..338d2ae50 100644
--- a/buildroot/package/qemu/qemu.hash
+++ b/buildroot/package/qemu/qemu.hash
@@ -1,4 +1,4 @@
 # Locally computed, tarball verified with GPG signature
-sha256 33583800e0006cd00b78226b85be5a27c8e3b156bed2e60e83ecbeb7b9b8364f  qemu-2.12.1.tar.xz
+sha256 6a0508df079a0a33c2487ca936a56c12122f105b8a96a44374704bef6c69abfc  qemu-3.1.0.tar.xz
 sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
 sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df  COPYING.LIB
diff --git a/buildroot/package/qemu/qemu.mk b/buildroot/package/qemu/qemu.mk
index 709535a4b..b858efe3f 100644
--- a/buildroot/package/qemu/qemu.mk
+++ b/buildroot/package/qemu/qemu.mk
@@ -4,19 +4,19 @@
 #
 ################################################################################
 
-QEMU_VERSION = 2.12.1
+QEMU_VERSION = 3.1.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SITE = http://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
 QEMU_LICENSE_FILES = COPYING COPYING.LIB
-# NOTE: there is no top-level license file for non-(L)GPL licenses;
+# NOTE: there is no top-level license file for non-(L)GPL licenses;
 #       the non-(L)GPL license texts are specified in the affected
 #       individual source files.
 
 #-------------------------------------------------------------
 # Target-qemu
 
-QEMU_DEPENDENCIES = host-pkgconf host-python libglib2 zlib pixman
+QEMU_DEPENDENCIES = host-pkgconf libglib2 zlib pixman
 
 # Need the LIBS variable because librt and libm are
 # not automatically pulled. :-(
@@ -24,10 +24,7 @@ QEMU_LIBS = -lrt -lm
 
 QEMU_OPTS =
 
-QEMU_VARS = \
-	LIBTOOL=$(HOST_DIR)/bin/libtool \
-	PYTHON=$(HOST_DIR)/bin/python2 \
-	PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+QEMU_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool
 
 # If we want to specify only a subset of targets, we must still enable all
 # of them, so that QEMU properly builds its list of default targets, from
@@ -81,6 +78,13 @@ else
 QEMU_OPTS += --disable-tools
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+QEMU_OPTS += --enable-seccomp
+QEMU_DEPENDENCIES += libseccomp
+else
+QEMU_OPTS += --disable-seccomp
+endif
+
 ifeq ($(BR2_PACKAGE_LIBSSH2),y)
 QEMU_OPTS += --enable-libssh2
 QEMU_DEPENDENCIES += libssh2
@@ -121,7 +125,6 @@ define QEMU_CONFIGURE_CMDS
 			--disable-libiscsi \
 			--disable-usb-redir \
 			--disable-strip \
-			--disable-seccomp \
 			--disable-sparse \
 			--disable-mpath \
 			--disable-sanitizers \
@@ -151,7 +154,7 @@ $(eval $(generic-package))
 #-------------------------------------------------------------
 # Host-qemu
 
-HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-pixman
+HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman
 
 #       BR ARCH         qemu
 #       -------         ----
@@ -254,6 +257,10 @@ HOST_QEMU_OPTS += --enable-vde
 HOST_QEMU_DEPENDENCIES += host-vde2
 endif
 
+ifdef ($(BR2_PACKAGE_HOST_QEMU_VIRTFS),y)
+HOST_QEMU_OPTS += --enable-virtfs
+endif
+
 # Override CPP, as it expects to be able to call it like it'd
 # call the compiler.
 define HOST_QEMU_CONFIGURE_CMDS
@@ -264,7 +271,6 @@ define HOST_QEMU_CONFIGURE_CMDS
 		--interp-prefix=$(STAGING_DIR) \
 		--cc="$(HOSTCC)" \
 		--host-cc="$(HOSTCC)" \
-		--python=$(HOST_DIR)/bin/python2 \
 		--extra-cflags="$(HOST_CFLAGS)" \
 		--extra-ldflags="$(HOST_LDFLAGS)" \
 		$(HOST_QEMU_OPTS)
diff --git a/buildroot/package/qextserialport/Config.in b/buildroot/package/qextserialport/Config.in
index 4e7ef1378..f880d335e 100644
--- a/buildroot/package/qextserialport/Config.in
+++ b/buildroot/package/qextserialport/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_QEXTSERIALPORT
 	bool "qextserialport"
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
 	help
 	  A Qt library to manage serial ports
 
diff --git a/buildroot/package/qextserialport/qextserialport.mk b/buildroot/package/qextserialport/qextserialport.mk
index e3e325ce6..ecaff21ef 100644
--- a/buildroot/package/qextserialport/qextserialport.mk
+++ b/buildroot/package/qextserialport/qextserialport.mk
@@ -14,16 +14,10 @@ ifeq ($(BR2_STATIC_LIBS),y)
 QEXTSERIALPORT_CONF_OPTS += CONFIG+=qesp_static
 endif
 
-ifeq ($(BR2_PACKAGE_QT),y)
-QEXTSERIALPORT_DEPENDENCIES += qt
-QEXTSERIALPORT_QMAKE = $(QT_QMAKE)
-else ifeq ($(BR2_PACKAGE_QT5),y)
-QEXTSERIALPORT_DEPENDENCIES += qt5base
-QEXTSERIALPORT_QMAKE = $(QT5_QMAKE)
-endif
+QEXTSERIALPORT_DEPENDENCIES = qt5base
 
 define QEXTSERIALPORT_CONFIGURE_CMDS
-	cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE) $(QEXTSERIALPORT_CONF_OPTS)
+	cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) $(QEXTSERIALPORT_CONF_OPTS)
 endef
 
 define QEXTSERIALPORT_BUILD_CMDS
diff --git a/buildroot/package/qjson/Config.in b/buildroot/package/qjson/Config.in
index 5c423bf31..adb06cddc 100644
--- a/buildroot/package/qjson/Config.in
+++ b/buildroot/package/qjson/Config.in
@@ -1,13 +1,8 @@
 config BR2_PACKAGE_QJSON
 	bool "qjson"
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
 	help
 	  QJson is a Qt-based library that maps JSON data to
 	  QVariant objects and vice versa.
 
 	  http://qjson.sourceforge.net
-
-comment "qjson needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
diff --git a/buildroot/package/qjson/qjson.mk b/buildroot/package/qjson/qjson.mk
index 1777b9454..718d6622a 100644
--- a/buildroot/package/qjson/qjson.mk
+++ b/buildroot/package/qjson/qjson.mk
@@ -7,9 +7,7 @@
 QJSON_VERSION = 0.9.0
 QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION))
 QJSON_INSTALL_STAGING = YES
-QJSON_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_QT),qt) \
-	$(if $(BR2_PACKAGE_QT5),qt5base)
+QJSON_DEPENDENCIES = qt5base
 QJSON_LICENSE = LGPL-2.1
 QJSON_LICENSE_FILES = COPYING.lib
 
diff --git a/buildroot/package/qpid-proton/0001-PROTON-1381-PROTON-1326-Modify-openssl-DH-code-to-wo.patch b/buildroot/package/qpid-proton/0001-PROTON-1381-PROTON-1326-Modify-openssl-DH-code-to-wo.patch
new file mode 100644
index 000000000..1085804f4
--- /dev/null
+++ b/buildroot/package/qpid-proton/0001-PROTON-1381-PROTON-1326-Modify-openssl-DH-code-to-wo.patch
@@ -0,0 +1,78 @@
+From bc872440428073e86ce2631276dc8b7f62da4c33 Mon Sep 17 00:00:00 2001
+From: Andrew Stitcher 
+Date: Tue, 17 Jan 2017 02:10:48 -0500
+Subject: [PATCH] PROTON-1381, PROTON-1326: Modify openssl DH code to work with
+ openssl 1.1 Modified patch from Volker Diels-Grabsch
+
+Upstream: https://github.com/apache/qpid-proton/commit/bc872440428073e86ce2631276dc8b7f62da4c33
+
+Signed-off-by: Matthew Weber 
+---
+ proton-c/src/ssl/openssl.c | 37 +++++++++++++++++++++++++++----------
+ 1 file changed, 27 insertions(+), 10 deletions(-)
+
+diff --git a/proton-c/src/ssl/openssl.c b/proton-c/src/ssl/openssl.c
+index 0b7d157..0c51c03 100644
+--- a/proton-c/src/ssl/openssl.c
++++ b/proton-c/src/ssl/openssl.c
+@@ -356,12 +356,22 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
+   return preverify_ok;
+ }
+ 
++// This was introduced in v1.1
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
++{
++  dh->p = p;
++  dh->q = q;
++  dh->g = g;
++  return 1;
++}
++#endif
+ 
+ // this code was generated using the command:
+ // "openssl dhparam -C -2 2048"
+ static DH *get_dh2048(void)
+ {
+-  static const unsigned char dh2048_p[]={
++  static const unsigned char dhp_2048[]={
+     0xAE,0xF7,0xE9,0x66,0x26,0x7A,0xAC,0x0A,0x6F,0x1E,0xCD,0x81,
+     0xBD,0x0A,0x10,0x7E,0xFA,0x2C,0xF5,0x2D,0x98,0xD4,0xE7,0xD9,
+     0xE4,0x04,0x8B,0x06,0x85,0xF2,0x0B,0xA3,0x90,0x15,0x56,0x0C,
+@@ -385,17 +395,24 @@ static DH *get_dh2048(void)
+     0xA4,0xED,0xFD,0x49,0x0B,0xE3,0x4A,0xF6,0x28,0xB3,0x98,0xB0,
+     0x23,0x1C,0x09,0x33,
+   };
+-  static const unsigned char dh2048_g[]={
++  static const unsigned char dhg_2048[]={
+     0x02,
+   };
+-  DH *dh;
+-
+-  if ((dh=DH_new()) == NULL) return(NULL);
+-  dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+-  dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+-  if ((dh->p == NULL) || (dh->g == NULL))
+-    { DH_free(dh); return(NULL); }
+-  return(dh);
++  DH *dh = DH_new();
++  BIGNUM *dhp_bn, *dhg_bn;
++
++  if (dh == NULL)
++    return NULL;
++  dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL);
++  dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL);
++  if (dhp_bn == NULL || dhg_bn == NULL
++      || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
++    DH_free(dh);
++    BN_free(dhp_bn);
++    BN_free(dhg_bn);
++    return NULL;
++  }
++  return dh;
+ }
+ 
+ typedef struct {
+-- 
+1.9.1
+
diff --git a/buildroot/package/qpid-proton/0002-PROTON-1326-restore-anonymous-cyphers-by-lowering-Op.patch b/buildroot/package/qpid-proton/0002-PROTON-1326-restore-anonymous-cyphers-by-lowering-Op.patch
new file mode 100644
index 000000000..2adba9a59
--- /dev/null
+++ b/buildroot/package/qpid-proton/0002-PROTON-1326-restore-anonymous-cyphers-by-lowering-Op.patch
@@ -0,0 +1,62 @@
+From 8c54c62516671375de4068158ccaa0bc1dba0a4a Mon Sep 17 00:00:00 2001
+From: Cliff Jansen 
+Date: Wed, 2 Aug 2017 16:34:39 -0700
+Subject: [PATCH] PROTON-1326: restore anonymous cyphers by lowering OpenSSL
+ v1.1 security level just for the PN_SSL_ANONYMOUS_PEER verification mode
+
+Upstream: https://github.com/apache/qpid-proton/commit/8c54c62516671375de4068158ccaa0bc1dba0a4a
+
+Signed-off-by: Matthew Weber 
+---
+ proton-c/src/ssl/openssl.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/proton-c/src/ssl/openssl.c b/proton-c/src/ssl/openssl.c
+index 8cb4e7b..f37cf49 100644
+--- a/proton-c/src/ssl/openssl.c
++++ b/proton-c/src/ssl/openssl.c
+@@ -72,6 +72,9 @@ struct pn_ssl_domain_t {
+   char *trusted_CAs;
+ 
+   int   ref_count;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++  int default_seclevel;
++#endif
+   pn_ssl_mode_t mode;
+   pn_ssl_verify_mode_t verify_mode;
+ 
+@@ -524,6 +527,9 @@ pn_ssl_domain_t *pn_ssl_domain( pn_ssl_mode_t mode )
+   // Mitigate the CRIME vulnerability
+   SSL_CTX_set_options(domain->ctx, SSL_OP_NO_COMPRESSION);
+ #endif
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++    domain->default_seclevel = SSL_CTX_get_security_level(domain->ctx);
++#endif
+ 
+   // by default, allow anonymous ciphers so certificates are not required 'out of the box'
+   if (!SSL_CTX_set_cipher_list( domain->ctx, CIPHERS_ANONYMOUS )) {
+@@ -647,6 +653,10 @@ int pn_ssl_domain_set_peer_authentication(pn_ssl_domain_t *domain,
+   case PN_SSL_VERIFY_PEER:
+   case PN_SSL_VERIFY_PEER_NAME:
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++    SSL_CTX_set_security_level(domain->ctx, domain->default_seclevel);
++#endif
++
+     if (!domain->has_ca_db) {
+       pn_transport_logf(NULL, "Error: cannot verify peer without a trusted CA configured.\n"
+                  "       Use pn_ssl_domain_set_trusted_ca_db()");
+@@ -685,6 +695,10 @@ int pn_ssl_domain_set_peer_authentication(pn_ssl_domain_t *domain,
+     break;
+ 
+   case PN_SSL_ANONYMOUS_PEER:   // hippie free love mode... :)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++    // Must use lowest OpenSSL security level to enable anonymous ciphers.
++    SSL_CTX_set_security_level(domain->ctx, 0);
++#endif
+     SSL_CTX_set_verify( domain->ctx, SSL_VERIFY_NONE, NULL );
+     break;
+ 
+-- 
+1.9.1
+
diff --git a/buildroot/package/qpid-proton/0003-PROTON-1587-fix-openssl-error-handling-causing-spuri.patch b/buildroot/package/qpid-proton/0003-PROTON-1587-fix-openssl-error-handling-causing-spuri.patch
new file mode 100644
index 000000000..bbd3c7b81
--- /dev/null
+++ b/buildroot/package/qpid-proton/0003-PROTON-1587-fix-openssl-error-handling-causing-spuri.patch
@@ -0,0 +1,58 @@
+From c31ca95ac73d0da462f7e324e1c3a33b11c39f2c Mon Sep 17 00:00:00 2001
+From: Alan Conway 
+Date: Wed, 27 Sep 2017 18:37:24 -0400
+Subject: [PATCH] PROTON-1587: fix openssl error handling, causing spurious
+ errors
+
+From the SSL_get_error() man page:
+
+       In addition  to ssl and ret, SSL_get_error() inspects the current thread's OpenSSL error
+       queue.  Thus, SSL_get_error() must be used in the same thread that performed the TLS/SSL I/O
+       operation, and no other OpenSSL function calls should appear in between.  The current
+       thread's error queue must be empty before the TLS/SSL I/O operation is attempted, or
+       SSL_get_error() will not work reliably.
+
+Proton was not clearing the error queue, so the "shutdown-during-init"
+error (which was introduced recently in OpenSSL) was left dangling, and was
+reported incorrectly when the thread was used to serve another transport.
+
+Upstream: https://github.com/apache/qpid-proton/commit/c31ca95ac73d0da462f7e324e1c3a33b11c39f2c
+
+Signed-off-by: Matthew Weber 
+---
+ proton-c/src/ssl/openssl.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/proton-c/src/ssl/openssl.c b/proton-c/src/ssl/openssl.c
+index 5c750b0..3a4e1a3 100644
+--- a/proton-c/src/ssl/openssl.c
++++ b/proton-c/src/ssl/openssl.c
+@@ -206,7 +206,7 @@ static int ssl_failed(pn_transport_t *transport)
+   // fake a shutdown so the i/o processing code will close properly
+   SSL_set_shutdown(ssl->ssl, SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
+   // try to grab the first SSL error to add to the failure log
+-  char buf[128] = "Unknown error.";
++  char buf[256] = "Unknown error";
+   unsigned long ssl_err = ERR_get_error();
+   if (ssl_err) {
+     ERR_error_string_n( ssl_err, buf, sizeof(buf) );
+@@ -909,6 +909,7 @@ static ssize_t process_input_ssl( pn_transport_t *transport, unsigned int layer,
+ 
+   do {
+     work_pending = false;
++    ERR_clear_error();
+ 
+     // Write to network bio as much as possible, consuming bytes/available
+ 
+@@ -1058,6 +1059,8 @@ static ssize_t process_output_ssl( pn_transport_t *transport, unsigned int layer
+ 
+   do {
+     work_pending = false;
++    ERR_clear_error();
++
+     // first, get any pending application output, if possible
+ 
+     if (!ssl->app_output_closed && ssl->out_count < ssl->out_size) {
+-- 
+1.9.1
+
diff --git a/buildroot/package/qpid-proton/0004-src-ssl-openssl-add-libressl-compatibility.patch b/buildroot/package/qpid-proton/0004-src-ssl-openssl-add-libressl-compatibility.patch
new file mode 100644
index 000000000..f969671ff
--- /dev/null
+++ b/buildroot/package/qpid-proton/0004-src-ssl-openssl-add-libressl-compatibility.patch
@@ -0,0 +1,53 @@
+From 87c44b4ebc64c15f6324ed40852224b61fbe77a7 Mon Sep 17 00:00:00 2001
+From: Matt Weber 
+Date: Tue, 5 Feb 2019 06:10:16 -0600
+Subject: [PATCH] src/ssl/openssl: add libressl compatibility
+
+Similar to https://github.com/FreeRDP/FreeRDP/issues/5049
+libressl has `#define OPENSSL_VERSION_NUMBER ` defined the same as
+openssl 1.1.x which results in SSL_CTX_set_security_level() getting used.
+
+This patch prevents SSL_CTX_set_security_level() from being used with
+libressl.
+
+Upstream: https://github.com/apache/qpid-proton/pull/175
+
+Signed-off-by: Matthew Weber 
+---
+ c/src/ssl/openssl.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/proton-c/src/ssl/openssl.c b/proton-c/src/ssl/openssl.c
+index c2b5869..541d0ae 100644
+--- a/proton-c/src/ssl/openssl.c
++++ b/proton-c/src/ssl/openssl.c
+@@ -522,7 +522,7 @@ pn_ssl_domain_t *pn_ssl_domain( pn_ssl_mode_t mode )
+   // Mitigate the CRIME vulnerability
+   SSL_CTX_set_options(domain->ctx, SSL_OP_NO_COMPRESSION);
+ #endif
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000
++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+     domain->default_seclevel = SSL_CTX_get_security_level(domain->ctx);
+ #endif
+ 
+@@ -709,7 +709,7 @@ int pn_ssl_domain_set_peer_authentication(pn_ssl_domain_t *domain,
+    case PN_SSL_VERIFY_PEER:
+    case PN_SSL_VERIFY_PEER_NAME:
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000
++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CTX_set_security_level(domain->ctx, domain->default_seclevel);
+ #endif
+ 
+@@ -749,7 +749,7 @@ int pn_ssl_domain_set_peer_authentication(pn_ssl_domain_t *domain,
+     break;
+ 
+   case PN_SSL_ANONYMOUS_PEER:   // hippie free love mode... :)
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000
++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+     // Must use lowest OpenSSL security level to enable anonymous ciphers.
+     SSL_CTX_set_security_level(domain->ctx, 0);
+ #endif
+-- 
+1.9.1
+
diff --git a/buildroot/package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch b/buildroot/package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch
deleted file mode 100644
index 4cec4bde5..000000000
--- a/buildroot/package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b8f98d956501dfa4ce03a137f15d404930a56066 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev 
-Date: Sat, 5 Mar 2016 10:25:33 +0300
-Subject: [PATCH] alsatest: Fix the check to treat alsalib 1.1.x as correct
- version
-
-Task-number: QTBUG-51681
-Change-Id: I63266c33342f02f4d1a5ea5786f5fbc5a1b421b3
-Reviewed-by: Oswald Buddenhagen 
-[Upstream commit: https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f15d404930a56066]
-[Patch fixing ALSA detection. Taken from Qt5, but applies fine to Qt4.]
-Signed-off-by: Thomas Petazzoni 
----
- config.tests/unix/alsa/alsatest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp
-index cab6533977..0b45819b61 100644
---- a/config.tests/unix/alsa/alsatest.cpp
-+++ b/config.tests/unix/alsa/alsatest.cpp
-@@ -32,7 +32,7 @@
- ****************************************************************************/
- 
- #include 
--#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if SND_LIB_VERSION < 0x1000a  // 1.0.10
- #error "Alsa version found too old, require >= 1.0.10"
- #endif
- 
diff --git a/buildroot/package/qt/0002-configure.patch b/buildroot/package/qt/0002-configure.patch
deleted file mode 100644
index 07c9630c9..000000000
--- a/buildroot/package/qt/0002-configure.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix -hostprefix behaviour
-
-When -hostprefix ./configure option is used, Qt installs all its
-headers, libraries and binaries inside the given host prefix, instead
-of the prefix. This is used by Buildroot to make sure that all Qt
-libraries and headers are installed in $(STAGING_DIR).
-
-Qt ./configure script also allows to tune the installation location of
-various elements, for examples the plugins through the -plugindir
-option. Unfortunately, this option only impact the installation path
-on the target, but not on the host when -hostprefix is used.
-
-This patch modifies Qt ./configure script so that HOST_*PATH_STR
-variables are composed of the host prefix concatenated with the path
-of installation on the target. This way, the plugin installation local
-in the $(STAGING_DIR) and on the target remains the same.
-
-Signed-off-by: Thomas Petazzoni 
-
----
- configure |   18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-Index: qt-everywhere-opensource-src-4.8.1/configure
-===================================================================
---- qt-everywhere-opensource-src-4.8.1.orig/configure
-+++ qt-everywhere-opensource-src-4.8.1/configure
-@@ -4661,15 +4661,15 @@
- 
- 
- if [ ! -z "$QT_HOST_PREFIX" ]; then
--    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"`
--    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
--    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
--    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
--    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
--    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
--    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
--    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"`
--    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"`
-+    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX/$QT_INSTALL_PREFIX"`
-+    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/$QT_INSTALL_DOCS"`
-+    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/$QT_INSTALL_HEADERS"`
-+    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/$QT_INSTALL_LIBS"`
-+    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/$QT_INSTALL_BINS"`
-+    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/$QT_INSTALL_PLUGINS"`
-+    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/$QT_INSTALL_IMPORTS"`
-+    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX/$QT_INSTALL_DATA"`
-+    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/$QT_INSTALL_TRANSLATIONS"`
-     HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
-     HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
-     HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
diff --git a/buildroot/package/qt/0003-eglwsegl-use-system.patch b/buildroot/package/qt/0003-eglwsegl-use-system.patch
deleted file mode 100644
index cb3038138..000000000
--- a/buildroot/package/qt/0003-eglwsegl-use-system.patch
+++ /dev/null
@@ -1,802 +0,0 @@
-Patch to remove obsolete powervr headers and instead use the headers provided
-on the system.
-
-Signed-off-by: Spenser Gilliland 
----
-Index: qt-4.8.5/src/3rdparty/powervr/pvr2d.h
-===================================================================
---- qt-4.8.5.orig/src/3rdparty/powervr/pvr2d.h	2013-07-08 11:24:33.010516867 -0500
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,502 +0,0 @@
--/*!****************************************************************************
--@File          pvr2d.h
--@Title         PVR2D external header file
--@Author        Imagination Technologies
--@Copyright     Copyright (c) by Imagination Technologies Limited.
--				This specification is protected by copyright laws and contains
--				material proprietary to Imagination Technologies Limited.
--				You may use and distribute this specification free of charge for implementing
--				the functionality therein, without altering or removing any trademark, copyright,
--				or other notice from the specification.
--@Platform      Generic
--@Description   PVR2D definitions for PVR2D clients
--******************************************************************************/
--
--
--/******************************************************************************
--Modifications :-
--$Log: pvr2d.h $
--******************************************************************************/
--
--#ifndef _PVR2D_H_
--#define _PVR2D_H_
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--/* PVR2D Platform-specific definitions */
--#define PVR2D_EXPORT
--#define PVR2D_IMPORT
--
--
--#define PVR2D_REV_MAJOR		2
--#define PVR2D_REV_MINOR		1
--
--typedef enum
--{
--	PVR2D_FALSE = 0,
--	PVR2D_TRUE
--} PVR2D_BOOL;
--
--
--/* error codes */
--typedef enum
--{
--	PVR2D_OK = 0,
--	PVR2DERROR_INVALID_PARAMETER = -1,
--	PVR2DERROR_DEVICE_UNAVAILABLE = -2,
--	PVR2DERROR_INVALID_CONTEXT = -3,
--	PVR2DERROR_MEMORY_UNAVAILABLE = -4,
--	PVR2DERROR_DEVICE_NOT_PRESENT = -5,
--	PVR2DERROR_IOCTL_ERROR = -6,
--	PVR2DERROR_GENERIC_ERROR = -7,
--	PVR2DERROR_BLT_NOTCOMPLETE = -8,
--	PVR2DERROR_HW_FEATURE_NOT_SUPPORTED = -9,
--	PVR2DERROR_NOT_YET_IMPLEMENTED = -10,
--	PVR2DERROR_MAPPING_FAILED = -11
--}PVR2DERROR;
--
--
--/* pixel formats */
--typedef enum
--{
--	PVR2D_1BPP = 0,
--	PVR2D_RGB565,
--	PVR2D_ARGB4444,
--	PVR2D_RGB888,
--	PVR2D_ARGB8888,
--	PVR2D_ARGB1555,
--	PVR2D_ALPHA8,
--	PVR2D_ALPHA4,
--	PVR2D_PAL2,
--	PVR2D_PAL4,
--	PVR2D_PAL8,
--	PVR2D_VGAEMU
--
--}PVR2DFORMAT;
--
--
--/* wrap surface type */
--typedef enum
--{
--	PVR2D_WRAPFLAG_NONCONTIGUOUS = 0,
--	PVR2D_WRAPFLAG_CONTIGUOUS = 1,
--
--}PVR2DWRAPFLAGS;
--
--/* flags for control information of additional blits */
--typedef enum
--{
--	PVR2D_BLIT_DISABLE_ALL					= 0x0000,	/* disable all additional controls */
--	PVR2D_BLIT_CK_ENABLE					= 0x0001,	/* enable colour key */
--	PVR2D_BLIT_GLOBAL_ALPHA_ENABLE			= 0x0002,	/* enable standard global alpha */
--	PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE	= 0x0004,	/* enable per-pixel alpha bleding */
--	PVR2D_BLIT_PAT_SURFACE_ENABLE			= 0x0008,	/* enable pattern surf (disable fill) */
--	PVR2D_BLIT_FULLY_SPECIFIED_ALPHA_ENABLE	= 0x0010,	/* enable fully specified alpha */
--	PVR2D_BLIT_ROT_90						= 0x0020,	/* apply 90 degree rotation to the blt */
--	PVR2D_BLIT_ROT_180						= 0x0040,	/* apply 180 degree rotation to the blt */
--	PVR2D_BLIT_ROT_270						= 0x0080,	/* apply 270 degree rotation to the blt */
--	PVR2D_BLIT_COPYORDER_TL2BR				= 0x0100,	/* copy order overrides */
--	PVR2D_BLIT_COPYORDER_BR2TL				= 0x0200,
--	PVR2D_BLIT_COPYORDER_TR2BL				= 0x0400,
--	PVR2D_BLIT_COPYORDER_BL2TR				= 0x0800,
--	PVR2D_BLIT_COLKEY_SOURCE				= 0x1000,	/* Key colour is on the source surface */
--	PVR2D_BLIT_COLKEY_DEST					= 0x2000	/* Key colour is on the destination surface */
--
--} PVR2DBLITFLAGS;
--
--/* standard alpha-blending functions, AlphaBlendingFunc field of PVR2DBLTINFO */
--typedef enum
--{
--	PVR2D_ALPHA_OP_SRC_DSTINV = 1,	/* source alpha : Cdst = Csrc*Asrc + Cdst*(1-Asrc) */
--	PVR2D_ALPHA_OP_SRCP_DSTINV = 2	/* premultiplied source alpha : Cdst = Csrc + Cdst*(1-Asrc) */
--} PVR2D_ALPHABLENDFUNC;
--
--/* blend ops for fully specified alpha */
--typedef enum
--{
--	PVR2D_BLEND_OP_ZERO = 0,
--	PVR2D_BLEND_OP_ONE = 1,
--	PVR2D_BLEND_OP_SRC = 2,
--	PVR2D_BLEND_OP_DST = 3,
--	PVR2D_BLEND_OP_GLOBAL = 4,
--	PVR2D_BLEND_OP_SRC_PLUS_GLOBAL = 5,
--	PVR2D_BLEND_OP_DST_PLUS_GLOBAL = 6
--}PVR2D_BLEND_OP;
--
--
--typedef void* PVR2D_HANDLE;
--
--
--/* Fully specified alpha blend :	pAlpha field of PVR2DBLTINFO structure					*/
--/* a fully specified Alpha Blend operation is defined as									*/
--/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (ALPHA_3 * DST (ALPHA))							*/
--/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (ALPHA_4 * DST (RGB))								*/
--/* if the pre-multiplication stage is enabled then the equations become the following:		*/
--/* PRE_MUL     = ((SRC(A)) * (Global Alpha Value))											*/
--/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (PRE_MUL * DST (ALPHA))							*/
--/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (PRE_MUL * DST (RGB))								*/
--/* if the transparent source alpha stage is enabled then a source alpha of zero forces the	*/
--/* source to be transparent for that pixel regardless of the blend equation being used.		*/
--typedef struct _PVR2D_ALPHABLT
--{
--	PVR2D_BLEND_OP	eAlpha1;
--	PVR2D_BOOL		bAlpha1Invert;
--	PVR2D_BLEND_OP	eAlpha2;
--	PVR2D_BOOL		bAlpha2Invert;
--	PVR2D_BLEND_OP	eAlpha3;
--	PVR2D_BOOL		bAlpha3Invert;
--	PVR2D_BLEND_OP	eAlpha4;
--	PVR2D_BOOL		bAlpha4Invert;
--	PVR2D_BOOL		bPremulAlpha;			/* enable pre-multiplication stage */
--	PVR2D_BOOL		bTransAlpha;			/* enable transparent source alpha stage */
--	PVR2D_BOOL		bUpdateAlphaLookup;		/* enable and update the 1555-Lookup alpha table */
--	unsigned char	uAlphaLookup0;			/* 8 bit alpha when A=0 in a 1555-Lookup surface */
--	unsigned char	uAlphaLookup1;			/* 8 bit alpha when A=1 in a 1555-Lookup surface */
--	unsigned char	uGlobalRGB;				/* Global Alpha Value for RGB, 0=transparent 255=opaque */
--	unsigned char	uGlobalA;				/* Global Alpha Value for Alpha */
--
--} PVR2D_ALPHABLT, *PPVR2D_ALPHABLT;
--
--
--/* surface memory info structure */
--typedef struct _PVR2DMEMINFO
--{
--	void				*pBase;
--	unsigned long		ui32MemSize;
--	unsigned long		ui32DevAddr;
--	unsigned long		ulFlags;
--	void				*hPrivateData;
--	void				*hPrivateMapData;
--
--}PVR2DMEMINFO, *PPVR2DMEMINFO;
--
--
--#define PVR2D_MAX_DEVICE_NAME 20
--
--typedef struct _PVR2DDEVICEINFO
--{
--	unsigned long	ulDevID;
--	char			szDeviceName[PVR2D_MAX_DEVICE_NAME];
--}PVR2DDEVICEINFO;
--
--
--typedef struct _PVR2DISPLAYINFO
--{
--	unsigned long	ulMaxFlipChains;
--	unsigned long	ulMaxBuffersInChain;
--	PVR2DFORMAT		eFormat;
--	unsigned long	ulWidth;
--	unsigned long	ulHeight;
--	long			lStride;
--	unsigned long	ulMinFlipInterval;
--	unsigned long	ulMaxFlipInterval;
--
--}PVR2DDISPLAYINFO;
--
--
--typedef struct _PVR2DBLTINFO
--{
--	unsigned long	CopyCode;			/* rop code  */
--	unsigned long	Colour;				/* fill colour */
--	unsigned long	ColourKey;			/* colour key */
--	unsigned char	GlobalAlphaValue;	/* global alpha blending */
--	unsigned char	AlphaBlendingFunc;	/* per-pixel alpha-blending function */
--
--	PVR2DBLITFLAGS	BlitFlags;			/* additional blit control information */
--
--	PVR2DMEMINFO	*pDstMemInfo;		/* destination memory */
--	unsigned long	DstOffset;			/* byte offset from start of allocation to destination surface pixel 0,0 */
--	long			DstStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */
--	long			DstX, DstY;			/* pixel offset from start of dest surface to start of blt rectangle */
--	long			DSizeX,DSizeY;		/* blt size */
--	PVR2DFORMAT		DstFormat;			/* dest format */
--	unsigned long	DstSurfWidth;		/* size of dest surface in pixels */
--	unsigned long	DstSurfHeight;		/* size of dest surface in pixels */
--
--	PVR2DMEMINFO	*pSrcMemInfo;		/* source mem, (source fields are also used for patterns) */
--	unsigned long	SrcOffset;			/* byte offset from start of allocation to src/pat surface pixel 0,0 */
--	long			SrcStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */
--	long			SrcX, SrcY;			/* pixel offset from start of surface to start of source rectangle */
--										/* for patterns this is the start offset within the pattern */
--	long			SizeX,SizeY;		/* source rectangle size or pattern size in pixels */
--	PVR2DFORMAT		SrcFormat;			/* source/pattern format */
--	PVR2DMEMINFO	*pPalMemInfo;		/* source/pattern palette memory containing argb8888 colour table */
--	unsigned long	PalOffset;			/* byte offset from start of allocation to start of palette */
--	unsigned long	SrcSurfWidth;		/* size of source surface in pixels */
--	unsigned long	SrcSurfHeight;		/* size of source surface in pixels */
--
--	PVR2DMEMINFO	*pMaskMemInfo;		/* mask memory, 1bpp format implied */
--	unsigned long	MaskOffset;			/* byte offset from start of allocation to mask surface pixel 0,0 */
--	long			MaskStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */
--	long			MaskX, MaskY;		/* mask rect top left (mask size = blt size) */
--	unsigned long	MaskSurfWidth;		/* size of mask surface in pixels */
--	unsigned long	MaskSurfHeight;		/* size of mask surface in pixels */
--	
--	PPVR2D_ALPHABLT pAlpha;				/* fully specified alpha blend */
--
--}PVR2DBLTINFO, *PPVR2DBLTINFO;
--
--typedef struct _PVR2DRECT
--{
--	long left, top;
--	long right, bottom;
--} PVR2DRECT;
--
--typedef struct
--{
--	PVR2DMEMINFO	*pSurfMemInfo;		/* surface memory */
--	unsigned long	SurfOffset;			/* byte offset from start of allocation to destination surface pixel 0,0 */
--	long			Stride;				/* signed stride */
--	PVR2DFORMAT		Format;
--	unsigned long	SurfWidth;			/* surface size in pixels */
--	unsigned long	SurfHeight;
--
--} PVR2D_SURFACE, *PPVR2D_SURFACE;
--
--typedef struct
--{
--	unsigned long	*pUseCode;					/* USSE code */
--	unsigned long	UseCodeSize;				/* usse code size in bytes */
--
--} PVR2D_USECODE, *PPVR2D_USECODE;
--
--typedef struct
--{
--	PVR2D_SURFACE			sDst;				/* destination surface */
--	PVR2D_SURFACE			sSrc;				/* source surface */
--	PVR2DRECT				rcDest;				/* destination rectangle */
--	PVR2DRECT				rcSource;			/* source rectangle */
--	PVR2D_HANDLE			hUseCode;			/* custom USE code (NULL implies source copy) */
--	unsigned long			UseParams[2];		/* per-blt params for use code */
--
--} PVR2D_3DBLT, *PPVR2D_3DBLT;
--
--
--#define MAKE_COPY_BLIT(src,soff,dest,doff,sx,sy,dx,dy,sz)
--
--typedef void* PVR2DCONTEXTHANDLE;
--typedef void* PVR2DFLIPCHAINHANDLE;
--
--
--// CopyCode field of PVR2DBLTINFO structure:
--// the CopyCode field of the PVR2DBLTINFO structure should contain a rop3 or rop4 code.
--// a rop3 is an 8 bit code that describes a blt with three inputs : source dest and pattern
--// rop4 is a 16 bit code that describes a blt with four inputs : source dest pattern and mask
--// common rop3 codes are defined below
--// a colour fill blt is processed in the pattern channel as a constant colour with a rop code of 0xF0
--// PVR2D_BLIT_PAT_SURFACE_ENABLE defines whether the pattern channel is a surface or a fill colour.
--// a rop4 is defined by two rop3 codes, and the 1 bit-per-pixel mask surface defines which is used.
--// a common rop4 is 0xAAF0 which is the mask copy blt used for text glyphs.
--// CopyCode is taken to be a rop4 when pMaskMemInfo is non zero, otherwise it is assumed to be a rop3
--// use the PVR2DMASKROP4 macro below to construct a rop4 from two rop3's
--// rop3a is the rop used when mask pixel = 1, and rop3b when mask = 0
--#define PVR2DROP4(rop3b, rop3a)			((rop3b<<8)|rop3a)
--
--/* common rop codes */
--#define PVR2DROPclear				0x00       /* 0 (whiteness) */
--#define PVR2DROPset					0xFF       /* 1 (blackness) */
--#define PVR2DROPnoop				0xAA       /* dst (used for masked blts) */
--
--/* source and  dest rop codes */
--#define PVR2DROPand					0x88       /* src AND dst */
--#define PVR2DROPandReverse			0x44       /* src AND NOT dst */
--#define PVR2DROPcopy				0xCC       /* src (used for source copy and alpha blts) */
--#define PVR2DROPandInverted			0x22       /* NOT src AND dst */
--#define PVR2DROPxor					0x66       /* src XOR dst */
--#define PVR2DROPor					0xEE       /* src OR dst */
--#define PVR2DROPnor					0x11       /* NOT src AND NOT dst */
--#define PVR2DROPequiv				0x99       /* NOT src XOR dst */
--#define PVR2DROPinvert				0x55       /* NOT dst */
--#define PVR2DROPorReverse			0xDD       /* src OR NOT dst */
--#define PVR2DROPcopyInverted		0x33       /* NOT src */
--#define PVR2DROPorInverted			0xBB       /* NOT src OR dst */
--#define PVR2DROPnand				0x77       /* NOT src OR NOT dst */
--
--/* pattern rop codes */
--#define PVR2DPATROPand				0xA0       /* pat AND dst */
--#define PVR2DPATROPandReverse		0x50       /* pat AND NOT dst */
--#define PVR2DPATROPcopy				0xF0       /* pat (used for solid color fills and pattern blts) */
--#define PVR2DPATROPandInverted		0x0A       /* NOT pat AND dst */
--#define PVR2DPATROPxor				0x5A       /* pat XOR dst */
--#define PVR2DPATROPor				0xFA       /* pat OR dst */
--#define PVR2DPATROPnor				0x05       /* NOT pat AND NOT dst */
--#define PVR2DPATROPequiv			0xA5       /* NOT pat XOR dst */
--#define PVR2DPATROPinvert			0x55       /* NOT dst */
--#define PVR2DPATROPorReverse		0xF5       /* pat OR NOT dst */
--#define PVR2DPATROPcopyInverted		0x0F       /* NOT pat */
--#define PVR2DPATROPorInverted		0xAF       /* NOT pat OR dst */
--#define PVR2DPATROPnand				0x5F       /* NOT pat OR NOT dst */
--
--/* common rop4 codes */
--#define PVR2DROP4MaskedCopy              PVR2DROP4(PVR2DROPnoop,PVR2DROPcopy)		/* masked source copy blt (used for rounded window corners etc) */
--#define PVR2DROP4MaskedFill              PVR2DROP4(PVR2DROPnoop,PVR2DPATROPcopy)	/* masked colour fill blt (used for text) */
--
--/* Legacy support */
--#define PVR2DROP3_PATMASK			PVR2DPATROPcopy
--#define PVR2DROP3_SRCMASK			PVR2DROPcopy
--
--/* pixmap memory alignment */
--#define PVR2D_ALIGNMENT_4			4			/* DWORD alignment */
--#define PVR2D_ALIGNMENT_ANY			0			/* no alignment    */
--#define PVR2D_ALIGNMENT_PALETTE		16			/* 16 byte alignment is required for palettes */
--
--/* Heap number for PVR2DGetFrameBuffer */
--#define PVR2D_FB_PRIMARY_SURFACE 0
--
--#define PVR2D_PRESENT_PROPERTY_SRCSTRIDE	(1 << 0)
--#define PVR2D_PRESENT_PROPERTY_DSTSIZE		(1 << 1)
--#define PVR2D_PRESENT_PROPERTY_DSTPOS		(1 << 2)
--#define PVR2D_PRESENT_PROPERTY_CLIPRECTS	(1 << 3)
--#define PVR2D_PRESENT_PROPERTY_INTERVAL		(1 << 4)
--
--
--#define PVR2D_CREATE_FLIPCHAIN_SHARED		(1 << 0)
--#define PVR2D_CREATE_FLIPCHAIN_QUERY		(1 << 1)
--
--/* Functions that the library exports */
--
--PVR2D_IMPORT
--int PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DCreateDeviceContext(unsigned long ulDevID,
--									PVR2DCONTEXTHANDLE* phContext,
--									unsigned long ulFlags);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DDestroyDeviceContext(PVR2DCONTEXTHANDLE hContext);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetDeviceInfo(PVR2DCONTEXTHANDLE hContext,
--							  PVR2DDISPLAYINFO *pDisplayInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetScreenMode(PVR2DCONTEXTHANDLE hContext,
--							  PVR2DFORMAT *pFormat,
--							  long *plWidth,
--							  long *plHeight,
--							  long *plStride,
--							  int *piRefreshRate);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetFrameBuffer(PVR2DCONTEXTHANDLE hContext,
--							   int nHeap,
--							   PVR2DMEMINFO **ppsMemInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DMemAlloc(PVR2DCONTEXTHANDLE hContext,
--						 unsigned long ulBytes,
--						 unsigned long ulAlign,
--						 unsigned long ulFlags,
--						 PVR2DMEMINFO **ppsMemInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DMemWrap(PVR2DCONTEXTHANDLE hContext,
--						void *pMem,
--						unsigned long ulFlags,
--						unsigned long ulBytes,
--						unsigned long alPageAddress[],
--						PVR2DMEMINFO **ppsMemInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DMemMap(PVR2DCONTEXTHANDLE hContext,
--						unsigned long ulFlags,
--						void *hPrivateMapData,
--						PVR2DMEMINFO **ppsDstMem);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DMemFree(PVR2DCONTEXTHANDLE hContext,
--						PVR2DMEMINFO *psMemInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DBlt(PVR2DCONTEXTHANDLE hContext,
--					PVR2DBLTINFO *pBltInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DBltClipped(PVR2DCONTEXTHANDLE hContext,
--						   PVR2DBLTINFO *pBltInfo,
--						   unsigned long ulNumClipRects,
--						   PVR2DRECT *pClipRects);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DQueryBlitsComplete(PVR2DCONTEXTHANDLE hContext,
--								   PVR2DMEMINFO *pMemInfo,
--								   unsigned int uiWaitForComplete);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DSetPresentBltProperties(PVR2DCONTEXTHANDLE hContext,
--										unsigned long ulPropertyMask,
--										long lSrcStride,
--										unsigned long ulDstWidth,
--										unsigned long ulDstHeight,
--										long lDstXPos,
--										long lDstYPos,
--										unsigned long ulNumClipRects,
--										PVR2DRECT *pClipRects,
--										unsigned long ulSwapInterval);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DPresentBlt(PVR2DCONTEXTHANDLE hContext,
--						   PVR2DMEMINFO *pMemInfo,
--						   long lRenderID);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DCreateFlipChain(PVR2DCONTEXTHANDLE hContext,
--								unsigned long ulFlags,
--								unsigned long ulNumBuffers,
--								unsigned long ulWidth,
--								unsigned long ulHeight,
--								PVR2DFORMAT eFormat,
--								long *plStride,
--								unsigned long *pulFlipChainID,
--								PVR2DFLIPCHAINHANDLE *phFlipChain);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DDestroyFlipChain(PVR2DCONTEXTHANDLE hContext,
--								 PVR2DFLIPCHAINHANDLE hFlipChain);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetFlipChainBuffers(PVR2DCONTEXTHANDLE hContext,
--									PVR2DFLIPCHAINHANDLE hFlipChain,
--									unsigned long *pulNumBuffers,
--									PVR2DMEMINFO *psMemInfo[]);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DSetPresentFlipProperties(PVR2DCONTEXTHANDLE hContext,
--										 PVR2DFLIPCHAINHANDLE hFlipChain,
--										 unsigned long ulPropertyMask,
--										 long lDstXPos,
--										 long lDstYPos,
--										 unsigned long ulNumClipRects,
--										 PVR2DRECT *pClipRects,
--										 unsigned long ulSwapInterval);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DPresentFlip(PVR2DCONTEXTHANDLE hContext,
--							PVR2DFLIPCHAINHANDLE hFlipChain,
--							PVR2DMEMINFO *psMemInfo,
--							long lRenderID);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetAPIRev(long *lRevMajor, long *lRevMinor);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DLoadUseCode (const PVR2DCONTEXTHANDLE hContext, const unsigned char	*pUseCode,
--									const unsigned long UseCodeSize, PVR2D_HANDLE *pUseCodeHandle);
--PVR2D_IMPORT
--PVR2DERROR PVR2DFreeUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_HANDLE hUseCodeHandle);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DBlt3D (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT pBlt3D);
--
--#ifdef __cplusplus
--}
--#endif 
--
--#endif /* _PVR2D_H_ */
--
--/******************************************************************************
-- End of file (pvr2d.h)
--******************************************************************************/
-Index: qt-4.8.5/src/3rdparty/powervr/wsegl.h
-===================================================================
---- qt-4.8.5.orig/src/3rdparty/powervr/wsegl.h	2013-07-08 11:24:33.010516867 -0500
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,240 +0,0 @@
--/******************************************************************************
-- Name         : wsegl.h
-- Copyright    :	Copyright (c) Imagination Technologies Limited.
--				This specification is protected by copyright laws and contains
--				material proprietary to Imagination Technologies Limited.
--				You may use and distribute this specification free of charge for implementing
--				the functionality therein, without altering or removing any trademark, copyright,
--				or other notice from the specification.
-- Platform     : ANSI
--*****************************************************************************/
--
--
--#if !defined(__WSEGL_H__)
--#define __WSEGL_H__
--
--#ifdef __cplusplus
--extern "C" {
--#endif 
--
--/*
--// WSEGL Platform-specific definitions
--*/
--#define WSEGL_EXPORT
--#define WSEGL_IMPORT
--
--/*
--// WSEGL API Version Number
--*/
--
--#define WSEGL_VERSION 1
--#define WSEGL_DEFAULT_DISPLAY 0
--#define WSEGL_DEFAULT_NATIVE_ENGINE 0
--
--#define WSEGL_FALSE		0
--#define WSEGL_TRUE		1
--#define WSEGL_NULL		0
--
--#define	WSEGL_UNREFERENCED_PARAMETER(param) (param) = (param)
--
--/*
--// WSEGL handles
--*/
--typedef void *WSEGLDisplayHandle;
--typedef void *WSEGLDrawableHandle;
--
--/*
--// Display capability type
--*/
--typedef enum WSEGLCapsType_TAG
--{
--	WSEGL_NO_CAPS = 0,
--	WSEGL_CAP_MIN_SWAP_INTERVAL = 1, /* System default value = 1 */
--	WSEGL_CAP_MAX_SWAP_INTERVAL = 2, /* System default value = 1 */
--	WSEGL_CAP_WINDOWS_USE_HW_SYNC = 3, /* System default value = 0 (FALSE) */
--	WSEGL_CAP_PIXMAPS_USE_HW_SYNC = 4, /* System default value = 0 (FALSE) */
--
--} WSEGLCapsType;
--
--/*
--// Display capability
--*/
--typedef struct WSEGLCaps_TAG
--{
--	WSEGLCapsType eCapsType;
--	unsigned long ui32CapsValue;
--
--} WSEGLCaps;
--
--/*
--// Drawable type
--*/
--#define WSEGL_NO_DRAWABLE			0x0
--#define WSEGL_DRAWABLE_WINDOW		0x1
--#define WSEGL_DRAWABLE_PIXMAP		0x2
--
--
--/*
--// Pixel format of display/drawable
--*/
--typedef enum WSEGLPixelFormat_TAG
--{
--	WSEGL_PIXELFORMAT_565 = 0,
--	WSEGL_PIXELFORMAT_4444 = 1,
--	WSEGL_PIXELFORMAT_8888 = 2,
--	WSEGL_PIXELFORMAT_1555 = 3
--
--} WSEGLPixelFormat;
--
--/*
--// Transparent of display/drawable
--*/
--typedef enum WSEGLTransparentType_TAG
--{
--	WSEGL_OPAQUE = 0,
--	WSEGL_COLOR_KEY = 1,
--
--} WSEGLTransparentType;
--
--/*
--// Display/drawable configuration
--*/
--typedef struct WSEGLConfig_TAG
--{
--	/*
--	// Type of drawables this configuration applies to -
--	// OR'd values of drawable types. 
--	*/
--	unsigned long ui32DrawableType;
--
--	/* Pixel format */
--	WSEGLPixelFormat ePixelFormat;
--
--	/* Native Renderable  - set to WSEGL_TRUE if native renderable */
--	unsigned long ulNativeRenderable;
--
--	/* FrameBuffer Level Parameter */
--	unsigned long ulFrameBufferLevel;
--
--	/* Native Visual ID */
--	unsigned long ulNativeVisualID;
--
--	/* Native Visual */
--	void *hNativeVisual;
--
--	/* Transparent Type */
--	WSEGLTransparentType eTransparentType;
--
--	/* Transparent Color - only used if transparent type is COLOR_KEY */
--	unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */
--
--
--} WSEGLConfig;
--
--/*
--// WSEGL errors
--*/
--typedef enum WSEGLError_TAG
--{
--	WSEGL_SUCCESS = 0,
--	WSEGL_CANNOT_INITIALISE = 1,
--	WSEGL_BAD_NATIVE_DISPLAY = 2,
--	WSEGL_BAD_NATIVE_WINDOW = 3,
--	WSEGL_BAD_NATIVE_PIXMAP = 4,
--	WSEGL_BAD_NATIVE_ENGINE = 5,
--	WSEGL_BAD_DRAWABLE = 6,
--	WSEGL_BAD_CONFIG = 7,
--	WSEGL_OUT_OF_MEMORY = 8
--
--} WSEGLError; 
--
--/*
--// Drawable orientation (in degrees anti-clockwise)
--*/
--typedef enum WSEGLRotationAngle_TAG
--{
--	WSEGL_ROTATE_0 = 0,
--	WSEGL_ROTATE_90 = 1,
--	WSEGL_ROTATE_180 = 2,
--	WSEGL_ROTATE_270 = 3
--
--} WSEGLRotationAngle; 
--
--/*
--// Drawable information required by OpenGL-ES driver
--*/
--typedef struct WSEGLDrawableParams_TAG
--{
--	/* Width in pixels of the drawable */
--	unsigned long	ui32Width;
--
--	/* Height in pixels of the drawable */
--	unsigned long	ui32Height;
--
--	/* Stride in pixels of the drawable */
--	unsigned long	ui32Stride;
--
--	/* Pixel format of the drawable */
--	WSEGLPixelFormat	ePixelFormat;
--
--	/* User space cpu virtual address of the drawable */
--	void   			*pvLinearAddress;
--
--	/* HW address of the drawable */
--	unsigned long	ui32HWAddress;
--
--	/* Private data for the drawable */
--	void			*hPrivateData;
--
--} WSEGLDrawableParams;
--
--
--/*
--// Table of function pointers that is returned by WSEGL_GetFunctionTablePointer()
--//
--// The first entry in the table is the version number of the wsegl.h header file that
--// the module has been written against, and should therefore be set to WSEGL_VERSION
--*/
--typedef struct WSEGL_FunctionTable_TAG
--{
--	unsigned long ui32WSEGLVersion;
--
--	WSEGLError (*pfnWSEGL_IsDisplayValid)(NativeDisplayType);
--
--	WSEGLError (*pfnWSEGL_InitialiseDisplay)(NativeDisplayType, WSEGLDisplayHandle *, const WSEGLCaps **, WSEGLConfig **);
--
--	WSEGLError (*pfnWSEGL_CloseDisplay)(WSEGLDisplayHandle);
--
--	WSEGLError (*pfnWSEGL_CreateWindowDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativeWindowType, WSEGLRotationAngle *);
--
--	WSEGLError (*pfnWSEGL_CreatePixmapDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativePixmapType, WSEGLRotationAngle *);
--
--	WSEGLError (*pfnWSEGL_DeleteDrawable)(WSEGLDrawableHandle);
--
--	WSEGLError (*pfnWSEGL_SwapDrawable)(WSEGLDrawableHandle, unsigned long);
--
--	WSEGLError (*pfnWSEGL_SwapControlInterval)(WSEGLDrawableHandle, unsigned long);
--
--	WSEGLError (*pfnWSEGL_WaitNative)(WSEGLDrawableHandle, unsigned long);
--
--	WSEGLError (*pfnWSEGL_CopyFromDrawable)(WSEGLDrawableHandle, NativePixmapType);
--
--	WSEGLError (*pfnWSEGL_CopyFromPBuffer)(void *, unsigned long, unsigned long, unsigned long, WSEGLPixelFormat, NativePixmapType);
--
--	WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *);
--
--
--} WSEGL_FunctionTable;
--
--
--WSEGL_IMPORT const WSEGL_FunctionTable *WSEGL_GetFunctionTablePointer(void);
--
--#ifdef __cplusplus
--}
--#endif 
--
--#endif /* __WSEGL_H__ */
--
--/******************************************************************************
-- End of file (wsegl.h)
--******************************************************************************/
-Index: qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
-===================================================================
---- qt-4.8.5.orig/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c	2013-07-08 11:24:33.010516867 -0500
-+++ qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c	2013-07-08 11:28:26.142521123 -0500
-@@ -39,7 +39,7 @@
- **
- ****************************************************************************/
- 
--#include 
-+#include 
- #include 
- #include 
- #include 
-@@ -379,6 +379,20 @@
-     return WSEGL_SUCCESS;
- }
- 
-+/* Function stub for ConnectDrawable() */
-+static WSEGLError wseglConnectDrawable(WSEGLDrawableHandle hDrawable)
-+{
-+    WSEGL_UNREFERENCED_PARAMETER(hDrawable);
-+    return WSEGL_SUCCESS;
-+}
-+
-+/* Function stub for DisconnectDrawable() */
-+static WSEGLError wseglDisconnectDrawable(WSEGLDrawableHandle hDrawable)
-+{
-+    WSEGL_UNREFERENCED_PARAMETER(hDrawable);
-+    return WSEGL_SUCCESS;
-+}
-+
- static WSEGL_FunctionTable const wseglFunctions = {
-     WSEGL_VERSION,
-     wseglIsDisplayValid,
-@@ -392,7 +406,9 @@
-     wseglWaitNative,
-     wseglCopyFromDrawable,
-     wseglCopyFromPBuffer,
--    wseglGetDrawableParameters
-+    wseglGetDrawableParameters,
-+    wseglConnectDrawable,
-+    wseglDisconnectDrawable
- };
- 
- /* Return the table of WSEGL functions to the EGL implementation */
diff --git a/buildroot/package/qt/0004-fix-const-atomics.patch b/buildroot/package/qt/0004-fix-const-atomics.patch
deleted file mode 100644
index 64853565e..000000000
--- a/buildroot/package/qt/0004-fix-const-atomics.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d4d07dac01796b2aa0fb501c14865cab7e42b3a9 Mon Sep 17 00:00:00 2001
-From: Mischa Jonker 
-Date: Sun, 4 Nov 2012 11:42:04 +0100
-Subject: [PATCH] Fix const-related build error in generic atomic ops
-
-It's still not entirely const-correct though. In all other architectures
-this is obfuscated through the use of inline asm (which the compiler
-doesn't check). This patch obfuscates through const_cast
----
- src/corelib/arch/generic/qatomic_generic_unix.cpp |    8 ++++----
- src/corelib/arch/qatomic_generic.h                |    2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/corelib/arch/generic/qatomic_generic_unix.cpp b/src/corelib/arch/generic/qatomic_generic_unix.cpp
-index 1c6cbf0..6fce81d 100644
---- a/src/corelib/arch/generic/qatomic_generic_unix.cpp
-+++ b/src/corelib/arch/generic/qatomic_generic_unix.cpp
-@@ -85,13 +85,13 @@ int QBasicAtomicInt_fetchAndAddOrdered(volatile int *_q_value, int valueToAdd)
- 
- Q_CORE_EXPORT
- bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *_q_value,
--                                           void *expectedValue,
--                                           void *newValue)
-+                                           const void *expectedValue,
-+                                           const void *newValue)
- {
-     bool returnValue = false;
-     pthread_mutex_lock(&qAtomicMutex);
-     if (*_q_value == expectedValue) {
--        *_q_value = newValue;
-+        *_q_value = const_cast(newValue);
-         returnValue = true;
-     }
-     pthread_mutex_unlock(&qAtomicMutex);
-diff --git a/src/corelib/arch/qatomic_generic.h b/src/corelib/arch/qatomic_generic.h
-index 621a767..4c14679 100644
---- a/src/corelib/arch/qatomic_generic.h
-+++ b/src/corelib/arch/qatomic_generic.h
-@@ -105,7 +105,7 @@ Q_CORE_EXPORT bool QBasicAtomicInt_testAndSetOrdered(volatile int *, int, int);
- Q_CORE_EXPORT int QBasicAtomicInt_fetchAndStoreOrdered(volatile int *, int);
- Q_CORE_EXPORT int QBasicAtomicInt_fetchAndAddOrdered(volatile int *, int);
- 
--Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, void *, void *);
-+Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, const void *, const void *);
- Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndStoreOrdered(void * volatile *, void *);
- Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *, qptrdiff);
- 
--- 
-1.7.0.4
-
diff --git a/buildroot/package/qt/0005-pthread_getattr_np.patch b/buildroot/package/qt/0005-pthread_getattr_np.patch
deleted file mode 100644
index 28f0c8411..000000000
--- a/buildroot/package/qt/0005-pthread_getattr_np.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Add pthred_getattr_np / phread_attr_getstrack alternatives for uClibc
-
-Based on https://dev.openwrt.org/log/packages/Xorg/lib/qt4/patches/100-fix-webkit-for-uclibc.patch?rev=20371
-
-Signed-off-by: Johan Sagaert 
----
- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp |   61 ++++++++++
- 1 file changed, 61 insertions(+)
-
-Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
-===================================================================
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
-@@ -70,6 +70,23 @@
- #endif
- #include 
- 
-+#if defined(QT_LINUXBASE)
-+#include 
-+#endif
-+
-+#if defined(__UCLIBC__)
-+// versions of uClibc 0.9.32 and below with linuxthreads.old do not have
-+// pthread_getattr_np or pthread_attr_getstack.
-+#if __UCLIBC_MAJOR__ == 0 && \
-+    (__UCLIBC_MINOR__ < 9 || \
-+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \
-+    defined(__LINUXTHREADS_OLD__)
-+#define UCLIBC_USE_PROC_SELF_MAPS 1
-+#include 
-+extern int *__libc_stack_end;
-+#endif
-+#endif
-+
- #if OS(SOLARIS)
- #include 
- #else
-@@ -648,6 +665,37 @@
-     get_thread_info(find_thread(NULL), &threadInfo);
-     return threadInfo.stack_end;
- #elif OS(UNIX)
-+#ifdef UCLIBC_USE_PROC_SELF_MAPS
-+    // Read /proc/self/maps and locate the line whose address
-+    // range contains __libc_stack_end.
-+    FILE *file = fopen("/proc/self/maps", "r");
-+    if (!file)
-+        return 0;
-+    __fsetlocking(file, FSETLOCKING_BYCALLER);
-+    char *line = NULL;
-+    size_t lineLen = 0;
-+    while (!feof_unlocked(file)) {
-+        if (getdelim(&line, &lineLen, '\n', file) <= 0)
-+            break;
-+
-+        long from;
-+        long to;
-+        if (sscanf (line, "%lx-%lx", &from, &to) != 2)
-+            continue;
-+        if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) {
-+            fclose(file);
-+            free(line);
-+#ifdef _STACK_GROWS_UP
-+            return (void *)from;
-+#else
-+            return (void *)to;
-+#endif
-+        }
-+    }
-+    fclose(file);
-+    free(line);
-+    return 0;
-+#else
-     AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
-     MutexLocker locker(mutex);
-     static void* stackBase = 0;
-@@ -655,11 +703,23 @@
-     static pthread_t stackThread;
-     pthread_t thread = pthread_self();
-     if (stackBase == 0 || thread != stackThread) {
-+
-+#if defined(QT_LINUXBASE)
-+        // LinuxBase is missing pthread_getattr_np - resolve it once at runtime instead
-+        // see http://bugs.linuxbase.org/show_bug.cgi?id=2364
-+        typedef int (*GetAttrPtr)(pthread_t, pthread_attr_t *);
-+        static int (*pthread_getattr_np_ptr)(pthread_t, pthread_attr_t *) = 0;
-+        if (!pthread_getattr_np_ptr)
-+            *(void **)&pthread_getattr_np_ptr = dlsym(RTLD_DEFAULT, "pthread_getattr_np");
-+#endif
-         pthread_attr_t sattr;
-         pthread_attr_init(&sattr);
- #if HAVE(PTHREAD_NP_H) || OS(NETBSD)
-         // e.g. on FreeBSD 5.4, neundorf@kde.org
-         pthread_attr_get_np(thread, &sattr);
-+#elif defined(QT_LINUXBASE)
-+        if (pthread_getattr_np_ptr)
-+            pthread_getattr_np_ptr(thread, &sattr);
- #else
-         // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
-         pthread_getattr_np(thread, &sattr);
-@@ -671,6 +731,7 @@
-         stackThread = thread;
-     }
-     return static_cast(stackBase) + stackSize;
-+#endif
- #else
- #error Need a way to get the stack base on this platform
- #endif
diff --git a/buildroot/package/qt/0006-script-qtdbus-no-gui.patch b/buildroot/package/qt/0006-script-qtdbus-no-gui.patch
deleted file mode 100644
index e29e9e4a1..000000000
--- a/buildroot/package/qt/0006-script-qtdbus-no-gui.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-[PATCH] fix build with script+dbus enabled, but no gui
-
-The script/qtdbus plugin doesn't need gui support, so don't try to
-link it against libQtGui.
-
-Signed-off-by: Peter Korsgaard 
----
- src/plugins/script/qtdbus/qtdbus.pro |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro
-===================================================================
---- qt-4.7.3.orig/src/plugins/script/qtdbus/qtdbus.pro
-+++ qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro
-@@ -1,6 +1,6 @@
- TARGET  = qtscriptdbus
- include(../../qpluginbase.pri)
--QT = core gui script
-+QT = core script
- CONFIG += qdbus
- 
- SOURCES += main.cpp
diff --git a/buildroot/package/qt/0007-Add-initial-support-of-ARC-architecture.patch b/buildroot/package/qt/0007-Add-initial-support-of-ARC-architecture.patch
deleted file mode 100644
index 4470d3b0d..000000000
--- a/buildroot/package/qt/0007-Add-initial-support-of-ARC-architecture.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From a695eec2ef21240bbc6cd8cd1bdbab76f8da8dfd Mon Sep 17 00:00:00 2001
-From: Vineet Gupta 
-Date: Wed, 20 May 2015 10:37:25 +0300
-Subject: [PATCH 1/2] Add initial support of ARC architecture
-
-DesignWare ARC 700 and ARC HS38 are families of 32-bit CPUs
-developed by Synopsys, Inc.
-
-This change implements following:
- [1] Defines ARC as one embedded targets
- [2] Defines default tools prefixed for ARC like
-     arc-linux-g++ etc
- [3] Defines "inotify" syscall numbers for ARC
-     (note ARC fully compliant to Linux UAPI headers)
- [4] Disables 16-bit aligned data access
-
-For now we're using generic atomic ops even though it may
-introduce performance panalty.
-
-Change-Id: I91e879ac55c2f3643a544f97cd59671a81ccc3c2
-
-This patch was submited in upstream Qt4 and if it ever gets accepted,
-it should be removed from Buildroot.
-
-https://codereview.qt-project.org/#/c/112667
----
- configure                                     |  6 ++++
- mkspecs/qws/linux-arc-g++/qmake.conf          | 21 ++++++++++++++
- mkspecs/qws/linux-arc-g++/qplatformdefs.h     | 42 +++++++++++++++++++++++++++
- src/corelib/arch/qatomic_arch.h               |  2 ++
- src/corelib/io/qfilesystemwatcher_inotify.cpp |  5 ++++
- src/gui/painting/qblendfunctions.cpp          |  4 +--
- 6 files changed, 78 insertions(+), 2 deletions(-)
- create mode 100644 mkspecs/qws/linux-arc-g++/qmake.conf
- create mode 100644 mkspecs/qws/linux-arc-g++/qplatformdefs.h
-
-diff --git a/configure b/configure
-index 10ad7ca..c7ef074 100755
---- a/configure
-+++ b/configure
-@@ -2829,6 +2829,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then
-                     *86_64)
-                         CFG_EMBEDDED=x86_64
-                         ;;
-+                    *arc)
-+                        CFG_EMBEDDED=arc
-+                        ;;
-                     *)
-                         CFG_EMBEDDED=generic
-                         ;;
-@@ -3309,6 +3312,9 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
-     arm*)
-         CFG_ARCH=arm
-         ;;
-+    arc)
-+        CFG_ARCH=arc
-+        ;;
-     *)
-         CFG_ARCH="$CFG_EMBEDDED"
-         ;;
-diff --git a/mkspecs/qws/linux-arc-g++/qmake.conf b/mkspecs/qws/linux-arc-g++/qmake.conf
-new file mode 100644
-index 0000000..a14587b
---- /dev/null
-+++ b/mkspecs/qws/linux-arc-g++/qmake.conf
-@@ -0,0 +1,21 @@
-+#
-+# qmake configuration for building with arc-linux-g++
-+#
-+
-+include(../../common/linux.conf)
-+include(../../common/gcc-base-unix.conf)
-+include(../../common/g++-unix.conf)
-+include(../../common/qws.conf)
-+
-+# modifications to g++.conf
-+QMAKE_CC                = arc-linux-gcc
-+QMAKE_CXX               = arc-linux-g++
-+QMAKE_LINK              = arc-linux-g++
-+QMAKE_LINK_SHLIB        = arc-linux-g++
-+
-+# modifications to linux.conf
-+QMAKE_AR                = arc-linux-ar cqs
-+QMAKE_OBJCOPY           = arc-linux-objcopy
-+QMAKE_STRIP             = arc-linux-strip
-+
-+load(qt_config)
-diff --git a/mkspecs/qws/linux-arc-g++/qplatformdefs.h b/mkspecs/qws/linux-arc-g++/qplatformdefs.h
-new file mode 100644
-index 0000000..a654aa7
---- /dev/null
-+++ b/mkspecs/qws/linux-arc-g++/qplatformdefs.h
-@@ -0,0 +1,42 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2015 The Qt Company Ltd.
-+** Contact: http://www.qt.io/licensing/
-+**
-+** This file is part of the qmake spec of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see http://www.qt.io/terms-conditions. For further
-+** information use the contact form at http://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 or version 3 as published by the Free
-+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-+** following information to ensure the GNU Lesser General Public License
-+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** As a special exception, The Qt Company gives you certain additional
-+** rights. These rights are described in The Qt Company LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "../../linux-g++/qplatformdefs.h"
-diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h
-index d154b7e..a48c42a 100644
---- a/src/corelib/arch/qatomic_arch.h
-+++ b/src/corelib/arch/qatomic_arch.h
-@@ -94,6 +94,8 @@ QT_BEGIN_HEADER
- #  include "QtCore/qatomic_sh4a.h"
- #elif defined(QT_ARCH_NACL)
- #  include "QtCore/qatomic_generic.h"
-+#elif defined(QT_ARCH_ARC)
-+#  include "QtCore/qatomic_generic.h"
- #else
- #  error "Qt has not been ported to this architecture"
- #endif
-diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
-index 8bca422..e3e2565 100644
---- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
-+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
-@@ -143,6 +143,11 @@
- # define __NR_inotify_add_watch 27
- # define __NR_inotify_rm_watch  28
- // no inotify_init for aarch64
-+#elif defined (__arc__)
-+# define __NR_inotify_init      1043
-+# define __NR_inotify_add_watch 27
-+# define __NR_inotify_rm_watch  28
-+# define __NR_inotify_init1     26
- #else
- # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com"
- #endif
-diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp
-index de8790a..cc2f5b6 100644
---- a/src/gui/painting/qblendfunctions.cpp
-+++ b/src/gui/painting/qblendfunctions.cpp
-@@ -309,9 +309,9 @@ template  void qt_blend_argb24_on_rgb16(uchar *destPixels, int dbpl,
-         const uchar *src = srcPixels + y * sbpl;
-         const uchar *srcEnd = src + srcOffset;
-         while (src < srcEnd) {
--#if defined(QT_ARCH_ARMV5) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) || (defined(QT_ARCH_INTEGRITY) && !defined(_X86_))
-+#if defined(QT_ARCH_ARMV5) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) || (defined(QT_ARCH_INTEGRITY) && !defined(_X86_)) || defined(QT_ARCH_ARC)
-             // non-16-bit aligned memory access is not possible on PowerPC,
--            // ARM 
-Date: Wed, 20 May 2015 10:53:59 +0300
-Subject: [PATCH 2/2] Prevent unaligned access on ARC
-
-As many other architectures ARC cores by default don't support
-unaligned word access to data.
-
-Even though it's possible to enable unaligned access to data in
-ARC HS38 core (we're talking about configuration of core design)
-to make sure Qt could be executed on any flavour of ARC fall-back
-to byte-accesses is used.
-
-Change-Id: I96068d40b449f11ba987ed1e5d5e44f493d1eb5f
-
-This patch was submited in upstream Qt4 and if it ever gets accepted,
-it should be removed from Buildroot.
-
-https://codereview.qt-project.org/#/c/112668
----
- src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h |  2 +-
- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h    | 13 ++++++++++++-
- .../webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp  |  2 +-
- .../webkit/Source/JavaScriptCore/wtf/text/StringHash.h      |  2 +-
- 4 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h
-index 2d76809..ee9b7f0 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h
-@@ -202,7 +202,7 @@ struct UStringHash {
- 
-         // FIXME: perhaps we should have a more abstract macro that indicates when
-         // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC)
-+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(ARC)
-         const UChar* aChars = a->characters();
-         const UChar* bChars = b->characters();
-         for (unsigned i = 0; i != aLength; ++i) {
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-index e8b03be..cd17e9c 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-@@ -369,7 +369,18 @@
- 
- #endif /* ARM */
- 
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
-+/* CPU(ARC) - ARC, any version*/
-+#if   defined(arc) \
-+    || defined(__arc__) \
-+    || defined(ARC) \
-+    || defined(_ARC_)
-+#define WTF_CPU_ARC 1
-+#if defined(__BIG_ENDIAN__)
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+#endif
-+
-+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ARC)
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
- 
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-index 9dd655e..bd3ab95 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-@@ -142,7 +142,7 @@ static inline bool equal(StringImpl* string, const UChar* characters, unsigned l
- 
-     // FIXME: perhaps we should have a more abstract macro that indicates when
-     // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC)
-+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(ARC)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h
-index 4637c3d..91cef81 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h
-@@ -55,7 +55,7 @@ namespace WTF {
- 
-             // FIXME: perhaps we should have a more abstract macro that indicates when
-             // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC)
-+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(ARC)
-             const UChar* aChars = a->characters();
-             const UChar* bChars = b->characters();
-             for (unsigned i = 0; i != aLength; ++i) {
--- 
-2.1.0
-
diff --git a/buildroot/package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch b/buildroot/package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch
deleted file mode 100644
index d7d387a78..000000000
--- a/buildroot/package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From ea46f47fb3c475ba2d7581c15185b8d43e63b8c2 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer 
-Date: Fri, 27 Feb 2015 21:30:52 +0100
-Subject: [PATCH] Fix conversion/constructor error for legacy c++ compiler.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes the following compile error with legacy c++ compiler:
-
-error: in C++98 ‘blitRect’ must be initialized by constructor, not by ‘{...}’
-
-Signed-off-by: Peter Seiderer 
----
- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp   | 14 +++++++-------
- src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp        |  6 +++---
- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp        |  6 +++---
- src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp |  2 +-
- 4 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
-index 876d0c2..ed69386 100644
---- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
-+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
-@@ -942,7 +942,7 @@ void QDirectFBPaintEngine::drawBufferSpan(const uint *buffer, int bufsize,
-     IDirectFBSurface *src = d->surfaceCache->getSurface(buffer, bufsize);
-     // ### how does this play with setDFBColor
-     src->SetColor(src, 0, 0, 0, const_alpha);
--    const DFBRectangle rect = { 0, 0, length, 1 };
-+    const DFBRectangle rect = (DFBRectangle_C){ 0, 0, length, 1 };
-     d->surface->Blit(d->surface, src, &rect, x, y);
- }
- 
-@@ -1223,14 +1223,14 @@ void QDirectFBPaintEnginePrivate::blit(const QRectF &dest, IDirectFBSurface *s,
-     const QRect dr = engine->state()->matrix.mapRect(dest).toRect();
-     if (dr.isEmpty())
-         return;
--    const DFBRectangle sRect = { sr.x(), sr.y(), sr.width(), sr.height() };
-+    const DFBRectangle sRect = (DFBRectangle_C){ sr.x(), sr.y(), sr.width(), sr.height() };
-     DFBResult result;
- 
-     if (dr.size() == sr.size()) {
-         result = surface->Blit(surface, s, &sRect, dr.x(), dr.y());
-     } else {
-         Q_ASSERT(supportsStretchBlit());
--        const DFBRectangle dRect = { dr.x(), dr.y(), dr.width(), dr.height() };
-+        const DFBRectangle dRect = (DFBRectangle_C){ dr.x(), dr.y(), dr.width(), dr.height() };
-         result = surface->StretchBlit(surface, s, &sRect, &dRect);
-     }
-     if (result != DFB_OK)
-@@ -1261,7 +1261,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
-     if (newClip.isNull())
-         return;
- 
--    const DFBRegion clip = {
-+    const DFBRegion clip = (DFBRegion_C){
-         newClip.x(),
-         newClip.y(),
-         newClip.right(),
-@@ -1295,7 +1295,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
-         while (y <= destinationRect.bottom()) {
-             qreal x = startX;
-             while (x <= destinationRect.right()) {
--                const DFBRectangle destination = { qRound(x), qRound(y), mappedSize.width(), mappedSize.height() };
-+                const DFBRectangle destination = (DFBRectangle_C){ qRound(x), qRound(y), (int)mappedSize.width(), (int)mappedSize.height() };
-                 surface->StretchBlit(surface, sourceSurface, 0, &destination);
-                 x += mappedSize.width();
-             }
-@@ -1337,7 +1337,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
-     if (currentClip.isEmpty()) {
-         surface->SetClip(surface, 0);
-     } else {
--        const DFBRegion clip = {
-+        const DFBRegion clip = (DFBRegion_C){
-             currentClip.x(),
-             currentClip.y(),
-             currentClip.right(),
-@@ -1356,7 +1356,7 @@ void QDirectFBPaintEnginePrivate::updateClip()
-         surface->SetClip(surface, NULL);
-         clipType = NoClip;
-     } else if (clipData->hasRectClip) {
--        const DFBRegion r = {
-+        const DFBRegion r = (DFBRegion_C){
-             clipData->clipRect.x(),
-             clipData->clipRect.y(),
-             clipData->clipRect.right(),
-diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
-index 412e684..c59c47d 100644
---- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
-+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
-@@ -363,7 +363,7 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect)
-     } else {
-         dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
-     }
--    const DFBRectangle blitRect = { rect.x(), rect.y(),
-+    const DFBRectangle blitRect = (DFBRectangle_C){ rect.x(), rect.y(),
-                                     rect.width(), rect.height() };
-     w = rect.width();
-     h = rect.height();
-@@ -465,7 +465,7 @@ QPixmap QDirectFBPixmapData::transformed(const QTransform &transform,
-     }
-     data->dfbSurface->SetBlittingFlags(data->dfbSurface, flags);
- 
--    const DFBRectangle destRect = { 0, 0, size.width(), size.height() };
-+    const DFBRectangle destRect = (DFBRectangle_C){ 0, 0, size.width(), size.height() };
-     data->dfbSurface->StretchBlit(data->dfbSurface, dfbSurface, 0, &destRect);
-     data->w = size.width();
-     data->h = size.height();
-@@ -551,7 +551,7 @@ bool QDirectFBPixmapData::scroll(int dx, int dy, const QRect &rect)
-         return false;
-     }
- 
--    const DFBRectangle source = { rect.x(), rect.y(), rect.width(), rect.height() };
-+    const DFBRectangle source = (DFBRectangle_C){ rect.x(), rect.y(), rect.width(), rect.height() };
-     result = dfbSurface->Blit(dfbSurface, dfbSurface, &source, source.x + dx, source.y + dy);
-     if (result != DFB_OK) {
-         DirectFBError("QDirectFBPixmapData::scroll", result);
-diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
-index eab9580..d26e5bf 100644
---- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
-+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
-@@ -1635,7 +1635,7 @@ void QDirectFBScreen::solidFill(const QColor &color, const QRegion ®ion)
- static inline void clearRect(IDirectFBSurface *surface, const QColor &color, const QRect &rect)
- {
-     Q_ASSERT(surface);
--    const DFBRegion region = { rect.left(), rect.top(), rect.right(), rect.bottom() };
-+    const DFBRegion region = (DFBRegion_C){ rect.left(), rect.top(), rect.right(), rect.bottom() };
-     // could just reinterpret_cast this to a DFBRegion
-     surface->SetClip(surface, ®ion);
-     surface->Clear(surface, color.red(), color.green(), color.blue(), color.alpha());
-@@ -1716,14 +1716,14 @@ void QDirectFBScreen::flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags
-             const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT;
-             for (int i=0; iFlip(surface, &dfbReg, i + 1 < rects.size() ? nonWaitFlags : flipFlags);
-             }
-         } else {
-             const QRect r = region.boundingRect();
--            const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
-+            const DFBRegion dfbReg = (DFBRegion_C){ r.x() + offset.x(), r.y() + offset.y(),
-                                        r.right() + offset.x(),
-                                        r.bottom() + offset.y() };
-             surface->Flip(surface, &dfbReg, flipFlags);
-diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
-index 4dff907..25ad06b 100644
---- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
-+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
-@@ -333,7 +333,7 @@ bool QDirectFBWindowSurface::scroll(const QRegion ®ion, int dx, int dy)
-     }
-     dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
-     const QRect r = region.boundingRect();
--    const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() };
-+    const DFBRectangle rect = (DFBRectangle_C){ r.x(), r.y(), r.width(), r.height() };
-     dfbSurface->Blit(dfbSurface, dfbSurface, &rect, r.x() + dx, r.y() + dy);
-     return true;
- }
--- 
-2.1.4
-
diff --git a/buildroot/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch b/buildroot/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
deleted file mode 100644
index 9b1655322..000000000
--- a/buildroot/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0bf90de93b9fe21df32319e27b2507154fa8a21d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= 
-Date: Fri, 15 Apr 2016 00:37:26 +0200
-Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
-only when its glibc < 2 and not also for the libraries which may define
-it as per standards but are not glibc, e.g. musl.
-
-This patch is adapted from Qt5 [1].
-
-[1]
-https://github.com/qtproject/qtbase/commit/813f468a14fb84af43c1f8fc0a1430277358eba2
-
-Signed-off-by: Jörg Krause 
----
- mkspecs/linux-g++/qplatformdefs.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
-index de751dd..d4146ed 100644
---- a/mkspecs/linux-g++/qplatformdefs.h
-+++ b/mkspecs/linux-g++/qplatformdefs.h
-@@ -86,10 +86,10 @@
- 
- #undef QT_SOCKLEN_T
- 
--#if defined(__GLIBC__) && (__GLIBC__ >= 2)
--#define QT_SOCKLEN_T            socklen_t
--#else
-+#if defined(__GLIBC__) && (__GLIBC__ < 2)
- #define QT_SOCKLEN_T            int
-+#else
-+#define QT_SOCKLEN_T            socklen_t
- #endif
- 
- #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
--- 
-2.8.0
-
diff --git a/buildroot/package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch b/buildroot/package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch
deleted file mode 100644
index f3d47f754..000000000
--- a/buildroot/package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 438f088ad520ac91ae47dba9a515ab0d1088c89c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= 
-Date: Fri, 15 Apr 2016 03:32:02 +0200
-Subject: [PATCH] Link with -ldl option only when it is supported
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-`-ldl` option is used unconditionally in `QMAKE_LIBS_DYNLOAD` while libdl is
-not supported when libc is static. As the value of `QMAKE_LIBS_DYNLOAD` goes
-into 'Libs.private' field of the pkgconfig files created by qmake, static
-linking with qt will fail with:
-  /usr/bin/ld: cannot find -ldl
-
-Fix this issue by adding a build test to configure to check if libdl is
-supported. `QMAKE_LIBS_DYNLOAD` in "src/corelib/plugin/plugin.pri" is now used
-only if libdl is available.
-
-Backported from Qt5:
-https://github.com/qtproject/qtbase/commit/f669ea0d54302de31456d57286aa0e4ca1443e98
-
-Signed-off-by: Jörg Krause 
----
- config.tests/unix/libdl/libdl.cpp | 39 +++++++++++++++++++++++++++++++++++++++
- config.tests/unix/libdl/libdl.pro |  3 +++
- configure                         |  6 ++++++
- src/corelib/plugin/plugin.pri     |  2 +-
- 4 files changed, 49 insertions(+), 1 deletion(-)
- create mode 100644 config.tests/unix/libdl/libdl.cpp
- create mode 100644 config.tests/unix/libdl/libdl.pro
-
-diff --git a/config.tests/unix/libdl/libdl.cpp b/config.tests/unix/libdl/libdl.cpp
-new file mode 100644
-index 0000000..28a8233
---- /dev/null
-+++ b/config.tests/unix/libdl/libdl.cpp
-@@ -0,0 +1,39 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2015 The Qt Company Ltd.
-+** Contact: http://www.qt.io/licensing/
-+**
-+** This file is part of the config.tests of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL21$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see http://www.qt.io/terms-conditions. For further
-+** information use the contact form at http://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 or version 3 as published by the Free
-+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-+** following information to ensure the GNU Lesser General Public License
-+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** As a special exception, The Qt Company gives you certain additional
-+** rights. These rights are described in The Qt Company LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include 
-+
-+int main(int, char **)
-+{
-+    dlopen(0, 0);
-+}
-diff --git a/config.tests/unix/libdl/libdl.pro b/config.tests/unix/libdl/libdl.pro
-new file mode 100644
-index 0000000..a643934
---- /dev/null
-+++ b/config.tests/unix/libdl/libdl.pro
-@@ -0,0 +1,3 @@
-+SOURCES = libdl.cpp
-+CONFIG -= qt dylib
-+LIBS += -ldl
-\ No newline at end of file
-diff --git a/configure b/configure
-index 10ad7ca..1c70691 100755
---- a/configure
-+++ b/configure
-@@ -5506,6 +5506,12 @@ if [ "$CFG_LIBPNG" = "auto" ]; then
-     fi
- fi
- 
-+# detect dl
-+if ! compileTest unix/libdl "libdl"; then
-+    QMakeVar add DEFINES QT_NO_DYNAMIC_LIBRARY
-+    QMAKE_CONFIG="$QMAKE_CONFIG no-libdl"
-+fi
-+
- # detect accessibility
- if [ "$CFG_ACCESSIBILITY" = "auto" ]; then
-     if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-diff --git a/src/corelib/plugin/plugin.pri b/src/corelib/plugin/plugin.pri
-index eb7a7f7..c342f2e 100644
---- a/src/corelib/plugin/plugin.pri
-+++ b/src/corelib/plugin/plugin.pri
-@@ -32,4 +32,4 @@ integrity {
- 	SOURCES += plugin/qlibrary_unix.cpp
- }
- 
--LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD
-+!no-libdl: LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD
--- 
-2.8.0
-
diff --git a/buildroot/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch b/buildroot/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch
deleted file mode 100644
index 8c65d1db3..000000000
--- a/buildroot/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 87c9c18fad02744238336a6cf1ce70d3ec2c89c2 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls 
-Date: Sat, 11 Jun 2016 17:03:07 +0200
-Subject: [PATCH 1/1] OpenGL/EGL: Avoid X11 header collision
-
-Including X11 headers via EGL/egl.h leads to a collision of defines
-between Qt and X11. To fix this qt5 added
-  DEFINES += MESA_EGL_NO_X11_HEADERS
-in various files:
-
-https://github.com/qtproject/qtbase/blob/dev/src/platformsupport/eglconvenience/eglconvenience.pri#L19
-https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/minimalegl/minimalegl.pro#L10
-https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro#L6
-[...]
-
-This patch fixes a similar compile error in qt4:
-http://autobuild.buildroot.net/results/9b0/9b0ed92984eead89d148eaa71aff6e2f1e117837/
-http://autobuild.buildroot.org/results/4fd/4fd57553336d36439fab32a7221fc8639758e887/
-http://autobuild.buildroot.org/results/5cb/5cb8072f8220f7203fa79936eedcc43eab53ec66/
-
-Signed-off-by: Bernd Kuhls 
-(patch not sent upstream because qt4 branch is closed:
- http://blog.qt.io/blog/2015/05/26/qt-4-8-7-released/)
----
-
- src/gui/egl/egl.pri   | 3 +++
- src/opengl/opengl.pro | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
-index 8e8664c..715ffd7 100644
---- a/src/gui/egl/egl.pri
-+++ b/src/gui/egl/egl.pri
-@@ -22,6 +22,9 @@ contains(QT_CONFIG, egl): {
-             !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
-         }
- 
-+	# Avoid X11 header collision
-+	DEFINES += MESA_EGL_NO_X11_HEADERS
-+
- 	wince*: SOURCES += egl/qegl_wince.cpp
- 
- 	unix {
-diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
-index ce1a5d2..65b1031 100644
---- a/src/opengl/opengl.pro
-+++ b/src/opengl/opengl.pro
-@@ -149,6 +149,9 @@ embedded {
-                qglwindowsurface_qws_p.h \
-                qgl_egl_p.h
- 
-+    # Avoid X11 header collision
-+    DEFINES += MESA_EGL_NO_X11_HEADERS
-+
-     contains(QT_CONFIG, fontconfig) {
-         include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
-     } else {
--- 
-2.8.1
-
diff --git a/buildroot/package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch b/buildroot/package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch
deleted file mode 100644
index 645041acf..000000000
--- a/buildroot/package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2281fa50f6e13278d3fd4f028377b8249b7b3cdb Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Fri, 8 Sep 2017 09:06:54 +0200
-Subject: [PATCH] src/corelib/arch/qatomic_arm.h: fix build on ARMv8 32-bit
-
-The Qt build fails on ARMv8 32-bit because it falls back to using the
-ARMv5 code that uses the swp instruction, which no longer exists:
-
-/tmp/ccSxVIzw.s: Assembler messages:
-/tmp/ccSxVIzw.s:127: Error: swp{b} use is obsoleted for ARMv8 and later
-/tmp/ccSxVIzw.s:190: Error: swp{b} use is obsoleted for ARMv8 and later
-
-So, this commit adjusts the ARM atomic code to assume ARMv8 is similar
-to ARMv7.
-
-Signed-off-by: Thomas Petazzoni 
----
- src/corelib/arch/qatomic_arm.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h
-index 77cd66f272..e011929d3e 100644
---- a/src/corelib/arch/qatomic_arm.h
-+++ b/src/corelib/arch/qatomic_arm.h
-@@ -47,7 +47,8 @@ QT_BEGIN_HEADER
- #if defined(__ARM_ARCH_7__) \
-     || defined(__ARM_ARCH_7A__) \
-     || defined(__ARM_ARCH_7R__) \
--    || defined(__ARM_ARCH_7M__)
-+    || defined(__ARM_ARCH_7M__) \
-+    || defined(__ARM_ARCH_8A__)
- # define QT_ARCH_ARMV7
- QT_BEGIN_INCLUDE_HEADER
- # include "QtCore/qatomic_armv7.h"
--- 
-2.13.5
-
diff --git a/buildroot/package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch b/buildroot/package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch
deleted file mode 100644
index 1e555e721..000000000
--- a/buildroot/package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From f566411fb314b7e4ab01f28e25e942cfaf8c59b7 Mon Sep 17 00:00:00 2001
-From: Evgeniy Didin 
-Date: Fri, 15 Sep 2017 19:43:48 +0300
-Subject: [PATCH] qt: Allow enabling of QtWebKit with GCC 6+
-
-Building Qt with QtWebKit on configuration step there is
-a check which disables QtWebKit build with GCC 6+.
-Back in the day nobody thought about building Qt with GCC
-version greater than 5.x. And now with modern GCCs like
-6.x and 7.x this assumption gets in the way.
-
-Given in Buildroot today we don't have GCC older than 4.9 
-it should be safe to remove now meaningless check completely.
-
-Signed-off-by: Evgeniy Didin 
-Cc: Alexey Brodkin 
-Cc: Thomas Petazzoni 
-
----
- configure | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/configure b/configure
-index 10ad7ca0b0..8771144a65 100755
---- a/configure
-+++ b/configure
-@@ -7731,20 +7731,6 @@ case "$XPLATFORM" in
- 	canBuildWebKit="no"
- 	canBuildQtXmlPatterns="no"
- 	;;
--    *-g++*)
--	# Check gcc's version
--	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
--	    5*|4*|3.4*)
--		;;
--            3.3*)
--                canBuildWebKit="no"
--                ;;
--	    *)
--		canBuildWebKit="no"
--		canBuildQtXmlPatterns="no"
--		;;
--	esac
--	;;
-     solaris-cc*)
-         # Check the compiler version
-         case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
--- 
-2.11.0
-
diff --git a/buildroot/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch b/buildroot/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch
deleted file mode 100644
index a5995484c..000000000
--- a/buildroot/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 02e9698c96ca78342b82fa7239e93bab4aa45db2 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Fri, 17 Nov 2017 22:20:06 +0100
-Subject: [PATCH] configure: fix build on non-x86 platforms
-
-When building for an uncommon platform on a ppc64le machine, Qt build
-fails because it builds qmake with the target compiler instead of
-using the host compiler. This is due to the fact that Qt configure
-script believes that both the host and target platforms are "powerpc",
-even though the target really is Xtensa or ARC for example.
-
-Qt's configure script defines a variable called PLATFORM that points to
-the mkspecs describing the host machine. For x86, its value is
-qws/linux-x86-g++ and for x86-64, its value is
-qws/linux-x86_64-g++. For any other host architecture, its value is
-qws/linux-generic-g++.
-
-In parallel to this, Qt's configure script defines a variable called
-XPLATFORM that points to the mkspecs describing the target machine. It
-points to qws/linux-${CFG_EMBEDDED}-g++, where CFG_EMBEDDED is
-simply "generic" for most uncommon architectures.
-
-Therefore, when we're building for an uncommon architecture, on a
-ppc64le machine, we have:
-
-  PLATFORM = qws/linux-generic-g++
-  XPLATFORM = qws/linux-generic-g++
-
-i.e, both values are equal. Due to this, the following condition is
-false:
-
-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
-
-which causes Qt's configure script to fallback to:
-
-elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
-    CFG_ARCH=$CFG_HOST_ARCH
-fi
-
-because CFG_ARCH is not defined, and therefore gets defined to
-CFG_HOST_ARCH. So we have CFG_ARCH == CFG_HOST_ARCH, and Qt believes
-we're doing a native build.
-
-Therefore, we need to ensure that PLATFORM and XPLATFORM always have a
-different value. To achieve this, we create a
-qws/linux-host-generic-g++ mkspecs, which is always used as
-PLATFORM. It is identical to qws/linux-x86-g++. Compared to
-qws/linux-x86_64-g++, the only difference is that we're not passing
-the -m64 flag, but that isn't needed when building host tools.
-
-Signed-off-by: Thomas Petazzoni 
----
- configure                                          |  8 +----
- mkspecs/qws/linux-host-generic-g++/qmake.conf      | 10 ++++++
- mkspecs/qws/linux-host-generic-g++/qplatformdefs.h | 42 ++++++++++++++++++++++
- 3 files changed, 53 insertions(+), 7 deletions(-)
- create mode 100644 mkspecs/qws/linux-host-generic-g++/qmake.conf
- create mode 100644 mkspecs/qws/linux-host-generic-g++/qplatformdefs.h
-
-diff --git a/configure b/configure
-index 10ad7ca0b0..d25f90be1e 100755
---- a/configure
-+++ b/configure
-@@ -2806,14 +2806,8 @@ if [ "$CFG_EMBEDDED" != "no" ]; then
-     Linux:*)
-         if [ -z "$PLATFORM" ]; then
-             case "$UNAME_MACHINE" in
--            *86)
--                PLATFORM=qws/linux-x86-g++
--                ;;
--            *86_64)
--                PLATFORM=qws/linux-x86_64-g++
--                ;;
-             *)
--                PLATFORM=qws/linux-generic-g++
-+                PLATFORM=qws/linux-host-generic-g++
-                 ;;
-             esac
-         fi
-diff --git a/mkspecs/qws/linux-host-generic-g++/qmake.conf b/mkspecs/qws/linux-host-generic-g++/qmake.conf
-new file mode 100644
-index 0000000000..55011ec52b
---- /dev/null
-+++ b/mkspecs/qws/linux-host-generic-g++/qmake.conf
-@@ -0,0 +1,10 @@
-+#
-+# qmake configuration for building with linux-g++
-+#
-+
-+include(../../common/linux.conf)
-+include(../../common/gcc-base-unix.conf)
-+include(../../common/g++-unix.conf)
-+include(../../common/qws.conf)
-+
-+load(qt_config)
-diff --git a/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h b/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h
-new file mode 100644
-index 0000000000..a654aa78a2
---- /dev/null
-+++ b/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h
-@@ -0,0 +1,42 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2015 The Qt Company Ltd.
-+** Contact: http://www.qt.io/licensing/
-+**
-+** This file is part of the qmake spec of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see http://www.qt.io/terms-conditions. For further
-+** information use the contact form at http://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 or version 3 as published by the Free
-+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-+** following information to ensure the GNU Lesser General Public License
-+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** As a special exception, The Qt Company gives you certain additional
-+** rights. These rights are described in The Qt Company LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "../../linux-g++/qplatformdefs.h"
--- 
-2.13.6
-
diff --git a/buildroot/package/qt/Config.gfx.in b/buildroot/package/qt/Config.gfx.in
deleted file mode 100644
index 5e6619c7b..000000000
--- a/buildroot/package/qt/Config.gfx.in
+++ /dev/null
@@ -1,31 +0,0 @@
-menu "Graphics drivers"
-
-config BR2_PACKAGE_QT_GFX_LINUXFB
-	bool "Linux Framebuffer"
-	default y
-
-config BR2_PACKAGE_QT_GFX_TRANSFORMED
-	bool "Transformed"
-
-config BR2_PACKAGE_QT_GFX_QVFB
-	bool "Qt Virtual Framebuffer"
-
-config BR2_PACKAGE_QT_GFX_VNC
-	bool "VNC"
-
-config BR2_PACKAGE_QT_GFX_MULTISCREEN
-	bool "multiscreen"
-
-comment "directfb Qt driver not available (need directfb)"
-	depends on !BR2_PACKAGE_DIRECTFB
-
-config BR2_PACKAGE_QT_GFX_DIRECTFB
-	bool "directFB"
-	depends on BR2_PACKAGE_DIRECTFB
-
-config BR2_PACKAGE_QT_GFX_POWERVR
-	bool "powervr"
-	depends on BR2_PACKAGE_QT_OPENGL_ES
-	depends on BR2_PACKAGE_HAS_POWERVR
-
-endmenu
diff --git a/buildroot/package/qt/Config.in b/buildroot/package/qt/Config.in
deleted file mode 100644
index a1218ecf3..000000000
--- a/buildroot/package/qt/Config.in
+++ /dev/null
@@ -1,543 +0,0 @@
-comment "qt needs a toolchain w/ C++, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-
-menuconfig BR2_PACKAGE_QT
-	bool "Qt (obsolete)"
-	depends on BR2_USE_MMU # fork
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	help
-	  Qt is a cross-platform application and UI framework for
-	  developers using C++.
-
-	  http://qt-project.org
-
-if BR2_PACKAGE_QT
-
-choice
-	prompt "Qt installation"
-	help
-	  Selects the type of installation: standard or embedded
-
-config BR2_PACKAGE_QT_EMBEDDED
-	bool "Qt embedded"
-	help
-	  The embedded Qt installation targets embedded systems
-	  without X.org. Provides backends for framebuffer.
-	  If unsure, say Y.
-
-comment "Qt standard (X11) not available (need X.org)"
-	depends on !BR2_PACKAGE_XORG7
-
-config BR2_PACKAGE_QT_X11
-	bool "Qt standard (X11)"
-	depends on BR2_PACKAGE_XORG7
-	select BR2_PACKAGE_FONTCONFIG
-	select BR2_PACKAGE_XLIB_LIBXI
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXRENDER
-	select BR2_PACKAGE_XLIB_LIBXCURSOR
-	select BR2_PACKAGE_XLIB_LIBXRANDR
-	select BR2_PACKAGE_XLIB_LIBXEXT
-	select BR2_PACKAGE_XLIB_LIBXV
-	select BR2_PACKAGE_QT_SYSTEMFREETYPE
-	select BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  The standard Qt installation provides X.org backend. If you
-	  don't want to use X.org, say N.
-
-endchoice
-
-config BR2_PACKAGE_QT_DEBUG
-	bool "Compile with debug support"
-	help
-	  If unsure, say N.
-
-config BR2_PACKAGE_QT_DEMOS
-	bool "Compile and install Qt demos (with code)"
-	select BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  If unsure, say N.
-
-config BR2_PACKAGE_QT_TRANSLATION_FILES
-	bool "Install translation files"
-	help
-	  Install binary .qm translation files.
-	  Say y if you need these files. They will take about 8 MB
-	  on the target root filesystem.
-
-config BR2_PACKAGE_QT_EXAMPLES
-	bool "Compile and install Qt examples (with code)"
-	select BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  If unsure, say N.
-
-choice
-	prompt "Library type"
-	help
-	  Selects the library type: Shared or Static
-
-config BR2_PACKAGE_QT_SHARED
-	bool "Shared library"
-	depends on !BR2_STATIC_LIBS
-	help
-	  Create and use shared Qt libraries.
-	  If you have multiple programs that depend on Qt or intend to
-	  use plugins, say Y.
-
-config BR2_PACKAGE_QT_STATIC
-	bool "Static Library"
-	help
-	  Create and use static Qt libraries.
-	  If you don't have multiple programs on the target that
-	  depends on Qt, then this will save you quite some of storage
-	  space.
-	  If unsure, say Y.
-
-endchoice
-
-config BR2_PACKAGE_QT_CONFIG_FILE
-	string "Config file"
-	help
-	  Configure options allow to set which modules are being
-	  compiled or not in Qt, but Qt also provide a more
-	  fine-grained mechanism to configure which features should be
-	  enabled or disabled, through a header file. Examples of such
-	  header files can be found in src/corelib/global/qconfig-*.h
-	  in the Qt sources.
-
-	  This option allows to set the path of such a configuration
-	  file, which Buildroot will give to Qt at compile time.
-
-config BR2_PACKAGE_QT_QT3SUPPORT
-	bool "Compatibility with Qt3"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	select BR2_PACKAGE_QT_SQL_MODULE
-	help
-	  Turns on support for older Qt3. This will create an
-	  additional library with proxy code and increase the space
-	  required on target.  If unsure say n.
-
-config BR2_PACKAGE_QT_GUI_MODULE
-	bool "Gui Module"
-	default y
-	select BR2_PACKAGE_QT_NETWORK
-	help
-	  Turns on support for Gui applications. If your board doesn't
-	  have video output, or you don't require Qt GUI, say n.
-
-if BR2_PACKAGE_QT_GUI_MODULE
-
-if BR2_PACKAGE_QT_EMBEDDED
-
-menu "Pixel depths"
-comment "Deselecting each option leads to Qt's default (8,16,32)"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_1
-	bool "1 bpp, black/white"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_4
-	bool "4 bpp, grayscale"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_8
-	bool "8 bpp, paletted"
-	default y
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_12
-	bool "12 bpp, rgb 4-4-4"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_15
-	bool "15 bpp, rgb 5-5-5"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_16
-	bool "16 bpp, rgb 5-6-5"
-	default y
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_18
-	bool "18 bpp, rgb 6-6-6"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_24
-	bool "24 bpp, rgb 8-8-8"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_32
-	bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"
-	default y
-
-endmenu
-
-menu "Fonts"
-
-config BR2_PACKAGE_QT_FONT_TRUETYPE
-	bool "dejavu/vera"
-	default y
-	depends on BR2_PACKAGE_QT_QTFREETYPE || BR2_PACKAGE_QT_SYSTEMFREETYPE
-
-comment "dejavu/vera fonts need freetype support"
-	depends on !BR2_PACKAGE_QT_QTFREETYPE && !BR2_PACKAGE_QT_SYSTEMFREETYPE
-
-config BR2_PACKAGE_QT_FONT_MICRO
-	bool "micro"
-	default y
-
-config BR2_PACKAGE_QT_FONT_FIXED
-	bool "fixed"
-	default y
-
-config BR2_PACKAGE_QT_FONT_HELVETICA
-	bool "helvetica"
-	default y
-
-config BR2_PACKAGE_QT_FONT_JAPANESE
-	bool "japanese"
-
-config BR2_PACKAGE_QT_FONT_UNIFONT
-	bool "unicode"
-
-endmenu
-
-endif # BR2_PACKAGE_QT_EMBEDDED
-
-choice
-	prompt "freetype2 support"
-	default BR2_PACKAGE_QT_NOFREETYPE
-	help
-	  Select freetype2 support.
-
-config BR2_PACKAGE_QT_NOFREETYPE
-	bool "no freetype2 support"
-	depends on BR2_PACKAGE_QT_EMBEDDED
-	help
-	  Do not compile in Freetype2 support.
-
-comment "Qt freetype2 needs Qt embedded"
-	depends on BR2_PACKAGE_QT_X11
-
-config BR2_PACKAGE_QT_QTFREETYPE
-	bool "Qt freetype2"
-	depends on BR2_PACKAGE_QT_EMBEDDED
-	help
-	  Use the libfreetype bundled with Qt.
-
-config BR2_PACKAGE_QT_SYSTEMFREETYPE
-	bool "System freetype2"
-	select BR2_PACKAGE_FREETYPE
-	help
-	  Use shared libfreetype from the target system.
-	  See http://www.freetype.org/
-endchoice
-
-config BR2_PACKAGE_QT_GIF
-	bool "Enable GIF support"
-	help
-	  This compiles and installs the plugin for GIF reading support.
-
-config BR2_PACKAGE_QT_LIBMNG
-	bool "Enable libmng support"
-	help
-	  This compiles and installs the plugin for MNG support.
-
-choice
-	prompt "JPEG support"
-	default BR2_PACKAGE_QT_NOJPEG
-	help
-	  Select libjpeg support.
-
-config BR2_PACKAGE_QT_NOJPEG
-	bool "No jpeg support"
-	help
-	  Disable JPEG support
-
-config BR2_PACKAGE_QT_SYSTEMJPEG
-	bool "System libjpeg"
-	select BR2_PACKAGE_JPEG
-	help
-	  Link against system libjpeg
-
-config BR2_PACKAGE_QT_QTJPEG
-	bool "Use Qt bundled libjpeg"
-	help
-	  Link against libjpeg provided with Qt
-endchoice
-
-choice
-	prompt "PNG support"
-	default BR2_PACKAGE_QT_NOPNG
-	help
-	  Select which library to use if PNG support should be enabled.
-
-config BR2_PACKAGE_QT_NOPNG
-	bool "No PNG support"
-
-config BR2_PACKAGE_QT_SYSTEMPNG
-	bool "System libpng"
-	select BR2_PACKAGE_LIBPNG
-
-config BR2_PACKAGE_QT_QTPNG
-	bool "Use Qt bundled libpng"
-endchoice
-
-choice
-	prompt "TIFF support"
-	default BR2_PACKAGE_QT_NOTIFF
-	help
-	  Select which library to use if TIFF support should be enabled.
-
-config BR2_PACKAGE_QT_NOTIFF
-	bool "No TIFF support"
-
-config BR2_PACKAGE_QT_SYSTEMTIFF
-	bool "System libtiff"
-	select BR2_PACKAGE_TIFF
-
-config BR2_PACKAGE_QT_QTTIFF
-	bool "Use Qt bundled libtiff"
-endchoice
-
-config BR2_PACKAGE_QT_ACCESSIBILITY
-	bool "Enable accessibility support"
-	help
-	  This enables and compiles the accessibility support.
-
-endif # BR2_PACKAGE_QT_GUI_MODULE
-
-choice
-	prompt "zlib support"
-	default BR2_PACKAGE_QT_QTZLIB
-	help
-	  Select zlib support.
-
-config BR2_PACKAGE_QT_QTZLIB
-	bool "Qt zlib"
-	depends on !BR2_STATIC_LIBS
-	help
-	  Use the zlib bundled with Qt.
-
-comment "Qt zlib needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
-
-config BR2_PACKAGE_QT_SYSTEMZLIB
-	bool "System zlib"
-	select BR2_PACKAGE_ZLIB
-	help
-	  Use the shared zlib from the system.
-endchoice
-
-source "package/qt/Config.sql.in"
-if BR2_PACKAGE_QT_GUI_MODULE
-if BR2_PACKAGE_QT_EMBEDDED
-source "package/qt/Config.gfx.in"
-source "package/qt/Config.mouse.in"
-source "package/qt/Config.keyboard.in"
-endif
-
-config BR2_PACKAGE_QT_PHONON
-	bool "Phonon Module"
-	default y
-	depends on BR2_PACKAGE_GSTREAMER
-	select BR2_PACKAGE_GST_PLUGINS_BASE
-	help
-	  Build the Phonon module. Support for different audio/video
-	  formats can be configured at the GStreamer package.
-	  If unsure, say n.
-
-comment "Phonon module needs gstreamer"
-	depends on !BR2_PACKAGE_GSTREAMER
-
-config BR2_PACKAGE_QT_PHONON_BACKEND
-	bool "Phonon Module Backend"
-	depends on BR2_PACKAGE_QT_PHONON
-	help
-	  Build the platform Phonon plugin.
-	  If unsure, say n.
-
-config BR2_PACKAGE_QT_OPENGL
-	bool "OpenGL support"
-	default y
-	depends on (BR2_PACKAGE_HAS_LIBGL && BR2_PACKAGE_QT_X11) || \
-		   (BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES)
-	help
-	  This option enables OpenGL support.
-
-if BR2_PACKAGE_QT_OPENGL
-
-choice
-	prompt "OpenGL API"
-	help
-	  Select OpenGL API.
-
-comment "Desktop OpenGL not available (needs Qt standard (X11))"
-	depends on !BR2_PACKAGE_QT_X11
-
-config BR2_PACKAGE_QT_OPENGL_GL_DESKTOP
-	bool "Desktop OpenGL"
-	depends on BR2_PACKAGE_HAS_LIBGL
-	depends on BR2_PACKAGE_QT_X11
-	help
-	  Use desktop OpenGL.
-
-config BR2_PACKAGE_QT_OPENGL_ES
-	bool "OpenGL ES v2.x support"
-	depends on BR2_PACKAGE_HAS_LIBGLES
-	depends on BR2_PACKAGE_HAS_LIBEGL
-	help
-	  Enable the OpenGL ES v2.x support.
-
-endchoice
-
-endif # BR2_PACKAGE_QT_OPENGL
-
-endif
-
-config BR2_PACKAGE_QT_DBUS
-	bool "DBus Module"
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
-	depends on BR2_USE_MMU # dbus
-	select BR2_PACKAGE_DBUS
-	help
-	  Build the Qt DBus module.
-
-comment "DBus Module needs a toolchain w/ threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
-
-config BR2_PACKAGE_QT_XML
-	bool "XML Module"
-	default y
-	help
-	  Build the XML module.
-
-config BR2_PACKAGE_QT_XMLPATTERNS
-	bool "XML Patterns Module"
-	depends on BR2_PACKAGE_QT_XML
-	help
-	  Build QtXmlPatterns module.
-	  If unsure, say n
-
-config BR2_PACKAGE_QT_MULTIMEDIA
-	bool "Multimedia Module"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  Build QtMultimedia module.
-
-config BR2_PACKAGE_QT_AUDIO_BACKEND
-	bool "QtMultimedia Audio backend"
-	depends on BR2_PACKAGE_QT_MULTIMEDIA
-	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
-	select BR2_PACKAGE_ALSA_LIB
-	help
-	  Build the ALSA audio backend into QtMultimedia
-
-config BR2_PACKAGE_QT_SVG
-	bool "SVG Module"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  Build the SVG module.
-	  If unsure, say n
-
-config BR2_PACKAGE_QT_NETWORK
-	bool "Network Module"
-	default y
-	help
-	  Install the Network module.
-	  if unsure, say y
-
-config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-	bool
-	# see src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-	# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
-	default y if BR2_arc || BR2_arm || BR2_armeb || BR2_i386 || BR2_microblazeel || \
-		BR2_microblazebe || BR2_mips || BR2_mipsel || \
-		(BR2_mips64 || BR2_mips64el) && !BR2_MIPS_NABI32 || BR2_powerpc || \
-		BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64 || \
-		BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-
-config BR2_PACKAGE_QT_WEBKIT
-	bool "WebKit Module"
-	depends on BR2_PACKAGE_QT_SCRIPT
-	depends on BR2_PACKAGE_QT_SHARED
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	depends on BR2_PACKAGE_QT_NETWORK
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # needs pthread_getattr_np()
-	depends on BR2_PACKAGE_GSTREAMER
-	select BR2_PACKAGE_GST_PLUGINS_BASE
-	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
-	help
-	  Build the WebKit module.
-	  If unsure, say n.
-
-comment "WebKit needs a toolchain w/ dynamic library, NPTL"
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIB
-
-comment "WebKit needs QtShared/Script/Gui/Network and Gstreamer 0.10"
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL && !BR2_STATIC_LIB
-	depends on !BR2_PACKAGE_QT_SCRIPT     || !BR2_PACKAGE_QT_SHARED   \
-		|| !BR2_PACKAGE_QT_GUI_MODULE || !BR2_PACKAGE_QT_NETWORK  \
-		|| !BR2_PACKAGE_GSTREAMER
-
-config BR2_PACKAGE_QT_STL
-	bool "STL support"
-	help
-	  Compile STL support.
-	  If unsure, say n.
-
-config BR2_PACKAGE_QT_OPENSSL
-	bool "Enable OpenSSL support"
-	depends on BR2_PACKAGE_QT_NETWORK
-	select BR2_PACKAGE_OPENSSL
-	help
-	  Enable support for the OpenSSL encryption library. If you use
-	  QSslSocket say y here, otherwise, say no to save space on the
-	  target.
-	  If unsure, say n.
-
-config BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
-	bool
-	# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
-	default y if BR2_arc || BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
-		BR2_microblazeel || BR2_microblazebe || BR2_mips || BR2_mipsel || \
-		BR2_mips64 || BR2_mips64el || BR2_nios2 || BR2_powerpc || \
-		BR2_powerpc64 || BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \
-		BR2_sh4a || BR2_sh4aeb || BR2_x86_64
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-
-config BR2_PACKAGE_QT_SCRIPT
-	bool "Script Module"
-	default y
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # needs pthread_getattr_np()
-	help
-	  Build the Qt Script module.
-	  if unsure, say y.
-
-comment "Script Module needs a toolchain with NPTL"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
-
-config BR2_PACKAGE_QT_SCRIPTTOOLS
-	bool "Script Tools Module"
-	depends on BR2_PACKAGE_QT_SCRIPT
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  Build the Qt Script Tools module.
-	  if unsure, say n.
-
-config BR2_PACKAGE_QT_DECLARATIVE
-	bool "Declarative module"
-	depends on BR2_PACKAGE_QT_SCRIPT
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	depends on BR2_PACKAGE_QT_SQL_MODULE
-	help
-	  Build the Qt Declarative Module for qml support
-	  if unsure, say n.
-
-config BR2_PACKAGE_QT_TEST
-	bool "Test Module"
-	help
-	  Install the Test module.
-
-endif # BR2_PACKAGE_QT
diff --git a/buildroot/package/qt/Config.keyboard.in b/buildroot/package/qt/Config.keyboard.in
deleted file mode 100644
index b0425471e..000000000
--- a/buildroot/package/qt/Config.keyboard.in
+++ /dev/null
@@ -1,12 +0,0 @@
-menu "Keyboard drivers"
-
-config BR2_PACKAGE_QT_KEYBOARD_TTY
-	bool "tty"
-
-config BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT
-	bool "linux input"
-
-config BR2_PACKAGE_QT_KEYBOARD_QVFB
-	bool "qvfb"
-
-endmenu
diff --git a/buildroot/package/qt/Config.mouse.in b/buildroot/package/qt/Config.mouse.in
deleted file mode 100644
index 1062facb6..000000000
--- a/buildroot/package/qt/Config.mouse.in
+++ /dev/null
@@ -1,26 +0,0 @@
-menu "Mouse drivers"
-
-config BR2_PACKAGE_QT_MOUSE_PC
-	bool "pc"
-
-config BR2_PACKAGE_QT_MOUSE_LINUXTP
-	bool "linuxtp"
-
-config BR2_PACKAGE_QT_MOUSE_LINUXINPUT
-	bool "linux input"
-
-config BR2_PACKAGE_QT_MOUSE_TSLIB
-	bool "tslib"
-	select BR2_PACKAGE_TSLIB
-
-config BR2_PACKAGE_QT_MOUSE_QVFB
-	bool "qvfb"
-
-comment "Mouse Options"
-
-config BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR
-	bool "Hide the mouse cursor"
-	help
-	  Do not show the mouse cursor in QWS.
-
-endmenu
diff --git a/buildroot/package/qt/Config.sql.in b/buildroot/package/qt/Config.sql.in
deleted file mode 100644
index 1e7f6ba79..000000000
--- a/buildroot/package/qt/Config.sql.in
+++ /dev/null
@@ -1,60 +0,0 @@
-menuconfig BR2_PACKAGE_QT_SQL_MODULE
-	bool "SQL Module"
-	help
-	  Compile Qt SQL Module
-
-if BR2_PACKAGE_QT_SQL_MODULE
-config BR2_PACKAGE_QT_MYSQL
-	bool "MySQL Driver"
-	depends on BR2_USE_MMU # mysql
-	select BR2_PACKAGE_MYSQL
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
-	help
-	  Build MySQL driver
-	  If unsure, say n.
-
-config BR2_PACKAGE_QT_ODBC
-	bool "ODBC Driver"
-	select BR2_PACKAGE_UNIXODBC
-	help
-	  Build ODBC driver
-	  If unsure, say n.
-
-config BR2_PACKAGE_QT_PSQL
-	bool "PostgreSQL Driver"
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_POSTGRESQL
-	help
-	  Build PostgreSQL driver
-	  If unsure, say n.
-
-comment "PostgreSQL driver needs a toolchain w/ wchar, dynamic library"
-	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
-
-choice
-	prompt "SQLite 3 support"
-	default BR2_PACKAGE_QT_SQLITE_NONE
-	help
-	  Select SQLite support.
-
-config BR2_PACKAGE_QT_SQLITE_NONE
-	bool "No sqlite support"
-	help
-	  Do not compile any kind of SQLite support.
-
-config BR2_PACKAGE_QT_SQLITE_QT
-	bool "Qt SQLite"
-	help
-	  Use Qt bundled SQLite support.
-
-config BR2_PACKAGE_QT_SQLITE_SYSTEM
-	bool "System SQLite"
-	select BR2_PACKAGE_SQLITE
-	help
-	  Use system SQLite.
-
-endchoice
-
-endif
diff --git a/buildroot/package/qt/powervr.ini b/buildroot/package/qt/powervr.ini
deleted file mode 100644
index 57863ebc4..000000000
--- a/buildroot/package/qt/powervr.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[default]
-WindowSystem=libpvrQWSWSEGL.so.1
diff --git a/buildroot/package/qt/qt.hash b/buildroot/package/qt/qt.hash
deleted file mode 100644
index 301010cae..000000000
--- a/buildroot/package/qt/qt.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# md5 http://download.qt.io/official_releases/qt/4.8/4.8.7/md5sums-4.8.7, sha256 locally computed:
-md5    d990ee66bf7ab0c785589776f35ba6ad                                 qt-everywhere-opensource-src-4.8.7.tar.gz
-sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 qt-everywhere-opensource-src-4.8.7.tar.gz
diff --git a/buildroot/package/qt/qt.mk b/buildroot/package/qt/qt.mk
deleted file mode 100644
index 23cb94c11..000000000
--- a/buildroot/package/qt/qt.mk
+++ /dev/null
@@ -1,725 +0,0 @@
-################################################################################
-#
-# qt
-#
-################################################################################
-
-QT_VERSION_MAJOR = 4.8
-QT_VERSION = $(QT_VERSION_MAJOR).7
-QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
-QT_SITE = http://download.qt.io/archive/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
-QT_DEPENDENCIES = host-pkgconf
-QT_INSTALL_STAGING = YES
-
-QT_LICENSE := LGPL-2.1 with exceptions or GPL-3.0
-QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
-
-# Opensource licenses are the only one we catter about
-QT_CONFIGURE_OPTS += -opensource -confirm-license
-
-QT_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE))
-
-ifneq ($(QT_CONFIG_FILE),)
-QT_CONFIGURE_OPTS += -qconfig buildroot
-endif
-
-QT_CFLAGS = $(TARGET_CFLAGS)
-QT_CXXFLAGS = $(TARGET_CXXFLAGS)
-QT_LDFLAGS = $(TARGET_LDFLAGS)
-
-# Qt WebKit build fails when gcc-6 is used for build, because
-# 'std::auto_ptr' is deprecated starting from gcc 6.x. So, we have to
-# use an older c++ standard to prevent build failure
-QT_CXXFLAGS += -std=gnu++98
-
-# gcc bug internal compiler error: in validate_condition_mode, at
-# config/rs6000/rs6000.c:180744. Bug is fixed since gcc 7.
-# Workaround is to set -mno-isel, see
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60818 and
-# https://gcc.gnu.org/ml/gcc-patches/2016-02/msg01036.html
-ifeq ($(BR2_powerpc_8540)$(BR2_powerpc_8548)$(BR2_powerpc_e500mc)$(BR2_powerpc_e5500):$(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y:)
-QT_CXXFLAGS += -mno-isel
-endif
-
-# Qt has some assembly function that are not present in thumb1 mode:
-# Error: selected processor does not support Thumb mode `swp r3,r7,[r4]'
-# so, we desactivate thumb mode
-ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
-QT_CFLAGS += -marm
-QT_CXXFLAGS += -marm
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
-QT_CONFIGURE_OPTS += -qt3support
-else
-QT_CONFIGURE_OPTS += -no-qt3support
-endif
-
-ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-QT_CONFIGURE_OPTS += -demosdir $(TARGET_DIR)/usr/share/qt/demos
-else
-QT_CONFIGURE_OPTS += -nomake demos
-endif
-ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples
-else
-QT_CONFIGURE_OPTS += -nomake examples
-endif
-
-# ensure glib is built first if enabled for Qt's glib support
-ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-QT_CONFIGURE_OPTS += -glib
-QT_DEPENDENCIES += libglib2
-else
-QT_CONFIGURE_OPTS += -no-glib
-endif
-
-### Pixel depths
-QT_PIXEL_DEPTHS = # empty
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)
-QT_PIXEL_DEPTHS += 1
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_4),y)
-QT_PIXEL_DEPTHS += 4
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_8),y)
-QT_PIXEL_DEPTHS += 8
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_12),y)
-QT_PIXEL_DEPTHS += 12
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_15),y)
-QT_PIXEL_DEPTHS += 15
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_16),y)
-QT_PIXEL_DEPTHS += 16
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_18),y)
-QT_PIXEL_DEPTHS += 18
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_24),y)
-QT_PIXEL_DEPTHS += 24
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_32),y)
-QT_PIXEL_DEPTHS += 32
-endif
-ifneq ($(QT_PIXEL_DEPTHS),)
-QT_CONFIGURE_OPTS += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS)))
-endif
-
-### Display drivers
-ifeq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y)
-QT_CONFIGURE_OPTS += -qt-gfx-linuxfb
-else
-QT_CONFIGURE_OPTS += -no-gfx-linuxfb
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y)
-QT_CONFIGURE_OPTS += -qt-gfx-transformed
-else
-QT_CONFIGURE_OPTS += -no-gfx-transformed
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_QVFB),y)
-QT_CONFIGURE_OPTS += -qt-gfx-qvfb
-else
-QT_CONFIGURE_OPTS += -no-gfx-qvfb
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_VNC),y)
-QT_CONFIGURE_OPTS += -qt-gfx-vnc
-else
-QT_CONFIGURE_OPTS += -no-gfx-vnc
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_MULTISCREEN),y)
-QT_CONFIGURE_OPTS += -qt-gfx-multiscreen
-else
-QT_CONFIGURE_OPTS += -no-gfx-multiscreen
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_DIRECTFB),y)
-QT_CONFIGURE_OPTS += -qt-gfx-directfb
-QT_DEPENDENCIES += directfb
-else
-QT_CONFIGURE_OPTS += -no-gfx-directfb
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
-QT_CONFIGURE_OPTS += \
-	-plugin-gfx-powervr -D QT_NO_QWS_CURSOR -D QT_QWS_CLIENTBLIT
-QT_DEPENDENCIES += powervr
-endif
-
-### Mouse drivers
-ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
-QT_CONFIGURE_OPTS += -qt-mouse-pc
-else
-QT_CONFIGURE_OPTS += -no-mouse-pc
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y)
-QT_CONFIGURE_OPTS += -qt-mouse-linuxtp
-else
-QT_CONFIGURE_OPTS += -no-mouse-linuxtp
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXINPUT),y)
-QT_CONFIGURE_OPTS += -qt-mouse-linuxinput
-else
-QT_CONFIGURE_OPTS += -no-mouse-linuxinput
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
-QT_CONFIGURE_OPTS += -qt-mouse-tslib
-QT_DEPENDENCIES += tslib
-else
-QT_CONFIGURE_OPTS += -no-mouse-tslib
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_QVFB),y)
-QT_CONFIGURE_OPTS += -qt-mouse-qvfb
-else
-QT_CONFIGURE_OPTS += -no-mouse-qvfb
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR),y)
-QT_CONFIGURE_OPTS += -D QT_NO_QWS_CURSOR
-endif
-
-### Keyboard drivers
-ifeq ($(BR2_PACKAGE_QT_KEYBOARD_TTY),y)
-QT_CONFIGURE_OPTS += -qt-kbd-tty
-else
-QT_CONFIGURE_OPTS += -no-kbd-tty
-endif
-ifeq ($(BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT),y)
-QT_CONFIGURE_OPTS += -qt-kbd-linuxinput
-else
-QT_CONFIGURE_OPTS += -no-kbd-linuxinput
-endif
-ifeq ($(BR2_PACKAGE_QT_KEYBOARD_QVFB),y)
-QT_CONFIGURE_OPTS += -qt-kbd-qvfb
-else
-QT_CONFIGURE_OPTS += -no-kbd-qvfb
-endif
-
-ifeq ($(BR2_PACKAGE_QT_DEBUG),y)
-QT_CONFIGURE_OPTS += -debug
-else
-QT_CONFIGURE_OPTS += -release
-endif
-
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-QT_CONFIGURE_OPTS += -shared
-else
-QT_CONFIGURE_OPTS += -static
-endif
-
-ifeq ($(BR2_STATIC_LIBS),y)
-QT_CONFIGURE_OPTS += -D QT_NO_DYNAMIC_LIBRARY
-endif
-
-ifeq ($(BR2_ENDIAN),"LITTLE")
-QT_CONFIGURE_OPTS += -little-endian
-else
-QT_CONFIGURE_OPTS += -big-endian
-endif
-
-ifeq ($(BR2_arm)$(BR2_armeb),y)
-QT_EMB_PLATFORM = arm
-else ifeq ($(BR2_i386),y)
-QT_EMB_PLATFORM = x86
-else ifeq ($(BR2_x86_64),y)
-QT_EMB_PLATFORM = x86_64
-else ifeq ($(BR2_mips)$(BR2_mipsel),y)
-QT_EMB_PLATFORM = mips
-else ifeq ($(BR2_powerpc),y)
-QT_EMB_PLATFORM = powerpc
-else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y)
-QT_EMB_PLATFORM = sh
-else
-QT_EMB_PLATFORM = generic
-endif
-
-ifeq ($(BR2_PACKAGE_QT_X11),y)
-QT_DEPENDENCIES += fontconfig xlib_libXi xlib_libX11 xlib_libXrender \
-	xlib_libXcursor xlib_libXrandr xlib_libXext xlib_libXv
-# Using pkg-config avoids us some logic to redefine and sed again mkspecs files
-# to add X11 include path and link options
-QT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags x11`
-QT_CXXFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags x11`
-QT_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs x11 xext`
-QT_CONFIGURE_OPTS += -arch $(QT_EMB_PLATFORM) \
-		-xplatform qws/linux-$(QT_EMB_PLATFORM)-g++ -x11 -no-gtkstyle -no-sm \
-		-no-openvg
-else # if BR2_PACKAGE_QT_EMBEDDED
-QT_CONFIGURE_OPTS += -embedded $(QT_EMB_PLATFORM)
-endif
-
-ifneq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-QT_CONFIGURE_OPTS += -no-gui
-endif
-
-ifneq ($(BR2_PACKAGE_QT_GIF),y)
-QT_CONFIGURE_OPTS += -no-gif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_LIBMNG),y)
-QT_CONFIGURE_OPTS += -qt-libmng
-else
-QT_CONFIGURE_OPTS += -no-libmng
-endif
-
-ifeq ($(BR2_PACKAGE_QT_ACCESSIBILITY),y)
-QT_CONFIGURE_OPTS += -accessibility
-else
-QT_CONFIGURE_OPTS += -no-accessibility
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QTZLIB),y)
-QT_CONFIGURE_OPTS += -qt-zlib
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y)
-QT_CONFIGURE_OPTS += -system-zlib
-QT_DEPENDENCIES += zlib
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QTJPEG),y)
-QT_CONFIGURE_OPTS += -qt-libjpeg
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y)
-QT_CONFIGURE_OPTS += -system-libjpeg
-QT_DEPENDENCIES += jpeg
-else
-QT_CONFIGURE_OPTS += -no-libjpeg
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QTPNG),y)
-QT_CONFIGURE_OPTS += -qt-libpng
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y)
-QT_CONFIGURE_OPTS += -system-libpng
-QT_DEPENDENCIES += libpng
-else
-QT_CONFIGURE_OPTS += -no-libpng
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QTTIFF),y)
-QT_CONFIGURE_OPTS += -qt-libtiff
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y)
-QT_CONFIGURE_OPTS += -system-libtiff
-QT_DEPENDENCIES += tiff
-else
-QT_CONFIGURE_OPTS += -no-libtiff
-endif
-endif
-
-QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
-	   $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \
-	   $(if $(BR2_PACKAGE_QT_FONT_FIXED),fixed) \
-	   $(if $(BR2_PACKAGE_QT_FONT_HELVETICA),helvetica) \
-	   $(if $(BR2_PACKAGE_QT_FONT_JAPANESE),japanese) \
-	   $(if $(BR2_PACKAGE_QT_FONT_UNIFONT),unifont)))
-
-ifeq ($(BR2_PACKAGE_QT_QTFREETYPE),y)
-QT_CONFIGURE_OPTS += -qt-freetype
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
-QT_CONFIGURE_OPTS += -system-freetype
-QT_CONFIGURE_OPTS += -I $(STAGING_DIR)/usr/include/freetype2/
-QT_DEPENDENCIES += freetype
-else
-QT_CONFIGURE_OPTS += -no-freetype
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-QT_DEPENDENCIES += dbus
-endif
-
-ifeq ($(BR2_PACKAGE_QT_OPENSSL),y)
-QT_CONFIGURE_OPTS += -openssl
-QT_DEPENDENCIES += openssl
-else
-QT_CONFIGURE_OPTS += -no-openssl
-endif
-
-ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
-QT_CONFIGURE_OPTS += -opengl es2 -egl
-QT_DEPENDENCIES += libgles libegl
-QT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
-QT_CXXFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
-QT_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs egl`
-else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y)
-QT_CONFIGURE_OPTS += -opengl desktop
-QT_DEPENDENCIES += libgl
-else
-QT_CONFIGURE_OPTS += -no-opengl
-endif
-
-# Qt SQL Drivers
-ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
-ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
-QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
-QT_DEPENDENCIES += mysql
-endif
-ifeq ($(BR2_PACKAGE_QT_ODBC),y)
-QT_CONFIGURE_OPTS += -qt-sql-odbc
-QT_DEPENDENCIES += unixodbc
-endif
-ifeq ($(BR2_PACKAGE_QT_PSQL),y)
-QT_CONFIGURE_OPTS += -qt-sql-psql -psql_config $(STAGING_DIR)/usr/bin/pg_config
-QT_DEPENDENCIES += postgresql
-endif
-ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
-QT_CONFIGURE_OPTS += -qt-sql-sqlite
-else
-ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
-QT_CONFIGURE_OPTS += -system-sqlite
-QT_DEPENDENCIES += sqlite
-else
-QT_CONFIGURE_OPTS += -no-sql-sqlite
-endif
-endif
-ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
-QT_CONFIGURE_OPTS += -qt-sql-sqlite2
-endif
-else
-# By default, no SQL driver is turned on by configure.
-# but it seems sqlite isn't disabled despite what says
-# configure --help
-QT_CONFIGURE_OPTS += -no-sql-sqlite
-endif
-
-ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_CONFIGURE_OPTS += -xmlpatterns -exceptions
-else
-QT_CONFIGURE_OPTS += -no-xmlpatterns
-endif
-
-ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
-QT_CONFIGURE_OPTS += -multimedia
-else
-QT_CONFIGURE_OPTS += -no-multimedia
-endif
-
-ifeq ($(BR2_PACKAGE_QT_AUDIO_BACKEND),y)
-QT_CONFIGURE_OPTS += -audio-backend
-QT_DEPENDENCIES += alsa-lib
-else
-QT_CONFIGURE_OPTS += -no-audio-backend
-endif
-
-ifeq ($(BR2_PACKAGE_QT_PHONON),y)
-QT_CONFIGURE_OPTS += -phonon
-QT_DEPENDENCIES += gstreamer gst-plugins-base
-else
-QT_CONFIGURE_OPTS += -no-phonon
-endif
-
-ifeq ($(BR2_PACKAGE_QT_PHONON_BACKEND),y)
-QT_CONFIGURE_OPTS += -phonon-backend
-else
-QT_CONFIGURE_OPTS += -no-phonon-backend
-endif
-
-ifeq ($(BR2_PACKAGE_QT_SVG),y)
-QT_CONFIGURE_OPTS += -svg
-else
-QT_CONFIGURE_OPTS += -no-svg
-endif
-
-ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
-QT_CONFIGURE_OPTS += -webkit
-QT_DEPENDENCIES += gstreamer gst-plugins-base
-else
-QT_CONFIGURE_OPTS += -no-webkit
-endif
-
-ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
-QT_CONFIGURE_OPTS += -script
-else
-QT_CONFIGURE_OPTS += -no-script
-endif
-
-ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
-QT_CONFIGURE_OPTS += -scripttools
-else
-QT_CONFIGURE_OPTS += -no-scripttools
-endif
-
-ifeq ($(BR2_PACKAGE_QT_STL),y)
-QT_CONFIGURE_OPTS += -stl
-else
-QT_CONFIGURE_OPTS += -no-stl
-endif
-
-ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
-QT_CONFIGURE_OPTS += -declarative
-else
-QT_CONFIGURE_OPTS += -no-declarative
-endif
-
-# -no-pch is needed to workaround the issue described at
-# http://comments.gmane.org/gmane.comp.lib.qt.devel/5933.
-# In addition, ccache and precompiled headers don't play well together
-QT_CONFIGURE_OPTS += -no-pch
-
-# x86x86fix
-# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
-# host. It's unclear if this would happen on other hosts.
-ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
-ifneq ($(findstring x86,$(QT_EMB_PLATFORM)),)
-QT_CONFIGURE_OPTS += -platform linux-g++
-endif
-endif
-# End of workaround.
-
-# Variable for other Qt applications to use
-QT_QMAKE = $(HOST_DIR)/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
-
-################################################################################
-# QT_QMAKE_SET -- helper macro to set  =  in
-# the qmake.conf file. Will remove existing variable declaration if
-# available.
-#
-# Argument 1 is the variable name
-# Argument 2 is the value to set variable to
-# Argument 3 is the base source directory of Qt
-#
-# E.G. use like this:
-# $(call QT_QMAKE_SET,variable,value,directory)
-################################################################################
-define QT_QMAKE_SET
-	$(SED) '/$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) "/include.*qws.conf/a$(1) = $(2)" $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
-endef
-
-ifneq ($(QT_CONFIG_FILE),)
-define QT_CONFIGURE_CONFIG_FILE
-	cp $(QT_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h
-endef
-endif
-
-define QT_CONFIGURE_CMDS
-	-[ -f $(@D)/Makefile ] && $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) confclean
-	$(QT_CONFIGURE_IPV6)
-	$(QT_CONFIGURE_CONFIG_FILE)
-	# Fix compiler path
-	$(call QT_QMAKE_SET,QMAKE_CC,$(TARGET_CC),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_CXX,$(TARGET_CXX),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_LINK,$(TARGET_CXX),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_LINK_SHLIB,$(TARGET_CXX),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_AR,$(TARGET_AR) cqs,$(@D))
-	$(call QT_QMAKE_SET,QMAKE_OBJCOPY,$(TARGET_OBJCOPY),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_RANLIB,$(TARGET_RANLIB),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_LFLAGS,$(QT_LDFLAGS),$(@D))
-	$(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/bin/pkg-config,$(@D))
-# Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
-# instead of the host then. So set PKG_CONFIG* manually.
-	(cd $(@D); \
-		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
-		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
-		$(TARGET_MAKE_ENV) \
-		MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \
-		$(if $(VERBOSE),-verbose,-silent) \
-		-force-pkg-config \
-		$(QT_CONFIGURE_OPTS) \
-		-no-xinerama \
-		-no-cups \
-		-no-nis \
-		-no-separate-debug-info \
-		-prefix /usr \
-		-plugindir /usr/lib/qt/plugins \
-		-importdir /usr/lib/qt/imports \
-		-translationdir /usr/share/qt/translations \
-		-hostprefix $(STAGING_DIR) \
-		-fast \
-		-no-rpath \
-	)
-endef
-
-define QT_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-# Build the list of libraries and plugins to install to the target
-
-QT_INSTALL_LIBS += QtCore
-QT_HOST_PROGRAMS += moc rcc qmake lrelease
-
-ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-QT_INSTALL_LIBS += QtGui
-QT_HOST_PROGRAMS += uic
-endif
-ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
-QT_INSTALL_LIBS += QtSql
-endif
-ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
-QT_INSTALL_LIBS += QtMultimedia
-endif
-ifeq ($(BR2_PACKAGE_QT_PHONON),y)
-QT_INSTALL_LIBS += phonon
-endif
-ifeq ($(BR2_PACKAGE_QT_SVG),y)
-QT_INSTALL_LIBS += QtSvg
-endif
-ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
-QT_INSTALL_LIBS += QtNetwork
-endif
-ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
-QT_INSTALL_LIBS += QtWebKit
-endif
-ifeq ($(BR2_PACKAGE_QT_XML),y)
-QT_INSTALL_LIBS += QtXml
-endif
-ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-QT_INSTALL_LIBS += QtDBus
-endif
-ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_INSTALL_LIBS += QtXmlPatterns
-endif
-ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
-QT_INSTALL_LIBS += QtScript
-endif
-ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
-QT_INSTALL_LIBS += QtScriptTools
-endif
-ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
-QT_INSTALL_LIBS += QtDeclarative
-endif
-ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
-QT_INSTALL_LIBS += Qt3Support
-endif
-ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
-QT_INSTALL_LIBS += QtOpenGL
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
-QT_INSTALL_LIBS += pvrQWSWSEGL
-endif
-ifeq ($(BR2_PACKAGE_QT_TEST),y)
-QT_INSTALL_LIBS += QtTest
-endif
-
-QT_CONF_FILE = $(HOST_DIR)/bin/qt.conf
-
-# Since host programs and spec files have been moved to $(HOST_DIR),
-# we need to tell qmake the new location of the various elements,
-# through a qt.conf file.
-define QT_INSTALL_QT_CONF
-	mkdir -p $(dir $(QT_CONF_FILE))
-	echo "[Paths]"                             > $(QT_CONF_FILE)
-	echo "Prefix=$(HOST_DIR)"                 >> $(QT_CONF_FILE)
-	echo "Headers=$(STAGING_DIR)/usr/include" >> $(QT_CONF_FILE)
-	echo "Libraries=$(STAGING_DIR)/usr/lib"   >> $(QT_CONF_FILE)
-	echo "Data=$(HOST_DIR)"                   >> $(QT_CONF_FILE)
-	echo "Binaries=$(HOST_DIR)/bin"           >> $(QT_CONF_FILE)
-endef
-
-# After running Qt normal installation process (which installs
-# everything in the STAGING_DIR), we move host programs such as qmake,
-# rcc or uic to the HOST_DIR so that they are available at the usual
-# location. A qt.conf file is generated to make sure that all host
-# programs still find all files they need. The .pc files are tuned to
-# remove the sysroot path from them, since pkg-config already adds it
-# automatically.
-define QT_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-	mkdir -p $(HOST_DIR)/bin
-	mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/bin
-	ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/mkspecs
-	$(QT_INSTALL_QT_CONF)
-	for i in moc uic rcc lupdate lrelease ; do \
-		$(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/bin/$${i}," \
-			$(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc ; \
-	done
-	$(SED) "s,$(STAGING_DIR)/,,g" $(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc
-endef
-
-# Library installation
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-define QT_INSTALL_TARGET_LIBS
-	mkdir -p $(TARGET_DIR)/usr/lib
-	for lib in $(QT_INSTALL_LIBS); do \
-		cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib ; \
-	done
-endef
-endif
-
-# Plugin installation
-define QT_INSTALL_TARGET_PLUGINS
-	if [ -d $(STAGING_DIR)/usr/lib/qt/plugins/ ] ; then \
-		mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins ; \
-		cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins ; \
-	fi
-endef
-
-# Import installation
-define QT_INSTALL_TARGET_IMPORTS
-	if [ -d $(STAGING_DIR)/usr/lib/qt/imports/ ] ; then \
-		mkdir -p $(TARGET_DIR)/usr/lib/qt/imports ; \
-		cp -dpfr $(STAGING_DIR)/usr/lib/qt/imports/* $(TARGET_DIR)/usr/lib/qt/imports ; \
-	fi
-endef
-
-# Fonts installation
-ifeq ($(BR2_PACKAGE_QT_EMBEDDED),y)
-ifneq ($(QT_FONTS),)
-define QT_INSTALL_TARGET_FONTS
-	mkdir -p $(TARGET_DIR)/usr/lib/fonts
-	cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
-endef
-ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),)
-# as stated in the font source src/3rdparty/fonts/micro.bdf
-# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf
-QT_LICENSE := $(QT_LICENSE), Public Domain (Micro/Fixed font)
-endif
-ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),)
-QT_LICENSE := $(QT_LICENSE), Adobe Helvetica license (Helvetica/Japanese fonts)
-QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica
-endif
-ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y)
-QT_LICENSE := $(QT_LICENSE), Freeware (Unifont font)
-QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont
-endif
-endif # QT_FONTS
-
-ifeq ($(BR2_PACKAGE_QT_FONT_TRUETYPE),y)
-define QT_INSTALL_TARGET_FONTS_TTF
-	mkdir -p $(TARGET_DIR)/usr/lib/fonts
-	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
-endef
-QT_LICENSE := $(QT_LICENSE), Bitstream license (DejaVu/Vera TrueType fonts)
-QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \
-	src/3rdparty/fonts/README.DejaVu \
-	src/3rdparty/fonts/COPYRIGHT.Vera
-endif
-endif # BR2_PACKAGE_QT_EMBEDDED
-
-ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
-define QT_INSTALL_TARGET_POWERVR
-	# Note: this overwrites the default powervr.ini provided by the ti-gfx
-	# package.
-	$(INSTALL) -D -m 0644 package/qt/powervr.ini \
-		$(TARGET_DIR)/etc/powervr.ini
-endef
-endif
-
-ifeq ($(BR2_PACKAGE_QT_TRANSLATION_FILES),y)
-define QT_INSTALL_TARGET_TRANSLATIONS
-	if [ -d $(STAGING_DIR)/usr/share/qt/translations/ ] ; then \
-		mkdir -p $(TARGET_DIR)/usr/share/qt/translations ; \
-		cp -dpfr $(STAGING_DIR)/usr/share/qt/translations/* $(TARGET_DIR)/usr/share/qt/translations ; \
-	fi
-endef
-endif
-
-define QT_INSTALL_TARGET_CMDS
-	$(QT_INSTALL_TARGET_LIBS)
-	$(QT_INSTALL_TARGET_PLUGINS)
-	$(QT_INSTALL_TARGET_IMPORTS)
-	$(QT_INSTALL_TARGET_FONTS)
-	$(QT_INSTALL_TARGET_FONTS_TTF)
-	$(QT_INSTALL_TARGET_POWERVR)
-	$(QT_INSTALL_TARGET_TRANSLATIONS)
-endef
-
-$(eval $(generic-package))
diff --git a/buildroot/package/qt5/Config.in b/buildroot/package/qt5/Config.in
index 735824402..a50b57a82 100644
--- a/buildroot/package/qt5/Config.in
+++ b/buildroot/package/qt5/Config.in
@@ -12,7 +12,6 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on !BR2_ARM_CPU_ARMV4
 
 comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
-	depends on !BR2_PACKAGE_QT
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 
 menuconfig BR2_PACKAGE_QT5
@@ -21,7 +20,6 @@ menuconfig BR2_PACKAGE_QT5
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS
-	depends on !BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT5BASE
 	help
 	  This option enables the Qt5 framework. Sub-options allow to
diff --git a/buildroot/package/qt5/qt5.mk b/buildroot/package/qt5/qt5.mk
index 5b7a6d697..88ba1958d 100644
--- a/buildroot/package/qt5/qt5.mk
+++ b/buildroot/package/qt5/qt5.mk
@@ -6,7 +6,7 @@
 
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 QT5_VERSION_MAJOR = 5.11
-QT5_VERSION = $(QT5_VERSION_MAJOR).2
+QT5_VERSION = $(QT5_VERSION_MAJOR).3
 QT5_SOURCE_TARBALL_PREFIX = everywhere-src
 else
 QT5_VERSION_MAJOR = 5.6
diff --git a/buildroot/package/qt5/qt53d/qt53d.hash b/buildroot/package/qt5/qt53d/qt53d.hash
index 789ea29d9..2da550050 100644
--- a/buildroot/package/qt5/qt53d/qt53d.hash
+++ b/buildroot/package/qt5/qt53d/qt53d.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qt3d-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 7f72c823ec10a2effba95d08d9439215472d2cb1e3229de50a6b3d2523c8f962 qt3d-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz.sha256
+sha256 04a55c21f365d897ec75042ee83f9ad59a847992c6f55fae0763ad2701d99eab qt3d-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL
diff --git a/buildroot/package/qt5/qt5base/5.11.2/0005-Export-qt_open64-from-QtCore.patch b/buildroot/package/qt5/qt5base/5.11.2/0005-Export-qt_open64-from-QtCore.patch
deleted file mode 100644
index 2fd14a282..000000000
--- a/buildroot/package/qt5/qt5base/5.11.2/0005-Export-qt_open64-from-QtCore.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira 
-Date: Fri, 21 Sep 2018 09:04:24 -0700
-Subject: [PATCH] Export qt_open64 from QtCore
-
-Other libs use qcore_unix_p.h.
-
-qopenglprogrambinarycache.cpp:function QOpenGLProgramBinaryCache::load(QByteArray const&, unsigned int): error: undefined reference to 'qt_open64(char const*, int, unsigned int)'
-
-Change-Id: I44e7d800c68141bdaae0fffd155675d15eded2e4
-Reviewed-by: Simon Hausmann 
-Reviewed-by: Eric Lemanissier 
-
-Upstream: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432
-Signed-off-by: Peter Seiderer 
----
- src/corelib/kernel/qcore_unix_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
-index cb98bef347..5a2a29a327 100644
---- a/src/corelib/kernel/qcore_unix_p.h
-+++ b/src/corelib/kernel/qcore_unix_p.h
-@@ -178,7 +178,7 @@ inline void qt_ignore_sigpipe()
- 
- #if defined(Q_PROCESSOR_X86_32) && defined(__GLIBC__)
- #  if !__GLIBC_PREREQ(2, 22)
--int qt_open64(const char *pathname, int flags, mode_t);
-+Q_CORE_EXPORT int qt_open64(const char *pathname, int flags, mode_t);
- #    undef QT_OPEN
- #    define QT_OPEN qt_open64
- #  endif
--- 
-2.19.0
-
diff --git a/buildroot/package/qt5/qt5base/5.11.2/0001-qtbase-Fix-build-error-when-using-EGL.patch b/buildroot/package/qt5/qt5base/5.11.3/0001-qtbase-Fix-build-error-when-using-EGL.patch
similarity index 100%
rename from buildroot/package/qt5/qt5base/5.11.2/0001-qtbase-Fix-build-error-when-using-EGL.patch
rename to buildroot/package/qt5/qt5base/5.11.3/0001-qtbase-Fix-build-error-when-using-EGL.patch
diff --git a/buildroot/package/qt5/qt5base/5.11.2/0002-double-conversion-enable-for-aarch64_be.patch b/buildroot/package/qt5/qt5base/5.11.3/0002-double-conversion-enable-for-aarch64_be.patch
similarity index 100%
rename from buildroot/package/qt5/qt5base/5.11.2/0002-double-conversion-enable-for-aarch64_be.patch
rename to buildroot/package/qt5/qt5base/5.11.3/0002-double-conversion-enable-for-aarch64_be.patch
diff --git a/buildroot/package/qt5/qt5base/5.11.2/0003-double-conversion-enable-for-or1k.patch b/buildroot/package/qt5/qt5base/5.11.3/0003-double-conversion-enable-for-or1k.patch
similarity index 100%
rename from buildroot/package/qt5/qt5base/5.11.2/0003-double-conversion-enable-for-or1k.patch
rename to buildroot/package/qt5/qt5base/5.11.3/0003-double-conversion-enable-for-or1k.patch
diff --git a/buildroot/package/qt5/qt5base/5.11.2/0004-double-conversion-enable-for-microblaze.patch b/buildroot/package/qt5/qt5base/5.11.3/0004-double-conversion-enable-for-microblaze.patch
similarity index 100%
rename from buildroot/package/qt5/qt5base/5.11.2/0004-double-conversion-enable-for-microblaze.patch
rename to buildroot/package/qt5/qt5base/5.11.3/0004-double-conversion-enable-for-microblaze.patch
diff --git a/buildroot/package/qt5/qt5base/5.11.3/0005-double-conversion-enable-for-riscv.patch b/buildroot/package/qt5/qt5base/5.11.3/0005-double-conversion-enable-for-riscv.patch
new file mode 100644
index 000000000..0bdfd4918
--- /dev/null
+++ b/buildroot/package/qt5/qt5base/5.11.3/0005-double-conversion-enable-for-riscv.patch
@@ -0,0 +1,31 @@
+From 982801a21c3abad7025a7110275a49e200bc460f Mon Sep 17 00:00:00 2001
+From: Stefan O'Rear 
+Date: Thu, 17 Nov 2016 09:54:33 -0800
+Subject: [PATCH] double-conversion: enable for riscv
+
+Original double conversion patch [1] 'Add support for RISC-V' ported
+to qtbase-5.11.3.
+
+[1] Upstream: https://github.com/google/double-conversion/commit/8316ed5bf405835558a476e528d8e1d0adf69dd9
+
+Change-Id: Id88a356940f4d61dbcec3741a74db695e47af3f0
+Signed-off-by: Peter Seiderer 
+---
+ src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
+index 485f680180..a736b14d1e 100644
+--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
+@@ -66,6 +66,7 @@
+     defined(__SH4__) || defined(__alpha__) || \
+     defined(_MIPS_ARCH_MIPS32R2) || \
+     defined(__AARCH64EL__) || defined(__AARCH64EB__) || \
++    defined(__riscv) || \
+     defined(__or1k__) || \
+     defined(__microblaze__)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-- 
+2.20.1
+
diff --git a/buildroot/package/qt5/qt5base/5.11.2/qt5base.hash b/buildroot/package/qt5/qt5base/5.11.3/qt5base.hash
similarity index 80%
rename from buildroot/package/qt5/qt5base/5.11.2/qt5base.hash
rename to buildroot/package/qt5/qt5base/5.11.3/qt5base.hash
index 1c11adba2..964bcf1ab 100644
--- a/buildroot/package/qt5/qt5base/5.11.2/qt5base.hash
+++ b/buildroot/package/qt5/qt5base/5.11.3/qt5base.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107 qtbase-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz.sha256
+sha256 c6bf887732b83ce072eb72eddb7497bedcdf9ca794e7ed91261a93f063623e1c qtbase-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch b/buildroot/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch
new file mode 100644
index 000000000..c8fc426f7
--- /dev/null
+++ b/buildroot/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch
@@ -0,0 +1,29 @@
+From 62588f2d8267c67c2337004e83e80695280db9eb Mon Sep 17 00:00:00 2001
+From: James Grant 
+Date: Sun, 3 Mar 2019 17:29:29 +1300
+Subject: [PATCH 1/1] libressl - add -fpermissive gcc flag to allow
+ compilation.
+
+Workaround for 'const BIO_METHOD *' vs. 'BIO_METHOD *' changes to BIO_new() and BIO_s_mem() function signatures.
+
+Signed-off-by: James Grant 
+---
+ src/network/ssl/ssl.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
+index 29c47cd7..f0aad448 100644
+--- a/src/network/ssl/ssl.pri
++++ b/src/network/ssl/ssl.pri
+@@ -77,7 +77,7 @@ android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
+         LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE
+     }
+ 
+-    QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS
++    QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS -fpermissive
+     LIBS_PRIVATE += $$OPENSSL_LIBS
+     win32: LIBS_PRIVATE += -lcrypt32
+ }
+-- 
+2.18.1
+
diff --git a/buildroot/package/qt5/qt5base/Config.in b/buildroot/package/qt5/qt5base/Config.in
index 1340ea48f..696e68975 100644
--- a/buildroot/package/qt5/qt5base/Config.in
+++ b/buildroot/package/qt5/qt5base/Config.in
@@ -286,6 +286,12 @@ comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8"
 	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
 		!BR2_HOST_GCC_AT_LEAST_4_8
 
+config BR2_PACKAGE_QT5BASE_OPENSSL
+	bool
+	# No OpenSSL 1.1.x support in Qt 5.6.x
+	default y if BR2_PACKAGE_QT5_VERSION_5_6 && BR2_PACKAGE_LIBRESSL
+	default y if BR2_PACKAGE_QT5_VERSION_LATEST && BR2_PACKAGE_OPENSSL
+
 config BR2_PACKAGE_QT5BASE_TSLIB
 	bool "Enable Tslib support"
 	select BR2_PACKAGE_TSLIB
diff --git a/buildroot/package/qt5/qt5base/qt5base.mk b/buildroot/package/qt5/qt5base/qt5base.mk
index 2b6fd3926..1c20b67e4 100644
--- a/buildroot/package/qt5/qt5base/qt5base.mk
+++ b/buildroot/package/qt5/qt5base/qt5base.mk
@@ -33,7 +33,24 @@ else
 QT5BASE_DEPENDENCIES += pcre2
 endif
 
-QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
+ifeq ($(BR2_X86_CPU_HAS_SSE2),)
+QT5BASE_CONFIGURE_OPTS += -no-sse2
+else ifeq ($(BR2_X86_CPU_HAS_SSE3),)
+QT5BASE_CONFIGURE_OPTS += -no-sse3
+else ifeq ($(BR2_X86_CPU_HAS_SSSE3),)
+QT5BASE_CONFIGURE_OPTS += -no-ssse3
+else ifeq ($(BR2_X86_CPU_HAS_SSE4),)
+QT5BASE_CONFIGURE_OPTS += -no-sse4.1
+else ifeq ($(BR2_X86_CPU_HAS_SSE42),)
+QT5BASE_CONFIGURE_OPTS += -no-sse4.2
+else ifeq ($(BR2_X86_CPU_HAS_AVX),)
+QT5BASE_CONFIGURE_OPTS += -no-avx
+else ifeq ($(BR2_X86_CPU_HAS_AVX2),)
+QT5BASE_CONFIGURE_OPTS += -no-avx2
+else
+# no buildroot BR2_X86_CPU_HAS_AVX512 option yet for qt configure
+# option '-no-avx512' (available for latest only)
+endif
 
 ifeq ($(BR2_PACKAGE_LIBDRM),y)
 QT5BASE_CONFIGURE_OPTS += -kms
@@ -171,8 +188,15 @@ else
 QT5BASE_CONFIGURE_OPTS += -no-eglfs
 endif
 
+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+# No OpenSSL 1.1.x support in Qt 5.6.x
+# LibreSSL works with shared linkage only and -fpermissive patch
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBRESSL),-openssl-linked,-no-openssl)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_LIBRESSL),openssl)
+else
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_OPENSSL),openssl)
+endif
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
@@ -271,6 +295,15 @@ define QT5BASE_CONFIGURE_ARCH_CONFIG
 endef
 endif
 
+# This allows to use ccache when available
+define QT5BASE_CONFIGURE_HOSTCC
+	$(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf
+	$(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
+endef
+
+# Must be last so can override all options set by Buildroot
+QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
+
 define QT5BASE_CONFIGURE_CMDS
 	mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/
 	sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \
@@ -281,10 +314,11 @@ define QT5BASE_CONFIGURE_CMDS
 	$(QT5BASE_CONFIGURE_CONFIG_FILE)
 	touch $(QT5BASE_ARCH_CONFIG_FILE)
 	$(QT5BASE_CONFIGURE_ARCH_CONFIG)
+	$(QT5BASE_CONFIGURE_HOSTCC)
 	(cd $(@D); \
 		$(TARGET_MAKE_ENV) \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" \
+		MAKEFLAGS="-j$(PARALLEL_JOBS) $(MAKEFLAGS)" \
 		./configure \
 		-v \
 		-prefix /usr \
diff --git a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash
index 1fe8ecab1..4fc7c613b 100644
--- a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash
+++ b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtcanvas3d-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 fd9ca31268e81d4864da961de7635ef7316a815b8fc77910e512647eb4ceea40 qtcanvas3d-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz.sha256
+sha256 d5a004848588c1c53ea7ed9d36bb5bfe3a813ffc45290066d2f6cfcace072138 qtcanvas3d-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5charts/qt5charts.hash b/buildroot/package/qt5/qt5charts/qt5charts.hash
index fa4e615cf..2519b8f13 100644
--- a/buildroot/package/qt5/qt5charts/qt5charts.hash
+++ b/buildroot/package/qt5/qt5charts/qt5charts.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist
 sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f  qtcharts-opensource-src-2.1.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtcharts-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 f6a312c596bfffa5074a3a5606dff1ef197dac075b3c1bd6443e3a6db1c3a114 qtcharts-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz.sha256
+sha256 4798f3ebc4d937d1c190db7ff718ad5affa907caa56b5557e593f6b5a60d95dc qtcharts-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
diff --git a/buildroot/package/qt5/qt5connectivity/5.11.2/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/5.11.3/qt5connectivity.hash
similarity index 73%
rename from buildroot/package/qt5/qt5connectivity/5.11.2/qt5connectivity.hash
rename to buildroot/package/qt5/qt5connectivity/5.11.3/qt5connectivity.hash
index 921f2e80a..54fda648c 100644
--- a/buildroot/package/qt5/qt5connectivity/5.11.2/qt5connectivity.hash
+++ b/buildroot/package/qt5/qt5connectivity/5.11.3/qt5connectivity.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtconnectivity-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 58901bbd14d3bc472f27fe305fd8dc33cffbd10da83616e9691c04c3290d42c5 qtconnectivity-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz.sha256
+sha256 148cfcbceb3d0a70059f4d92fa069baf56babb627b16a4203b318ca6f0d0b32a qtconnectivity-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5declarative/5.11.2/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/buildroot/package/qt5/qt5declarative/5.11.3/0001-qsgtexture-fix-debug-build-with-uclibc.patch
similarity index 100%
rename from buildroot/package/qt5/qt5declarative/5.11.2/0001-qsgtexture-fix-debug-build-with-uclibc.patch
rename to buildroot/package/qt5/qt5declarative/5.11.3/0001-qsgtexture-fix-debug-build-with-uclibc.patch
diff --git a/buildroot/package/qt5/qt5declarative/qt5declarative.hash b/buildroot/package/qt5/qt5declarative/qt5declarative.hash
index e1af61fbe..3ce4e5025 100644
--- a/buildroot/package/qt5/qt5declarative/qt5declarative.hash
+++ b/buildroot/package/qt5/qt5declarative/qt5declarative.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtdeclarative-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 220d86f8031e9d45f3c369c3fd517aaa4c5783ad62c843a21fa7cc3c0a36f2cd qtdeclarative-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz.sha256
+sha256 8e263621d706f1c4def5d71212a6ae37b0d3c378da89d9e3e5fc0b5557721ae6 qtdeclarative-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5enginio/Config.in b/buildroot/package/qt5/qt5enginio/Config.in
index 102058e7c..ac2d13b3a 100644
--- a/buildroot/package/qt5/qt5enginio/Config.in
+++ b/buildroot/package/qt5/qt5enginio/Config.in
@@ -1,9 +1,8 @@
 config BR2_PACKAGE_QT5ENGINIO
 	bool "qt5enginio"
-	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_QT5BASE
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5BASE_NETWORK
+	select BR2_PACKAGE_OPENSSL
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
@@ -15,3 +14,10 @@ config BR2_PACKAGE_QT5ENGINIO
 	  5.6 and not recommended for new design.
 
 	  http://doc.qt.io/archives/qt-5.5/enginio-index.html
+
+# Forcibly selecting libressl is not possible because it is from a choice, and
+# depending on it is also not possible because we select openssl. So just a
+# a warning.
+comment "qt5enginio needs libressl for Qt5.6"
+	depends on BR2_PACKAGE_QT5_VERSION_5_6
+	depends on !BR2_PACKAGE_LIBRESSL
diff --git a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
index f871e0b77..36dd34526 100644
--- a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
+++ b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtgraphicaleffects-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 a9dcaaa3932f7b71717a393700e1387bcd6f9c03538d0ffca2a64128a0e4a9fd qtgraphicaleffects-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz.sha256
+sha256 14d86983fcdd119daefad235ffee7d8ca691e6074ef360cb6347b8aae66f57e2 qtgraphicaleffects-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash
index b4684bb76..1c1f81bbe 100644
--- a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash
+++ b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtimageformats-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 27e5d10551d0b5bf4799d09e5412ea2e6898b09aa1521ea24bce660ee6183a68 qtimageformats-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz.sha256
+sha256 04b261bc3d7a277fbe9ac8619ecd037d7089b356eaee41b2d41d7a2ff58b087f qtimageformats-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
diff --git a/buildroot/package/qt5/qt5location/5.11.2/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch b/buildroot/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch
similarity index 100%
rename from buildroot/package/qt5/qt5location/5.11.2/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch
rename to buildroot/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch
diff --git a/buildroot/package/qt5/qt5location/qt5location.hash b/buildroot/package/qt5/qt5location/qt5location.hash
index 7c7f007bc..be0ac7c31 100644
--- a/buildroot/package/qt5/qt5location/qt5location.hash
+++ b/buildroot/package/qt5/qt5location/qt5location.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtlocation-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 d698911edfb2d45b7adca6557b3de880e966cb8823a8adf1beb3a3079560024e qtlocation-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz.sha256
+sha256 58e498a5b496e3a38925398b244bbd57ba68cbb482f2a0d2ae51572e037100eb qtlocation-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash
index fb8285116..851cbc353 100644
--- a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash
+++ b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtmultimedia-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 25608f3d08636026387394956fe72cedcb78eb786fb32fd87deb41d574cf726d qtmultimedia-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz.sha256
+sha256 728078eff7dc21495d704a7cd17c604d74604604b45a3c58271608f90dea3c41 qtmultimedia-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index a4fc20ebc..25c41c6e3 100644
--- a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtquickcontrols-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 9c772e30fb1ba107168498328585063f4303c6562baf4a5cfedd0c5250b621e0 qtquickcontrols-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz.sha256
+sha256 4e4e5da02ab0b06d35b09356170013cfe36a773d15f92281f7e6d085c3f07537 qtquickcontrols-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
diff --git a/buildroot/package/qt5/qt5quickcontrols2/5.11.2/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/5.11.3/qt5quickcontrols2.hash
similarity index 64%
rename from buildroot/package/qt5/qt5quickcontrols2/5.11.2/qt5quickcontrols2.hash
rename to buildroot/package/qt5/qt5quickcontrols2/5.11.3/qt5quickcontrols2.hash
index bdf844eb9..b1caf464a 100644
--- a/buildroot/package/qt5/qt5quickcontrols2/5.11.2/qt5quickcontrols2.hash
+++ b/buildroot/package/qt5/qt5quickcontrols2/5.11.3/qt5quickcontrols2.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtquickcontrols2-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 aa0549f9a4135f9d600b57f53347ebf344e60d21f90c6d844109755da12dcb84 qtquickcontrols2-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz.sha256
+sha256 f45630b652585b62204405b28432977e67c148ca5f1789a794654fd6c1bad086 qtquickcontrols2-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
diff --git a/buildroot/package/qt5/qt5script/qt5script.hash b/buildroot/package/qt5/qt5script/qt5script.hash
index 0efc40bb4..245d66be6 100644
--- a/buildroot/package/qt5/qt5script/qt5script.hash
+++ b/buildroot/package/qt5/qt5script/qt5script.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtscript-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 b2c2466a83653a9473ea4810462d8a88e0fb1fb691f85d1c6e60d8bc4283f976 qtscript-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz.sha256
+sha256 bb84f3cc581078df4ff76705c5623cd88287f70f7405cbccf99e6fb6dedbec08 qtscript-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
diff --git a/buildroot/package/qt5/qt5scxml/qt5scxml.hash b/buildroot/package/qt5/qt5scxml/qt5scxml.hash
index ecaf50745..d2184c94e 100644
--- a/buildroot/package/qt5/qt5scxml/qt5scxml.hash
+++ b/buildroot/package/qt5/qt5scxml/qt5scxml.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtscxml-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 d625cb2149f5bfef5747b1d40b22327fd36132307c8b76d358f235d5422ff7a4 qtscxml-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz.sha256
+sha256 13172767eda404f1b71ab35998a95af6633d700d2417fff3648d8c6dc6af68d7 qtscxml-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 
diff --git a/buildroot/package/qt5/qt5sensors/qt5sensors.hash b/buildroot/package/qt5/qt5sensors/qt5sensors.hash
index 4795356e6..a8d325d32 100644
--- a/buildroot/package/qt5/qt5sensors/qt5sensors.hash
+++ b/buildroot/package/qt5/qt5sensors/qt5sensors.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtsensors-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 0e27c38824f7a1deb506f6195156eed79b80aa7034356272c3be0611667d63c7 qtsensors-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz.sha256
+sha256 a75753d1d5607d4cb27b1849ea9612a65bb3a5271bb31bf0817edd143b620859 qtsensors-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5serialbus/5.11.2/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/5.11.3/qt5serialbus.hash
similarity index 70%
rename from buildroot/package/qt5/qt5serialbus/5.11.2/qt5serialbus.hash
rename to buildroot/package/qt5/qt5serialbus/5.11.3/qt5serialbus.hash
index 9c4aa16fd..7d8d9b341 100644
--- a/buildroot/package/qt5/qt5serialbus/5.11.2/qt5serialbus.hash
+++ b/buildroot/package/qt5/qt5serialbus/5.11.3/qt5serialbus.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtserialbus-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 1774c2c162f85f7cbcb2bdd2ef47507b110a01bc261627b46aa718e87079641e qtserialbus-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz.sha256
+sha256 5664def35d4ad4aedef14bc529679851450262ea81477a69031ba81aa614c16d qtserialbus-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
diff --git a/buildroot/package/qt5/qt5serialport/5.11.2/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/5.11.3/qt5serialport.hash
similarity index 74%
rename from buildroot/package/qt5/qt5serialport/5.11.2/qt5serialport.hash
rename to buildroot/package/qt5/qt5serialport/5.11.3/qt5serialport.hash
index 4dda77e44..63e0cb61c 100644
--- a/buildroot/package/qt5/qt5serialport/5.11.2/qt5serialport.hash
+++ b/buildroot/package/qt5/qt5serialport/5.11.3/qt5serialport.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtserialport-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 b01b69ce421d449402363c0cf617fcc8856e39d6d2c28aa3d06d1f5359dc6f6e qtserialport-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz.mirrorlist
+sha256 96c45e6d0d470626815f82b38ee48bf941e1bbfc10863087b69cc5f7bb766bda qtserialport-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5svg/qt5svg.hash b/buildroot/package/qt5/qt5svg/qt5svg.hash
index fa4d6f445..3c2f0fe47 100644
--- a/buildroot/package/qt5/qt5svg/qt5svg.hash
+++ b/buildroot/package/qt5/qt5svg/qt5svg.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtsvg-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 bc16bbf855b466e77dda996d8c91fa73db7fe14d3aa98ce6d92145ca1a1bd166 qtsvg-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz.sha256
+sha256 21ea2c9c4e78101e98163bc19e463b8d8cdffa20e1ccd523ccc925b9f2cd4491 qtsvg-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5tools/qt5tools.hash b/buildroot/package/qt5/qt5tools/qt5tools.hash
index 7c78866c8..94f1254b0 100644
--- a/buildroot/package/qt5/qt5tools/qt5tools.hash
+++ b/buildroot/package/qt5/qt5tools/qt5tools.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qttools-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 f0e8332c771958b4aa373ac643d35e2fabb1a2dcdbaca756ebf3d1ace7c631b8 qttools-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz.sha256
+sha256 c205e81bba9b87c6186604a05ab48e4e6cac0cd511525749dfd00b107b6f9f8e qttools-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5virtualkeyboard/5.11.2/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/5.11.3/qt5virtualkeyboard.hash
similarity index 77%
rename from buildroot/package/qt5/qt5virtualkeyboard/5.11.2/qt5virtualkeyboard.hash
rename to buildroot/package/qt5/qt5virtualkeyboard/5.11.3/qt5virtualkeyboard.hash
index c065a9e80..c7d27870b 100644
--- a/buildroot/package/qt5/qt5virtualkeyboard/5.11.2/qt5virtualkeyboard.hash
+++ b/buildroot/package/qt5/qt5virtualkeyboard/5.11.3/qt5virtualkeyboard.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtvirtualkeyboard-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 2709500071e7e98ca6f6eecef0f5c80d19ae22aba562293352debd516633b197 qtvirtualkeyboard-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz.sha256
+sha256 8c5c40245a9dd2e9e504ce2d47d45079d8280436146797b24b8115ef163b4b9e qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
diff --git a/buildroot/package/qt5/qt5virtualkeyboard/Config.in b/buildroot/package/qt5/qt5virtualkeyboard/Config.in
index 57b0c703b..3a60c2733 100644
--- a/buildroot/package/qt5/qt5virtualkeyboard/Config.in
+++ b/buildroot/package/qt5/qt5virtualkeyboard/Config.in
@@ -53,4 +53,10 @@ config BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING
 	  Lipi Toolkit (LipiTk) is an open source toolkit for online
 	  Handwriting Recognition.
 
+config BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION
+	bool "Arrow key navigation"
+	help
+	  Allows controlling the keyboard using the arrow and return
+	  keys.
+
 endif
diff --git a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index 4aa5fc957..8ce316977 100644
--- a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -53,6 +53,10 @@ QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/MI
 endif
 endif
 
+ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION),y)
+QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=arrow-key-navigation
+endif
+
 ifdef QT5VIRTUALKEYBOARD_3RDPARTY_PARTS
 define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS
 	cp -dpfr $(STAGING_DIR)/usr/qtvirtualkeyboard $(TARGET_DIR)/usr
diff --git a/buildroot/package/qt5/qt5wayland/qt5wayland.hash b/buildroot/package/qt5/qt5wayland/qt5wayland.hash
index 01305c950..40d1bb0b2 100644
--- a/buildroot/package/qt5/qt5wayland/qt5wayland.hash
+++ b/buildroot/package/qt5/qt5wayland/qt5wayland.hash
@@ -1,8 +1,8 @@
 # hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwayland-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 4e35e15da360480a5aef414246f70d29b0252b6a9c7e129e63afba3fb2ecb771 qtwayland-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz.sha256
+sha256 62c94f29e461c849e479f39d21577b0c72f0f084250e126021edcf0719271fb2 qtwayland-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash
index 1ed2bddb6..7c87683ba 100644
--- a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash
+++ b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwebchannel-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 945fdae8f1ea8dfc8e47a6d8421cef00690d6d4bfe26ce61bb59c0d0326c02fc qtwebchannel-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz.sha256
+sha256 3c254fa41b1af09c1e951131f3a1336dee70a15cbb8a82112488b38d29572df3 qtwebchannel-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5webengine/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/qt5webengine.hash
index e8e57d5d9..730352611 100644
--- a/buildroot/package/qt5/qt5webengine/qt5webengine.hash
+++ b/buildroot/package/qt5/qt5webengine/qt5webengine.hash
@@ -1,5 +1,5 @@
 # Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwebengine-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 3ff9bba5f631cfdd454ce298489360b3e2d9a2de4eb82bb121d838ef65f9b772 qtwebengine-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz.sha256
+sha256 5bb49ead71b851db4dc56f8fd97e0db72a268b22104129a06bac201d55d3b8fe qtwebengine-everywhere-src-5.11.3.tar.xz
diff --git a/buildroot/package/qt5/qt5webkit/Config.in b/buildroot/package/qt5/qt5webkit/Config.in
index 72c641b9f..e8008f7ba 100644
--- a/buildroot/package/qt5/qt5webkit/Config.in
+++ b/buildroot/package/qt5/qt5webkit/Config.in
@@ -3,10 +3,13 @@ config BR2_PACKAGE_QT5WEBKIT
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
+	depends on BR2_INSTALL_LIBSTDCPP # leveldb
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
+	depends on BR2_TOOLCHAIN_HAS_THREADS # leveldb
 	depends on !BR2_BINFMT_FLAT # icu
 	# assumes a FPU is available on MIPS
 	depends on !BR2_MIPS_SOFT_FLOAT
+	select BR2_PACKAGE_LEVELDB
 	select BR2_PACKAGE_QT5BASE
 	select BR2_PACKAGE_QT5BASE_ICU
 	select BR2_PACKAGE_QT5BASE_GUI
diff --git a/buildroot/package/qt5/qt5webkit/qt5webkit.mk b/buildroot/package/qt5/qt5webkit/qt5webkit.mk
index e8d368fb0..a0a0998d1 100644
--- a/buildroot/package/qt5/qt5webkit/qt5webkit.mk
+++ b/buildroot/package/qt5/qt5webkit/qt5webkit.mk
@@ -16,7 +16,7 @@ endif
 QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
 QT5WEBKIT_DEPENDENCIES = \
 	host-bison host-flex host-gperf host-python host-ruby \
-	qt5base sqlite
+	leveldb qt5base sqlite
 QT5WEBKIT_INSTALL_STAGING = YES
 
 QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
@@ -45,7 +45,7 @@ endef
 QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
 
 define QT5WEBKIT_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake WEBKIT_CONFIG+=use_system_leveldb)
 endef
 
 define QT5WEBKIT_BUILD_CMDS
diff --git a/buildroot/package/qt5/qt5websockets/qt5websockets.hash b/buildroot/package/qt5/qt5websockets/qt5websockets.hash
index 1b340b989..0df4ac98f 100644
--- a/buildroot/package/qt5/qt5websockets/qt5websockets.hash
+++ b/buildroot/package/qt5/qt5websockets/qt5websockets.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtwebsockets-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 ae6197619ce0c4104bdc43e097d79082f90ba6567fa286eae6306ce7aec88b8d qtwebsockets-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz.sha256
+sha256 021090c1a92f11fcf2914168741c1364235896793685b7fae2bc23e3dd55d5b9 qtwebsockets-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5x11extras/5.11.2/qt5x11extras.hash b/buildroot/package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash
similarity index 74%
rename from buildroot/package/qt5/qt5x11extras/5.11.2/qt5x11extras.hash
rename to buildroot/package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash
index 21702b91f..9a0e85d8f 100644
--- a/buildroot/package/qt5/qt5x11extras/5.11.2/qt5x11extras.hash
+++ b/buildroot/package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtx11extras-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 f407ca61052d44bfb06e831fc6db7595bb2b64882b1f0af23f5db2d1ee519089 qtx11extras-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz.mirrorlist
+sha256 f99eebe685f7cdbb71cd62903c2b2511548345535841bcc3f6b662205815cd85 qtx11extras-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
index 61788dd3b..5c66a54ee 100644
--- a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
+++ b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
@@ -1,8 +1,8 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz
 
-# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtxmlpatterns-everywhere-src-5.11.2.tar.xz.mirrorlist
-sha256 5fd5f680ba40dadf81665417501e1f3778982aea0e268bf4f75a420d54a86746 qtxmlpatterns-everywhere-src-5.11.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz.sha256
+sha256 8bd00be30722570d22382b99679d07787a2d62d4891d1c47d738d634e2db0eee qtxmlpatterns-everywhere-src-5.11.3.tar.xz
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
diff --git a/buildroot/package/qtuio/0001-TuioServer.cpp-add-missing-include.patch b/buildroot/package/qtuio/0001-TuioServer.cpp-add-missing-include.patch
deleted file mode 100644
index 99337026d..000000000
--- a/buildroot/package/qtuio/0001-TuioServer.cpp-add-missing-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4dd7cad8c95484a882eaa2aeaa74595a3dd93a07 Mon Sep 17 00:00:00 2001
-From: Stephan Hoffmann 
-Date: Sun, 2 Dec 2012 13:36:41 +0100
-Subject: [PATCH] TuioServer.cpp: add missing include
-
-If usleep() is used the header  has to be included
-
-Signed-off-by: Stephan Hoffmann 
----
- src/3rdparty/tuio/TuioServer.cpp |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/3rdparty/tuio/TuioServer.cpp b/src/3rdparty/tuio/TuioServer.cpp
-index f17bef9..851144c 100644
---- a/src/3rdparty/tuio/TuioServer.cpp
-+++ b/src/3rdparty/tuio/TuioServer.cpp
-@@ -25,6 +25,8 @@ using namespace TUIO;
- using namespace osc;
- 
- #ifndef WIN32
-+#include 
-+
- static void* ThreadFunc( void* obj )
- #else
- static DWORD WINAPI ThreadFunc( LPVOID obj )
--- 
-1.7.0.4
-
diff --git a/buildroot/package/qtuio/0002-dont-append-_d-for-debug.patch b/buildroot/package/qtuio/0002-dont-append-_d-for-debug.patch
deleted file mode 100644
index fbaaf1922..000000000
--- a/buildroot/package/qtuio/0002-dont-append-_d-for-debug.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-[PATCH] don't append _d to library name when Qt is built with debug support
-
-qtuio appends _d to the library name when Qt was built with debug support,
-breaking linking step for examples and staging/target install.
-
-There's no real advantage to the _d suffix, so simply fix it by removing
-the logic appending _d.
-
-Signed-off-by: Peter Korsgaard 
----
- src/qTUIO.pro |    5 -----
- 1 file changed, 5 deletions(-)
-
-Index: qtuio-abe4973ff6/src/qTUIO.pro
-===================================================================
---- qtuio-abe4973ff6.orig/src/qTUIO.pro
-+++ qtuio-abe4973ff6/src/qTUIO.pro
-@@ -16,11 +16,6 @@
- win32:LIBS += ws2_32.lib \
-     winmm.lib
- 
--# Changes the name of the target, when is debug mode
--CONFIG( debug, debug|release ) { 
--    TARGET = $${TARGET}_d
--    BUILD_NAME = debug
--}
- CONFIG( release, debug|release ):BUILD_NAME = release
- 
- # Temporary folders for the auxiliar files
diff --git a/buildroot/package/qtuio/Config.in b/buildroot/package/qtuio/Config.in
deleted file mode 100644
index f46f1dd40..000000000
--- a/buildroot/package/qtuio/Config.in
+++ /dev/null
@@ -1,22 +0,0 @@
-config BR2_PACKAGE_QTUIO
-	bool "qtuio"
-	depends on BR2_PACKAGE_QT
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  Implementation of an interface connecting TUIO messages
-	  and QT events
-
-	  https://github.com/x29a/qTUIO
-
-if BR2_PACKAGE_QTUIO
-
-config BR2_QTUIO_EXAMPLES
-	bool "qtuio examples"
-	help
-	  Build and install qtuio examples
-
-endif
-
-comment "qtuio depends on QT gui module"
-	depends on BR2_PACKAGE_QT
-	depends on !BR2_PACKAGE_QT_GUI_MODULE
diff --git a/buildroot/package/qtuio/qtuio.hash b/buildroot/package/qtuio/qtuio.hash
deleted file mode 100644
index bb9bdb184..000000000
--- a/buildroot/package/qtuio/qtuio.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# locally computed
-sha256  65308adb59e910d552d4885772c7f99c7d19dec5e924d852a5a39a1972f8d223  qtuio-abe4973ff60654aad9df7037c4ca15c45f811d24.tar.gz
diff --git a/buildroot/package/qtuio/qtuio.mk b/buildroot/package/qtuio/qtuio.mk
deleted file mode 100644
index 6b90a2c06..000000000
--- a/buildroot/package/qtuio/qtuio.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-################################################################################
-#
-# qtuio
-#
-################################################################################
-
-QTUIO_VERSION = abe4973ff60654aad9df7037c4ca15c45f811d24
-QTUIO_SITE = $(call github,x29a,qTUIO,$(QTUIO_VERSION))
-QTUIO_INSTALL_STAGING = YES
-QTUIO_DEPENDENCIES = qt
-
-QTUIO_LICENSE = GPL-3.0+
-QTUIO_LICENSE_FILES = COPYING
-
-# The pong example needs QtOpenGL support, which might become available
-# some time in the future. Then add pong to the list of examples.
-QTUIO_EXAMPLES = dials fingerpaint knobs pinchzoom
-
-ifeq ($(BR2_QTUIO_EXAMPLES),y)
-define QTUIO_CONFIGURE_EXAMPLES
-	for example in $(QTUIO_EXAMPLES) ; do \
-		(cd $(@D)/examples/$${example} && $(TARGET_MAKE_ENV) $(QT_QMAKE)) || exit 1; \
-	done
-endef
-endif
-
-define QTUIO_CONFIGURE_CMDS
-	cd $(@D)/src && $(TARGET_MAKE_ENV) $(QT_QMAKE)
-	$(QTUIO_CONFIGURE_EXAMPLES)
-endef
-
-ifeq ($(BR2_QTUIO_EXAMPLES),y)
-define QTUIO_BUILD_EXAMPLES
-	for example in $(QTUIO_EXAMPLES) ; do \
-		$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/examples/$${example} || exit 1; \
-	done
-endef
-endif
-
-define QTUIO_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src
-	$(QTUIO_BUILD_EXAMPLES)
-endef
-
-# Unfortunately, there is no working "install" target available
-ifeq ($(BR2_QTUIO_EXAMPLES),y)
-define QTUIO_INSTALL_EXAMPLES
-	for example in $(QTUIO_EXAMPLES) ; do \
-		$(INSTALL) -D -m 0755 $(@D)/examples/$${example}/$${example} $(TARGET_DIR)/usr/share/qtuio/$${example} || exit 1 ; \
-	done
-endef
-endif
-
-ifeq ($(BR2_PACKAGE_QT_STATIC),y)
-QTUIO_LIBRARY = libqTUIO.a
-else
-QTUIO_LIBRARY = libqTUIO.so*
-define QTUIO_INSTALL_TARGET_LIBRARY
-	cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(TARGET_DIR)/usr/lib
-endef
-endif
-
-define QTUIO_INSTALL_TARGET_CMDS
-	$(QTUIO_INSTALL_TARGET_LIBRARY)
-	$(QTUIO_INSTALL_EXAMPLES)
-endef
-
-define QTUIO_INSTALL_STAGING_CMDS
-	cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(STAGING_DIR)/usr/lib
-endef
-
-$(eval $(generic-package))
diff --git a/buildroot/package/quagga/0002-configure-fix-static-linking-with-readline.patch b/buildroot/package/quagga/0002-configure-fix-static-linking-with-readline.patch
deleted file mode 100644
index 243dfaf75..000000000
--- a/buildroot/package/quagga/0002-configure-fix-static-linking-with-readline.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 62ede7482da15d276b880f6d8540dce400dc50a7 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Thu, 26 Nov 2015 15:59:07 +0100
-Subject: [PATCH] configure: fix static linking with readline
-
-When static linking is used, the order of the libraries is important,
-and the libraries using a symbol from another library should be listed
-*before* the library providing that symbol (see
-http://eli.thegreenplace.net/2013/07/09/library-order-in-static-linking)
-for details.
-
-When vtysh is linked statically, the command line contains "-lcurses
--lreadline", which causes a build failure due to unresolved
-symbols. This is because readline is using symbols from the curses
-library: the order should be the opposite.
-
-This patch fixes that problem by putting the -lreadline at the
-beginning of the LIBREADLINE variable calcualted by the configure
-script.
-
-Signed-off-by: Thomas Petazzoni 
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3003e62..290953d 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -652,7 +652,7 @@ dnl	 [TODO] on Linux, and in [TODO] on Solaris.
- 	      )]
- 	    )]
- 	  )
--         AC_CHECK_LIB(readline, main, LIBREADLINE="$LIBREADLINE -lreadline",,
-+         AC_CHECK_LIB(readline, main, LIBREADLINE="-lreadline $LIBREADLINE",,
-                       "$LIBREADLINE")
-          if test $ac_cv_lib_readline_main = no; then
-            AC_MSG_ERROR([vtysh needs libreadline but was not found and usable on your system.])
--- 
-2.6.3
-
diff --git a/buildroot/package/quagga/0003-lib-memory-fix-indirect-static-link-with-zlib.patch b/buildroot/package/quagga/0003-lib-memory-fix-indirect-static-link-with-zlib.patch
deleted file mode 100644
index 6990f47cd..000000000
--- a/buildroot/package/quagga/0003-lib-memory-fix-indirect-static-link-with-zlib.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 008dd9771057dbbd7ce971c43bce2a0b05e2cf97 Mon Sep 17 00:00:00 2001
-From: Baruch Siach 
-Date: Sun, 21 Aug 2016 08:56:57 +0300
-Subject: [PATCH] lib/memory: fix indirect static link with zlib
-
-quagga SNMP support depends on netsnmp, that optionally depends on OpenSSL,
-which in turn requires zlib. zlib exports the 'zcalloc' symbol, which collides
-with a function of the same name in memory.c. This is not a problem when
-linking dynamically, since quagga does not use zlib directly. But static
-linking fails with the error:
-
-  CCLD     ospfd
-.../output/host/usr/mips64el-buildroot-linux-uclibc/sysroot/usr/lib/libz.a(zutil.o): In function `zcalloc':
-zutil.c:(.text+0x48): multiple definition of `zcalloc'
-.../output/build/quagga-1.0.20160315/lib/.libs/libzebra.a(memory.o):memory.c:(.text+0x1a0): first defined here
-
-Rename 'zcalloc' to 'zzcalloc' to avoid symbol collision.
-
-Signed-off-by: Baruch Siach 
----
-Patch status: posted upstream
-https://lists.quagga.net/pipermail/quagga-dev/2016-August/016109.html
-
- lib/memory.c | 14 ++++++++------
- lib/memory.h |  4 ++--
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/lib/memory.c b/lib/memory.c
-index 269520d5a435..b1680a5e6f07 100644
---- a/lib/memory.c
-+++ b/lib/memory.c
-@@ -80,9 +80,11 @@ zmalloc (int type, size_t size)
- 
- /*
-  * Allocate memory as in zmalloc, and also clear the memory.
-+ * Add an extra 'z' prefix to function name to avoid collision when linking
-+ * statically with zlib that exports the 'zcalloc' symbol.
-  */
- void *
--zcalloc (int type, size_t size)
-+zzcalloc (int type, size_t size)
- {
-   void *memory;
- 
-@@ -97,9 +99,9 @@ zcalloc (int type, size_t size)
- }
- 
- /* 
-- * Given a pointer returned by zmalloc or zcalloc, free it and
-+ * Given a pointer returned by zmalloc or zzcalloc, free it and
-  * return a pointer to a new size, basically acting like realloc().
-- * Requires: ptr was returned by zmalloc, zcalloc, or zrealloc with the
-+ * Requires: ptr was returned by zmalloc, zzcalloc, or zrealloc with the
-  * same type.
-  * Effects: Returns a pointer to the new memory, or aborts.
-  */
-@@ -109,7 +111,7 @@ zrealloc (int type, void *ptr, size_t size)
-   void *memory;
- 
-   if (ptr == NULL)              /* is really alloc */
--      return zcalloc(type, size);
-+      return zzcalloc(type, size);
- 
-   memory = realloc (ptr, size);
-   if (memory == NULL)
-@@ -122,7 +124,7 @@ zrealloc (int type, void *ptr, size_t size)
- 
- /*
-  * Free memory allocated by z*alloc or zstrdup.
-- * Requires: ptr was returned by zmalloc, zcalloc, or zrealloc with the
-+ * Requires: ptr was returned by zmalloc, zzcalloc, or zrealloc with the
-  * same type.
-  * Effects: The memory is freed and may no longer be referenced.
-  */
-@@ -196,7 +198,7 @@ mtype_zcalloc (const char *file, int line, int type, size_t size)
-   mstat[type].c_calloc++;
-   mstat[type].t_calloc++;
- 
--  memory = zcalloc (type, size);
-+  memory = zzcalloc (type, size);
-   mtype_log ("xcalloc", memory, file, line, type);
- 
-   return memory;
-diff --git a/lib/memory.h b/lib/memory.h
-index 23962235dbfe..501352993d21 100644
---- a/lib/memory.h
-+++ b/lib/memory.h
-@@ -56,7 +56,7 @@ extern struct mlist mlists[];
-   mtype_zstrdup (__FILE__, __LINE__, (mtype), (str))
- #else
- #define XMALLOC(mtype, size)       zmalloc ((mtype), (size))
--#define XCALLOC(mtype, size)       zcalloc ((mtype), (size))
-+#define XCALLOC(mtype, size)       zzcalloc ((mtype), (size))
- #define XREALLOC(mtype, ptr, size) zrealloc ((mtype), (ptr), (size))
- #define XFREE(mtype, ptr)          do { \
-                                      zfree ((mtype), (ptr)); \
-@@ -67,7 +67,7 @@ extern struct mlist mlists[];
- 
- /* Prototypes of memory function. */
- extern void *zmalloc (int type, size_t size);
--extern void *zcalloc (int type, size_t size);
-+extern void *zzcalloc (int type, size_t size);
- extern void *zrealloc (int type, void *ptr, size_t size);
- extern void  zfree (int type, void *ptr);
- extern char *zstrdup (int type, const char *str);
--- 
-2.8.1
-
diff --git a/buildroot/package/quagga/0004-bgpd-Fix-AS_PATH-size-calculation-for-long-paths.patch b/buildroot/package/quagga/0004-bgpd-Fix-AS_PATH-size-calculation-for-long-paths.patch
deleted file mode 100644
index 1425cf042..000000000
--- a/buildroot/package/quagga/0004-bgpd-Fix-AS_PATH-size-calculation-for-long-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7a42b78be9a4108d98833069a88e6fddb9285008 Mon Sep 17 00:00:00 2001
-From: Andreas Jaggi 
-Date: Mon, 2 Oct 2017 19:38:43 +0530
-Subject: [PATCH] bgpd: Fix AS_PATH size calculation for long paths
-
-If you have an AS_PATH with more entries than
-what can be written into a single AS_SEGMENT_MAX
-it needs to be broken up.  The code that noticed
-that the AS_PATH needs to be broken up was not
-correctly calculating the size of the resulting
-message.  This patch addresses this issue.
-
-Signed-off-by: Peter Korsgaard 
----
- bgpd/bgp_aspath.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
-index b7af5e88..d813bfba 100644
---- a/bgpd/bgp_aspath.c
-+++ b/bgpd/bgp_aspath.c
-@@ -903,7 +903,7 @@ aspath_put (struct stream *s, struct aspath *as, int use32bit )
-               assegment_header_put (s, seg->type, AS_SEGMENT_MAX);
-               assegment_data_put (s, seg->as, AS_SEGMENT_MAX, use32bit);
-               written += AS_SEGMENT_MAX;
--              bytes += ASSEGMENT_SIZE (written, use32bit);
-+              bytes += ASSEGMENT_SIZE (AS_SEGMENT_MAX, use32bit);
-             }
-           
-           /* write the final segment, probably is also the first */
--- 
-2.11.0
-
diff --git a/buildroot/package/quagga/0005-bgpd-security-invalid-attr-length-sends-NOTIFY-with-.patch b/buildroot/package/quagga/0005-bgpd-security-invalid-attr-length-sends-NOTIFY-with-.patch
deleted file mode 100644
index b64109d0f..000000000
--- a/buildroot/package/quagga/0005-bgpd-security-invalid-attr-length-sends-NOTIFY-with-.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From cc2e6770697e343f4af534114ab7e633d5beabec Mon Sep 17 00:00:00 2001
-From: Paul Jakma 
-Date: Wed, 3 Jan 2018 23:57:33 +0000
-Subject: [PATCH] bgpd/security: invalid attr length sends NOTIFY with data
- overrun
-
-Security issue: Quagga-2018-0543
-
-See: https://www.quagga.net/security/Quagga-2018-0543.txt
-
-* bgpd/bgp_attr.c: (bgp_attr_parse) An invalid attribute length is correctly
-  checked, and a NOTIFY prepared.  The NOTIFY can include the incorrect
-  received data with the NOTIFY, for debug purposes.  Commit
-  c69698704806a9ac5 modified the code to do that just, and also send the
-  malformed attr with the NOTIFY.  However, the invalid attribute length was
-  used as the length of the data to send back.
-
-  The result is a read past the end of data, which is then written to the
-  NOTIFY message and sent to the peer.
-
-  A configured BGP peer can use this bug to read up to 64 KiB of memory from
-  the bgpd process, or crash the process if the invalid read is caught by
-  some means (unmapped page and SEGV, or other mechanism) resulting in a DoS.
-
-  This bug _ought_ /not/ be exploitable by anything other than the connected
-  BGP peer, assuming the underlying TCP transport is secure.  For no BGP
-  peer should send on an UPDATE with this attribute.  Quagga will not, as
-  Quagga always validates the attr header length, regardless of type.
-
-  However, it is possible that there are BGP implementations that do not
-  check lengths on some attributes (e.g.  optional/transitive ones of a type
-  they do not recognise), and might pass such malformed attrs on.  If such
-  implementations exists and are common, then this bug might be triggerable
-  by BGP speakers further hops away.  Those peers will not receive the
-  NOTIFY (unless they sit on a shared medium), however they might then be
-  able to trigger a DoS.
-
-  Fix: use the valid bound to calculate the length.
-
-Signed-off-by: Peter Korsgaard 
----
- bgpd/bgp_attr.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
-index ef58beb1..9564637e 100644
---- a/bgpd/bgp_attr.c
-+++ b/bgpd/bgp_attr.c
-@@ -2147,6 +2147,8 @@ bgp_attr_parse (struct peer *peer, struct attr *attr, bgp_size_t size,
-   memset (seen, 0, BGP_ATTR_BITMAP_SIZE);
- 
-   /* End pointer of BGP attribute. */
-+  assert (size <= stream_get_size (BGP_INPUT (peer)));
-+  assert (size <= stream_get_endp (BGP_INPUT (peer)));
-   endp = BGP_INPUT_PNT (peer) + size;
-   
-   /* Get attributes to the end of attribute length. */
-@@ -2228,7 +2230,7 @@ bgp_attr_parse (struct peer *peer, struct attr *attr, bgp_size_t size,
-           bgp_notify_send_with_data (peer,
-                                      BGP_NOTIFY_UPDATE_ERR,
-                                      BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
--                                     startp, attr_endp - startp);
-+                                     startp, endp - startp);
- 	  return BGP_ATTR_PARSE_ERROR;
- 	}
- 	
--- 
-2.11.0
-
diff --git a/buildroot/package/quagga/0006-bgpd-security-Fix-double-free-of-unknown-attribute.patch b/buildroot/package/quagga/0006-bgpd-security-Fix-double-free-of-unknown-attribute.patch
deleted file mode 100644
index 0e32817f0..000000000
--- a/buildroot/package/quagga/0006-bgpd-security-Fix-double-free-of-unknown-attribute.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From e69b535f92eafb599329bf725d9b4c6fd5d7fded Mon Sep 17 00:00:00 2001
-From: Paul Jakma 
-Date: Sat, 6 Jan 2018 19:52:10 +0000
-Subject: [PATCH] bgpd/security: Fix double free of unknown attribute
-
-Security issue: Quagga-2018-1114
-See: https://www.quagga.net/security/Quagga-2018-1114.txt
-
-It is possible for bgpd to double-free an unknown attribute. This can happen
-via bgp_update_receive receiving an UPDATE with an invalid unknown attribute.
-bgp_update_receive then will call bgp_attr_unintern_sub and bgp_attr_flush,
-and the latter may try free an already freed unknown attr.
-
-* bgpd/bgp_attr.c: (transit_unintern) Take a pointer to the caller's storage
-  for the (struct transit *), so that transit_unintern can NULL out the
-  caller's reference if the (struct transit) is freed.
-  (cluster_unintern) By inspection, appears to have a similar issue.
-  (bgp_attr_unintern_sub) adjust for above.
-
-Signed-off-by: Peter Korsgaard 
----
- bgpd/bgp_attr.c | 33 +++++++++++++++++++--------------
- bgpd/bgp_attr.h |  4 ++--
- 2 files changed, 21 insertions(+), 16 deletions(-)
-
-diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
-index 9564637e..0c2806b5 100644
---- a/bgpd/bgp_attr.c
-+++ b/bgpd/bgp_attr.c
-@@ -199,15 +199,17 @@ cluster_intern (struct cluster_list *cluster)
- }
- 
- void
--cluster_unintern (struct cluster_list *cluster)
-+cluster_unintern (struct cluster_list **cluster)
- {
--  if (cluster->refcnt)
--    cluster->refcnt--;
-+  struct cluster_list *c = *cluster;
-+  if (c->refcnt)
-+    c->refcnt--;
- 
--  if (cluster->refcnt == 0)
-+  if (c->refcnt == 0)
-     {
--      hash_release (cluster_hash, cluster);
--      cluster_free (cluster);
-+      hash_release (cluster_hash, c);
-+      cluster_free (c);
-+      *cluster = NULL;
-     }
- }
- 
-@@ -357,15 +359,18 @@ transit_intern (struct transit *transit)
- }
- 
- void
--transit_unintern (struct transit *transit)
-+transit_unintern (struct transit **transit)
- {
--  if (transit->refcnt)
--    transit->refcnt--;
-+  struct transit *t = *transit;
-+  
-+  if (t->refcnt)
-+    t->refcnt--;
- 
--  if (transit->refcnt == 0)
-+  if (t->refcnt == 0)
-     {
--      hash_release (transit_hash, transit);
--      transit_free (transit);
-+      hash_release (transit_hash, t);
-+      transit_free (t);
-+      *transit = NULL;
-     }
- }
- 
-@@ -820,11 +825,11 @@ bgp_attr_unintern_sub (struct attr *attr)
-       UNSET_FLAG(attr->flag, ATTR_FLAG_BIT (BGP_ATTR_LARGE_COMMUNITIES));
-       
-       if (attr->extra->cluster)
--        cluster_unintern (attr->extra->cluster);
-+        cluster_unintern (&attr->extra->cluster);
-       UNSET_FLAG(attr->flag, ATTR_FLAG_BIT (BGP_ATTR_CLUSTER_LIST));
-       
-       if (attr->extra->transit)
--        transit_unintern (attr->extra->transit);
-+        transit_unintern (&attr->extra->transit);
-     }
- }
- 
-diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
-index 9ff074b2..052acc7d 100644
---- a/bgpd/bgp_attr.h
-+++ b/bgpd/bgp_attr.h
-@@ -187,10 +187,10 @@ extern unsigned long int attr_unknown_count (void);
- 
- /* Cluster list prototypes. */
- extern int cluster_loop_check (struct cluster_list *, struct in_addr);
--extern void cluster_unintern (struct cluster_list *);
-+extern void cluster_unintern (struct cluster_list **);
- 
- /* Transit attribute prototypes. */
--void transit_unintern (struct transit *);
-+void transit_unintern (struct transit **);
- 
- /* Below exported for unit-test purposes only */
- struct bgp_attr_parser_args {
--- 
-2.11.0
-
diff --git a/buildroot/package/quagga/0007-bgpd-security-debug-print-of-received-NOTIFY-data-ca.patch b/buildroot/package/quagga/0007-bgpd-security-debug-print-of-received-NOTIFY-data-ca.patch
deleted file mode 100644
index aeb50ae55..000000000
--- a/buildroot/package/quagga/0007-bgpd-security-debug-print-of-received-NOTIFY-data-ca.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 9e5251151894aefdf8e9392a2371615222119ad8 Mon Sep 17 00:00:00 2001
-From: Paul Jakma 
-Date: Sat, 6 Jan 2018 22:31:52 +0000
-Subject: [PATCH] bgpd/security: debug print of received NOTIFY data can
- over-read msg array
-
-Security issue: Quagga-2018-1550
-See: https://www.quagga.net/security/Quagga-2018-1550.txt
-
-* bgpd/bgp_debug.c: (struct message) Nearly every one of the NOTIFY
-  code/subcode message arrays has their corresponding size variables off
-  by one, as most have 1 as first index.
-
-  This means (bgp_notify_print) can cause mes_lookup to overread the (struct
-  message) by 1 pointer value if given an unknown index.
-
-  Fix the bgp_notify_..._msg_max variables to use the compiler to calculate
-  the correct sizes.
-
-Signed-off-by: Peter Korsgaard 
----
- bgpd/bgp_debug.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
-index ba797228..43faee7c 100644
---- a/bgpd/bgp_debug.c
-+++ b/bgpd/bgp_debug.c
-@@ -29,6 +29,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- #include "log.h"
- #include "sockunion.h"
- #include "filter.h"
-+#include "memory.h"
- 
- #include "bgpd/bgpd.h"
- #include "bgpd/bgp_aspath.h"
-@@ -73,7 +74,8 @@ const struct message bgp_status_msg[] =
-   { Clearing,    "Clearing"    },
-   { Deleted,     "Deleted"     },
- };
--const int bgp_status_msg_max = BGP_STATUS_MAX;
-+#define BGP_DEBUG_MSG_MAX(msg) const int msg ## _max = array_size (msg)
-+BGP_DEBUG_MSG_MAX (bgp_status_msg);
- 
- /* BGP message type string. */
- const char *bgp_type_str[] =
-@@ -84,7 +86,8 @@ const char *bgp_type_str[] =
-   "NOTIFICATION",
-   "KEEPALIVE",
-   "ROUTE-REFRESH",
--  "CAPABILITY"
-+  "CAPABILITY",
-+  NULL,
- };
- 
- /* message for BGP-4 Notify */
-@@ -98,15 +101,15 @@ static const struct message bgp_notify_msg[] =
-   { BGP_NOTIFY_CEASE, "Cease"},
-   { BGP_NOTIFY_CAPABILITY_ERR, "CAPABILITY Message Error"},
- };
--static const int bgp_notify_msg_max = BGP_NOTIFY_MAX;
-+BGP_DEBUG_MSG_MAX (bgp_notify_msg);
- 
- static const struct message bgp_notify_head_msg[] = 
- {
-   { BGP_NOTIFY_HEADER_NOT_SYNC, "/Connection Not Synchronized"},
-   { BGP_NOTIFY_HEADER_BAD_MESLEN, "/Bad Message Length"},
--  { BGP_NOTIFY_HEADER_BAD_MESTYPE, "/Bad Message Type"}
-+  { BGP_NOTIFY_HEADER_BAD_MESTYPE, "/Bad Message Type"},
- };
--static const int bgp_notify_head_msg_max = BGP_NOTIFY_HEADER_MAX;
-+BGP_DEBUG_MSG_MAX (bgp_notify_head_msg);
- 
- static const struct message bgp_notify_open_msg[] = 
- {
-@@ -119,7 +122,7 @@ static const struct message bgp_notify_open_msg[] =
-   { BGP_NOTIFY_OPEN_UNACEP_HOLDTIME, "/Unacceptable Hold Time"}, 
-   { BGP_NOTIFY_OPEN_UNSUP_CAPBL, "/Unsupported Capability"},
- };
--static const int bgp_notify_open_msg_max = BGP_NOTIFY_OPEN_MAX;
-+BGP_DEBUG_MSG_MAX (bgp_notify_open_msg);
- 
- static const struct message bgp_notify_update_msg[] = 
- {
-@@ -136,7 +139,7 @@ static const struct message bgp_notify_update_msg[] =
-   { BGP_NOTIFY_UPDATE_INVAL_NETWORK, "/Invalid Network Field"},
-   { BGP_NOTIFY_UPDATE_MAL_AS_PATH, "/Malformed AS_PATH"},
- };
--static const int bgp_notify_update_msg_max = BGP_NOTIFY_UPDATE_MAX;
-+BGP_DEBUG_MSG_MAX (bgp_notify_update_msg);
- 
- static const struct message bgp_notify_cease_msg[] =
- {
-@@ -150,7 +153,7 @@ static const struct message bgp_notify_cease_msg[] =
-   { BGP_NOTIFY_CEASE_COLLISION_RESOLUTION, "/Connection collision resolution"},
-   { BGP_NOTIFY_CEASE_OUT_OF_RESOURCE, "/Out of Resource"},
- };
--static const int bgp_notify_cease_msg_max = BGP_NOTIFY_CEASE_MAX;
-+BGP_DEBUG_MSG_MAX (bgp_notify_cease_msg);
- 
- static const struct message bgp_notify_capability_msg[] = 
- {
-@@ -159,7 +162,7 @@ static const struct message bgp_notify_capability_msg[] =
-   { BGP_NOTIFY_CAPABILITY_INVALID_LENGTH, "/Invalid Capability Length"},
-   { BGP_NOTIFY_CAPABILITY_MALFORMED_CODE, "/Malformed Capability Value"},
- };
--static const int bgp_notify_capability_msg_max = BGP_NOTIFY_CAPABILITY_MAX;
-+BGP_DEBUG_MSG_MAX (bgp_notify_capability_msg);
- 
- /* Origin strings. */
- const char *bgp_origin_str[] = {"i","e","?"};
--- 
-2.11.0
-
diff --git a/buildroot/package/quagga/0008-bgpd-security-fix-infinite-loop-on-certain-invalid-O.patch b/buildroot/package/quagga/0008-bgpd-security-fix-infinite-loop-on-certain-invalid-O.patch
deleted file mode 100644
index 0a06da933..000000000
--- a/buildroot/package/quagga/0008-bgpd-security-fix-infinite-loop-on-certain-invalid-O.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ce07207c50a3d1f05d6dd49b5294282e59749787 Mon Sep 17 00:00:00 2001
-From: Paul Jakma 
-Date: Sat, 6 Jan 2018 21:20:51 +0000
-Subject: [PATCH] bgpd/security: fix infinite loop on certain invalid OPEN
- messages
-
-Security issue: Quagga-2018-1975
-See: https://www.quagga.net/security/Quagga-2018-1975.txt
-
-* bgpd/bgp_packet.c: (bgp_capability_msg_parse) capability parser can infinite
-  loop due to checks that issue 'continue' without bumping the input
-  pointer.
-
-Signed-off-by: Peter Korsgaard 
----
- bgpd/bgp_packet.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
-index b3d601fc..f9338d8d 100644
---- a/bgpd/bgp_packet.c
-+++ b/bgpd/bgp_packet.c
-@@ -2328,7 +2328,8 @@ bgp_capability_msg_parse (struct peer *peer, u_char *pnt, bgp_size_t length)
- 
-   end = pnt + length;
- 
--  while (pnt < end)
-+  /* XXX: Streamify this */
-+  for (; pnt < end; pnt += hdr->length + 3)
-     {      
-       /* We need at least action, capability code and capability length. */
-       if (pnt + 3 > end)
-@@ -2416,7 +2417,6 @@ bgp_capability_msg_parse (struct peer *peer, u_char *pnt, bgp_size_t length)
-           zlog_warn ("%s unrecognized capability code: %d - ignored",
-                      peer->host, hdr->code);
-         }
--      pnt += hdr->length + 3;
-     }
-   return 0;
- }
--- 
-2.11.0
-
diff --git a/buildroot/package/quagga/Config.in b/buildroot/package/quagga/Config.in
index 98b9d3481..9427475d0 100644
--- a/buildroot/package/quagga/Config.in
+++ b/buildroot/package/quagga/Config.in
@@ -38,6 +38,12 @@ config BR2_PACKAGE_QUAGGA_ISISD
 	help
 	  Enable isisd support in quagga.
 
+config BR2_PACKAGE_QUAGGA_NHRPD
+	bool "NHRPD protocol"
+	select BR2_PACKAGE_C_ARES
+	help
+	  Build Next Hop Routing Protocol daemon.
+
 config BR2_PACKAGE_QUAGGA_OSPFD
 	bool "OSPFv2 protocol"
 	help
diff --git a/buildroot/package/quagga/quagga.hash b/buildroot/package/quagga/quagga.hash
index 6da37cf80..93fc42c8f 100644
--- a/buildroot/package/quagga/quagga.hash
+++ b/buildroot/package/quagga/quagga.hash
@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	b5a94e5bdad3062e04595a5692b8cc435f0a85102f75dfdca0a06d093b4ef63f	quagga-1.1.1.tar.gz
+sha256	ee2c0907a106902abbdcaf63b4f28c67241c4f3396989ed54da7b4976eecad31	quagga-1.2.3.tar.gz
+
+# Hash for license file
+sha256	b39c1bad4e51e2a3389cd25fc4addebe41a3ae7c11100795683f9330de1536e5	COPYING
diff --git a/buildroot/package/quagga/quagga.mk b/buildroot/package/quagga/quagga.mk
index 8c2b80631..420d72c79 100644
--- a/buildroot/package/quagga/quagga.mk
+++ b/buildroot/package/quagga/quagga.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QUAGGA_VERSION = 1.1.1
+QUAGGA_VERSION = 1.2.3
 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 QUAGGA_DEPENDENCIES = host-gawk host-pkgconf
 QUAGGA_LICENSE = GPL-2.0+
@@ -18,9 +18,6 @@ QUAGGA_CONF_OPTS = \
 	--sysconfdir=/etc/quagga \
 	--localstatedir=/var/run/quagga
 
-# 0002-configure-fix-static-linking-with-readline.patch
-QUAGGA_AUTORECONF = YES
-
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 QUAGGA_CONF_OPTS += --enable-capabilities
 QUAGGA_DEPENDENCIES += libcap
@@ -61,6 +58,13 @@ define QUAGGA_PERMISSIONS
 	/etc/quagga d 755 quagga quagga - - - - -
 endef
 
+ifeq ($(BR2_PACKAGE_QUAGGA_NHRPD),y)
+QUAGGA_CONF_OPTS += --enable-nhrpd
+QUAGGA_DEPENDENCIES += c-ares
+else
+QUAGGA_CONF_OPTS += --disable-nhrpd
+endif
+
 ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
 QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
 QUAGGA_CONF_OPTS += --enable-snmp=agentx
diff --git a/buildroot/package/quazip/Config.in b/buildroot/package/quazip/Config.in
index 83537d461..e98029755 100644
--- a/buildroot/package/quazip/Config.in
+++ b/buildroot/package/quazip/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_QUAZIP
 	bool "quazip"
+	depends on BR2_PACKAGE_QT5
 	select BR2_PACKAGE_ZLIB
 	help
 	  QuaZIP is a simple C++ wrapper over Gilles Vollant's
diff --git a/buildroot/package/quazip/quazip.mk b/buildroot/package/quazip/quazip.mk
index 872340ab4..aba827450 100644
--- a/buildroot/package/quazip/quazip.mk
+++ b/buildroot/package/quazip/quazip.mk
@@ -9,19 +9,12 @@ QUAZIP_SITE = $(call github,stachenov,quazip,$(QUAZIP_VERSION))
 QUAZIP_INSTALL_STAGING = YES
 QUAZIP_DEPENDENCIES = \
 	zlib \
-	$(if $(BR2_PACKAGE_QT),qt) \
-	$(if $(BR2_PACKAGE_QT5),qt5base)
+	qt5base
 QUAZIP_LICENSE = LGPL-2.1
 QUAZIP_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PACKAGE_QT5),y)
-QUAZIP_QMAKE = $(QT5_QMAKE)
-else
-QUAZIP_QMAKE = $(QT_QMAKE)
-endif
-
 define QUAZIP_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(QUAZIP_QMAKE) PREFIX=/usr)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr)
 endef
 
 define QUAZIP_BUILD_CMDS
diff --git a/buildroot/package/qwt/Config.in b/buildroot/package/qwt/Config.in
index 041c2d102..2e9cec19d 100644
--- a/buildroot/package/qwt/Config.in
+++ b/buildroot/package/qwt/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport
-	select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport
+	select BR2_PACKAGE_QT5BASE_CONCURRENT
 	help
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
@@ -15,18 +15,15 @@ if BR2_PACKAGE_QWT
 
 config BR2_PACKAGE_QWT_SVG
 	bool "SVG support"
-	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5SVG
 
 config BR2_PACKAGE_QWT_MATHML
 	bool "MathML support"
 
 config BR2_PACKAGE_QWT_OPENGL
 	bool "OpenGL support"
-	depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_QT) || \
-		(BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_PACKAGE_QT5)
-	select BR2_PACKAGE_QT_OPENGL if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
+	select BR2_PACKAGE_QT5BASE_OPENGL
+	select BR2_PACKAGE_QT5BASE_OPENGL_LIB
 
 endif
diff --git a/buildroot/package/qwt/qwt.mk b/buildroot/package/qwt/qwt.mk
index 619453bfc..f381ebbb7 100644
--- a/buildroot/package/qwt/qwt.mk
+++ b/buildroot/package/qwt/qwt.mk
@@ -8,13 +8,7 @@ QWT_VERSION = 6.1.3
 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
 QWT_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT),y)
-QWT_DEPENDENCIES = qt
-QWT_QMAKE = $(QT_QMAKE)
-else ifeq ($(BR2_PACKAGE_QT5),y)
-QWT_DEPENDENCIES += qt5base
-QWT_QMAKE = $(QT5_QMAKE)
-endif
+QWT_DEPENDENCIES = qt5base
 
 QWT_LICENSE = LGPL-2.1 with exceptions
 QWT_LICENSE_FILES = COPYING
@@ -49,7 +43,7 @@ endif
 
 define QWT_CONFIGURE_CMDS
 	$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
-	(cd $(@D); $(TARGET_MAKE_ENV) $(QWT_QMAKE))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE))
 endef
 
 define QWT_BUILD_CMDS
diff --git a/buildroot/package/rabbitmq-c/Config.in b/buildroot/package/rabbitmq-c/Config.in
index b330c9047..6dbd1467c 100644
--- a/buildroot/package/rabbitmq-c/Config.in
+++ b/buildroot/package/rabbitmq-c/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_RABBITMQ_C
 	bool "rabbitmq-c"
+	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  This is a C-language AMQP client library for use with v2.0+
@@ -7,5 +8,5 @@ config BR2_PACKAGE_RABBITMQ_C
 
 	  https://github.com/alanxz/rabbitmq-c
 
-comment "rabbitmq-c needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "rabbitmq-c needs a toolchain w/ dynamic library, threads"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/buildroot/package/rabbitmq-c/rabbitmq-c.mk b/buildroot/package/rabbitmq-c/rabbitmq-c.mk
index a3c4f8219..6385ccb6b 100644
--- a/buildroot/package/rabbitmq-c/rabbitmq-c.mk
+++ b/buildroot/package/rabbitmq-c/rabbitmq-c.mk
@@ -19,28 +19,20 @@ RABBITMQ_C_CONF_OPTS = \
 RABBITMQ_C_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
 
 # BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable
-ifeq ($(BR2_STATIC_LIBS),y)
-RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
-else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+ifeq ($(BR2_SHARED_STATIC_LIBS),y)
 RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
 else ifeq ($(BR2_SHARED_LIBS),y)
 RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
 endif
 
-# CMake OpenSSL detection is buggy, and doesn't properly use
-# pkg-config, so it fails when statically linking. See
-# https://gitlab.kitware.com/cmake/cmake/issues/16885.
-ifeq ($(BR2_PACKAGE_OPENSSL):$(BR2_STATIC_LIBS),y:)
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
 RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=ON
 RABBITMQ_C_DEPENDENCIES += openssl
 else
 RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=OFF
 endif
 
-# Popt is sometimes linked against libintl, but CMake doesn't know
-# about that, and there's no way to tell manually CMake to link
-# against an additional library.
-ifeq ($(BR2_PACKAGE_POPT):$(BR2_STATIC_LIBS),y:)
+ifeq ($(BR2_PACKAGE_POPT),y)
 RABBITMQ_C_CONF_OPTS += -DBUILD_TOOLS=ON
 RABBITMQ_C_DEPENDENCIES += popt
 else
diff --git a/buildroot/package/rabbitmq-server/S50rabbitmq-server b/buildroot/package/rabbitmq-server/S50rabbitmq-server
old mode 100755
new mode 100644
diff --git a/buildroot/package/radvd/S50radvd b/buildroot/package/radvd/S50radvd
old mode 100755
new mode 100644
diff --git a/buildroot/package/rapidxml/rapidxml.mk b/buildroot/package/rapidxml/rapidxml.mk
index 9d034d820..ef2dd3972 100644
--- a/buildroot/package/rapidxml/rapidxml.mk
+++ b/buildroot/package/rapidxml/rapidxml.mk
@@ -21,7 +21,8 @@ define RAPIDXML_EXTRACT_CMDS
 endef
 
 define RAPIDXML_INSTALL_STAGING_CMDS
-	cp -dpfr $(@D)/*hpp $(STAGING_DIR)/usr/include
+	mkdir -p $(STAGING_DIR)/usr/include/rapidxml
+	cp -dpfr $(@D)/*hpp $(STAGING_DIR)/usr/include/rapidxml
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot/package/rauc/0001-emmc-add-workaround-for-older-kernels.patch b/buildroot/package/rauc/0001-emmc-add-workaround-for-older-kernels.patch
deleted file mode 100644
index 23c9484e6..000000000
--- a/buildroot/package/rauc/0001-emmc-add-workaround-for-older-kernels.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7c67c0ef267d470fcec950d2be49507255f39fc5 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" 
-Date: Sun, 13 May 2018 14:17:44 +0200
-Subject: [PATCH] emmc: add workaround for older kernels
-
-Kernels up to (and including 3.3) forgot to include types.h in their
-mmc/ioctl.h, and thus __u32 (and others) are not defined, causing
-compilation errors:
-
-    http://autobuild.buildroot.org/results/621/621587906bd2bb27c43b6fcbb051d75f20e32e7c/build-end.log
-
-Fix that by explicitly including types.h before mmc/ioctl.h.
-
-Signed-off-by: "Yann E. MORIN" 
----
- src/emmc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/emmc.c b/src/emmc.c
-index e8b0b05..2ce3373 100644
---- a/src/emmc.c
-+++ b/src/emmc.c
-@@ -4,6 +4,7 @@
- #include 
- #include 
- #include 
-+#include  /* kernel < 3.4 forgot that in mmc/ioctl.h */
- #include 
- #include 
- #include 
--- 
-2.14.1
-
diff --git a/buildroot/package/rauc/0002-build-make-eMMC-boot-partition-support-optional.patch b/buildroot/package/rauc/0002-build-make-eMMC-boot-partition-support-optional.patch
deleted file mode 100644
index f6177c9d5..000000000
--- a/buildroot/package/rauc/0002-build-make-eMMC-boot-partition-support-optional.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From d66502532fea652d8743bfb61f9843c796d305cf Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Fri, 24 Aug 2018 14:30:19 +0200
-Subject: [PATCH] build: make eMMC boot partition support optional
-
-The eMMC boot partition support, added in commit
-ea5cc7ff606c65536da218bd1ef6d0ca279c9b17 ("src/update_handler: add
-support for updating eMMC boot partitions"), requires
-, only available starting from kernel headers 3.0.
-
-Even though it is pretty likely that people are going to use Linux >=
-3.0 on their embedded systems these days, RAUC also needs to be built
-natively on the build machine to produce update artifacts, and the
-build machine is sometimes using an ancient Linux system, especially
-in an enterprise contexts.
-
-In order to make sure that RAUC builds fine in this context, this
-commit makes the eMMC boot partition support optional, by verifying
-the availability of .
-
-Signed-off-by: Thomas Petazzoni 
----
- Makefile.am          | 5 ++++-
- configure.ac         | 6 ++++++
- src/update_handler.c | 6 ++++++
- 3 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 23eb2d1..7b4682d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -39,7 +39,6 @@ librauc_la_SOURCES = \
- 	src/checksum.c \
- 	src/config_file.c \
- 	src/context.c \
--	src/emmc.c \
- 	src/install.c \
- 	src/manifest.c \
- 	src/mark.c \
-@@ -63,6 +62,10 @@ librauc_la_SOURCES = \
- 	include/update_handler.h \
- 	include/utils.h
- 
-+if WANT_EMMC_BOOT_SUPPORT
-+librauc_la_SOURCES += src/emmc.c
-+endif
-+
- if WANT_NETWORK
- librauc_la_SOURCES += src/network.c include/network.h
- endif
-diff --git a/configure.ac b/configure.ac
-index 2d6f940..1ec124b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,6 +102,12 @@ AC_SUBST(DBUS_SYSTEMSERVICEDIR)
- 
- # Checks for header files.
- 
-+AC_CHECK_HEADER([linux/mmc/ioctl.h],
-+	AC_DEFINE([ENABLE_EMMC_BOOT_SUPPORT], [1], [Define to 1 to enable eMMC boot support]),
-+	AC_DEFINE([ENABLE_EMMC_BOOT_SUPPORT], [0]))
-+
-+AM_CONDITIONAL([WANT_EMMC_BOOT_SUPPORT], [test x$ac_cv_header_linux_mmc_ioctl_h != xno])
-+
- # Checks for typedefs, structures, and compiler characteristics.
- 
- # Checks for library functions.
-diff --git a/src/update_handler.c b/src/update_handler.c
-index 62115ec..a9f233a 100644
---- a/src/update_handler.c
-+++ b/src/update_handler.c
-@@ -57,6 +57,7 @@ out:
- 	return outstream;
- }
- 
-+#if ENABLE_EMMC_BOOT_SUPPORT == 1
- static gboolean clear_slot(RaucSlot *slot, GError **error)
- {
- 	GError *ierror = NULL;
-@@ -99,6 +100,7 @@ out:
- 	g_clear_object(&outstream);
- 	return res;
- }
-+#endif
- 
- static gboolean ubifs_ioctl(RaucImage *image, int fd, GError **error)
- {
-@@ -1085,6 +1087,7 @@ out:
- 	return res;
- }
- 
-+#if ENABLE_EMMC_BOOT_SUPPORT == 1
- static gboolean img_to_boot_emmc_handler(RaucImage *image, RaucSlot *dest_slot, const gchar *hook_name, GError **error)
- {
- 
-@@ -1245,6 +1248,7 @@ out:
- 
- 	return res;
- }
-+#endif
- 
- static gboolean img_to_raw_handler(RaucImage *image, RaucSlot *dest_slot, const gchar *hook_name, GError **error)
- {
-@@ -1329,7 +1333,9 @@ RaucUpdatePair updatepairs[] = {
- 	{"*.img", "nand", img_to_nand_handler},
- 	{"*.img", "ubivol", img_to_ubivol_handler},
- 	{"*.squashfs", "ubivol", img_to_ubivol_handler},
-+#if ENABLE_EMMC_BOOT_SUPPORT == 1
- 	{"*.img", "boot-emmc", img_to_boot_emmc_handler},
-+#endif
- 	{"*.img", "*", img_to_raw_handler}, /* fallback */
- 	{0}
- };
--- 
-2.14.4
-
diff --git a/buildroot/package/rauc/Config.in b/buildroot/package/rauc/Config.in
index 6433b827d..456f8f382 100644
--- a/buildroot/package/rauc/Config.in
+++ b/buildroot/package/rauc/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_RAUC
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_DBUS # run-time dependency
+	select BR2_PACKAGE_SQUASHFS # run-time dependency
 	help
 	  RAUC is the Robust Auto-Update Controller developed by
 	  Pengutronix. It supports updating embedded Linux
diff --git a/buildroot/package/rauc/rauc.hash b/buildroot/package/rauc/rauc.hash
index a16340f18..54c6c9322 100644
--- a/buildroot/package/rauc/rauc.hash
+++ b/buildroot/package/rauc/rauc.hash
@@ -1,3 +1,3 @@
 # Locally calculated, after verifying against
 # https://github.com/rauc/rauc/releases/download/v0.4/rauc-0.4.tar.xz.asc
-sha256 89656b6330ac1f31293d450f5179896397c588ab52e77ec229382a6abd125d35 rauc-0.4.tar.xz
+sha256 8875ab0d02b4cb38a211b236855361c18b874b385e6f18dde394ac699f2cf2aa rauc-1.0.tar.xz
diff --git a/buildroot/package/rauc/rauc.mk b/buildroot/package/rauc/rauc.mk
index 36119c061..3848a010b 100644
--- a/buildroot/package/rauc/rauc.mk
+++ b/buildroot/package/rauc/rauc.mk
@@ -4,13 +4,11 @@
 #
 ################################################################################
 
-RAUC_VERSION = 0.4
+RAUC_VERSION = 1.0
 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)
 RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz
 RAUC_LICENSE = LGPL-2.1
 RAUC_DEPENDENCIES = host-pkgconf openssl libglib2
-# 0002-build-make-eMMC-boot-partition-support-optional.patch
-RAUC_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y)
 RAUC_CONF_OPTS += --enable-network
diff --git a/buildroot/package/rcw/Config.in.host b/buildroot/package/rcw/Config.in.host
new file mode 100644
index 000000000..ba40f76de
--- /dev/null
+++ b/buildroot/package/rcw/Config.in.host
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_HOST_RCW
+	bool "host rcw"
+	help
+	  This package provides an reset configuration word(RCW)
+	  compiler to build NXP QoriQ/LS PBL/RCW binary(s).
+
+	  The package installs example configurations and scripts
+	  for each devkit supported in the current release see
+	  $(HOST_DIR)/share/rcw. Either a SDK or post scripts can
+	  then use this toolset and examples.
+
+	  https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/
diff --git a/buildroot/package/rcw/rcw.hash b/buildroot/package/rcw/rcw.hash
new file mode 100644
index 000000000..7de1ec659
--- /dev/null
+++ b/buildroot/package/rcw/rcw.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 1421ada9fec10b12ff21cd9ad82f0a835b191cb2dde80f03547764574b1346c3 rcw-LSDK-18.12.tar.gz
+sha256 a531b3146425e592db17a51ff39c4801cb01fb4055ffdaada0572decc0655bcd LICENSE
diff --git a/buildroot/package/rcw/rcw.mk b/buildroot/package/rcw/rcw.mk
new file mode 100644
index 000000000..f4570b9bd
--- /dev/null
+++ b/buildroot/package/rcw/rcw.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# rcw
+#
+################################################################################
+
+RCW_VERSION = LSDK-18.12
+RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
+RCW_SITE_METHOD = git
+RCW_LICENSE = BSD-3-Clause
+RCW_LICENSE_FILES = LICENSE
+
+# Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer
+# could use a post image or SDK to build/install PBL files.
+define HOST_RCW_INSTALL_CMDS
+	mkdir -p  $(HOST_DIR)/share/rcw
+	cp -a $(@D)/* $(HOST_DIR)/share/rcw
+endef
+
+$(eval $(host-generic-package))
diff --git a/buildroot/package/rdesktop/0002-openssl11.patch b/buildroot/package/rdesktop/0002-openssl11.patch
deleted file mode 100644
index 050d6f690..000000000
--- a/buildroot/package/rdesktop/0002-openssl11.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From bd6aa6acddf0ba640a49834807872f4cc0d0a773 Mon Sep 17 00:00:00 2001
-From: Jani Hakala 
-Date: Thu, 16 Jun 2016 14:28:15 +0300
-Subject: [PATCH] Fix OpenSSL 1.1 compability issues
-
-Some data types have been made opaque in OpenSSL version 1.1 so
-stack allocation and accessing struct fields directly does not work.
-
-Downloaded from upstream commit
-https://github.com/rdesktop/rdesktop/commit/bd6aa6acddf0ba640a49834807872f4cc0d0a773
-
-Signed-off-by: Bernd Kuhls 
----
- ssl.c | 65 ++++++++++++++++++++++++++++++++++++-----------------------
- 1 file changed, 40 insertions(+), 25 deletions(-)
-
-diff --git a/ssl.c b/ssl.c
-index 48751255..032e9b9e 100644
---- a/ssl.c
-+++ b/ssl.c
-@@ -88,7 +88,7 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 *
- 		  uint8 * exponent)
- {
- 	BN_CTX *ctx;
--	BIGNUM mod, exp, x, y;
-+	BIGNUM *mod, *exp, *x, *y;
- 	uint8 inr[SEC_MAX_MODULUS_SIZE];
- 	int outlen;
- 
-@@ -98,24 +98,24 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 *
- 	reverse(inr, len);
- 
- 	ctx = BN_CTX_new();
--	BN_init(&mod);
--	BN_init(&exp);
--	BN_init(&x);
--	BN_init(&y);
--
--	BN_bin2bn(modulus, modulus_size, &mod);
--	BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp);
--	BN_bin2bn(inr, len, &x);
--	BN_mod_exp(&y, &x, &exp, &mod, ctx);
--	outlen = BN_bn2bin(&y, out);
-+	mod = BN_new();
-+	exp = BN_new();
-+	x = BN_new();
-+	y = BN_new();
-+
-+	BN_bin2bn(modulus, modulus_size, mod);
-+	BN_bin2bn(exponent, SEC_EXPONENT_SIZE, exp);
-+	BN_bin2bn(inr, len, x);
-+	BN_mod_exp(y, x, exp, mod, ctx);
-+	outlen = BN_bn2bin(y, out);
- 	reverse(out, outlen);
- 	if (outlen < (int) modulus_size)
- 		memset(out + outlen, 0, modulus_size - outlen);
- 
--	BN_free(&y);
--	BN_clear_free(&x);
--	BN_free(&exp);
--	BN_free(&mod);
-+	BN_free(y);
-+	BN_clear_free(x);
-+	BN_free(exp);
-+	BN_free(mod);
- 	BN_CTX_free(ctx);
- }
- 
-@@ -146,12 +146,20 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len)
- 
- 	   Kudos to Richard Levitte for the following (. intiutive .) 
- 	   lines of code that resets the OID and let's us extract the key. */
--	nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
-+
-+	X509_PUBKEY *key = NULL;
-+	X509_ALGOR *algor = NULL;
-+
-+	key = X509_get_X509_PUBKEY(cert);
-+	algor = X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key);
-+
-+	nid = OBJ_obj2nid(algor->algorithm);
-+
- 	if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption))
- 	{
- 		DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n"));
--		ASN1_OBJECT_free(cert->cert_info->key->algor->algorithm);
--		cert->cert_info->key->algor->algorithm = OBJ_nid2obj(NID_rsaEncryption);
-+		X509_PUBKEY_set0_param(key, OBJ_nid2obj(NID_rsaEncryption),
-+				       0, NULL, NULL, 0);
- 	}
- 	epk = X509_get_pubkey(cert);
- 	if (NULL == epk)
-@@ -201,14 +209,24 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len,
- {
- 	int len;
- 
--	if ((BN_num_bytes(rkey->e) > (int) max_exp_len) ||
--	    (BN_num_bytes(rkey->n) > (int) max_mod_len))
-+	BIGNUM *e = NULL;
-+	BIGNUM *n = NULL;
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+	e = rkey->e;
-+	n = rkey->n;
-+#else
-+	RSA_get0_key(rkey, &e, &n, NULL);
-+#endif
-+
-+	if ((BN_num_bytes(e) > (int) max_exp_len) ||
-+	    (BN_num_bytes(n) > (int) max_mod_len))
- 	{
- 		return 1;
- 	}
--	len = BN_bn2bin(rkey->e, exponent);
-+	len = BN_bn2bin(e, exponent);
- 	reverse(exponent, len);
--	len = BN_bn2bin(rkey->n, modulus);
-+	len = BN_bn2bin(n, modulus);
- 	reverse(modulus, len);
- 	return 0;
- }
-@@ -229,8 +247,5 @@ void
- rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len,
- 	       unsigned char *md)
- {
--	HMAC_CTX ctx;
--	HMAC_CTX_init(&ctx);
- 	HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL);
--	HMAC_CTX_cleanup(&ctx);
- }
diff --git a/buildroot/package/rdesktop/rdesktop.hash b/buildroot/package/rdesktop/rdesktop.hash
index cc1f55b77..a43fab76f 100644
--- a/buildroot/package/rdesktop/rdesktop.hash
+++ b/buildroot/package/rdesktop/rdesktop.hash
@@ -1,3 +1,3 @@
-# From http://sourceforge.net/projects/rdesktop/files/rdesktop/1.8.3/
-md5	86e8b368a7c715e74ded92e0d7912dc5	rdesktop-1.8.3.tar.gz
-sha1	aa1e56043782e04a0121357b24874e3ad6ae7b1d	rdesktop-1.8.3.tar.gz
+# Locally calculated
+sha256	516f04df92f16eba04c96bbf9aeb05b9da686689c2bb5c107e0941583e09f933	rdesktop-1.8.4.tar.gz
+sha256	fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7	COPYING
diff --git a/buildroot/package/rdesktop/rdesktop.mk b/buildroot/package/rdesktop/rdesktop.mk
index da8a80ef9..d97422cf1 100644
--- a/buildroot/package/rdesktop/rdesktop.mk
+++ b/buildroot/package/rdesktop/rdesktop.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-RDESKTOP_VERSION = 1.8.3
-RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION)
+RDESKTOP_VERSION = 1.8.4
+RDESKTOP_SITE = $(call github,rdesktop,rdesktop,v$(RDESKTOP_VERSION))
 RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \
 	$(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \
 	$(if $(BR2_PACKAGE_LIBAO),libao) \
@@ -13,6 +13,8 @@ RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \
 RDESKTOP_CONF_OPTS = --with-openssl=$(STAGING_DIR)/usr --disable-credssp
 RDESKTOP_LICENSE = GPL-3.0+
 RDESKTOP_LICENSE_FILES = COPYING
+# From git
+RDESKTOP_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_PCSC_LITE),y)
 RDESKTOP_DEPENDENCIES += pcsc-lite
diff --git a/buildroot/package/readline/0001-configure.ac-readline.pc.in-fix-Requires.private-val.patch b/buildroot/package/readline/0001-configure.ac-readline.pc.in-fix-Requires.private-val.patch
deleted file mode 100644
index 22b479cd9..000000000
--- a/buildroot/package/readline/0001-configure.ac-readline.pc.in-fix-Requires.private-val.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 7bbf2046fbcf4416ec226ecb3a2b4c6a5c263298 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Sun, 22 Apr 2018 23:06:28 +0200
-Subject: [PATCH] configure.ac, readline.pc.in: fix Requires.private value
-
-The provided readline.pc.in hardcodes the fact that readline depends
-on the tinfo library. However, different termcap implementation are
-supported beyond tinfo. This commit improves the configure.ac script
-to define a TERMCAP_PKG_CONFIG_LIB variable, which is then used in
-readline.pc.in.
-
-This for example allows the generated readline.pc to properly contain
-"Requires.private: ncurses" when ncurses is used as the termcap
-implementation.
-
-Signed-off-by: Thomas Petazzoni 
----
- configure.ac   | 8 ++++++++
- readline.pc.in | 2 +-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fd0cec4..9f85f37 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -276,6 +276,13 @@ case "$BUILD_DIR" in
- *)	;;
- esac
- 
-+case "$TERMCAP_LIB" in
-+-ltinfo)  TERMCAP_PKG_CONFIG_LIB=tinfo ;;
-+-lcurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
-+-lncurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
-+-ltermcap) TERMCAP_PKG_CONFIG_LIB=termcap ;;
-+esac
-+
- AC_SUBST(BUILD_DIR)
- 
- AC_SUBST(CFLAGS)
-@@ -292,6 +299,7 @@ AC_SUBST(host_os)
- AC_SUBST(LIBVERSION)
- 
- AC_SUBST(TERMCAP_LIB)
-+AC_SUBST(TERMCAP_PKG_CONFIG_LIB)
- 
- AC_OUTPUT([Makefile doc/Makefile examples/Makefile shlib/Makefile readline.pc],
- [
-diff --git a/readline.pc.in b/readline.pc.in
-index fbfca8a..a7f2cf3 100644
---- a/readline.pc.in
-+++ b/readline.pc.in
-@@ -7,6 +7,6 @@ Name: Readline
- Description: Gnu Readline library for command line editing
- URL: http://tiswww.cwru.edu/php/chet/readline/rltop.html
- Version: @LIBVERSION@
--Requires.private: tinfo
-+Requires.private: @TERMCAP_PKG_CONFIG_LIB@
- Libs: -L${libdir} -lreadline
- Cflags: -I${includedir}/readline
--- 
-2.14.3
-
diff --git a/buildroot/package/readline/readline.hash b/buildroot/package/readline/readline.hash
index 43f8c64bb..560154c2f 100644
--- a/buildroot/package/readline/readline.hash
+++ b/buildroot/package/readline/readline.hash
@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256 750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334  readline-7.0.tar.gz
+sha256 e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461  readline-8.0.tar.gz
+
+# Hash for license file
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/buildroot/package/readline/readline.mk b/buildroot/package/readline/readline.mk
index e00c59469..f5d7d5bf9 100644
--- a/buildroot/package/readline/readline.mk
+++ b/buildroot/package/readline/readline.mk
@@ -4,46 +4,21 @@
 #
 ################################################################################
 
-READLINE_VERSION = 7.0
+READLINE_VERSION = 8.0
 READLINE_SITE = $(BR2_GNU_MIRROR)/readline
 READLINE_INSTALL_STAGING = YES
 READLINE_DEPENDENCIES = ncurses host-autoconf
 HOST_READLINE_DEPENDENCIES = host-ncurses host-autoconf
 READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \
 	bash_cv_wcwidth_broken=no
+READLINE_CONF_OPTS = --disable-install-examples
 READLINE_LICENSE = GPL-3.0+
 READLINE_LICENSE_FILES = COPYING
 
-# readline only uses autoconf, not automake, and therefore the regular
-# AUTORECONF = YES doesn't work.
-define READLINE_AUTOCONF
-	cd $(@D); $(HOST_DIR)/bin/autoconf
-endef
-READLINE_PRE_CONFIGURE_HOOKS += READLINE_AUTOCONF
-HOST_READLINE_PRE_CONFIGURE_HOOKS += READLINE_AUTOCONF
-
-define READLINE_PURGE_EXAMPLES
-	rm -rf $(TARGET_DIR)/usr/share/readline
-endef
-READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_PURGE_EXAMPLES
-
-define READLINE_INSTALL_PC_FILE
-	$(INSTALL) -D -m 644 $(@D)/readline.pc $(STAGING_DIR)/usr/lib/pkgconfig/readline.pc
-endef
-READLINE_POST_INSTALL_STAGING_HOOKS += READLINE_INSTALL_PC_FILE
-
 define READLINE_INSTALL_INPUTRC
 	$(INSTALL) -D -m 644 package/readline/inputrc $(TARGET_DIR)/etc/inputrc
 endef
 READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_INPUTRC
 
-ifneq ($(BR2_STATIC_LIBS),y)
-# libraries get installed read only, so strip fails
-define READLINE_INSTALL_FIXUPS_SHARED
-	chmod +w $(addprefix $(TARGET_DIR)/usr/lib/,libhistory.so.* libreadline.so.*)
-endef
-READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_FIXUPS_SHARED
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/buildroot/package/reaver/0001-fix-271.patch b/buildroot/package/reaver/0001-fix-271.patch
new file mode 100644
index 000000000..9f6b39512
--- /dev/null
+++ b/buildroot/package/reaver/0001-fix-271.patch
@@ -0,0 +1,32 @@
+From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001
+From: rofl0r 
+Date: Fri, 22 Feb 2019 17:38:24 +0000
+Subject: [PATCH] fix #271
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391]
+---
+ src/wps/wps_attr_parse.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c
+index 30b0e79..d681b70 100644
+--- a/src/wps/wps_attr_parse.c
++++ b/src/wps/wps_attr_parse.c
+@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr)
+ 			 * Mac OS X 10.6 seems to be adding 0x00 padding to the
+ 			 * end of M1. Skip those to avoid interop issues.
+ 			 */
+-			int i;
+-			for (i = 0; i < end - pos; i++) {
++			uintptr_t i, left = end - pos;
++			for (i = 0; i < left; i++) {
+ 				if (pos[i])
+ 					break;
+ 			}
+-			if (i == end - pos) {
++			if (i == left) {
+ 				wpa_printf(MSG_DEBUG, "WPS: Workaround - skip "
+ 					   "unexpected message padding");
+ 				break;
diff --git a/buildroot/package/rings/Config.in b/buildroot/package/rings/Config.in
index 87ade07cb..d1f1efe55 100644
--- a/buildroot/package/rings/Config.in
+++ b/buildroot/package/rings/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_RINGS
 	bool "rings"
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  Provides a way to create new Lua states from within Lua.
 
diff --git a/buildroot/package/rings/rings.hash b/buildroot/package/rings/rings.hash
index 59da2fa32..c9a758b54 100644
--- a/buildroot/package/rings/rings.hash
+++ b/buildroot/package/rings/rings.hash
@@ -1,2 +1,3 @@
-# Locally calculated
-sha256	627ac55d4a420fab766e6870fcd82cb39da12fb4ec8efddc7220b188a4ad4bc3  rings-1.3.0-1.src.rock
+# computed by luarocks/buildroot
+sha256 627ac55d4a420fab766e6870fcd82cb39da12fb4ec8efddc7220b188a4ad4bc3  rings-1.3.0-1.src.rock
+sha256 f582a0c43737391070827ef273df0145b594b095ad2f49595701368b729e024f  rings-v_1_3_0/doc/us/license.html
diff --git a/buildroot/package/rng-tools/S21rngd b/buildroot/package/rng-tools/S21rngd
old mode 100755
new mode 100644
diff --git a/buildroot/package/rp-pppoe/Config.in b/buildroot/package/rp-pppoe/Config.in
index 8a692711b..12f981d8c 100644
--- a/buildroot/package/rp-pppoe/Config.in
+++ b/buildroot/package/rp-pppoe/Config.in
@@ -16,4 +16,4 @@ config BR2_PACKAGE_RP_PPPOE
 	  devices. Otherwise the normal client functionality already
 	  exists in the pppd package (and kernel).
 
-	  http://www.roaringpenguin.com/pppoe.html
+	  https://dianne.skoll.ca/projects/rp-pppoe/
diff --git a/buildroot/package/rpi-firmware/rpi-firmware.hash b/buildroot/package/rpi-firmware/rpi-firmware.hash
index b6b8824f3..c81935c91 100644
--- a/buildroot/package/rpi-firmware/rpi-firmware.hash
+++ b/buildroot/package/rpi-firmware/rpi-firmware.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 9a34ccc4a51695a33206cc6c8534f615ba5a30fcbce5fa3add400ecc6b80ad8a rpi-firmware-83977fe3b6ef54c1d29c83b0a778d330f523441f.tar.gz
+sha256	9a34ccc4a51695a33206cc6c8534f615ba5a30fcbce5fa3add400ecc6b80ad8a  rpi-firmware-83977fe3b6ef54c1d29c83b0a778d330f523441f.tar.gz
diff --git a/buildroot/package/rpi-firmware/rpi-firmware.mk b/buildroot/package/rpi-firmware/rpi-firmware.mk
index b883e9d98..b57ed2ef4 100644
--- a/buildroot/package/rpi-firmware/rpi-firmware.mk
+++ b/buildroot/package/rpi-firmware/rpi-firmware.mk
@@ -24,6 +24,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 		$(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \
 	done
 endef
+else
+# Still create the directory, so a genimage.cfg can include it independently of
+# whether _INSTALL_DTB_OVERLAYS is selected or not.
+define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
+	$(INSTALL) -d $(BINARIES_DIR)/rpi-firmware/overlays
+endef
 endif
 
 ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG),y)
diff --git a/buildroot/package/rpi-userland/S94vcfiled b/buildroot/package/rpi-userland/S94vcfiled
old mode 100755
new mode 100644
diff --git a/buildroot/package/rpi-userland/rpi-userland.hash b/buildroot/package/rpi-userland/rpi-userland.hash
index fc135e475..44d446ea3 100644
--- a/buildroot/package/rpi-userland/rpi-userland.hash
+++ b/buildroot/package/rpi-userland/rpi-userland.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 01ece7088e38864bb20a165746a43e8ceeb4fb71f7b0e6974aa5ba587b4a76b2 rpi-userland-8f0abfb07b96e7ee85f46e59d895014ec5e25f5e.tar.gz
+sha256 9424ffa45ef888fb61483c63fd66532c1c648e071fea72c93762efbb3c2a8669 rpi-userland-e5803f2c986cbf8c919c60278b3231dcdf4271a6.tar.gz
diff --git a/buildroot/package/rpi-userland/rpi-userland.mk b/buildroot/package/rpi-userland/rpi-userland.mk
index ede8c242e..20ef2fca9 100644
--- a/buildroot/package/rpi-userland/rpi-userland.mk
+++ b/buildroot/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = 8f0abfb07b96e7ee85f46e59d895014ec5e25f5e
+RPI_USERLAND_VERSION = e5803f2c986cbf8c919c60278b3231dcdf4271a6
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3-Clause
 RPI_USERLAND_LICENSE_FILES = LICENCE
diff --git a/buildroot/package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch b/buildroot/package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch
deleted file mode 100644
index 6f6a2aba5..000000000
--- a/buildroot/package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b5f1895aae096836d6e8e155ee289e1b10fcabcb Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Sat, 10 Oct 2015 23:17:44 +0200
-Subject: [PATCH] configure.ac: use link instead of compile for gcc flags test
-
-The logic that tests whether gcc supports or not certain flags uses
-AC_COMPILE_IFELSE(). However, when checking for stack smashing
-protection support, an AC_LINK_IFELSE() test is needed, since the
-build might work but not the link stage if certain libraries are
-missing for proper stack smashing protection support.
-
-Therefore, this commit switches to use AC_LINK_IFELSE().
-
-[Upstream commit: https://github.com/rpm-software-management/rpm/commit/b5f1895aae096836d6e8e155ee289e1b10fcabcb]
-Signed-off-by: Thomas Petazzoni 
-Signed-off-by: James Knight 
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6ece8c9fd..822294c3f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,7 @@ if test "$GCC" = yes; then
-     echo
-     for flag in $cflags_to_try; do
-         CFLAGS="$CFLAGS $flag -Werror"
--        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[
-                 echo "   $flag"
-                 RPMCFLAGS="$RPMCFLAGS $flag"
-         ],[])
diff --git a/buildroot/package/rpm/0002-configure-ac-correct-stack-protector-check.patch b/buildroot/package/rpm/0002-configure-ac-correct-stack-protector-check.patch
deleted file mode 100644
index 9d2942b4f..000000000
--- a/buildroot/package/rpm/0002-configure-ac-correct-stack-protector-check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c810a0aca3f1148d2072d44b91b8cc9caeb4cf19 Mon Sep 17 00:00:00 2001
-From: James Knight 
-Date: Wed, 16 Nov 2016 15:54:46 -0500
-Subject: [PATCH] configure.ac: correct stack protector check
-
-If a used toolchain accepts the `-fstack-protector` option but does not
-provide a stack smashing protector implementation (ex. libssp), linking
-will fail:
-
- .libs/rpmio.o: In function `Fdescr':
- rpmio.c:(.text+0x672): undefined reference to `__stack_chk_fail_local'
- .libs/rpmio.o: In function `Fdopen':
- rpmio.c:(.text+0xce9): undefined reference to `__stack_chk_fail_local'
- .libs/rpmio.o: In function `ufdCopy':
- rpmio.c:(.text+0x10f7): undefined reference to `__stack_chk_fail_local'
- ...
-
-This is a result of testing for `-fstack-protector` support using a main
-that GCC does not inject guards. GCC's manual notes that stack protector
-code is only added when "[functions] that call alloca, and functions
-with buffers larger than 8 bytes" [1]. This commit adjusts the stack
-protector check to allocate memory on the stack (via `alloca`).
-
-[1]: https://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.html
-
-Signed-off-by: James Knight 
-[Upstream commit: https://github.com/rpm-software-management/rpm/commit/c810a0aca3f1148d2072d44b91b8cc9caeb4cf19]
-Signed-off-by: Thomas Petazzoni 
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a9730d3bc..b4b3fe8fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,7 @@ if test "$GCC" = yes; then
-     echo
-     for flag in $cflags_to_try; do
-         CFLAGS="$CFLAGS $flag -Werror"
--        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])],[
-                 echo "   $flag"
-                 RPMCFLAGS="$RPMCFLAGS $flag"
-         ],[])
diff --git a/buildroot/package/rpm/0002-rpmio-digest_nss.c-fix-build-on-musl.patch b/buildroot/package/rpm/0002-rpmio-digest_nss.c-fix-build-on-musl.patch
new file mode 100644
index 000000000..66aeb6478
--- /dev/null
+++ b/buildroot/package/rpm/0002-rpmio-digest_nss.c-fix-build-on-musl.patch
@@ -0,0 +1,32 @@
+From 817dbe77e3e5a6d89540000a48584358efb4b03a Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Mon, 1 Apr 2019 07:33:19 +0200
+Subject: [PATCH] rpmio/digest_nss.c: fix build on musl
+
+signal.h must be included to be able to use sigaction
+
+Fixes:
+ - http://autobuild.buildroot.org/results/395fd44a930dfc2ad380bc735c26d9ce62344295
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status:
+https://github.com/rpm-software-management/rpm/pull/650]
+---
+ rpmio/digest_nss.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c
+index 50f8c8e90..1692a9221 100644
+--- a/rpmio/digest_nss.c
++++ b/rpmio/digest_nss.c
+@@ -3,6 +3,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.14.1
+
diff --git a/buildroot/package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch b/buildroot/package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch
deleted file mode 100644
index e1fd0697e..000000000
--- a/buildroot/package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From edadcf67980764c104c25c7c1a0ba91257b89698 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Thu, 8 Dec 2016 23:33:30 +0100
-Subject: [PATCH 1/2] Detect bfd.h to enable/disable sepdebugcrcfix building
-
-tools/sepdebugcrcfix includes , but this header from binutils
-is not checked in the configure script. Due to this, sepdebugcrcfix is
-attempted to be built even when  is not available. This commit
-addresses that by adding the appropriate configure check.
-
-This fixes the following build error:
-
-tools/sepdebugcrcfix.c:31:17: fatal error: bfd.h: No such file or directory
-compilation terminated.
-make[3]: *** [tools/sepdebugcrcfix.o] Error 1
-
-Signed-off-by: Thomas Petazzoni 
----
- Makefile.am  | 2 ++
- configure.ac | 3 +++
- 2 files changed, 5 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 863138c..d8a68f0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -168,9 +168,11 @@ elfdeps_SOURCES =	tools/elfdeps.c
- elfdeps_LDADD =		rpmio/librpmio.la
- elfdeps_LDADD +=	@WITH_LIBELF_LIB@ @WITH_POPT_LIB@
- 
-+if HAS_BFD_H
- rpmlibexec_PROGRAMS +=	sepdebugcrcfix
- sepdebugcrcfix_SOURCES = tools/sepdebugcrcfix.c
- sepdebugcrcfix_LDADD =	@WITH_LIBELF_LIB@
-+endif # HAS_BFD_H
- endif
- endif
- 
-diff --git a/configure.ac b/configure.ac
-index c5ae701..b99ecb8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -242,6 +242,9 @@ AC_CHECK_HEADERS([dwarf.h], [
- ])
- AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes])
- 
-+AC_CHECK_HEADERS([bfd.h])
-+AM_CONDITIONAL(HAS_BFD_H, [test "${ac_cv_header_bfd_h}" = "yes"])
-+
- #=================
- # Check for beecrypt library if requested.
- AC_ARG_WITH(beecrypt, [  --with-beecrypt         build with beecrypt support ],,[with_beecrypt=no])
--- 
-2.7.4
-
diff --git a/buildroot/package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch b/buildroot/package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch
deleted file mode 100644
index bebe94511..000000000
--- a/buildroot/package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 65afab91444d4996a8e61d1e2d27d52e18417ef5 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Thu, 8 Dec 2016 23:45:55 +0100
-Subject: [PATCH 2/2] tools/sepdebugcrcfix.c: fix build with recent binutils
-
-Moderately recent binutils versions install a  header that
-checks if config.h is included. While this makes sense in binutils
-itself, it does not outside. So the binutils developers have added a
-check: if PACKAGE or PACKAGE_VERSION are defined, they assume you're
-re-using bfd.h outside of binutils, and therefore including it without
-including config.h is legit.
-
-So we take the same approch as numerous users of bfd.h: fake a PACKAGE
-definition. See for example tools/perf/util/srcline.c in the Linux
-kernel source tree.
-
-This fixes the following build error:
-
-In file included from tools/sepdebugcrcfix.c:31:0:
-/home/test/autobuild/run/instance-0/output/host/usr/arc-buildroot-linux-uclibc/sysroot/usr/include/bfd.h:35:2: error: #error config.h must be included before this header
- #error config.h must be included before this header
-
-Signed-off-by: Thomas Petazzoni 
----
- tools/sepdebugcrcfix.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c
-index cd7fa02..e7b480f 100644
---- a/tools/sepdebugcrcfix.c
-+++ b/tools/sepdebugcrcfix.c
-@@ -28,6 +28,8 @@
- #include 
- #include 
- #include 
-+/* Needed to please  */
-+#define PACKAGE "rpm"
- #include 
- 
- #define _(x) x
--- 
-2.7.4
-
diff --git a/buildroot/package/rpm/rpm.hash b/buildroot/package/rpm/rpm.hash
index 7ae9ec73d..f7cbd0cbc 100644
--- a/buildroot/package/rpm/rpm.hash
+++ b/buildroot/package/rpm/rpm.hash
@@ -1,2 +1,5 @@
-# From http://rpm.org/wiki/Releases/4.13.0.1
-sha1 9566f95f38fcb214e439c552f378c2f64ba0aff9  rpm-4.13.0.1.tar.bz2
+# From https://rpm.org/wiki/Releases/4.14.2.1.html
+sha256 1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda  rpm-4.14.2.1.tar.bz2
+
+# Hash for license file
+sha256 d56f4f1f290f6920cb053aef0dbcd0b853cda289e2568b364ddbfce220a6f3e0  COPYING
diff --git a/buildroot/package/rpm/rpm.mk b/buildroot/package/rpm/rpm.mk
index 87c2059e7..b1ce4ad44 100644
--- a/buildroot/package/rpm/rpm.mk
+++ b/buildroot/package/rpm/rpm.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-RPM_VERSION_MAJOR = 4.13
-RPM_VERSION = $(RPM_VERSION_MAJOR).0.1
+RPM_VERSION_MAJOR = 4.14
+RPM_VERSION = $(RPM_VERSION_MAJOR).2.1
 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2
 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x
 RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib \
@@ -13,10 +13,6 @@ RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib \
 RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only)
 RPM_LICENSE_FILES = COPYING
 
-# 0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch
-# 0002-configure-ac-correct-stack-protector-check.patch
-RPM_AUTORECONF = YES
-
 RPM_CONF_OPTS = \
 	--disable-python \
 	--disable-rpath \
@@ -35,11 +31,11 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBNSS),y)
 RPM_DEPENDENCIES += libnss
-RPM_CONF_OPTS += --without-beecrypt
+RPM_CONF_OPTS += --with-crypto=nss
 RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr
 else
 RPM_DEPENDENCIES += beecrypt
-RPM_CONF_OPTS += --with-beecrypt
+RPM_CONF_OPTS += --with-crypto=beecrypt
 RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/beecrypt
 endif
 
@@ -76,6 +72,7 @@ endif
 # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`).
 RPM_CONF_ENV = \
 	ac_cv_prog_cc_c99='-std=gnu99' \
-	CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)"
+	CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)" \
+	LIBS=$(TARGET_NLS_LIBS)
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/rrdtool/rrdtool.hash b/buildroot/package/rrdtool/rrdtool.hash
index cff5501de..664067344 100644
--- a/buildroot/package/rrdtool/rrdtool.hash
+++ b/buildroot/package/rrdtool/rrdtool.hash
@@ -1,2 +1,4 @@
-# Locally calculated
-sha256	cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7	rrdtool-1.6.0.tar.gz
+# Locally calculated sha256
+sha256	f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b	rrdtool-1.7.0.tar.gz
+sha256	884385795ee48cd820082e8823bc748cd20574112da2cc7d2ef505b47b1058c3	COPYRIGHT
+sha256	14079d501f3092405a192463603f66e13da88fc5894981e2962e2e6aec4ab178	LICENSE
diff --git a/buildroot/package/rrdtool/rrdtool.mk b/buildroot/package/rrdtool/rrdtool.mk
index ea5c892e4..144bbcfb1 100644
--- a/buildroot/package/rrdtool/rrdtool.mk
+++ b/buildroot/package/rrdtool/rrdtool.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RRDTOOL_VERSION = 1.6.0
+RRDTOOL_VERSION = 1.7.0
 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
 RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT
 RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE
diff --git a/buildroot/package/rsyslog/S01logging b/buildroot/package/rsyslog/S01logging
deleted file mode 100644
index 8e4a59c2d..000000000
--- a/buildroot/package/rsyslog/S01logging
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-start() {
-  printf "Starting rsyslog daemon: "
-  start-stop-daemon -S -q -p /var/run/rsyslogd.pid --exec /usr/sbin/rsyslogd
-  [ $? = 0 ] && echo "OK" || echo "FAIL"
-}
-
-stop() {
-  printf "Stopping rsyslog daemon: "
-  start-stop-daemon -K -q -p /var/run/rsyslogd.pid
-  [ $? = 0 ] && echo "OK" || echo "FAIL"
-}
-
-restart() {
-  stop
-  sleep 1
-  start
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart|reload)
-    restart
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 1
-esac
-
-exit $?
diff --git a/buildroot/package/rsyslog/S01rsyslogd b/buildroot/package/rsyslog/S01rsyslogd
new file mode 100644
index 000000000..78421876d
--- /dev/null
+++ b/buildroot/package/rsyslog/S01rsyslogd
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+DAEMON="rsyslogd"
+PIDFILE="/var/run/$DAEMON.pid"
+
+RSYSLOGD_ARGS=""
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# shellcheck disable=SC2086 # we need the word splitting
+	start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \
+		-- $RSYSLOGD_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+case "$1" in
+	start|stop|restart)
+		"$1";;
+	reload)
+		# Restart, since there is no true "reload" feature (does not
+		# reconfigure/restart on SIGHUP, just closes all open files).
+		restart;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
diff --git a/buildroot/package/rsyslog/rsyslog.mk b/buildroot/package/rsyslog/rsyslog.mk
index 61e08ba76..fcd476cee 100644
--- a/buildroot/package/rsyslog/rsyslog.mk
+++ b/buildroot/package/rsyslog/rsyslog.mk
@@ -72,8 +72,8 @@ RSYSLOG_CONF_OPTS += \
 endif
 
 define RSYSLOG_INSTALL_INIT_SYSV
-	$(INSTALL) -m 0755 -D package/rsyslog/S01logging \
-		$(TARGET_DIR)/etc/init.d/S01logging
+	$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslogd \
+		$(TARGET_DIR)/etc/init.d/S01rsyslogd
 endef
 
 # The rsyslog.service is installed by rsyslog, but the link is not created
diff --git a/buildroot/package/rtc-tools/Config.in b/buildroot/package/rtc-tools/Config.in
new file mode 100644
index 000000000..78f5c0604
--- /dev/null
+++ b/buildroot/package/rtc-tools/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_RTC_TOOLS
+	bool "rtc-tools"
+	help
+	  This package provide a set of user-space tools that can be
+	  used to manipulate Real Time Clock Devices.
+
+	  https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/rtc-tools.git/
diff --git a/buildroot/package/rtc-tools/rtc-tools.hash b/buildroot/package/rtc-tools/rtc-tools.hash
new file mode 100644
index 000000000..81be1afe4
--- /dev/null
+++ b/buildroot/package/rtc-tools/rtc-tools.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 152d8455bae5ad672e99bb91dfbed5b8b4bd8b0325146d1cf1c4d80b6e0d8a16 rtc-tools-33ef4aa1c92b0c92a351284d93d1ac5570de9cc7.tar.gz
+sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a COPYING
diff --git a/buildroot/package/rtc-tools/rtc-tools.mk b/buildroot/package/rtc-tools/rtc-tools.mk
new file mode 100644
index 000000000..2ef850a81
--- /dev/null
+++ b/buildroot/package/rtc-tools/rtc-tools.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# rtc-tools
+#
+################################################################################
+
+RTC_TOOLS_VERSION = 33ef4aa1c92b0c92a351284d93d1ac5570de9cc7
+RTC_TOOLS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/rtc-tools.git
+RTC_TOOLS_LICENSE = GPL-2.0
+RTC_TOOLS_LICENSE_FILES = COPYING
+
+RTC_TOOLS_BINARIES = rtc rtc-range
+
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+RTC_TOOLS_BINARIES += rtc-sync
+endif
+
+define RTC_TOOLS_BUILD_CMDS
+	$(foreach bin,$(RTC_TOOLS_BINARIES),\
+		$(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/$(bin) $(@D)/$(bin).c
+	)
+endef
+
+define RTC_TOOLS_INSTALL_TARGET_CMDS
+	$(foreach bin,$(RTC_TOOLS_BINARIES),\
+		$(INSTALL) -D -m 0755 $(@D)/$(bin) $(TARGET_DIR)/usr/bin/$(bin)
+	)
+endef
+
+$(eval $(generic-package))
diff --git a/buildroot/package/rtmpdump/rtmpdump.mk b/buildroot/package/rtmpdump/rtmpdump.mk
index f5d430ce3..03cdd9d00 100644
--- a/buildroot/package/rtmpdump/rtmpdump.mk
+++ b/buildroot/package/rtmpdump/rtmpdump.mk
@@ -16,9 +16,6 @@ RTMPDUMP_DEPENDENCIES = zlib
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 RTMPDUMP_DEPENDENCIES += gnutls
 RTMPDUMP_CRYPTO = GNUTLS
-else ifeq ($(BR2_PACKAGE_OPENSSL),y)
-RTMPDUMP_DEPENDENCIES += openssl
-RTMPDUMP_CRYPTO = OPENSSL
 else
 # no crypto
 RTMPDUMP_CRYPTO =
diff --git a/buildroot/package/ruby/ruby.hash b/buildroot/package/ruby/ruby.hash
index b36d49461..fa9eddc27 100644
--- a/buildroot/package/ruby/ruby.hash
+++ b/buildroot/package/ruby/ruby.hash
@@ -1,5 +1,5 @@
-# https://www.ruby-lang.org/en/news/2018/10/17/ruby-2-4-5-released/
-sha256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb  ruby-2.4.5.tar.xz
+# https://www.ruby-lang.org/en/news/2019/04/01/ruby-2-4-6-released/
+sha256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c  ruby-2.4.6.tar.xz
 # License files, Locally calculated
 sha256 609292a6d848ab223073944fc2d844449391a5ba2055a8b5baf1726bc13b39cb  LEGAL
 sha256 f5eb1b2956d5f7a67b2e5722a3749bc2fe86f9c580f2e3f5a08519cf073b5864  COPYING
diff --git a/buildroot/package/ruby/ruby.mk b/buildroot/package/ruby/ruby.mk
index 3e71596bb..10424020a 100644
--- a/buildroot/package/ruby/ruby.mk
+++ b/buildroot/package/ruby/ruby.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 RUBY_VERSION_MAJOR = 2.4
-RUBY_VERSION = $(RUBY_VERSION_MAJOR).5
+RUBY_VERSION = $(RUBY_VERSION_MAJOR).6
 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
diff --git a/buildroot/package/runc/Config.in b/buildroot/package/runc/Config.in
index fd5dee7c5..47c850ef3 100644
--- a/buildroot/package/runc/Config.in
+++ b/buildroot/package/runc/Config.in
@@ -3,13 +3,14 @@ config BR2_PACKAGE_RUNC
 	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve
 	help
 	  runC is a CLI tool for spawning and running containers
 	  according to the OCP specification.
 
 	  https://github.com/opencontainers/runc
 
-comment "runc needs a toolchain w/ threads"
+comment "runc needs a glibc or musl toolchain toolchain w/ threads"
 	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \
 		BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAN_USES_UCLIBC
diff --git a/buildroot/package/runc/runc.hash b/buildroot/package/runc/runc.hash
index 1636e5b8e..969bb0bfb 100644
--- a/buildroot/package/runc/runc.hash
+++ b/buildroot/package/runc/runc.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	a221f8380e7b5806031f54d423af6dde24c305dad49868056cf70e5f5f4ef771  runc-v1.0.0-rc6.tar.gz
+sha256	efe4ff9bbe49b19074346d65c914d809c0a3e90d062ea9619fe240f931f0b700  runc-v1.0.0-rc8.tar.gz
 sha256  552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243  LICENSE
diff --git a/buildroot/package/runc/runc.mk b/buildroot/package/runc/runc.mk
index 4bce0aa77..31da4fae5 100644
--- a/buildroot/package/runc/runc.mk
+++ b/buildroot/package/runc/runc.mk
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-# docker-engine/hack/dockerfile/install/runc.installer:4 RUNC_COMMIT=...
-RUNC_VERSION = v1.0.0-rc6
+RUNC_VERSION = v1.0.0-rc8
 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION))
 RUNC_LICENSE = Apache-2.0
 RUNC_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/s6-linux-utils/0001-Include-sys-sysmacros.h-because-glibc-is-glibc.patch b/buildroot/package/s6-linux-utils/0001-Include-sys-sysmacros.h-because-glibc-is-glibc.patch
deleted file mode 100644
index ac31394f2..000000000
--- a/buildroot/package/s6-linux-utils/0001-Include-sys-sysmacros.h-because-glibc-is-glibc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bec661b6f037209c67fc7c9f022ee157c342ade6 Mon Sep 17 00:00:00 2001
-From: Laurent Bercot 
-Date: Thu, 5 Oct 2017 18:05:00 +0000
-Subject: [PATCH]  Include sys/sysmacros.h because glibc is glibc
-
-Signed-off-by: Baruch Siach 
----
-Upstream status: commit bec661b6f037
-
- src/minutils/s6ps_ttycache.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/minutils/s6ps_ttycache.c b/src/minutils/s6ps_ttycache.c
-index 7fa4bc09e624..319356044da9 100644
---- a/src/minutils/s6ps_ttycache.c
-+++ b/src/minutils/s6ps_ttycache.c
-@@ -7,6 +7,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
--- 
-2.18.0
-
diff --git a/buildroot/package/s6-linux-utils/s6-linux-utils.hash b/buildroot/package/s6-linux-utils/s6-linux-utils.hash
index 34fc5ea9b..20af7328d 100644
--- a/buildroot/package/s6-linux-utils/s6-linux-utils.hash
+++ b/buildroot/package/s6-linux-utils/s6-linux-utils.hash
@@ -1,3 +1,3 @@
 # Locally generated
-sha256 9562ef293c916c4448d16fcbbc065eb28fd995ac34cd3538179cbc3ee056ab93  s6-linux-utils-2.4.0.1.tar.gz
-sha256 6ee77e7199d69b707ab864ea7a838f9562717aaa41c89413bdb2cf835f95052f  COPYING
+sha256 78571574464c76fc623ef50dc14800138b4fd98c5fa877af6850fdd9c2f90213  s6-linux-utils-2.5.0.0.tar.gz
+sha256 3eadcf980c40da0f257b8292d805ff41e5e5a908c1942315d9a627732e1aa012  COPYING
diff --git a/buildroot/package/s6-linux-utils/s6-linux-utils.mk b/buildroot/package/s6-linux-utils/s6-linux-utils.mk
index 3f1745708..619f4c373 100644
--- a/buildroot/package/s6-linux-utils/s6-linux-utils.mk
+++ b/buildroot/package/s6-linux-utils/s6-linux-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-S6_LINUX_UTILS_VERSION = 2.4.0.1
+S6_LINUX_UTILS_VERSION = 2.5.0.0
 S6_LINUX_UTILS_SITE = http://skarnet.org/software/s6-linux-utils
 S6_LINUX_UTILS_LICENSE = ISC
 S6_LINUX_UTILS_LICENSE_FILES = COPYING
diff --git a/buildroot/package/s6-networking/s6-networking.mk b/buildroot/package/s6-networking/s6-networking.mk
index 7c9f08705..b621eb225 100644
--- a/buildroot/package/s6-networking/s6-networking.mk
+++ b/buildroot/package/s6-networking/s6-networking.mk
@@ -25,7 +25,7 @@ S6_NETWORKING_CONF_OPTS = \
 
 ifeq ($(BR2_PACKAGE_LIBRESSL),y)
 S6_NETWORKING_CONF_OPTS += --enable-ssl=libressl
-S6_NETWORKING_DEPENDENCIES = libressl
+S6_NETWORKING_DEPENDENCIES += libressl
 endif
 
 define S6_NETWORKING_CONFIGURE_CMDS
diff --git a/buildroot/package/safeclib/0002-add-pic_flag-to-RETPOLINE-cflags-and-ldflags.patch b/buildroot/package/safeclib/0002-add-pic_flag-to-RETPOLINE-cflags-and-ldflags.patch
new file mode 100644
index 000000000..f4f4eaab9
--- /dev/null
+++ b/buildroot/package/safeclib/0002-add-pic_flag-to-RETPOLINE-cflags-and-ldflags.patch
@@ -0,0 +1,62 @@
+From 23ae79fe84a3fa5d995b8c6b9be70587e37a6cd8 Mon Sep 17 00:00:00 2001
+From: Reini Urban 
+Date: Mon, 26 Mar 2018 18:31:30 +0200
+Subject: [PATCH] add pic_flag to RETPOLINE cflags and ldflags
+
+This fixes the linke probe, and fixes #55.
+Also: libtool is stripping pic_flags from the shared link cmd.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/rurban/safeclib/commit/23ae79fe84a3fa5d995b8c6b9be70587e37a6cd8]
+---
+ configure.ac                    | 2 +-
+ m4/ax_compiler_flags_cflags.m4  | 4 ++--
+ m4/ax_compiler_flags_ldflags.m4 | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 33ed7326..10325dc6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@
+ # 2017  Reini Urban 
+ #
+ # Copyright (c) 2012, 2013 Cisco Systems
+-# Copyright (c) 2017 Reini Urban
++# Copyright (c) 2017, 2018 Reini Urban
+ # All rights reserved.
+ #
+ # Permission is hereby granted, free of charge, to any person
+diff --git a/m4/ax_compiler_flags_cflags.m4 b/m4/ax_compiler_flags_cflags.m4
+index 31e3ba8c..1dec00b2 100644
+--- a/m4/ax_compiler_flags_cflags.m4
++++ b/m4/ax_compiler_flags_cflags.m4
+@@ -66,12 +66,12 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
+     ])
+ 
+     # retpoline: clang-7. Note: requires lld-7 linker support
+-    AX_APPEND_COMPILE_FLAGS(["-mretpoline -DRETPOLINE"],
++    AX_APPEND_COMPILE_FLAGS(["-mretpoline -DRETPOLINE $lt_prog_compiler_pic"],
+         [RETPOLINE_CFLAGS],[$ax_compiler_flags_test])
+     # or the equivalent gcc-7.3 variant
+     if test -z "$RETPOLINE_CFLAGS"; then
+         AX_APPEND_COMPILE_FLAGS(
+-          ["-mindirect-branch=thunk-extern -mfunction-return=thunk-extern -mindirect-branch-register -DRETPOLINE"],
++          ["-mindirect-branch=thunk-extern -mfunction-return=thunk-extern -mindirect-branch-register $lt_prog_compiler_pic -DRETPOLINE"],
+           [RETPOLINE_CFLAGS],[$ax_compiler_flags_test])
+     fi
+ 
+diff --git a/m4/ax_compiler_flags_ldflags.m4 b/m4/ax_compiler_flags_ldflags.m4
+index d0287852..193f412e 100644
+--- a/m4/ax_compiler_flags_ldflags.m4
++++ b/m4/ax_compiler_flags_ldflags.m4
+@@ -66,7 +66,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[
+     dnl /usr/bin/ld: warning: -z retpolineplt ignored.
+     case $RETPOLINE_CFLAGS in
+         *-mretpoline*|*-mindirect-branch=thunk-extern*)
+-            AX_APPEND_LINK_FLAGS([-Wl,-z,retpolineplt],
++            AX_APPEND_LINK_FLAGS(["$RETPOLINE_CFLAGS -Wl,-z,retpolineplt"],
+                 [RETPOLINE_LDFLAGS],[$ax_compiler_flags_test])
+             if test -n "$RETPOLINE_LDFLAGS"; then
+                 AM_CFLAGS="$AM_CFLAGS $RETPOLINE_CFLAGS"
diff --git a/buildroot/package/samba4/0005-test_regfio.c-include-stdint.h-before-cmoka.h.patch b/buildroot/package/samba4/0005-test_regfio.c-include-stdint.h-before-cmoka.h.patch
new file mode 100644
index 000000000..2415d57d7
--- /dev/null
+++ b/buildroot/package/samba4/0005-test_regfio.c-include-stdint.h-before-cmoka.h.patch
@@ -0,0 +1,38 @@
+From bed8720dce64181c188c23a28506a88cd2e1ee4f Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sat, 11 May 2019 00:07:50 +0200
+Subject: [PATCH] test_regfio.c: include stdint.h before cmoka.h
+
+This fix the following build failure on mips64el:
+/usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: error: conflicting types for 'uintptr_t'
+ typedef unsigned long int uintptr_t;
+                           ^
+In file included from ../source3/registry/tests/test_regfio.c:23:0:
+../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here
+       typedef unsigned int uintptr_t;
+
+Fixes:
+ - http://autobuild.buildroot.org/results/bae0508e84c905dc23ad7cf1153cd1e9d8e4d734
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status:
+https://gitlab.com/samba-team/samba/merge_requests/442]
+---
+ source3/registry/tests/test_regfio.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source3/registry/tests/test_regfio.c b/source3/registry/tests/test_regfio.c
+index 86a217661f3..f945e653708 100644
+--- a/source3/registry/tests/test_regfio.c
++++ b/source3/registry/tests/test_regfio.c
+@@ -20,6 +20,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include 
+-- 
+2.20.1
+
diff --git a/buildroot/package/samba4/samba4.hash b/buildroot/package/samba4/samba4.hash
index 41c670059..7e82261b4 100644
--- a/buildroot/package/samba4/samba4.hash
+++ b/buildroot/package/samba4/samba4.hash
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-# https://download.samba.org/pub/samba/stable/samba-4.9.3.tar.asc
-sha256 cf8fd8707e9ad7bce7832006aac5644155165745ba371170661b3004fa2135cf  samba-4.9.3.tar.gz
+# https://download.samba.org/pub/samba/stable/samba-4.9.8.tar.asc
+sha256 82ebb7c3f1847c39341dd97ff8b73f40fa83f5f794daeceb80f3c349ace3cf56  samba-4.9.8.tar.gz
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/buildroot/package/samba4/samba4.mk b/buildroot/package/samba4/samba4.mk
index 89e39dab5..d2f89e2c8 100644
--- a/buildroot/package/samba4/samba4.mk
+++ b/buildroot/package/samba4/samba4.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SAMBA4_VERSION = 4.9.3
+SAMBA4_VERSION = 4.9.8
 SAMBA4_SITE = https://download.samba.org/pub/samba/stable
 SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
 SAMBA4_INSTALL_STAGING = YES
@@ -18,7 +18,7 @@ SAMBA4_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_READLINE),readline) \
 	$(TARGET_NLS_DEPENDENCIES)
 SAMBA4_CFLAGS = $(TARGET_CFLAGS)
-SAMBA4_LDFLAGS = $(TARGET_LDFLAGS)
+SAMBA4_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
 SAMBA4_CONF_ENV = \
 	CFLAGS="$(SAMBA4_CFLAGS)" \
 	LDFLAGS="$(SAMBA4_LDFLAGS)"
diff --git a/buildroot/package/sane-backends/0002-Add-missing-sys-types.h-includes.patch b/buildroot/package/sane-backends/0002-Add-missing-sys-types.h-includes.patch
deleted file mode 100644
index 8ab41f1fe..000000000
--- a/buildroot/package/sane-backends/0002-Add-missing-sys-types.h-includes.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From d33f16f463e888846d69ddfbeeb963d40972b654 Mon Sep 17 00:00:00 2001
-From: Luiz Angelo Daros de Luca 
-Date: Thu, 15 Oct 2015 12:35:00 +0900
-Subject: [PATCH] Add missing  includes
-
-[Thomas: backport from upstream commit
-33495ef9b42a783c8f5f2c056ac5699481d3cc7e, allows to fix the build with
-the musl C library.]
-Signed-off-by: Thomas Petazzoni 
----
- backend/epsonds-io.c     | 3 +++
- backend/hp5400.c         | 3 +++
- backend/hp5590.c         | 3 +++
- backend/kvs20xx_cmd.h    | 4 ++++
- backend/kvs40xx.h        | 3 +++
- include/sane/sanei_udp.h | 3 +++
- 6 files changed, 19 insertions(+)
-
-diff --git a/backend/epsonds-io.c b/backend/epsonds-io.c
-index 28bacfc..512997d 100644
---- a/backend/epsonds-io.c
-+++ b/backend/epsonds-io.c
-@@ -16,6 +16,9 @@
- #include "sane/config.h"
- #include 
- #include      /* sleep */
-+#ifdef HAVE_SYS_TYPES_H
-+#include 
-+#endif
- 
- #include "epsonds.h"
- #include "epsonds-io.h"
-diff --git a/backend/hp5400.c b/backend/hp5400.c
-index 61de3db..cfa2dc9 100644
---- a/backend/hp5400.c
-+++ b/backend/hp5400.c
-@@ -67,6 +67,9 @@
- #include 		/* malloc, free */
- #include 		/* memcpy */
- #include 
-+#ifdef HAVE_SYS_TYPES_H
-+#include 
-+#endif
- 
- 
- #define HP5400_CONFIG_FILE "hp5400.conf"
-diff --git a/backend/hp5590.c b/backend/hp5590.c
-index 7b1cd60..5422372 100644
---- a/backend/hp5590.c
-+++ b/backend/hp5590.c
-@@ -48,6 +48,9 @@
- #include 
- #include 
- #include 
-+#ifdef HAVE_SYS_TYPES_H
-+#include 
-+#endif
- 
- #include "../include/sane/sane.h"
- #define BACKEND_NAME hp5590
-diff --git a/backend/kvs20xx_cmd.h b/backend/kvs20xx_cmd.h
-index c18b754..4acaf62 100644
---- a/backend/kvs20xx_cmd.h
-+++ b/backend/kvs20xx_cmd.h
-@@ -9,6 +9,10 @@
-    Panasonic KV-S20xx USB-SCSI scanners.
- */
- 
-+#ifdef HAVE_SYS_TYPES_H
-+#include 
-+#endif
-+
- #define COMMAND_BLOCK	1
- #define DATA_BLOCK	2
- #define RESPONSE_BLOCK	3
-diff --git a/backend/kvs40xx.h b/backend/kvs40xx.h
-index fa17163..02e0da6 100644
---- a/backend/kvs40xx.h
-+++ b/backend/kvs40xx.h
-@@ -10,6 +10,9 @@
- 
- #include "../include/sane/config.h"
- #include 
-+#ifdef HAVE_SYS_TYPES_H
-+#include 
-+#endif
- 
- #undef  BACKEND_NAME
- #define BACKEND_NAME kvs40xx
-diff --git a/include/sane/sanei_udp.h b/include/sane/sanei_udp.h
-index c44afdd..e32fc1a 100644
---- a/include/sane/sanei_udp.h
-+++ b/include/sane/sanei_udp.h
-@@ -27,6 +27,9 @@
- #include 
- #include 
- #endif
-+#ifdef HAVE_SYS_TYPES_H
-+#include 
-+#endif
- 
- extern SANE_Status sanei_udp_open(const char *host, int port, int *fdp);
- extern SANE_Status sanei_udp_open_broadcast(int *fdp);
--- 
-2.7.4
-
diff --git a/buildroot/package/sane-backends/0003-sane_backend-add-missing-config.h.patch b/buildroot/package/sane-backends/0002-sane_backend-add-missing-config.h.patch
similarity index 100%
rename from buildroot/package/sane-backends/0003-sane_backend-add-missing-config.h.patch
rename to buildroot/package/sane-backends/0002-sane_backend-add-missing-config.h.patch
diff --git a/buildroot/package/sane-backends/sane-backends.hash b/buildroot/package/sane-backends/sane-backends.hash
index a7693e252..09652c993 100644
--- a/buildroot/package/sane-backends/sane-backends.hash
+++ b/buildroot/package/sane-backends/sane-backends.hash
@@ -1,2 +1,5 @@
-# From http://www.sane-project.org/sane-md5sums.txt
-md5 f9ed5405b3c12f07c6ca51ee60225fe7  sane-backends-1.0.25.tar.gz
+# From https://gitlab.com/sane-project/backends/tags/RELEASE_1_0_27
+sha256 293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9  sane-backends-1.0.27.tar.gz
+
+# Hash for license file
+sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa  COPYING
diff --git a/buildroot/package/sane-backends/sane-backends.mk b/buildroot/package/sane-backends/sane-backends.mk
index ed3b91247..092123e19 100644
--- a/buildroot/package/sane-backends/sane-backends.mk
+++ b/buildroot/package/sane-backends/sane-backends.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-SANE_BACKENDS_VERSION = 1.0.25
-SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/file/4146
+SANE_BACKENDS_VERSION = 1.0.27
+SANE_BACKENDS_SITE = \
+	https://gitlab.com/sane-project/backends/uploads/a3ba9fff29253a94e84074917bff581a
 SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
 SANE_BACKENDS_LICENSE = GPL-2.0+
 SANE_BACKENDS_LICENSE_FILES = COPYING
@@ -23,9 +24,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 SANE_BACKENDS_DEPENDENCIES += libusb
-SANE_BACKENDS_CONF_OPTS += --enable-libusb_1_0
+SANE_BACKENDS_CONF_OPTS += --with-usb
 else
-SANE_BACKENDS_CONF_OPTS += --disable-libusb
+SANE_BACKENDS_CONF_OPTS += --without-usb
 endif
 
 ifeq ($(BR2_PACKAGE_JPEG),y)
diff --git a/buildroot/package/sdl/Config.in b/buildroot/package/sdl/Config.in
index 65ac8a246..9f1e34de5 100644
--- a/buildroot/package/sdl/Config.in
+++ b/buildroot/package/sdl/Config.in
@@ -17,10 +17,6 @@ config BR2_PACKAGE_SDL_DIRECTFB
 	bool "SDL DirectFB video driver"
 	depends on BR2_PACKAGE_DIRECTFB
 
-config BR2_PACKAGE_SDL_QTOPIA
-	bool "SDL Qtopia video driver"
-	depends on BR2_PACKAGE_QT
-
 config BR2_PACKAGE_SDL_X11
 	bool "SDL X11 video driver"
 	depends on BR2_PACKAGE_XORG7
diff --git a/buildroot/package/sdl/sdl.mk b/buildroot/package/sdl/sdl.mk
index 0a6a7de13..06564d610 100644
--- a/buildroot/package/sdl/sdl.mk
+++ b/buildroot/package/sdl/sdl.mk
@@ -23,6 +23,8 @@ HOST_SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
 SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
 HOST_SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
 
+SDL_CONF_OPTS += --enable-video-qtopia=no
+
 ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
 SDL_CONF_OPTS += --enable-video-fbcon=yes
 else
@@ -37,13 +39,6 @@ else
 SDL_CONF_OPTS += --enable-video-directfb=no
 endif
 
-ifeq ($(BR2_PACKAGE_SDL_QTOPIA),y)
-SDL_CONF_OPTS += --enable-video-qtopia=yes
-SDL_DEPENDENCIES += qt
-else
-SDL_CONF_OPTS += --enable-video-qtopia=no
-endif
-
 ifeq ($(BR2_PACKAGE_SDL_X11),y)
 SDL_CONF_OPTS += --enable-video-x11=yes
 SDL_DEPENDENCIES += \
diff --git a/buildroot/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch b/buildroot/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch
deleted file mode 100644
index 53926c03b..000000000
--- a/buildroot/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a0acea5bcce3f47badbfeeab7bc2e36eba08fd84 Mon Sep 17 00:00:00 2001
-From: Sam Lantinga 
-Date: Mon, 27 Aug 2018 11:51:05 -0700
-Subject: [PATCH] Fixed the DirectFB renderer not being enabled in autoconf
- builds
-
-Upstream-url: https://hg.libsdl.org/SDL/raw-rev/751cdc74d55c
-Signed-off-by: Peter Korsgaard 
----
- configure    | 3 +++
- configure.in | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/configure b/configure
-index e88b38001..40ac14d21 100755
---- a/configure
-+++ b/configure
-@@ -21501,6 +21501,9 @@ fi
- 
- $as_echo "#define SDL_VIDEO_DRIVER_DIRECTFB 1" >>confdefs.h
- 
-+
-+$as_echo "#define SDL_VIDEO_RENDER_DIRECTFB 1" >>confdefs.h
-+
-             SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
-             EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
- 
-diff --git a/configure.in b/configure.in
-index 5bf5d717b..ce1d57ea1 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2163,6 +2163,7 @@ AC_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[
-                               , enable_directfb_shared=yes)
- 
-             AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB, 1, [ ])
-+            AC_DEFINE(SDL_VIDEO_RENDER_DIRECTFB, 1, [ ])
-             SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
-             EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
- 
--- 
-2.11.0
-
diff --git a/buildroot/package/sdl2/0001-fix-build-with-disable-threads.patch b/buildroot/package/sdl2/0001-fix-build-with-disable-threads.patch
new file mode 100644
index 000000000..81f7d7446
--- /dev/null
+++ b/buildroot/package/sdl2/0001-fix-build-with-disable-threads.patch
@@ -0,0 +1,63 @@
+From 26646028f79d7f3d857df9b46cd6d0285796c699 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Wed, 21 Nov 2018 22:31:09 +0100
+Subject: [PATCH] fix build with --disable-threads
+
+SDL_LinuxSetThreadPriority() has been added since version 2.0.9 and
+https://github.com/SDL-mirror/SDL/commit/f25a7fa870bdceb339e5105973f689606bcb9086
+
+However, this function is used in src/dynapi/SDL_dynapi_procs.h even
+when SDL_THREADS_DISABLED
+
+However, when SDL_THREADS_DISABLED is set, SDL_LinuxSetThreadPriority is
+not defined because thread/pthread/SDL_systhread.c is not built
+
+So check SDL_THREADS_DISABLED in addition to __LINUX__
+
+Fixes:
+ - http://autobuild.buildroot.org/results/539cb9ab6c605dc6be73ebe90debab1a998f2451
+
+Signed-off-by: Fabrice Fontaine 
+---
+ include/SDL_system.h          | 4 ++--
+ src/dynapi/SDL_dynapi_procs.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/SDL_system.h b/include/SDL_system.h
+index 4dc372d6b..0513d7fa5 100644
+--- a/include/SDL_system.h
++++ b/include/SDL_system.h
+@@ -77,7 +77,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a
+ 
+ 
+ /* Platform specific functions for Linux */
+-#ifdef __LINUX__
++#if defined(__LINUX__) && !defined(SDL_THREADS_DISABLED)
+ 
+ /**
+    \brief Sets the UNIX nice value for a thread, using setpriority() if possible, and RealtimeKit if available.
+@@ -86,7 +86,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a
+  */
+ extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriority(Sint64 threadID, int priority);
+  
+-#endif /* __LINUX__ */
++#endif /* defined(__LINUX__) && !defined(SDL_THREADS_DISABLED) */
+ 	
+ /* Platform specific functions for iOS */
+ #if defined(__IPHONEOS__) && __IPHONEOS__
+diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
+index c95cf708b..ee9bf60a6 100644
+--- a/src/dynapi/SDL_dynapi_procs.h
++++ b/src/dynapi/SDL_dynapi_procs.h
+@@ -708,7 +708,7 @@ SDL_DYNAPI_PROC(SDL_bool,SDL_IsAndroidTV,(void),(),return)
+ SDL_DYNAPI_PROC(double,SDL_log10,(double a),(a),return)
+ SDL_DYNAPI_PROC(float,SDL_log10f,(float a),(a),return)
+ SDL_DYNAPI_PROC(char*,SDL_GameControllerMappingForDeviceIndex,(int a),(a),return)
+-#ifdef __LINUX__
++#if defined(__LINUX__) && !defined(SDL_THREADS_DISABLED)
+ SDL_DYNAPI_PROC(int,SDL_LinuxSetThreadPriority,(Sint64 a, int b),(a,b),return)
+ #endif
+ SDL_DYNAPI_PROC(SDL_bool,SDL_HasAVX512F,(void),(),return)
+-- 
+2.17.1
+
diff --git a/buildroot/package/sdl2/sdl2.hash b/buildroot/package/sdl2/sdl2.hash
index 997b4a5d4..0668883f0 100644
--- a/buildroot/package/sdl2/sdl2.hash
+++ b/buildroot/package/sdl2/sdl2.hash
@@ -1,4 +1,4 @@
-# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.8.tar.gz.sig
-sha256 edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec  SDL2-2.0.8.tar.gz
+# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.9.tar.gz.sig
+sha256 255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1  SDL2-2.0.9.tar.gz
 # Locally calculated
 sha256 61e627031e1160bf8b9bdbc9cda27656d422ea8eaab199b64b4a4a4168437154  COPYING.txt
diff --git a/buildroot/package/sdl2/sdl2.mk b/buildroot/package/sdl2/sdl2.mk
index bd71485f1..d2fba9d81 100644
--- a/buildroot/package/sdl2/sdl2.mk
+++ b/buildroot/package/sdl2/sdl2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SDL2_VERSION = 2.0.8
+SDL2_VERSION = 2.0.9
 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
 SDL2_SITE = http://www.libsdl.org/release
 SDL2_LICENSE = Zlib
diff --git a/buildroot/package/sdl_sound/sdl_sound.mk b/buildroot/package/sdl_sound/sdl_sound.mk
index 2544b598e..c6028e791 100644
--- a/buildroot/package/sdl_sound/sdl_sound.mk
+++ b/buildroot/package/sdl_sound/sdl_sound.mk
@@ -11,6 +11,11 @@ SDL_SOUND_LICENSE = LGPL-2.1+
 SDL_SOUND_LICENSE_FILES = COPYING
 SDL_SOUND_INSTALL_STAGING = YES
 SDL_SOUND_DEPENDENCIES = sdl
+SDL_SOUND_CONF_OPTS = \
+	--with-sdl-prefix=$(STAGING_DIR)/usr \
+	--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
+	--disable-sdltest \
+	--enable-static
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
 SDL_SOUND_DEPENDENCIES += libiconv
@@ -52,12 +57,6 @@ else
 SDL_SOUND_CONF_OPTS += --disable-physfs
 endif
 
-SDL_SOUND_CONF_OPTS = \
-	--with-sdl-prefix=$(STAGING_DIR)/usr \
-	--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
-	--disable-sdltest \
-	--enable-static
-
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
 SDL_SOUND_CONF_OPTS += --enable-mmx
 else
diff --git a/buildroot/package/sed/sed.hash b/buildroot/package/sed/sed.hash
index 470e5f259..cc3bebafe 100644
--- a/buildroot/package/sed/sed.hash
+++ b/buildroot/package/sed/sed.hash
@@ -1,6 +1,6 @@
 # Locally calculated after checking pgp signature
-# https://ftp.gnu.org/gnu/sed/sed-4.5.tar.xz.sig
+# https://ftp.gnu.org/gnu/sed/sed-4.7.tar.xz.sig
 # with the key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE
-sha256	7aad73c8839c2bdadca9476f884d2953cdace9567ecd0d90f9959f229d146b40	sed-4.5.tar.xz
+sha256	2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a	sed-4.7.tar.xz
 # Locally calculated
 sha256	e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b	COPYING
diff --git a/buildroot/package/sed/sed.mk b/buildroot/package/sed/sed.mk
index 4b2ed0313..6fee598f6 100644
--- a/buildroot/package/sed/sed.mk
+++ b/buildroot/package/sed/sed.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SED_VERSION = 4.5
+SED_VERSION = 4.7
 SED_SOURCE = sed-$(SED_VERSION).tar.xz
 SED_SITE = $(BR2_GNU_MIRROR)/sed
 SED_LICENSE = GPL-3.0
diff --git a/buildroot/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch b/buildroot/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
new file mode 100644
index 000000000..63344506b
--- /dev/null
+++ b/buildroot/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
@@ -0,0 +1,42 @@
+From bc36cba1393120e65bfe4d0f642fd8d38010c0f7 Mon Sep 17 00:00:00 2001
+From: Matt Weber 
+Date: Wed, 28 Nov 2018 20:49:00 -0600
+Subject: [PATCH] setup.py: drop path prefix from man install
+
+If the directory is a relative path, it is interpreted relative to the
+installation prefix (Python's sys.prefix for pure-Python packages,
+sys.exec_prefix for packages that contain extension modules).
+So the sys.prefix should not be joined because the correct one will be
+added regardless. The reason why a relative path is going to work is
+because the installation path is built internally joining python root
+with python prefix, thus forming the correct path $(TARGET_DIR)/usr.
+(https://docs.python.org/3/distutils/setupscript.html#installing-additional-files)
+
+For this man file install scenario, joining the sys.prefix makes the
+path absolute (this was previously working by accident).
+
+Upstream: https://github.com/SELinuxProject/setools/pull/13/commits/bc36cba1393120e65bfe4d0f642fd8d38010c0f7
+
+Cc: Angelo Compagnucci 
+Cc: Arnout Vandecappelle 
+Signed-off-by: Matthew Weber 
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 3767fbc..80e0400 100644
+--- a/setup.py
++++ b/setup.py
+@@ -136,7 +136,7 @@ setup(name='setools',
+       cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
+       packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
+       scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+-      data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
++      data_files=[('share/man/man1', glob.glob("man/*.1"))],
+       package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
+       ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
+                             annotate=cython_annotate,
+-- 
+1.9.1
+
diff --git a/buildroot/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch b/buildroot/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch
new file mode 100644
index 000000000..34a4e114e
--- /dev/null
+++ b/buildroot/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch
@@ -0,0 +1,29 @@
+From 68b0591cf37760e09e358533bbcecf36eddfceed Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni 
+Date: Sun, 10 Feb 2019 14:46:41 +0100
+Subject: [PATCH] src/Makefile.am: add missing @RT_LIB@ for sg_turs
+
+The sg_turs program uses clock_gettime(), so it should link against
+librt, as provided by @RT_LIB@.
+
+Signed-off-by: Thomas Petazzoni 
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 881cf29..0eba680 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -170,7 +170,7 @@ sg_test_rwbuf_LDADD = ../lib/libsgutils2.la
+ 
+ sg_timestamp_LDADD = ../lib/libsgutils2.la
+ 
+-sg_turs_LDADD = ../lib/libsgutils2.la
++sg_turs_LDADD = ../lib/libsgutils2.la @RT_LIB@
+ 
+ sg_unmap_LDADD = ../lib/libsgutils2.la
+ 
+-- 
+2.20.1
+
diff --git a/buildroot/package/sg3_utils/sg3_utils.mk b/buildroot/package/sg3_utils/sg3_utils.mk
index 0c17b30cd..79521fd06 100644
--- a/buildroot/package/sg3_utils/sg3_utils.mk
+++ b/buildroot/package/sg3_utils/sg3_utils.mk
@@ -14,7 +14,7 @@ SG3_UTILS_LICENSE := $(SG3_UTILS_LICENSE), GPL-2.0+ (programs), BSD-3-Clause (pr
 endif
 SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
 
-# Patching configure.ac
+# Patching configure.ac/Makefile.am
 SG3_UTILS_AUTORECONF = YES
 
 # install the libsgutils2 library
@@ -51,3 +51,4 @@ SG3_UTILS_POST_INSTALL_TARGET_HOOKS += SG3_UTILS_REMOVE_PROGS
 endif
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/buildroot/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch b/buildroot/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch
new file mode 100644
index 000000000..7ddb140e8
--- /dev/null
+++ b/buildroot/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch
@@ -0,0 +1,31 @@
+From 9b4aebc840f444e5aa83633838e3890cec523017 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 18 Jan 2019 21:05:34 +0100
+Subject: [PATCH] configure.ac: fix static build with netfilter_conntrack
+
+Fixes:
+ - http://autobuild.buildroot.org/results/22a28e8fd8182e1c908541dbc5b0ee087c3803e6
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status:
+https://github.com/shadowsocks/shadowsocks-libev/pull/2270]
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a706591..c6dab8b 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -256,7 +256,7 @@ if test x"$enable_connmarktos" = "xyes" ; then
+ 	        if test x"$enable_connmarktos" = "xyes"; then
+ 	            AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack library not found])
+ 	        fi
+-	        with_netfilter_conntrack=no])
++	        with_netfilter_conntrack=no], [-lnfnetlink])
+ 	    AC_CHECK_HEADERS([libnetfilter_conntrack/libnetfilter_conntrack.h \
+ 	        libnetfilter_conntrack/libnetfilter_conntrack_tcp.h],,[
+ 	        if test x"$enable_connmarktos" = "xyes"; then
+-- 
+2.14.1
+
diff --git a/buildroot/package/shadowsocks-libev/Config.in b/buildroot/package/shadowsocks-libev/Config.in
index f58abdbcb..fefb27bcc 100644
--- a/buildroot/package/shadowsocks-libev/Config.in
+++ b/buildroot/package/shadowsocks-libev/Config.in
@@ -15,6 +15,18 @@ config BR2_PACKAGE_SHADOWSOCKS_LIBEV
 
 	  https://github.com/shadowsocks/shadowsocks-libev
 
+config BR2_PACKAGE_SHADOWSOCKS_LIBEV_CONNMARKTOS
+	bool "connmarktos support in ss-server"
+	depends on BR2_PACKAGE_SHADOWSOCKS_LIBEV
+	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	help
+	  Build ss-server with the connmark to TOS feature.
+
+	  This feature requires advanced tc, iptables and conntrack
+	  rules to perform QoS on the server side.
+
+	  If unsure, don't enable this option
+
 comment "shadowsocks-libev needs a toolchain w/ threads"
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_TOOLCHAIN_HAS_SYNC_8 || !BR2_ARCH_IS_64
diff --git a/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash b/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash
index fffe9fddf..a7c0dc071 100644
--- a/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash
+++ b/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256 5521cf623a07fd1e393528516a83acd2b66c5d4bb4535a52662806a6a060c606 shadowsocks-libev-3.2.0.tar.gz
+sha256 2befc27b1cc62af0450702343d17e347936f0d4e3d4b04ba9246c4f9b409b742 shadowsocks-libev-3.2.3.tar.gz
 
 # License files, locally calculated
 sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41  COPYING
diff --git a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk
index caae2176b..c2c33b7aa 100644
--- a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk
+++ b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk
@@ -4,14 +4,23 @@
 #
 ################################################################################
 
-SHADOWSOCKS_LIBEV_VERSION = 3.2.0
+SHADOWSOCKS_LIBEV_VERSION = 3.2.3
 SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION)
 SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause (libbloom), BSD-3-Clause (libcork, libipset)
 SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING
 SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre
 SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES
+# We're patching configure.ac
+SHADOWSOCKS_LIBEV_AUTORECONF = YES
 SHADOWSOCKS_LIBEV_CONF_OPTS = \
 	--with-pcre=$(STAGING_DIR)/usr \
 	--disable-ssp
 
+ifeq ($(BR2_PACKAGE_SHADOWSOCKS_LIBEV_CONNMARKTOS),y)
+SHADOWSOCKS_LIBEV_DEPENDENCIES += libnetfilter_conntrack
+SHADOWSOCKS_LIBEV_CONF_OPTS += --enable-connmarktos
+else
+SHADOWSOCKS_LIBEV_CONF_OPTS += --disable-connmarktos
+endif
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/shairport-sync/S99shairport-sync b/buildroot/package/shairport-sync/S99shairport-sync
index 5443ed138..80b2fddbc 100644
--- a/buildroot/package/shairport-sync/S99shairport-sync
+++ b/buildroot/package/shairport-sync/S99shairport-sync
@@ -6,16 +6,18 @@ OPTIONS="-d"
 case "$1" in
     start)
 	printf "Starting shairport-sync: "
-	start-stop-daemon -S -q -p /var/run/shairport-sync.pid --exec /usr/bin/shairport-sync -- $OPTIONS
+	start-stop-daemon -S -q --exec /usr/bin/shairport-sync -- $OPTIONS
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
 	;;
     stop)
 	printf "Stopping shairport-sync: "
-	start-stop-daemon -K -q -p /var/run/shairport-sync.pid
+	start-stop-daemon -K -q --exec /usr/bin/shairport-sync \
+		-p /var/run/shairport-sync/shairport-sync.pid
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
 	;;
     restart)
 	$0 stop
+	sleep 1
 	$0 start
 	;;
     *)
diff --git a/buildroot/package/sigrok-cli/Config.in b/buildroot/package/sigrok-cli/Config.in
index 75bd8c6d5..df1cd95be 100644
--- a/buildroot/package/sigrok-cli/Config.in
+++ b/buildroot/package/sigrok-cli/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_SIGROK_CLI
 	depends on !BR2_STATIC_LIBS
 	# libsigrok
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	depends on BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBSIGROK
 	help
 	  Sigrok-cli is a command-line frontend for the sigrok
@@ -15,7 +16,8 @@ config BR2_PACKAGE_SIGROK_CLI
 
 	  http://sigrok.org/wiki/Sigrok-cli
 
-comment "sigrok-cli needs a toolchain w/ wchar, threads, dynamic library, gcc >= 4.7"
+comment "sigrok-cli needs a toolchain w/ locale, wchar, threads, dynamic library, gcc >= 4.7"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS \
+		|| !BR2_ENABLE_LOCALE
diff --git a/buildroot/package/skeleton-custom/skeleton-custom.mk b/buildroot/package/skeleton-custom/skeleton-custom.mk
index 8c5753178..b05c834b9 100644
--- a/buildroot/package/skeleton-custom/skeleton-custom.mk
+++ b/buildroot/package/skeleton-custom/skeleton-custom.mk
@@ -23,33 +23,11 @@ $(error No path specified for the custom skeleton)
 endif
 endif
 
-# Extract the inode numbers for all of those directories. In case any is
-# a symlink, we want to get the inode of the pointed-to directory, so we
-# append '/.' to be sure we get the target directory. Since the symlinks
-# can be anyway (/bin -> /usr/bin or /usr/bin -> /bin), we do that for
-# all of them.
-#
-SKELETON_CUSTOM_LIB_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/lib/. 2>/dev/null)
-SKELETON_CUSTOM_BIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/bin/. 2>/dev/null)
-SKELETON_CUSTOM_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/sbin/. 2>/dev/null)
-SKELETON_CUSTOM_USR_LIB_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/usr/lib/. 2>/dev/null)
-SKELETON_CUSTOM_USR_BIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/usr/bin/. 2>/dev/null)
-SKELETON_CUSTOM_USR_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/usr/sbin/. 2>/dev/null)
-
 # For a merged /usr, ensure that /lib, /bin and /sbin and their /usr
 # counterparts are appropriately setup as symlinks ones to the others.
 ifeq ($(BR2_ROOTFS_MERGED_USR),y)
-
-ifneq ($(SKELETON_CUSTOM_LIB_INODE),$(SKELETON_CUSTOM_USR_LIB_INODE))
-SKELETON_CUSTOM_NOT_MERGED_USR_DIRS += /lib
-endif
-ifneq ($(SKELETON_CUSTOM_BIN_INODE),$(SKELETON_CUSTOM_USR_BIN_INODE))
-SKELETON_CUSTOM_NOT_MERGED_USR_DIRS += /bin
-endif
-ifneq ($(SKELETON_CUSTOM_SBIN_INODE),$(SKELETON_CUSTOM_USR_SBIN_INODE))
-SKELETON_CUSTOM_NOT_MERGED_USR_DIRS += /sbin
-endif
-
+SKELETON_CUSTOM_NOT_MERGED_USR_DIRS = \
+	$(shell support/scripts/check-merged-usr.sh $(SKELETON_CUSTOM_PATH))
 endif # merged /usr
 
 ifeq ($(BR2_PACKAGE_SKELETON_CUSTOM)$(BR_BUILDING),yy)
@@ -64,6 +42,7 @@ endif
 # things we customise in the custom skeleton.
 define SKELETON_CUSTOM_INSTALL_TARGET_CMDS
 	$(call SYSTEM_RSYNC,$(SKELETON_CUSTOM_PATH),$(TARGET_DIR))
+	$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR))
 	$(call SYSTEM_LIB_SYMLINK,$(TARGET_DIR))
 	$(INSTALL) -m 0644 support/misc/target-dir-warning.txt \
 		$(TARGET_DIR_WARNING_FILE)
@@ -75,6 +54,7 @@ endef
 # skeleton to staging.
 define SKELETON_CUSTOM_INSTALL_STAGING_CMDS
 	$(call SYSTEM_RSYNC,$(SKELETON_CUSTOM_PATH),$(STAGING_DIR))
+	$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR))
 	$(call SYSTEM_LIB_SYMLINK,$(STAGING_DIR))
 endef
 
diff --git a/buildroot/package/skeleton-init-common/skeleton-init-common.mk b/buildroot/package/skeleton-init-common/skeleton-init-common.mk
index e8a052205..e429b13d7 100644
--- a/buildroot/package/skeleton-init-common/skeleton-init-common.mk
+++ b/buildroot/package/skeleton-init-common/skeleton-init-common.mk
@@ -20,6 +20,7 @@ define SKELETON_INIT_COMMON_INSTALL_TARGET_CMDS
 	$(call SYSTEM_RSYNC,$(SKELETON_INIT_COMMON_PATH),$(TARGET_DIR))
 	$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR))
 	$(call SYSTEM_LIB_SYMLINK,$(TARGET_DIR))
+	$(SED) 's,@PATH@,$(BR2_SYSTEM_DEFAULT_PATH),' $(TARGET_DIR)/etc/profile
 	$(INSTALL) -m 0644 support/misc/target-dir-warning.txt \
 		$(TARGET_DIR_WARNING_FILE)
 endef
@@ -41,10 +42,15 @@ SKELETON_INIT_COMMON_PASSWD_METHOD = $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_M
 SKELETON_INIT_COMMON_BIN_SH = $(call qstrip,$(BR2_SYSTEM_BIN_SH))
 
 ifneq ($(SKELETON_INIT_COMMON_HOSTNAME),)
+SKELETON_INIT_COMMON_HOSTS_LINE = $(SKELETON_INIT_COMMON_HOSTNAME)
+SKELETON_INIT_COMMON_SHORT_HOSTNAME = $(firstword $(subst ., ,$(SKELETON_INIT_COMMON_HOSTNAME)))
+ifneq ($(SKELETON_INIT_COMMON_HOSTNAME),$(SKELETON_INIT_COMMON_SHORT_HOSTNAME))
+SKELETON_INIT_COMMON_HOSTS_LINE += $(SKELETON_INIT_COMMON_SHORT_HOSTNAME)
+endif
 define SKELETON_INIT_COMMON_SET_HOSTNAME
 	mkdir -p $(TARGET_DIR)/etc
 	echo "$(SKELETON_INIT_COMMON_HOSTNAME)" > $(TARGET_DIR)/etc/hostname
-	$(SED) '$$a \127.0.1.1\t$(SKELETON_INIT_COMMON_HOSTNAME)' \
+	$(SED) '$$a \127.0.1.1\t$(SKELETON_INIT_COMMON_HOSTS_LINE)' \
 		-e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts
 endef
 SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_HOSTNAME
diff --git a/buildroot/package/sngrep/0001-Fix-building-against-LibreSSL.patch b/buildroot/package/sngrep/0001-Fix-building-against-LibreSSL.patch
deleted file mode 100644
index 311f0b3d5..000000000
--- a/buildroot/package/sngrep/0001-Fix-building-against-LibreSSL.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 05d110ef57e9647b84c9656e746f72a76ea8c758 Mon Sep 17 00:00:00 2001
-From: Adam Duskett 
-Date: Tue, 6 Feb 2018 12:47:43 -0500
-Subject: [PATCH] Fix building against LibreSSL
-
-LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
-changes from OpenSSL >= 1.1.
-
-To work around this:
-
-- Check to see if LIBRESSL_VERSION_NUMBER is defined.
-- If so, define MODSSL_USE_OPENSSL_PRE_1_1_API.
-- Change all checks for OPENSSL_VERSION_NUMBER < 0x10100000L to
-  '#if MODSSL_USE_OPENSSL_PRE_1_1_API'
-
-Upstream-Status: Committed
-https://github.com/irontec/sngrep/commit/0ee014d497986c40de264f6392b01fdf4e337fd5
-
-Signed-off-by: Adam Duskett 
----
- src/capture_openssl.c | 6 +++---
- src/capture_openssl.h | 9 +++++++++
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/capture_openssl.c b/src/capture_openssl.c
-index 0a052c3..a4e1de0 100644
---- a/src/capture_openssl.c
-+++ b/src/capture_openssl.c
-@@ -94,7 +94,7 @@ P_hash(const char *digest, unsigned char *dest, int dlen, unsigned char *secret,
- 
-     // Calculate enough data to fill destination
-     while (pending > 0) {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if MODSSL_USE_OPENSSL_PRE_1_1_API
-         HMAC_CTX hm;
-         HMAC_Init(&hm, secret, sslen, md);
-         HMAC_Update(&hm, tmpseed, tmpslen);
-@@ -495,7 +495,7 @@ tls_process_record(struct SSLConnection *conn, const uint8_t *payload,
-                 break;
-             case change_cipher_spec:
-                 // From now on, this connection will be encrypted using MasterSecret
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if MODSSL_USE_OPENSSL_PRE_1_1_API
-                 if (conn->client_cipher_ctx->cipher && conn->server_cipher_ctx->cipher)
-                     conn->encrypted = 1;
- #else
-@@ -588,7 +588,7 @@ tls_process_record_handshake(struct SSLConnection *conn, const opaque *fragment,
-                 // Decrypt PreMasterKey
-                 clientkeyex = (struct ClientKeyExchange *) body;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if MODSSL_USE_OPENSSL_PRE_1_1_API
-                 RSA_private_decrypt(UINT16_INT(clientkeyex->length),
-                                     (const unsigned char *) &clientkeyex->exchange_keys,
-                                     (unsigned char *) &conn->pre_master_secret,
-diff --git a/src/capture_openssl.h b/src/capture_openssl.h
-index 31f48ce..b3e88fe 100644
---- a/src/capture_openssl.h
-+++ b/src/capture_openssl.h
-@@ -65,6 +65,15 @@
- #define OLD_OPENSSL_VERSION 1
- #endif
- 
-+/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
-+ * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...)
-+ */
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+#define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
-+#else
-+#define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#endif
-+
- //! Three bytes unsigned integer
- typedef struct uint16 {
-     unsigned char x[2];
--- 
-2.14.3
-
diff --git a/buildroot/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch b/buildroot/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch
new file mode 100644
index 000000000..ec8a0f5dc
--- /dev/null
+++ b/buildroot/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch
@@ -0,0 +1,43 @@
+From 604f6d0ce2ec42ac494d76c95e68850ea6e7da8f Mon Sep 17 00:00:00 2001
+From: Sebastian Kemper 
+Date: Sun, 4 Nov 2018 16:58:00 +0100
+Subject: [PATCH] capture: fix typo in FILE object
+
+FILE *fstdin is defined, but when calling freopen() stdin is used instead
+of fstdin.
+
+This causes the compile to fail:
+
+  CC       sngrep-capture.o
+capture.c: In function 'capture_offline':
+capture.c:194:21: error: assignment of read-only variable 'stdin'
+         if (!(stdin = freopen("/dev/tty", "r", stdin))) {
+                     ^
+make[5]: *** [Makefile:519: sngrep-capture.o] Error 1
+
+This commit fixes the typo.
+
+Signed-off-by: Sebastian Kemper 
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit 604f6d0ce2ec
+
+ src/capture.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/capture.c b/src/capture.c
+index 911c35f43a35..a799413e2b0e 100644
+--- a/src/capture.c
++++ b/src/capture.c
+@@ -191,7 +191,7 @@ capture_offline(const char *infile, const char *outfile)
+ 
+     // Reopen tty for ncurses after pcap have used stdin
+     if (!strncmp(infile, "/dev/stdin", 10)) {
+-        if (!(stdin = freopen("/dev/tty", "r", stdin))) {
++        if (!(fstdin = freopen("/dev/tty", "r", stdin))) {
+             fprintf(stderr, "Failed to reopen tty while using stdin for capture.");
+             return 1;
+         }
+-- 
+2.19.2
+
diff --git a/buildroot/package/sngrep/sngrep.hash b/buildroot/package/sngrep/sngrep.hash
index 16552cf5c..f751a1463 100644
--- a/buildroot/package/sngrep/sngrep.hash
+++ b/buildroot/package/sngrep/sngrep.hash
@@ -1,6 +1,6 @@
-# From https://github.com/irontec/sngrep/releases/download/v1.4.5/sngrep-1.4.5.tar.gz.md5sum
-md5 11f1cdb8e8f3a3c9ef02ecd12268322e  sngrep-1.4.5.tar.gz
+# From https://github.com/irontec/sngrep/releases/download/v1.4.6/sngrep-1.4.6.tar.gz.md5sum
+md5 094e76786b118258bac69e1514aac826  sngrep-1.4.6.tar.gz
 
 # Locally computed
-sha256 16f1566f4507ba560c7461cc7ff1c1653beb14b8baf7846269bbb4880564e57f sngrep-v1.4.5.tar.gz
+sha256 638d6557dc68db401b07d73b2e7f8276800281f021fe0c942992566d6b59a48a sngrep-v1.4.6.tar.gz
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE
diff --git a/buildroot/package/sngrep/sngrep.mk b/buildroot/package/sngrep/sngrep.mk
index 3f1fe989c..c6d2a292b 100644
--- a/buildroot/package/sngrep/sngrep.mk
+++ b/buildroot/package/sngrep/sngrep.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SNGREP_VERSION = v1.4.5
+SNGREP_VERSION = v1.4.6
 SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION))
 SNGREP_LICENSE = GPL-3.0+
 SNGREP_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/softether/0003-use-fhs-install-directories.patch b/buildroot/package/softether/0003-use-fhs-install-directories.patch
index c489cc1a6..ba00d9b67 100644
--- a/buildroot/package/softether/0003-use-fhs-install-directories.patch
+++ b/buildroot/package/softether/0003-use-fhs-install-directories.patch
@@ -15,20 +15,22 @@ https://github.com/dajhorn/SoftEtherVPN/commit/b9420c3bfc2a8b9d35d0c8e5f6849007c
 
 Signed-off-by: Bernd Kuhls 
 Signed-off-by: Thomas Petazzoni 
+
+[Updated for 4.28 build 9669 beta - src/Mayaqua/Encrypt.c dropped IsXRevoked()
+Signed-off-by: Matthew Weber 
 ---
  autotools/softether.am      |  1 +
  src/Cedar/Admin.c           |  2 +-
  src/Cedar/Command.c         |  6 +++++-
  src/Cedar/Logging.c         |  2 +-
  src/Cedar/Server.c          |  4 ++--
- src/Mayaqua/Encrypt.c       |  2 +-
  src/Mayaqua/FileIO.c        | 39 ++++++++++++++++++++++++++++++++++++---
  src/Mayaqua/FileIO.h        |  2 ++
  src/Mayaqua/Mayaqua.c       |  4 ++++
  src/Mayaqua/Table.c         |  6 +++++-
  src/Mayaqua/Unix.c          |  6 +++---
  src/bin/hamcore/Makefile.am |  8 ++++++--
- 12 files changed, 67 insertions(+), 15 deletions(-)
+ 11 files changed, 66 insertions(+), 14 deletions(-)
 
 Index: b/autotools/softether.am
 ===================================================================
@@ -115,19 +117,6 @@ Index: b/src/Cedar/Server.c
  	Format(dir_full_path, sizeof(dir_full_path), "%s/%s", exe_dir, dirname);
  
  	dir = EnumDir(dir_full_path);
-Index: b/src/Mayaqua/Encrypt.c
-===================================================================
---- a/src/Mayaqua/Encrypt.c
-+++ b/src/Mayaqua/Encrypt.c
-@@ -579,7 +579,7 @@
- 		return false;
- 	}
- 
--	GetExeDir(dirname, sizeof(dirname));
-+	GetStateDir(dirname, sizeof(dirname));
- 
- 	// Search the CRL file
- 	t = EnumDir(dirname);
 Index: b/src/Mayaqua/FileIO.c
 ===================================================================
 --- a/src/Mayaqua/FileIO.c
diff --git a/buildroot/package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch b/buildroot/package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch
new file mode 100644
index 000000000..20a1f0622
--- /dev/null
+++ b/buildroot/package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch
@@ -0,0 +1,78 @@
+From 1fad008e1adba5cb596da6f9ec6a244d49a585cf Mon Sep 17 00:00:00 2001
+From: Davide Beatrici 
+Date: Mon, 9 Apr 2018 22:02:34 +0200
+Subject: [PATCH] Encrypt: set default RSA key size to 1024 everywhere, using
+ the RSA_KEY_SIZE macro
+
+This commit also fixes the problem described in #31, which was caused by the test key generated in RsaCheck() being too small for newer OpenSSL versions.
+
+Failure looks like
+-- Alert: RsaCheck() --
+OpenSSL Library Init Failed. (too old?)
+Please install the latest version of OpenSSL.
+
+Upstream: https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/commit/1fad008e1adba5cb596da6f9ec6a244d49a585cf
+(Currently still on an active pull request https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/pull/1)
+
+Signed-off-by: Matthew Weber 
+---
+ src/Mayaqua/Encrypt.c | 8 ++++----
+ src/Mayaqua/Encrypt.h | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c
+index 381d1c5..a557052 100644
+--- a/src/Mayaqua/Encrypt.c
++++ b/src/Mayaqua/Encrypt.c
+@@ -2194,7 +2194,7 @@ bool RsaVerifyEx(void *data, UINT data_size, void *sign, K *k, UINT bits)
+ 	}
+ 	if (bits == 0)
+ 	{
+-		bits = 1024;
++		bits = RSA_KEY_SIZE;
+ 	}
+ 
+ 	// Hash the data
+@@ -2233,7 +2233,7 @@ bool RsaSignEx(void *dst, void *src, UINT size, K *k, UINT bits)
+ 	}
+ 	if (bits == 0)
+ 	{
+-		bits = 1024;
++		bits = RSA_KEY_SIZE;
+ 	}
+ 
+ 	Zero(dst, bits / 8);
+@@ -2302,7 +2302,7 @@ bool RsaCheck()
+ 	BIO *bio;
+ 	char errbuf[MAX_SIZE];
+ 	UINT size = 0;
+-	UINT bit = 32;
++	UINT bit = RSA_KEY_SIZE;
+ 	// Validate arguments
+ 
+ 	// Key generation
+@@ -2372,7 +2372,7 @@ bool RsaGen(K **priv, K **pub, UINT bit)
+ 	}
+ 	if (bit == 0)
+ 	{
+-		bit = 1024;
++		bit = RSA_KEY_SIZE;
+ 	}
+ 
+ 	// Key generation
+diff --git a/src/Mayaqua/Encrypt.h b/src/Mayaqua/Encrypt.h
+index d795d2d..0c48161 100644
+--- a/src/Mayaqua/Encrypt.h
++++ b/src/Mayaqua/Encrypt.h
+@@ -128,7 +128,7 @@ void RAND_Free_For_SoftEther();
+ #define	DES_IV_SIZE					8			// DES IV size
+ #define DES_BLOCK_SIZE				8			// DES block size
+ #define DES3_KEY_SIZE				(8 * 3)		// 3DES key size
+-#define RSA_KEY_SIZE				128			// RSA key size
++#define RSA_KEY_SIZE				1024		// RSA key size
+ #define DH_KEY_SIZE					128			// DH key size
+ #define	RSA_MIN_SIGN_HASH_SIZE		(15 + SHA1_HASH_SIZE)	// Minimum RSA hash size
+ #define	RSA_SIGN_HASH_SIZE			(RSA_MIN_SIGN_HASH_SIZE)	// RSA hash size
+-- 
+1.9.1
+
diff --git a/buildroot/package/softether/softether.hash b/buildroot/package/softether/softether.hash
index ec6e0603d..fdbbbca39 100644
--- a/buildroot/package/softether/softether.hash
+++ b/buildroot/package/softether/softether.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 8e6310d36e579ea07171ce5fcb9ebe31235d218444c4e4836ca6c32aa49c1f93 softether-v4.22-9634-beta.tar.gz
-sha256 7aeb873293fa0e44425dabf68a8e46e26c848fe58efcfd3ac7c90a3386f3edd1 LICENSE
+sha256 fbf6e04c4451d0cb1555c3a53c178b5453c7d761119f82fd693538c9f115fecb softether-v4.28-9669-beta.tar.gz
+sha256 0a889e7e7a277397d0a2d56c37814eefd8c6b6129d8b74ee2d27fc3415fad561 LICENSE
diff --git a/buildroot/package/softether/softether.mk b/buildroot/package/softether/softether.mk
index 05d2f20fe..1a31abd4b 100644
--- a/buildroot/package/softether/softether.mk
+++ b/buildroot/package/softether/softether.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-SOFTETHER_VERSION = v4.22-9634-beta
-SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN,$(SOFTETHER_VERSION))
+SOFTETHER_VERSION = v4.28-9669-beta
+SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN_stable,$(SOFTETHER_VERSION))
 SOFTETHER_LICENSE = GPL-2.0
 SOFTETHER_LICENSE_FILES = LICENSE
-SOFTETHER_DEPENDENCIES = host-softether libopenssl readline
+SOFTETHER_DEPENDENCIES = host-pkgconf host-softether libopenssl readline
 SOFTETHER_AUTORECONF = YES
 
 ifeq ($(BR2_ENABLE_LOCALE),)
@@ -16,14 +16,7 @@ SOFTETHER_DEPENDENCIES += libiconv
 SOFTETHER_CONF_ENV = LIBS+=" -liconv"
 endif
 
-ifeq ($(BR2_STATIC_LIBS),y)
-# openssl needs zlib
-SOFTETHER_CONF_ENV += LIBS+=" -lz"
-endif
-
-SOFTETHER_CONF_OPTS = \
-	--with-openssl="$(STAGING_DIR)/usr" \
-	--with-zlib="$(STAGING_DIR)/usr"
+SOFTETHER_CONF_OPTS = --with-zlib="$(STAGING_DIR)/usr"
 
 # host-libiconv does not exist, therefore we need this extra line
 HOST_SOFTETHER_DEPENDENCIES = host-pkgconf host-libopenssl host-readline
diff --git a/buildroot/package/solarus/0001-cmake-remove-Werror.patch b/buildroot/package/solarus/0001-cmake-remove-Werror.patch
index b27908c82..533ac91c7 100644
--- a/buildroot/package/solarus/0001-cmake-remove-Werror.patch
+++ b/buildroot/package/solarus/0001-cmake-remove-Werror.patch
@@ -1,27 +1,26 @@
-From 4d315359d15e1221f3463b77a960a60093aac893 Mon Sep 17 00:00:00 2001
+From 5f372ba3502369c6501c77650a761300d26f64c0 Mon Sep 17 00:00:00 2001
 From: Romain Naour 
 Date: Thu, 22 Jun 2017 00:19:56 +0200
 Subject: [PATCH] cmake: remove Werror
 
 Signed-off-by: Romain Naour 
 ---
- cmake/AddCompilationFlags.cmake | 3 ---
- 1 file changed, 3 deletions(-)
+ cmake/AddCompilationFlags.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmake/AddCompilationFlags.cmake b/cmake/AddCompilationFlags.cmake
-index 5159ff9..a506033 100644
+index 2c105db7f..cb5c5719a 100644
 --- a/cmake/AddCompilationFlags.cmake
 +++ b/cmake/AddCompilationFlags.cmake
-@@ -24,9 +24,6 @@ endif()
- # Be less pedantic in release builds for users.
- set(CMAKE_CXX_FLAGS_RELEASE "-Wno-error -Wall -Wextra -Wno-unknown-pragmas -Wno-fatal-errors ${CMAKE_CXX_FLAGS_RELEASE}")
+@@ -25,7 +25,7 @@ endif()
+ set(CMAKE_CXX_FLAGS_RELEASE "-Wno-error -Wall -Wextra -Wno-unknown-pragmas -Wno-fatal-errors ${CMAKE_CXX_FLAGS_RELEASE} -O3")
  
--# Be more pedantic in debug mode for developers.
--set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS_DEBUG}")
--
- # Platform-specific flags.
- if(WIN32)
-   # MinGW: disable the console by default.
+ # Be more pedantic in debug mode for developers.
+-set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wextra -Wno-error=deprecated-declarations -pedantic ${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
++set(CMAKE_CXX_FLAGS_DEBUG "-Wno-error -Wall -Wextra -Wno-error=deprecated-declarations -pedantic ${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ if(CMAKE_COMPILER_IS_GNUCXX)
+     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wsuggest-override")
+ endif()
 -- 
-2.9.4
+2.14.5
 
diff --git a/buildroot/package/solarus/Config.in b/buildroot/package/solarus/Config.in
index 30c7aa28b..359ad15e0 100644
--- a/buildroot/package/solarus/Config.in
+++ b/buildroot/package/solarus/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_SOLARUS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
 	depends on !BR2_STATIC_LIBS # SDL2
+	depends on BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_LIBMODPLUG
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_LIBPNG # runtime
@@ -24,8 +25,9 @@ config BR2_PACKAGE_SOLARUS
 	  http://www.solarus-games.org
 	  https://github.com/solarus-games/solarus
 
-comment "solarus needs a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library"
+comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library"
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
-		|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
+		|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
+		|| !BR2_PACKAGE_HAS_LIBGL
diff --git a/buildroot/package/solarus/solarus.hash b/buildroot/package/solarus/solarus.hash
index 8ed5cafa4..dab8d1a1f 100644
--- a/buildroot/package/solarus/solarus.hash
+++ b/buildroot/package/solarus/solarus.hash
@@ -1,5 +1,4 @@
 # Locally calculated
-sha256 5930584e7c333089a2c1bf372ccc25ad3fb5c1d973189d2bf67f2308189af94d  solarus-v1.5.3.tar.gz
+sha256 d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751  solarus-1.6.0-src.tar.gz
 
-sha256 09cb24006b6a3f2698d8851dc5df4f413c1a98e20d4008bffd76ec236f14244d  license.txt
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  license_gpl.txt
+sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f  license.txt
diff --git a/buildroot/package/solarus/solarus.mk b/buildroot/package/solarus/solarus.mk
index af37f81a0..fd7bbea2c 100644
--- a/buildroot/package/solarus/solarus.mk
+++ b/buildroot/package/solarus/solarus.mk
@@ -4,17 +4,18 @@
 #
 ################################################################################
 
-SOLARUS_VERSION = v1.5.3
-SOLARUS_SITE = $(call github,solarus-games,solarus,$(SOLARUS_VERSION))
+SOLARUS_VERSION = 1.6.0
+SOLARUS_SITE = http://www.solarus-games.org/downloads/solarus
+SOLARUS_SOURCE = solarus-$(SOLARUS_VERSION)-src.tar.gz
 
 SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \
 	CC-BY-SA-3.0 (GUI icons)
-SOLARUS_LICENSE_FILES = license.txt license_gpl.txt
+SOLARUS_LICENSE_FILES = license.txt
 
 # Install libsolarus.so
 SOLARUS_INSTALL_STAGING = YES
 
-SOLARUS_DEPENDENCIES = libmodplug libogg libvorbis luajit openal physfs sdl2 \
+SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis luajit openal physfs sdl2 \
 	sdl2_image sdl2_ttf
 
 # Disable launcher GUI (requires Qt5)
diff --git a/buildroot/package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch b/buildroot/package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch
new file mode 100644
index 000000000..4fa3e3c76
--- /dev/null
+++ b/buildroot/package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch
@@ -0,0 +1,97 @@
+From 43f71fa7b4c6a20f4078b9098369abb8d38a5617 Mon Sep 17 00:00:00 2001
+From: Nick Parker 
+Date: Fri, 9 Dec 2016 11:47:39 -0600
+Subject: [PATCH] Support OpenSSL 1.1.0 and prior
+
+(cherry picked from commit 939c83a007e4724436c3955ae2afd8b11b92d867)
+Signed-off-by: Matt Weber 
+---
+ src/crypto_openssl.c | 53 +++++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 38 insertions(+), 15 deletions(-)
+
+diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c
+index 150ab92..6822325 100644
+--- a/src/crypto_openssl.c
++++ b/src/crypto_openssl.c
+@@ -47,6 +47,29 @@ static unsigned int openssl_external_init = 0;
+ static unsigned int openssl_init_count = 0;
+ static sqlite3_mutex* openssl_rand_mutex = NULL;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++static HMAC_CTX *HMAC_CTX_new(void)
++{
++  HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
++  if (ctx != NULL) {
++    HMAC_CTX_init(ctx);
++  }
++  return ctx;
++}
++
++// Per 1.1.0 (https://wiki.openssl.org/index.php/1.1_API_Changes)
++// HMAC_CTX_free should call HMAC_CTX_cleanup, then EVP_MD_CTX_Cleanup.
++// HMAC_CTX_cleanup internally calls EVP_MD_CTX_cleanup so these
++// calls are not needed.
++static void HMAC_CTX_free(HMAC_CTX *ctx)
++{
++  if (ctx != NULL) {
++    HMAC_CTX_cleanup(ctx);
++    OPENSSL_free(ctx);
++  }
++}
++#endif
++
+ static int sqlcipher_openssl_add_random(void *ctx, void *buffer, int length) {
+ #ifndef SQLCIPHER_OPENSSL_NO_MUTEX_RAND
+   sqlite3_mutex_enter(openssl_rand_mutex);
+@@ -143,14 +166,14 @@ static int sqlcipher_openssl_random (void *ctx, void *buffer, int length) {
+ }
+ 
+ static int sqlcipher_openssl_hmac(void *ctx, unsigned char *hmac_key, int key_sz, unsigned char *in, int in_sz, unsigned char *in2, int in2_sz, unsigned char *out) {
+-  HMAC_CTX hctx;
+   unsigned int outlen;
+-  HMAC_CTX_init(&hctx);
+-  HMAC_Init_ex(&hctx, hmac_key, key_sz, EVP_sha1(), NULL);
+-  HMAC_Update(&hctx, in, in_sz);
+-  HMAC_Update(&hctx, in2, in2_sz);
+-  HMAC_Final(&hctx, out, &outlen);
+-  HMAC_CTX_cleanup(&hctx);
++  HMAC_CTX* hctx = HMAC_CTX_new();
++  if(hctx == NULL) return SQLITE_ERROR;
++  HMAC_Init_ex(hctx, hmac_key, key_sz, EVP_sha1(), NULL);
++  HMAC_Update(hctx, in, in_sz);
++  HMAC_Update(hctx, in2, in2_sz);
++  HMAC_Final(hctx, out, &outlen);
++  HMAC_CTX_free(hctx);
+   return SQLITE_OK; 
+ }
+ 
+@@ -160,18 +183,18 @@ static int sqlcipher_openssl_kdf(void *ctx, const unsigned char *pass, int pass_
+ }
+ 
+ static int sqlcipher_openssl_cipher(void *ctx, int mode, unsigned char *key, int key_sz, unsigned char *iv, unsigned char *in, int in_sz, unsigned char *out) {
+-  EVP_CIPHER_CTX ectx;
+   int tmp_csz, csz;
+- 
+-  EVP_CipherInit(&ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, mode);
+-  EVP_CIPHER_CTX_set_padding(&ectx, 0); // no padding
+-  EVP_CipherInit(&ectx, NULL, key, iv, mode);
+-  EVP_CipherUpdate(&ectx, out, &tmp_csz, in, in_sz);
++  EVP_CIPHER_CTX* ectx = EVP_CIPHER_CTX_new();
++  if(ectx == NULL) return SQLITE_ERROR;
++  EVP_CipherInit_ex(ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, NULL, mode);
++  EVP_CIPHER_CTX_set_padding(ectx, 0); // no padding
++  EVP_CipherInit_ex(ectx, NULL, NULL, key, iv, mode);
++  EVP_CipherUpdate(ectx, out, &tmp_csz, in, in_sz);
+   csz = tmp_csz;  
+   out += tmp_csz;
+-  EVP_CipherFinal(&ectx, out, &tmp_csz);
++  EVP_CipherFinal_ex(ectx, out, &tmp_csz);
+   csz += tmp_csz;
+-  EVP_CIPHER_CTX_cleanup(&ectx);
++  EVP_CIPHER_CTX_free(ectx);
+   assert(in_sz == csz);
+   return SQLITE_OK; 
+ }
+-- 
+1.9.1
+
diff --git a/buildroot/package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch b/buildroot/package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch
new file mode 100644
index 000000000..1585b8d45
--- /dev/null
+++ b/buildroot/package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch
@@ -0,0 +1,42 @@
+From 6b4dbecbcfe35d36fea264c04c41b338852d4e88 Mon Sep 17 00:00:00 2001
+From: Nick Parker 
+Date: Wed, 1 Mar 2017 15:35:43 -0600
+Subject: [PATCH] Guard OpenSSL init and cleanup routines on versions less
+ than 1.1.0
+
+(cherry picked from commit 1c495b933cee3381f1ea6a70edcbcda1754d7409)
+Signed-off-by: Matt Weber 
+
+Conflicts:
+	src/crypto_openssl.c
+---
+ src/crypto_openssl.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c
+index 6822325..09bc2a2 100644
+--- a/src/crypto_openssl.c
++++ b/src/crypto_openssl.c
+@@ -102,7 +102,9 @@ static int sqlcipher_openssl_activate(void *ctx) {
+ 
+   if(openssl_init_count == 0 && openssl_external_init == 0)  {
+     /* if the library was not externally initialized, then should be now */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     OpenSSL_add_all_algorithms();
++#endif
+   } 
+ 
+ #ifndef SQLCIPHER_OPENSSL_NO_MUTEX_RAND
+@@ -131,7 +133,9 @@ static int sqlcipher_openssl_deactivate(void *ctx) {
+        Note: this code will only be reached if OpensSSL_add_all_algorithms()
+        is called by SQLCipher internally. This should prevent SQLCipher from 
+        "cleaning up" openssl when it was initialized externally by the program */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+       EVP_cleanup();
++#endif
+     }
+ #ifndef SQLCIPHER_OPENSSL_NO_MUTEX_RAND
+     sqlite3_mutex_free(openssl_rand_mutex);
+-- 
+1.9.1
+
diff --git a/buildroot/package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch b/buildroot/package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch
new file mode 100644
index 000000000..b15fabcbe
--- /dev/null
+++ b/buildroot/package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch
@@ -0,0 +1,48 @@
+From 3da532754fb2bb7d379d4386a8c3339742edfb0b Mon Sep 17 00:00:00 2001
+From: Stephen Lombardo 
+Date: Wed, 10 Oct 2018 15:55:49 -0400
+Subject: [PATCH] correct compliation under openssl 1.1.x
+
+(cherry picked from commit 57ea35296ce7f2c1c93ce79194eea19a008b69ae)
+Signed-off-by: Matt Weber 
+
+Conflicts:
+	src/crypto_openssl.c
+---
+ src/crypto_openssl.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c
+index 09bc2a2..57a1104 100644
+--- a/src/crypto_openssl.c
++++ b/src/crypto_openssl.c
+@@ -47,7 +47,7 @@ static unsigned int openssl_external_init = 0;
+ static unsigned int openssl_init_count = 0;
+ static sqlite3_mutex* openssl_rand_mutex = NULL;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ static HMAC_CTX *HMAC_CTX_new(void)
+ {
+   HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
+@@ -102,7 +102,7 @@ static int sqlcipher_openssl_activate(void *ctx) {
+ 
+   if(openssl_init_count == 0 && openssl_external_init == 0)  {
+     /* if the library was not externally initialized, then should be now */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+     OpenSSL_add_all_algorithms();
+ #endif
+   } 
+@@ -133,7 +133,7 @@ static int sqlcipher_openssl_deactivate(void *ctx) {
+        Note: this code will only be reached if OpensSSL_add_all_algorithms()
+        is called by SQLCipher internally. This should prevent SQLCipher from 
+        "cleaning up" openssl when it was initialized externally by the program */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+       EVP_cleanup();
+ #endif
+     }
+-- 
+1.9.1
+
diff --git a/buildroot/package/sqlcipher/Config.in b/buildroot/package/sqlcipher/Config.in
index 332754b15..b26bc7709 100644
--- a/buildroot/package/sqlcipher/Config.in
+++ b/buildroot/package/sqlcipher/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_SQLCIPHER
 	depends on !BR2_PACKAGE_SQLITE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
 	help
 	  SQLCipher is an SQLite extension that provides 256 bits AES
 	  encryption of database files. Note that it is a fork of
diff --git a/buildroot/package/sqlcipher/sqlcipher.hash b/buildroot/package/sqlcipher/sqlcipher.hash
index f3c7e0bd9..8632cd7a5 100644
--- a/buildroot/package/sqlcipher/sqlcipher.hash
+++ b/buildroot/package/sqlcipher/sqlcipher.hash
@@ -1,2 +1,3 @@
 # locally computed
 sha256  25fa4f4cb38dcf9e52e4d1f46be8fee9c7aaef35b6df96912a216b289e22c2af  sqlcipher-v3.2.0.tar.gz
+sha256  3eee3c7964a9becc94d747bd36703d31fc86eb994680b06a61bfd4f2661eaac8  LICENSE
diff --git a/buildroot/package/sqlcipher/sqlcipher.mk b/buildroot/package/sqlcipher/sqlcipher.mk
index db94d06c5..812ae7fa4 100644
--- a/buildroot/package/sqlcipher/sqlcipher.mk
+++ b/buildroot/package/sqlcipher/sqlcipher.mk
@@ -6,6 +6,8 @@
 
 SQLCIPHER_VERSION = v3.2.0
 SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,$(SQLCIPHER_VERSION))
+SQLCIPHER_LICENSE = BSD-3-Clause
+SQLCIPHER_LICENSE_FILES = LICENSE
 SQLCIPHER_DEPENDENCIES = openssl host-tcl
 SQLCIPHER_INSTALL_STAGING = YES
 
diff --git a/buildroot/package/sqlite/sqlite.hash b/buildroot/package/sqlite/sqlite.hash
index eefa31ffb..9b7efe71d 100644
--- a/buildroot/package/sqlite/sqlite.hash
+++ b/buildroot/package/sqlite/sqlite.hash
@@ -1,6 +1,6 @@
 # From https://www.sqlite.org/download.html
-sha1 aedfbdc14eb700099434d6a743135743cff47393  sqlite-autoconf-3250200.tar.gz
+sha1 01b9d8fc77085e144dddc87456c9783e53d09a53  sqlite-autoconf-3280000.tar.gz
 # Calculated based on the hash above
-sha256 da9a1484423d524d3ac793af518cdf870c8255d209e369bd6a193e9f9d0e3181  sqlite-autoconf-3250200.tar.gz
+sha256 d61b5286f062adfce5125eaf544d495300656908e61fca143517afcc0a89b7c3  sqlite-autoconf-3280000.tar.gz
 # Locally calculated
 sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9  tea/license.terms
diff --git a/buildroot/package/sqlite/sqlite.mk b/buildroot/package/sqlite/sqlite.mk
index 34a0b9538..7e97c966b 100644
--- a/buildroot/package/sqlite/sqlite.mk
+++ b/buildroot/package/sqlite/sqlite.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SQLITE_VERSION = 3250200
+SQLITE_VERSION = 3280000
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
-SQLITE_SITE = https://www.sqlite.org/2018
+SQLITE_SITE = https://www.sqlite.org/2019
 SQLITE_LICENSE = Public domain
 SQLITE_LICENSE_FILES = tea/license.terms
 SQLITE_INSTALL_STAGING = YES
diff --git a/buildroot/package/squid/Config.in b/buildroot/package/squid/Config.in
index 50f65de43..726160b01 100644
--- a/buildroot/package/squid/Config.in
+++ b/buildroot/package/squid/Config.in
@@ -1,10 +1,12 @@
 comment "squid needs a toolchain w/ C++, gcc >= 4.8 not affected by bug 64735"
 	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \
 		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 
 config BR2_PACKAGE_SQUID
 	bool "squid"
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
diff --git a/buildroot/package/squid/S97squid b/buildroot/package/squid/S97squid
old mode 100755
new mode 100644
diff --git a/buildroot/package/squid/squid.mk b/buildroot/package/squid/squid.mk
index d6f186d97..5d5ec0c38 100644
--- a/buildroot/package/squid/squid.mk
+++ b/buildroot/package/squid/squid.mk
@@ -39,13 +39,8 @@ SQUID_CONF_OPTS = \
 	--with-swapdir=/var/cache/squid/ \
 	--with-default-user=squid
 
-# Atomics in Squid use __sync built-ins on 4 and 8 bytes. However, the
-# configure script tests them using AC_TRY_RUN, so we have to give
-# some hints.
-ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4)$(BR2_TOOLCHAIN_HAS_SYNC_8),yy)
-SQUID_CONF_ENV += squid_cv_gnu_atomics=yes
-else
-SQUID_CONF_ENV += squid_cv_gnu_atomics=no
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+SQUID_CONF_ENV += LIBS=-latomic
 endif
 
 ifeq ($(BR2_PACKAGE_LIBKRB5),y)
diff --git a/buildroot/package/strace/0001-Fix-build-for-no-MMU-targets.patch b/buildroot/package/strace/0001-Fix-build-for-no-MMU-targets.patch
new file mode 100644
index 000000000..1464fb697
--- /dev/null
+++ b/buildroot/package/strace/0001-Fix-build-for-no-MMU-targets.patch
@@ -0,0 +1,49 @@
+From 1b657bf8e2f4bf6f80b969b220900003d7ecbce6 Mon Sep 17 00:00:00 2001
+From: Baruch Siach 
+Date: Tue, 8 Jan 2019 18:28:37 +0200
+Subject: [PATCH] Fix build for no-MMU targets
+
+Commit 7488ce9e23f1 ("Check whether PTRACE_GET_SYSCALL_INFO is supported
+by the kernel") added a fork() call in test_ptrace_get_syscall_info()
+which is included in the main strace executable code. Although the
+test_ptrace_get_syscall_info() routine is not called on no-MMU targets,
+the compiler can't optimize it out because it is a global symbol. So
+build for no-MMU targets currently fails:
+
+strace-ptrace_syscall_info.o: In function `test_ptrace_get_syscall_info':
+ptrace_syscall_info.c:(.text+0x1c): undefined reference to `fork'
+
+Make the test_ptrace_get_syscall_info() definition depend on HAVE_FORK
+to fix that.
+
+Signed-off-by: Baruch Siach 
+---
+Upstream status:
+https://lists.strace.io/pipermail/strace-devel/2019-January/008596.html
+
+ ptrace_syscall_info.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ptrace_syscall_info.c b/ptrace_syscall_info.c
+index 55eafddf7f71..cc6ce149649e 100644
+--- a/ptrace_syscall_info.c
++++ b/ptrace_syscall_info.c
+@@ -40,6 +40,7 @@ static const unsigned int expected_seccomp_size =
+  * Test that PTRACE_GET_SYSCALL_INFO API is supported by the kernel, and
+  * that the semantics implemented in the kernel matches our expectations.
+  */
++#ifdef HAVE_FORK
+ bool
+ test_ptrace_get_syscall_info(void)
+ {
+@@ -255,6 +256,7 @@ done:
+ 
+ 	return ptrace_get_syscall_info_supported;
+ }
++#endif /* HAVE_FORK */
+ 
+ void
+ print_ptrace_syscall_info(struct tcb *tcp, kernel_ulong_t addr,
+-- 
+2.20.1
+
diff --git a/buildroot/package/strace/0002-Fix-build-for-mips-targets.patch b/buildroot/package/strace/0002-Fix-build-for-mips-targets.patch
new file mode 100644
index 000000000..430d4071b
--- /dev/null
+++ b/buildroot/package/strace/0002-Fix-build-for-mips-targets.patch
@@ -0,0 +1,68 @@
+From 8150854b5dd030a47f601931daf827ca33bc9bd9 Mon Sep 17 00:00:00 2001
+From: Baruch Siach 
+Date: Tue, 8 Jan 2019 19:52:21 +0200
+Subject: [PATCH] Fix build for mips targets
+
+Commit 917c2ccf3a67 ("Refactor stack pointers") removed
+linux/mips/arch_regs.h that defines mips_REG_* macros and struct
+mips_regs. These symbols are referenced in mips code. Restore
+arch_regs.h to fix the build failure:
+
+syscall.c: In function 'decode_syscall_subcall':
+syscall.c:370:7: error: 'mips_REG_SP' undeclared (first use in this function)
+       mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]),
+	   ^~~~~~~~~~~
+
+[ baruch: drop the Makefile.in hunk to avoid autoreconf ]
+Signed-off-by: Baruch Siach 
+---
+Upstream status:
+https://lists.strace.io/pipermail/strace-devel/2019-January/008598.html
+
+ linux/mips/arch_regs.c |  4 +---
+ linux/mips/arch_regs.h | 18 ++++++++++++++++++
+ 3 files changed, 20 insertions(+), 3 deletions(-)
+ create mode 100644 linux/mips/arch_regs.h
+
+diff --git a/linux/mips/arch_regs.c b/linux/mips/arch_regs.c
+index 0874e31efea4..3ed841ee7c1a 100644
+--- a/linux/mips/arch_regs.c
++++ b/linux/mips/arch_regs.c
+@@ -5,9 +5,7 @@
+  * SPDX-License-Identifier: LGPL-2.1-or-later
+  */
+ 
+-static struct {
+-	uint64_t uregs[38];
+-} mips_regs;
++struct mips_regs mips_regs; /* not static */
+ 
+ #define REG_V0 2
+ #define REG_A0 4
+diff --git a/linux/mips/arch_regs.h b/linux/mips/arch_regs.h
+new file mode 100644
+index 000000000000..6372badce646
+--- /dev/null
++++ b/linux/mips/arch_regs.h
+@@ -0,0 +1,18 @@
++struct mips_regs {
++	uint64_t uregs[38];
++};
++
++extern struct mips_regs mips_regs;
++
++#define REG_V0 2
++#define REG_A0 4
++
++#define mips_REG_V0 mips_regs.uregs[REG_V0]
++#define mips_REG_A0 mips_regs.uregs[REG_A0 + 0]
++#define mips_REG_A1 mips_regs.uregs[REG_A0 + 1]
++#define mips_REG_A2 mips_regs.uregs[REG_A0 + 2]
++#define mips_REG_A3 mips_regs.uregs[REG_A0 + 3]
++#define mips_REG_A4 mips_regs.uregs[REG_A0 + 4]
++#define mips_REG_A5 mips_regs.uregs[REG_A0 + 5]
++#define mips_REG_SP mips_regs.uregs[29]
++#define mips_REG_EPC mips_regs.uregs[34]
+-- 
+2.20.1
+
diff --git a/buildroot/package/strace/strace.hash b/buildroot/package/strace/strace.hash
index c6450b1c5..fe58f2391 100644
--- a/buildroot/package/strace/strace.hash
+++ b/buildroot/package/strace/strace.hash
@@ -1,4 +1,5 @@
 # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36
-# https://strace.io/files/4.23/strace-4.23.tar.xz
-sha256	7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad	strace-4.23.tar.xz
-sha256	df862ba273812c589fd69acc74197a25d38c5295baccab00a62d39d1894c0253	COPYING
+# https://strace.io/files/4.26/strace-4.26.tar.xz
+sha256	7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c	strace-4.26.tar.xz
+sha256	ba6d645dfe0f5e13bf1f117f0595e90076b845fc9aaa1d5778699792bb2d70b2	COPYING
+sha256	7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa	LGPL-2.1-or-later
diff --git a/buildroot/package/strace/strace.mk b/buildroot/package/strace/strace.mk
index 471dbc2e1..afcd5e71f 100644
--- a/buildroot/package/strace/strace.mk
+++ b/buildroot/package/strace/strace.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-STRACE_VERSION = 4.23
+STRACE_VERSION = 4.26
 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = https://strace.io/files/$(STRACE_VERSION)
-STRACE_LICENSE = BSD-3-Clause
-STRACE_LICENSE_FILES = COPYING
+STRACE_LICENSE = LGPL-2.1+
+STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later
 STRACE_CONF_OPTS = --enable-mpers=check
 
 # strace bundle some kernel headers to build libmpers, this mixes userspace
@@ -34,10 +34,12 @@ else
 STRACE_CONF_OPTS += --without-libiberty
 endif
 
+ifeq ($(BR2_PACKAGE_PERL),)
 define STRACE_REMOVE_STRACE_GRAPH
 	rm -f $(TARGET_DIR)/usr/bin/strace-graph
 endef
 
 STRACE_POST_INSTALL_TARGET_HOOKS += STRACE_REMOVE_STRACE_GRAPH
+endif
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch b/buildroot/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch
new file mode 100644
index 000000000..3d656f315
--- /dev/null
+++ b/buildroot/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch
@@ -0,0 +1,34 @@
+From 818ed67f67c487d519bb55ed5656cff2dd58375e Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Tue, 4 Dec 2018 21:41:12 +0100
+Subject: [PATCH] stress-ng.h: fix include on semaphore.h
+
+semaphore.h is available only if HAVE_LIB_PTHREAD and
+HAVE_SEM_POSIX are defined
+
+Fixes:
+ - http://autobuild.buildroot.org/results/1c95898b2833683a22bbe2ff8471fa08d94210e1
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/ColinIanKing/stress-ng/commit/9b861e679f9de32e4c68437453756f93e13c01fb]
+---
+ stress-ng.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/stress-ng.h b/stress-ng.h
+index 0485dc1c..1bf2e207 100644
+--- a/stress-ng.h
++++ b/stress-ng.h
+@@ -53,7 +53,9 @@
+ #include 
+ #include 
+ #include 
++#if defined(HAVE_LIB_PTHREAD) && (HAVE_SEM_POSIX)
+ #include 
++#endif
+ #include 
+ 
+ #if defined(__GNUC__) && defined(__linux__)
+-- 
+2.14.1
+
diff --git a/buildroot/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch b/buildroot/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch
new file mode 100644
index 000000000..8c1bf6025
--- /dev/null
+++ b/buildroot/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch
@@ -0,0 +1,29 @@
+From 748ac7e88833472211ccce82563beb5050528e00 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Tue, 4 Dec 2018 21:52:49 +0100
+Subject: [PATCH] stress-stackmmap: needs swapcontext
+
+Fixes:
+ - http://autobuild.buildroot.org/results/f2d3b06afa6e31527a71c03671c8f08eb3f46c36
+
+Signed-off-by: Fabrice Fontaine 
+---
+ stress-stackmmap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/stress-stackmmap.c b/stress-stackmmap.c
+index c2f4c31d..eb31d084 100644
+--- a/stress-stackmmap.c
++++ b/stress-stackmmap.c
+@@ -24,7 +24,7 @@
+  */
+ #include "stress-ng.h"
+ 
+-#if defined(__linux__)
++#if defined(HAVE_SWAPCONTEXT)
+ 
+ #include 
+ 
+-- 
+2.14.1
+
diff --git a/buildroot/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch b/buildroot/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch
new file mode 100644
index 000000000..931aaff2b
--- /dev/null
+++ b/buildroot/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch
@@ -0,0 +1,29 @@
+From 291070801245da26e4841c321910b55016ca23c0 Mon Sep 17 00:00:00 2001
+From: Vadim Kochan 
+Date: Tue, 1 Jan 2019 17:24:54 +0200
+Subject: [PATCH] test/test-bsd-wchar: Explicitly include stdio.h
+
+libbsd's wchar requires FILE for some it's functions, for some
+reason it is not included by wchar automatically and the test fails. So
+include it explicitly.
+
+Signed-off-by: Vadim Kochan 
+---
+ test/test-bsd-wchar.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/test-bsd-wchar.c b/test/test-bsd-wchar.c
+index 4f7c7ca..6125968 100644
+--- a/test/test-bsd-wchar.c
++++ b/test/test-bsd-wchar.c
+@@ -22,6 +22,7 @@
+  * functionality.
+  *
+  */
++#include 
+ #include 
+ 
+ int main(void)
+-- 
+2.14.1
+
diff --git a/buildroot/package/stress-ng/Config.in b/buildroot/package/stress-ng/Config.in
index 881632214..fe92a7eb4 100644
--- a/buildroot/package/stress-ng/Config.in
+++ b/buildroot/package/stress-ng/Config.in
@@ -2,8 +2,7 @@ config BR2_PACKAGE_STRESS_NG
 	bool "stress-ng"
 	depends on BR2_USE_MMU # fork()
 	# disabled on musl: stress-malloc.c needs mallopt() and M_MMAP_THRESHOLD
-	# disabled on uClibc: stress-aio.c needs aio.h
-	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on !BR2_TOOLCHAIN_USES_MUSL
 	# perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
 	depends on !BR2_microblaze # keyutils
@@ -21,8 +20,8 @@ config BR2_PACKAGE_STRESS_NG
 
 	  http://kernel.ubuntu.com/~cking/stress-ng/
 
-comment "stress-ng needs a glibc toolchain w/ dynamic library, headers >= 3.3"
+comment "stress-ng needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.3"
 	depends on !BR2_microblaze && !BR2_nios2 && !BR2_arc
 	depends on BR2_USE_MMU
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 \
-		|| !BR2_TOOLCHAIN_USES_GLIBC
+		|| BR2_TOOLCHAIN_USES_MUSL
diff --git a/buildroot/package/stress-ng/stress-ng.hash b/buildroot/package/stress-ng/stress-ng.hash
index e0185fad1..c7c6ec0fe 100644
--- a/buildroot/package/stress-ng/stress-ng.hash
+++ b/buildroot/package/stress-ng/stress-ng.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 485f6e7384614fd96955bea4d1f79cd75f8be7e8da30cb3a7e8724ff7b75cd9c stress-ng-0.09.39.tar.xz
+sha256 ed888f5192297855f3ce39b4591b1decc9c580c9753f2cc9c86449f50d23aeb0 stress-ng-0.09.47.tar.xz
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/buildroot/package/stress-ng/stress-ng.mk b/buildroot/package/stress-ng/stress-ng.mk
index 26e100f45..42b27e3cd 100644
--- a/buildroot/package/stress-ng/stress-ng.mk
+++ b/buildroot/package/stress-ng/stress-ng.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-STRESS_NG_VERSION = 0.09.39
+STRESS_NG_VERSION = 0.09.47
 STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
 STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
 STRESS_NG_LICENSE = GPL-2.0+
@@ -12,6 +12,10 @@ STRESS_NG_LICENSE_FILES = COPYING
 
 STRESS_NG_DEPENDENCIES = attr keyutils
 
+ifeq ($(BR2_PACKAGE_LIBBSD),y)
+STRESS_NG_DEPENDENCIES += libbsd
+endif
+
 define STRESS_NG_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
 endef
diff --git a/buildroot/package/stunnel/stunnel.hash b/buildroot/package/stunnel/stunnel.hash
index d3b9451ce..999a4500e 100644
--- a/buildroot/package/stunnel/stunnel.hash
+++ b/buildroot/package/stunnel/stunnel.hash
@@ -1,5 +1,5 @@
-# From https://www.stunnel.org/downloads/stunnel-5.44.tar.gz.sha256
-sha256	990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299	stunnel-5.44.tar.gz
+# From https://www.stunnel.org/downloads/stunnel-5.53.tar.gz.sha256
+sha256	80439896ee14269eb70bc8bc669433c7d619018a62c9f9c5c760a24515302585	stunnel-5.53.tar.gz
 # Locally calculated
-sha256	c43821865591e4d893906e2801b5ec4de58e51978f5563a61475cd0adc0bec4d	COPYING
+sha256	81d0b7244f44ef81dd0b299cf681037c5a42d468b8533e53aff6d1ac84c97dc8	COPYING
 sha256	1ee2b290e92c211b08df10e9fcaf32596cdb22b8eae731b18c2c074a4a83eebe	COPYRIGHT.GPL
diff --git a/buildroot/package/stunnel/stunnel.mk b/buildroot/package/stunnel/stunnel.mk
index 4a5d2a033..adfa0748a 100644
--- a/buildroot/package/stunnel/stunnel.mk
+++ b/buildroot/package/stunnel/stunnel.mk
@@ -5,14 +5,14 @@
 ################################################################################
 
 STUNNEL_VERSION_MAJOR = 5
-STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).44
+STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).53
 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x
-STUNNEL_DEPENDENCIES = openssl
+STUNNEL_DEPENDENCIES = host-pkgconf openssl
 STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \
 	--disable-libwrap
 STUNNEL_CONF_ENV = \
 	ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) \
-	LIBS=$(if $(BR2_STATIC_LIBS),-lz)
+	LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 STUNNEL_LICENSE = GPL-2.0+
 STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL
 
diff --git a/buildroot/package/subversion/subversion.hash b/buildroot/package/subversion/subversion.hash
index 6adb57c1a..be0c8ec93 100644
--- a/buildroot/package/subversion/subversion.hash
+++ b/buildroot/package/subversion/subversion.hash
@@ -1,4 +1,5 @@
-# From http://subversion.apache.org/download.cgi#recommended-release
-sha1 874b81749cdc3e88152d103243c3623ac6338388  subversion-1.9.7.tar.bz2
-# From https://www.apache.org/dist/subversion/subversion-1.9.7.tar.bz2.sha512
-sha512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b  subversion-1.9.7.tar.bz2
+# From https://www.apache.org/dist/subversion/subversion-1.9.10.tar.bz2.sha512
+sha512 58ac11078e0e5a1720199e5c66da76e7a20b86d02edcb8d313f98e2ddc74ae70aa3e0763a7d8a8fcb5a1fd7d65186829625ff110d78028b1c447e91f420d6f48 subversion-1.9.10.tar.bz2
+
+# Locally calculated
+sha256 3202942c1aba495fd17390618dedc1d3542815c5bc11958da7fd98c985abc11a LICENSE
diff --git a/buildroot/package/subversion/subversion.mk b/buildroot/package/subversion/subversion.mk
index 55738a826..0e26cfd4b 100644
--- a/buildroot/package/subversion/subversion.mk
+++ b/buildroot/package/subversion/subversion.mk
@@ -4,12 +4,19 @@
 #
 ################################################################################
 
-SUBVERSION_VERSION = 1.9.7
+SUBVERSION_VERSION = 1.9.10
 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2
 SUBVERSION_SITE = http://mirror.catn.com/pub/apache/subversion
 SUBVERSION_LICENSE = Apache-2.0
 SUBVERSION_LICENSE_FILES = LICENSE
-SUBVERSION_DEPENDENCIES = host-pkgconf apr apr-util expat zlib sqlite
+SUBVERSION_DEPENDENCIES = \
+	host-pkgconf \
+	apr \
+	apr-util \
+	expat \
+	zlib \
+	sqlite \
+	$(TARGET_NLS_DEPENDENCIES)
 SUBVERSION_AUTORECONF = YES
 SUBVERSION_CONF_OPTS = \
 	--with-expat=$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/lib: \
@@ -22,5 +29,6 @@ SUBVERSION_CONF_OPTS = \
 	--without-sasl \
 	--without-gnome-keyring \
 	--without-libmagic
+SUBVERSION_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/sunxi-cedarx/sunxi-cedarx.mk b/buildroot/package/sunxi-cedarx/sunxi-cedarx.mk
index 219f1bc74..5b99f0418 100644
--- a/buildroot/package/sunxi-cedarx/sunxi-cedarx.mk
+++ b/buildroot/package/sunxi-cedarx/sunxi-cedarx.mk
@@ -19,7 +19,7 @@ SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel2
 endif
 
 define SUNXI_CEDARX_BUILD_AVHEAP
-	$(TARGET_CC) $(TARGET_CFLAGS) \
+	$(TARGET_CC) $(TARGET_CFLAGS) -fPIC \
 		-c $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.c \
 		-o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o \
 		-I $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap \
diff --git a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash
index 8a89d80d8..f2b18926d 100644
--- a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash
+++ b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 5e3bf2007c9b5201207f436f37c96f1386b81798288b8fef0ee35c71a1cadb5b  sunxi-mali-mainline-driver-143ff2b17de63ce931c4f758771969e75c09a4c7.tar.gz
+sha256 c5f787cc498cc3e156efa70acc3fbf8dc636fba0f677aac66bdded2fda4a529d  sunxi-mali-mainline-driver-e28c274f85c65ebec82cdf0f8d021895e105d917.tar.gz
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE
diff --git a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
index c7f294cbf..a77ee91f7 100644
--- a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
+++ b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUNXI_MALI_MAINLINE_DRIVER_VERSION = 143ff2b17de63ce931c4f758771969e75c09a4c7
+SUNXI_MALI_MAINLINE_DRIVER_VERSION = e28c274f85c65ebec82cdf0f8d021895e105d917
 SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION))
 SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux
 SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0
diff --git a/buildroot/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch b/buildroot/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch
new file mode 100644
index 000000000..997c413f2
--- /dev/null
+++ b/buildroot/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch
@@ -0,0 +1,59 @@
+From 5c0a443ba336f10a8db6a99c769aa84ad37ed4d2 Mon Sep 17 00:00:00 2001
+From: Vadim Kochan 
+Date: Wed, 20 Feb 2019 02:48:43 +0200
+Subject: [PATCH] meminfo: Access to io memory via pointers
+
+The main reason for this is to be able compile with musl library,
+because there is no support of inx/outx functions for ARM platform.
+
+Signed-off-by: Vadim Kochan 
+---
+ meminfo.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/meminfo.c b/meminfo.c
+index 0b0ff23..7d9f10f 100644
+--- a/meminfo.c
++++ b/meminfo.c
+@@ -22,7 +22,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ #include 
+ 
+ #include "common.h"
+@@ -74,24 +73,26 @@ static enum sunxi_soc_version soc_version;
+ unsigned int
+ sunxi_io_read(void *base, int offset)
+ {
+-	return inl((unsigned long) (base + offset));
++	unsigned long port = (unsigned long) (base + offset);
++	return *((volatile unsigned long *) port);
+ }
+ 
+ void
+ sunxi_io_write(void *base, int offset, unsigned int value)
+ {
+-	outl(value, (unsigned long) (base + offset));
++	unsigned long port = (unsigned long) (base + offset);
++	*((volatile unsigned long *) port) = value;
+ }
+ 
+ void
+ sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask)
+ {
+-	unsigned int tmp = inl((unsigned long) (base + offset));
++	unsigned int tmp = sunxi_io_read(base, offset);
+ 
+ 	tmp &= ~mask;
+ 	tmp |= value & mask;
+ 
+-	outl(tmp, (unsigned long) (base + offset));
++	sunxi_io_write(base, offset, tmp);
+ }
+ 
+ 
+-- 
+2.14.1
+
diff --git a/buildroot/package/sunxi-tools/Config.in b/buildroot/package/sunxi-tools/Config.in
index 02eba9561..80a7130a9 100644
--- a/buildroot/package/sunxi-tools/Config.in
+++ b/buildroot/package/sunxi-tools/Config.in
@@ -1,9 +1,69 @@
 config BR2_PACKAGE_SUNXI_TOOLS
-	bool "sunxi nand-part"
+	bool "sunxi-tools"
 	depends on BR2_arm
 	help
-	  nand-part is part of sunxi-tools for Allwinner A10 (aka
-	  sun4i) and A13 (aka sun5i) based devices. It is a tool to
-	  repartition the internal NAND on sunxi devices.
+	  Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i)
+	  based devices.
 
 	  http://linux-sunxi.org/Sunxi-tools
+
+if BR2_PACKAGE_SUNXI_TOOLS
+
+config BR2_PACKAGE_SUNXI_TOOLS_FEXC
+	bool "sunxi-fexc (fex2bin & bin2fex)"
+	help
+	  Convert between .fex board definition files and binary
+	  format. These tools are specific for the linux-sunxi kernel
+	  and do not apply to the mainline Linux kernel version.
+
+config BR2_PACKAGE_SUNXI_TOOLS_BOOTINFO
+	bool "sunxi-bootinfo"
+	help
+	  Displays information about sunxi boot code.
+
+config BR2_PACKAGE_SUNXI_TOOLS_FEL
+	bool "sunxi-fel"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
+	help
+	  The sunxi-fel command can interact with a sunxi device in
+	  fel mode. This allows do download code to memory and execute
+	  it.
+
+comment "sunxi-fel needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_SUNXI_TOOLS_NAND_PART
+	bool "sunxi-nand-part"
+	default y
+	help
+	  The sunxi-nand-part command allows to repartition the internal
+	  NAND on sunxi devices.
+
+config BR2_PACKAGE_SUNXI_TOOLS_PIO
+	bool "sunxi-pio"
+	help
+	  GPIO manipulation tool for sunxi boards.
+
+config BR2_PACKAGE_SUNXI_TOOLS_MEMINFO
+	bool "sunxi-meminfo"
+	help
+	  Utility to retrieve DRAM information from registers on
+	  Allwinner SoCs. Specific for the linux-sunxi kernel - does
+	  not apply to the mainline Linux kernel version.
+
+config BR2_PACKAGE_SUNXI_TOOLS_PHOENIX_INFO
+	bool "phoenix_info"
+	help
+	  Display information about self-installing SD card images
+	  (created with Phoenix Card).
+
+	  https://linux-sunxi.org/PhoenixCard
+
+config BR2_PACKAGE_SUNXI_TOOLS_NAND_IMAGE_BUILDER
+	bool "sunxi-nand-image-builder"
+	help
+	  Creates a raw NAND image that can be read by the sunxi NAND
+	  controller.
+
+endif # BR2_PACKAGE_SUNXI_TOOLS
diff --git a/buildroot/package/sunxi-tools/sunxi-tools.mk b/buildroot/package/sunxi-tools/sunxi-tools.mk
index 3a44cf6fd..ee590fb95 100644
--- a/buildroot/package/sunxi-tools/sunxi-tools.mk
+++ b/buildroot/package/sunxi-tools/sunxi-tools.mk
@@ -11,25 +11,52 @@ SUNXI_TOOLS_LICENSE_FILES = LICENSE.md
 HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf
 FEX2BIN = $(HOST_DIR)/bin/fex2bin
 
+SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_FEXC) += sunxi-fexc
+SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_BOOTINFO) += sunxi-bootinfo
+SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_FEL) += sunxi-fel
+SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_NAND_PART) += sunxi-nand-part
+SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_PIO) += sunxi-pio
+SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_MEMINFO) += sunxi-meminfo
+SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_PHOENIX_INFO) += phoenix_info
+SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_NAND_IMAGE_BUILDER) += \
+	sunxi-nand-image-builder
+
+ifeq ($(BR2_PACKAGE_SUNXI_TOOLS_FEXC),y)
+SUNXI_TOOLS_FEXC_LINKS += fex2bin bin2fex
+endif
+
+ifeq ($(BR2_PACKAGE_SUNXI_TOOLS_FEL),y)
+SUNXI_TOOLS_DEPENDENCIES += libusb host-pkgconf
+endif
+
 define HOST_SUNXI_TOOLS_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" PREFIX=$(HOST_DIR) \
-		EXTRA_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
-		-C $(@D) tools
+	$(HOST_MAKE_ENV) $(MAKE) CROSS_COMPILE="" CC="$(HOSTCC)" \
+		PREFIX=$(HOST_DIR) EXTRA_CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) tools misc
 endef
 
 define HOST_SUNXI_TOOLS_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) PREFIX=$(HOST_DIR) \
-		-C $(@D) install-tools
+	$(HOST_MAKE_ENV) $(MAKE) CROSS_COMPILE="" CC="$(HOSTCC)" \
+		PREFIX=$(HOST_DIR) EXTRA_CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)"  -C $(@D) install-tools install-misc
 endef
 
 define SUNXI_TOOLS_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" PREFIX=/usr \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \
-		-C $(@D) sunxi-nand-part
+	$(foreach t,$(SUNXI_TOOLS_TARGETS_y), \
+		$(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
+			CC="$(TARGET_CC)" PREFIX=/usr \
+			EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+			LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) $(t)
+	)
 endef
 
 define SUNXI_TOOLS_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/sunxi-nand-part $(TARGET_DIR)/usr/bin/sunxi-nand-part
+	$(foreach t,$(SUNXI_TOOLS_TARGETS_y), \
+		$(INSTALL) -D -m 0755 $(@D)/$(t) $(TARGET_DIR)/usr/bin/$(t)
+	)
+	$(foreach t,$(SUNXI_TOOLS_FEXC_LINKS), \
+		ln -nfs sunxi-fexc $(TARGET_DIR)/usr/bin/$(t)
+	)
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot/package/supertux/0001-Fix-build-on-PowerPC.patch b/buildroot/package/supertux/0001-Fix-build-on-PowerPC.patch
new file mode 100644
index 000000000..e40abac6b
--- /dev/null
+++ b/buildroot/package/supertux/0001-Fix-build-on-PowerPC.patch
@@ -0,0 +1,81 @@
+From cfcd478fe69ca1b3923f388a349a4f67ac2c03aa Mon Sep 17 00:00:00 2001
+From: Shawn Anastasio 
+Date: Sun, 3 Feb 2019 13:22:57 -0600
+Subject: [PATCH] Fix build on PowerPC
+
+On PowerPC-based architectures, SDL includes the altivec.h header
+for SIMD intrinsics. Unfortunately, altivec.h defines some types which
+conflict with C++ types like bool and std::vector. This commit adds
+a wrapper for altivec.h which resolves these conflicts and allows
+supertux to build and run.
+
+Tested on a ppc64le workstation.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/SuperTux/supertux/pull/1056/commits/cfcd478fe69ca1b3923f388a349a4f67ac2c03aa]
+---
+ CMakeLists.txt    | 15 ++++++++++++++-
+ src/ppc/altivec.h |  6 ++++++
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+ create mode 100644 src/ppc/altivec.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 70b9673b50..b9b6ea3ea6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -376,6 +376,11 @@ endif()
+ 
+ include(ConfigureChecks)
+ 
++# Include altivec wrapper on ppc
++if(CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc.*")
++  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/ppc)
++endif()
++
+ 
+ ## Also build external/squirrel
+ 
+@@ -420,6 +425,13 @@ if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/CMakeLists.txt)
+   message(FATAL_ERROR "tinygettext submodule is not checked out or ${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/CMakeLists.txt is missing")
+ endif()
+ 
++# Include altivec wrapper on ppc
++if(CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc.*")
++  set(TINYGETTEXT_CXX_FLAGS "-isystem ${CMAKE_CURRENT_SOURCE_DIR}/src/ppc ${CMAKE_CXX_FLAGS}")
++else()
++  set(TINYGETTEXT_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++endif()
++
+ set(TINYGETTEXT_PREFIX ${CMAKE_BINARY_DIR}/tinygettext/)
+ ExternalProject_Add(tinygettext
+   SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/tinygettext/"
+@@ -428,7 +440,7 @@ ExternalProject_Add(tinygettext
+   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+   -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+-  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
++  -DCMAKE_CXX_FLAGS=${TINYGETTEXT_CXX_FLAGS}
+   -DBUILD_SHARED_LIBS=OFF
+   -DHAVE_SDL=ON
+   -DVCPKG_BUILD=${VCPKG_BUILD}
+@@ -443,6 +455,7 @@ set_target_properties(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEX
+ 
+ include_directories(SYSTEM ${TINYGETTEXT_PREFIX}/include)
+ 
++
+ ## external/SDL_ttf with patches
+ find_package(Freetype REQUIRED)
+ find_package(RAQM)
+diff --git a/src/ppc/altivec.h b/src/ppc/altivec.h
+new file mode 100644
+index 0000000000..7ede8246ed
+--- /dev/null
++++ b/src/ppc/altivec.h
+@@ -0,0 +1,6 @@
++#include_next 
++
++// The altivec headers redefine vector and bool which conflict
++// with C++'s bool type and std::vector. Undefine them here.
++#undef vector
++#undef bool
diff --git a/buildroot/package/supertux/Config.in b/buildroot/package/supertux/Config.in
index 684c2cc94..c77d1ae2b 100644
--- a/buildroot/package/supertux/Config.in
+++ b/buildroot/package/supertux/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_SUPERTUX
 	depends on BR2_PACKAGE_HAS_LIBGL # libglew
 	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_XORG7 # libglew, SDL2 OpenGL (GLX)
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 gcc attributes noreturn
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
 	depends on BR2_USE_MMU # SDL2 OpenGL (GLX)
 	depends on !BR2_STATIC_LIBS # SDL2
@@ -12,11 +12,14 @@ config BR2_PACKAGE_SUPERTUX
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_DATE_TIME
 	select BR2_PACKAGE_BOOST_FILESYSTEM
+	select BR2_PACKAGE_BOOST_LOCALE
 	select BR2_PACKAGE_BOOST_SYSTEM
+	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBGLEW
 	select BR2_PACKAGE_LIBGLU # GL/glu.h
 	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_LIBVORBIS
 	select BR2_PACKAGE_OPENAL
 	select BR2_PACKAGE_PHYSFS
@@ -30,10 +33,10 @@ config BR2_PACKAGE_SUPERTUX
 
 	  http://supertux.github.io/
 
-comment "supertux needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library, wchar"
+comment "supertux needs OpenGL and a toolchain w/ C++, gcc >= 6, NPTL, dynamic library, wchar"
 	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
 		BR2_STATIC_LIBS || !BR2_USE_WCHAR
diff --git a/buildroot/package/supertux/supertux.hash b/buildroot/package/supertux/supertux.hash
index c56f608ed..23e2645da 100644
--- a/buildroot/package/supertux/supertux.hash
+++ b/buildroot/package/supertux/supertux.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 c9dc3b42991ce5c5d0d0cb94e44c4ec2373ad09029940f0e92331e7e9ada0ac5 SuperTux-v0.5.1-Source.tar.gz
+sha256 c4c3e5fa6f90e87b8c5ad6b22a179e9a9839bf997e7f219e22bbcd1c97223ac0 SuperTux-v0.6.0-Source.tar.gz
diff --git a/buildroot/package/supertux/supertux.mk b/buildroot/package/supertux/supertux.mk
index e39744186..5842b17ba 100644
--- a/buildroot/package/supertux/supertux.mk
+++ b/buildroot/package/supertux/supertux.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUPERTUX_VERSION = 0.5.1
+SUPERTUX_VERSION = 0.6.0
 SUPERTUX_SITE = https://github.com/SuperTux/supertux/releases/download/v$(SUPERTUX_VERSION)
 SUPERTUX_SOURCE = SuperTux-v$(SUPERTUX_VERSION)-Source.tar.gz
 
@@ -15,9 +15,10 @@ SUPERTUX_LICENSE_FILES = LICENSE.txt data/AUTHORS
 
 # Use bundled squirrel, tinygettext sexp-cpp packages which are hardcoded in
 # the CMake build system.
-SUPERTUX_DEPENDENCIES = host-pkgconf boost libcurl libgl libglew libglu \
-	libogg libvorbis openal physfs sdl2 sdl2_image
+SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew libglu \
+	libogg libpng libvorbis openal physfs sdl2 sdl2_image
 
+# CMAKE_BUILD_TYPE=Release: disable profiling code (-pg)
 # ENABLE_BOOST_STATIC_LIBS=OFF: use boost shared libraries since supertux
 # depends on !BR2_STATIC_LIBS and boost provide only shared libraries with
 # BR2_SHARED_LIBS.
@@ -26,14 +27,17 @@ SUPERTUX_DEPENDENCIES = host-pkgconf boost libcurl libgl libglew libglu \
 # Install the game directly in /usr/bin and game data in /usr/share/supertux2.
 # Force using physfs.so from staging since the check on PHYSFS_getPrefDir symbol
 # in physfs.h (CHECK_SYMBOL_EXISTS) doesn't work.
+# ENABLE_OPENGLES2=OFF: Disable opengles2 for now.
 SUPERTUX_CONF_OPTS += \
+	-DCMAKE_BUILD_TYPE=Release \
 	-DENABLE_BOOST_STATIC_LIBS=OFF \
 	-DBUILD_DOCUMENTATION=OFF \
 	-DENABLE_OPENGL=ON \
 	-DGLBINDING_ENABLED=OFF \
 	-DINSTALL_SUBDIR_BIN="bin" \
 	-DINSTALL_SUBDIR_SHARE="share/supertux2" \
-	-DUSE_SYSTEM_PHYSFS=ON
+	-DUSE_SYSTEM_PHYSFS=ON \
+	-DENABLE_OPENGLES2=OFF
 
 # Avoid incompatible posix_memalign declaration on x86 and x86_64 with
 # musl.
@@ -60,8 +64,6 @@ endif
 # [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58241#c3
 ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
 define SUPERTUX_FIX_ALTIVEC_ISSUE
-	$(SED) 's%std=c++0x%std=gnu++0x%' $(@D)/CMakeLists.txt
-	$(SED) 's%std=c++11%std=gnu++11%' $(@D)/CMakeLists.txt
 	$(SED) 's%std=c++0x%std=gnu++0x%' $(@D)/external/tinygettext/CMakeLists.txt
 endef
 SUPERTUX_POST_PATCH_HOOKS += SUPERTUX_FIX_ALTIVEC_ISSUE
diff --git a/buildroot/package/supervisor/S99supervisord b/buildroot/package/supervisor/S99supervisord
old mode 100755
new mode 100644
diff --git a/buildroot/package/swupdate/0001-Makefile-fix-static-build.patch b/buildroot/package/swupdate/0001-Makefile-fix-static-build.patch
new file mode 100644
index 000000000..56901f987
--- /dev/null
+++ b/buildroot/package/swupdate/0001-Makefile-fix-static-build.patch
@@ -0,0 +1,62 @@
+From 15a324f8c67548f219256a5a75ba8123cc5bdac6 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Mon, 4 Mar 2019 21:51:36 +0100
+Subject: [PATCH] Makefile: fix static build
+
+Don't build and install lua_swupdate.so if HAVE_LUA isn't set to y
+otherwise build will fail if the toolchain only suports building static
+libraries
+
+Fixes:
+ - http://autobuild.buildroot.org/results/c11c4d26983e0347d96f3dda62e6d72b031967bb
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/sbabic/swupdate/pull/49]
+---
+ Makefile | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index cfeb9a6..cac99b5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -369,11 +369,15 @@ tools-bins	:= $(patsubst $(tools-y)/%.c,$(tools-y)/%,$(wildcard $(tools-y)/*.c))
+ tools-bins-unstr:= $(patsubst %,%_unstripped,$(tools-bins))
+ tools-all	:= $(tools-objs)
+ 
++ifeq ($(HAVE_LUA),y)
++lua_swupdate	:= lua_swupdate.so
++endif
++
+ shared-dirs	:= $(shareds-y)
+ shared-libs	:= $(patsubst %,%/built-in.o, $(shareds-y))
+ shared-all	:= $(shared-libs)
+ 
+-all: swupdate ${tools-bins} lua_swupdate.so
++all: swupdate ${tools-bins} ${lua_swupdate}
+ 
+ # Do modpost on a prelinked vmlinux. The finally linked vmlinux has
+ # relevant sections renamed as per the linker script.
+@@ -434,7 +438,6 @@ install: all
+ 	install -d ${DESTDIR}/usr/bin
+ 	install -d ${DESTDIR}/usr/include
+ 	install -d ${DESTDIR}/usr/lib
+-	install -d ${DESTDIR}/usr/lib/lua/$(LUAVER)
+ 	install -m 755 swupdate ${DESTDIR}/usr/bin
+ 	for i in ${tools-bins};do \
+ 		install -m 755 $$i ${DESTDIR}/usr/bin; \
+@@ -443,7 +446,10 @@ install: all
+ 	install -m 0644 include/swupdate_status.h ${DESTDIR}/usr/include
+ 	install -m 0644 include/progress_ipc.h ${DESTDIR}/usr/include
+ 	install -m 0755 ipc/lib.a ${DESTDIR}/usr/lib/libswupdate.a
+-	install -m 0755 lua_swupdate.so $(DESTDIR)/usr/lib/lua/$(LUAVER)
++	if [ $(HAVE_LUA) = y ]; then \
++		install -d ${DESTDIR}/usr/lib/lua/$(LUAVER); \
++		install -m 0755 ${lua_swupdate} $(DESTDIR)/usr/lib/lua/$(LUAVER); \
++	fi
+ 
+ PHONY += run-tests
+ tests: \
+-- 
+2.14.1
+
diff --git a/buildroot/package/swupdate/swupdate.hash b/buildroot/package/swupdate/swupdate.hash
index 339f40e1b..138bd6d30 100644
--- a/buildroot/package/swupdate/swupdate.hash
+++ b/buildroot/package/swupdate/swupdate.hash
@@ -1,3 +1,6 @@
 # Locally calculated
 sha256  a65884ca18523cde1b0744d952d6f91462dbd4ad07941305f5684c6d4ec833dc  swupdate-2018.11.tar.gz
-sha256  dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa  COPYING
+sha256  43492b377cf2fb67942d1dd231146bd4e6578646ad13ef289297c9dd75cbc478  Licenses/Exceptions
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Licenses/lgpl-2.1.txt
+sha256  89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e  Licenses/mit.txt
diff --git a/buildroot/package/swupdate/swupdate.mk b/buildroot/package/swupdate/swupdate.mk
index 08d6ba937..78f23ec23 100644
--- a/buildroot/package/swupdate/swupdate.mk
+++ b/buildroot/package/swupdate/swupdate.mk
@@ -6,8 +6,9 @@
 
 SWUPDATE_VERSION = 2018.11
 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
-SWUPDATE_LICENSE = GPL-2.0+, LGPL-2.1+, MIT
-SWUPDATE_LICENSE_FILES = COPYING
+SWUPDATE_LICENSE = GPL-2.0+ with OpenSSL exception, LGPL-2.1+, MIT
+SWUPDATE_LICENSE_FILES = Licenses/Exceptions Licenses/gpl-2.0.txt \
+	Licenses/lgpl-2.1.txt Licenses/mit.txt
 
 # swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not
 # available in all external toolchains, and use CC for linking. Ensure
@@ -44,7 +45,7 @@ else
 SWUPDATE_MAKE_ENV += HAVE_LIBCURL=n
 endif
 
-ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
+ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER):$(BR2_STATIC_LIBS),y:)
 SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf
 # defines the base name for the pkg-config file ("lua" or "luajit")
 define SWUPDATE_SET_LUA_VERSION
diff --git a/buildroot/package/sysklogd/S01logging b/buildroot/package/sysklogd/S01logging
deleted file mode 100644
index 1cbfe869f..000000000
--- a/buildroot/package/sysklogd/S01logging
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		printf "Starting logging: "
-		/sbin/syslogd -m 0
-		/sbin/klogd
-		echo "OK"
-		;;
-	stop)
-		printf "Stopping logging: "
-		[ -f /var/run/klogd.pid ] && kill `cat /var/run/klogd.pid`
-		[ -f /var/run/syslogd.pid ] && kill `cat /var/run/syslogd.pid`
-		echo "OK"
-		;;
-	restart|reload)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-esac
-
-exit $?
diff --git a/buildroot/package/sysklogd/S01syslogd b/buildroot/package/sysklogd/S01syslogd
new file mode 100644
index 000000000..260363289
--- /dev/null
+++ b/buildroot/package/sysklogd/S01syslogd
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+DAEMON="syslogd"
+PIDFILE="/var/run/$DAEMON.pid"
+
+SYSLOGD_ARGS="-m 0"
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# shellcheck disable=SC2086 # we need the word splitting
+	start-stop-daemon -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
+		-- $SYSLOGD_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+# SIGHUP makes syslogd reload its configuration
+reload() {
+	printf 'Reloading %s: ' "$DAEMON"
+	start-stop-daemon -K -s HUP -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+case "$1" in
+	start|stop|restart|reload)
+		"$1";;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
diff --git a/buildroot/package/sysklogd/S02klogd b/buildroot/package/sysklogd/S02klogd
new file mode 100644
index 000000000..ba728aa99
--- /dev/null
+++ b/buildroot/package/sysklogd/S02klogd
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+DAEMON="klogd"
+PIDFILE="/var/run/$DAEMON.pid"
+
+KLOGD_ARGS=""
+
+KLOGD_RELOAD="0"
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# shellcheck disable=SC2086 # we need the word splitting
+	start-stop-daemon -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
+		-- $KLOGD_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+# SIGUSR1 makes klogd reload kernel module symbols
+# SIGUSR2 makes klogd reload static kernel symbols and kernel module symbols
+reload() {
+	printf 'Reloading %s: ' "$DAEMON"
+	start-stop-daemon -K -s "$KLOGD_RELOAD" -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+case "$1" in
+	start|stop|restart|reload)
+		"$1";;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
diff --git a/buildroot/package/sysklogd/sysklogd.mk b/buildroot/package/sysklogd/sysklogd.mk
index c4f064c10..976438c11 100644
--- a/buildroot/package/sysklogd/sysklogd.mk
+++ b/buildroot/package/sysklogd/sysklogd.mk
@@ -23,8 +23,10 @@ define SYSKLOGD_INSTALL_TARGET_CMDS
 endef
 
 define SYSKLOGD_INSTALL_INIT_SYSV
-	$(INSTALL) -m 755 -D package/sysklogd/S01logging \
-		$(TARGET_DIR)/etc/init.d/S01logging
+	$(INSTALL) -m 755 -D package/sysklogd/S01syslogd \
+		$(TARGET_DIR)/etc/init.d/S01syslogd
+	$(INSTALL) -m 755 -D package/sysklogd/S02klogd \
+		$(TARGET_DIR)/etc/init.d/S02klogd
 endef
 
 define SYSKLOGD_INSTALL_INIT_SYSTEMD
diff --git a/buildroot/package/syslog-ng/0001-fix-build-on-uclibc.patch b/buildroot/package/syslog-ng/0001-fix-build-on-uclibc.patch
new file mode 100644
index 000000000..dbb9b66b5
--- /dev/null
+++ b/buildroot/package/syslog-ng/0001-fix-build-on-uclibc.patch
@@ -0,0 +1,51 @@
+From 98bd6106f8c48bc8f0a27bd712ed4ba6249e9a5f Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 13 Jan 2019 11:03:51 +0100
+Subject: [PATCH] fix build on m68k with uclibc
+
+uclibc on m68k defines pthread_spinlock_t but does not define
+pthread_spin_trylock so check for this function before using it
+
+Fixes:
+ - http://autobuild.buildroot.org/results/0a6de11c030a4f39e402917809fc6d33fb463d1b
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/buytenh/ivykis/pull/17]
+---
+ configure.ac   | 3 +++
+ src/spinlock.h | 4 ++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/lib/ivykis/configure.ac b/lib/ivykis/configure.ac
+index e9b10c0..24152a9 100644
+--- a/lib/ivykis/configure.ac
++++ b/lib/ivykis/configure.ac
+@@ -110,6 +110,9 @@ AC_CACHE_CHECK(for linux/netfilter_ipv4.h, ac_cv_header_linux_netfilter_ipv4_h,
+ # Check for pthread_spinlock_t.
+ AC_CHECK_TYPES([pthread_spinlock_t], [], [], [[#include ]])
+ 
++# Check for pthread_spin_trylock
++AC_CHECK_FUNCS([pthread_spin_trylock])
++
+ # Check which header file defines 'struct timespec'.
+ for hdr in sys/time.h sys/timers.h time.h pthread.h
+ do
+diff --git a/lib/ivykis/src/spinlock.h b/lib/ivykis/src/spinlock.h
+index ebcdbec..d837df8 100644
+--- a/lib/ivykis/src/spinlock.h
++++ b/lib/ivykis/src/spinlock.h
+@@ -76,7 +76,11 @@ static inline void fallback_spin_unlock(fallback_spinlock_t *lock)
+ 
+ static inline int pthread_spinlocks_available(void)
+ {
++#ifdef HAVE_PTHREAD_SPIN_TRYLOCK
+ 	return !!(pthread_spin_trylock != NULL);
++#else
++	return 0;
++#endif
+ }
+ 
+ 
+-- 
+2.14.1
+
diff --git a/buildroot/package/syslog-ng/0001-modules-json-Adaptions-for-json-c-v0.13.patch b/buildroot/package/syslog-ng/0001-modules-json-Adaptions-for-json-c-v0.13.patch
deleted file mode 100644
index b307ab5ac..000000000
--- a/buildroot/package/syslog-ng/0001-modules-json-Adaptions-for-json-c-v0.13.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= 
-Date: Mon, 11 Dec 2017 15:46:06 +0100
-Subject: [PATCH] modules/json: Adaptions for json-c v0.13
-
-Signed-off-by: Baruch Siach 
----
-Patch status: upstream commit 1b824dd6389e
-
- modules/json/json-parser.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
-index 0368ed8f7ffe..356df48b9fc7 100644
---- a/modules/json/json-parser.c
-+++ b/modules/json/json-parser.c
-@@ -20,6 +20,8 @@
-  * COPYING for details.
-  */
- 
-+#define JSON_C_VER_013 (13 << 8)
-+
- #include "json-parser.h"
- #include "dot-notation.h"
- #include "scratch-buffers.h"
-@@ -28,7 +30,10 @@
- #include 
- 
- #include 
-+
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
- #include 
-+#endif
- 
- typedef struct _JSONParser
- {
--- 
-2.15.1
-
diff --git a/buildroot/package/syslog-ng/0002-build-make-dlsym-optional.patch b/buildroot/package/syslog-ng/0002-build-make-dlsym-optional.patch
new file mode 100644
index 000000000..bb29e1ed7
--- /dev/null
+++ b/buildroot/package/syslog-ng/0002-build-make-dlsym-optional.patch
@@ -0,0 +1,160 @@
+From d85121c0dc700cad4bd9735b0ee1dab9addf9dd7 Mon Sep 17 00:00:00 2001
+From: Kokan 
+Date: Thu, 17 Jan 2019 18:44:41 +0100
+Subject: [PATCH] build: make dlsym optional
+
+In case of static uClibc-ng lib, the  does not exists.
+
+The signal-handler.c solves an issue in case of program src/dst
+and Java destination. That combination is really rare if not impossible.
+
+This patch simply disables own sigaction if  is not present.
+
+Signed-off-by: Kokan 
+
+Downloaded from upstream commit
+https://github.com/balabit/syslog-ng/commit/d85121c0dc700cad4bd9735b0ee1dab9addf9dd7
+
+Signed-off-by: Chris Packham 
+---
+ CMakeLists.txt        |  1 +
+ configure.ac          |  1 +
+ lib/CMakeLists.txt    |  1 -
+ lib/Makefile.am       |  1 -
+ lib/signal-handler.c  |  8 ++++----
+ lib/signal-handler.h  | 31 -------------------------------
+ syslog-ng-config.h.in |  1 +
+ 7 files changed, 7 insertions(+), 37 deletions(-)
+ delete mode 100644 lib/signal-handler.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c847a547b..dee691388 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,6 +106,7 @@ check_symbol_exists("getrandom" "sys/random.h" SYSLOG_NG_HAVE_GETRANDOM)
+ 
+ check_include_files(utmp.h SYSLOG_NG_HAVE_UTMP_H)
+ check_include_files(utmpx.h SYSLOG_NG_HAVE_UTMPX_H)
++check_include_files(dlfcn.h SYSLOG_NG_HAVE_DLFCN_H)
+ 
+ check_struct_has_member("struct utmpx" "ut_type" "utmpx.h" UTMPX_HAS_UT_TYPE LANGUAGE C)
+ check_struct_has_member("struct utmp" "ut_type" "utmp.h" UTMP_HAS_UT_TYPE LANGUAGE C)
+diff --git a/configure.ac b/configure.ac
+index 6bdd8d252..6ef0ad2b4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -627,6 +627,7 @@ dnl ***************************************************************************
+ 
+ AC_HEADER_STDC
+ AC_CHECK_HEADER(dmalloc.h)
++AC_CHECK_HEADER(dlfcn.h)
+ AC_CHECK_HEADERS(strings.h	\
+ 	getopt.h		\
+ 	stropts.h		\
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index be2da32a4..5268712e9 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -91,7 +91,6 @@ set (LIB_HEADERS
+     logthrdestdrv.h
+     logwriter.h
+     mainloop.h
+-    signal-handler.h
+     mainloop-call.h
+     mainloop-worker.h
+     mainloop-io-worker.h
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index ec1928795..5f9e93d79 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -129,7 +129,6 @@ pkginclude_HEADERS			+= \
+ 	lib/logthrdestdrv.h		\
+ 	lib/logwriter.h			\
+ 	lib/mainloop.h			\
+-	lib/signal-handler.h		\
+ 	lib/mainloop-call.h		\
+ 	lib/mainloop-worker.h		\
+ 	lib/mainloop-io-worker.h	\
+diff --git a/lib/signal-handler.c b/lib/signal-handler.c
+index 5657ba182..8f52f675b 100644
+--- a/lib/signal-handler.c
++++ b/lib/signal-handler.c
+@@ -21,14 +21,15 @@
+  * COPYING for details.
+  *
+  */
+-#include "signal-handler.h"
+ 
+ #include "syslog-ng.h"
+ #include "children.h"
+ 
+-#ifndef _WIN32
++#include 
++
++#if SYSLOG_NG_HAVE_DLFCN_H
++
+ #include 
+-#endif
+ 
+ static const struct sigaction *sgchld_handler;
+ 
+@@ -41,7 +42,6 @@ trigger_sigchld_handler_chain(int signum)
+     }
+ }
+ 
+-#ifndef _WIN32
+ static int
+ call_original_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact)
+ {
+diff --git a/lib/signal-handler.h b/lib/signal-handler.h
+deleted file mode 100644
+index 36e5ac293..000000000
+--- a/lib/signal-handler.h
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/*
+- * Copyright (c) 2018 Balabit
+- * Copyright (c) 2018 Kokan
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+- *
+- * As an additional exemption you are allowed to compile & link against the
+- * OpenSSL libraries as published by the OpenSSL project. See the file
+- * COPYING for details.
+- *
+- */
+-#ifndef SIGNAL_HANDLER_H_INCLUDED
+-#define SIGNAL_HANDLER_H_INCLUDED
+-
+-#include 
+-
+-void trigger_sigchld_handler_chain(int);
+-
+-#endif
+diff --git a/syslog-ng-config.h.in b/syslog-ng-config.h.in
+index 9e372f103..d8208eedd 100644
+--- a/syslog-ng-config.h.in
++++ b/syslog-ng-config.h.in
+@@ -38,6 +38,7 @@
+ #cmakedefine SYSLOG_NG_PATH_XSDDIR "@SYSLOG_NG_PATH_XSDDIR@"
+ #cmakedefine SYSLOG_NG_HAVE_GETUTENT @SYSLOG_NG_HAVE_GETUTENT@
+ #cmakedefine SYSLOG_NG_HAVE_GETUTXENT @SYSLOG_NG_HAVE_GETUTXENT@
++#cmakedefine SYSLOG_NG_HAVE_DLFCN_H @SYSLOG_NG_HAVE_DLFCN_H@
+ #cmakedefine SYSLOG_NG_HAVE_UTMPX_H @SYSLOG_NG_HAVE_UTMPX_H@
+ #cmakedefine SYSLOG_NG_HAVE_UTMP_H @SYSLOG_NG_HAVE_UTMP_H@
+ #cmakedefine SYSLOG_NG_HAVE_MODERN_UTMP @SYSLOG_NG_HAVE_MODERN_UTMP@
+-- 
+2.20.1
+
diff --git a/buildroot/package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch b/buildroot/package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch
new file mode 100644
index 000000000..0f8454af9
--- /dev/null
+++ b/buildroot/package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch
@@ -0,0 +1,49 @@
+From a844abca43349739c36a4cdb7ea6f3bce560bd7f Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer 
+Date: Thu, 8 Nov 2018 08:14:46 +0100
+Subject: [PATCH] look for pthread_atfork() also in lib c_nonshared
+
+Newer versions of glibc do not have pthread_nonshared anymore, instead the
+symbol is in c_nonshared. This fixes a crash on start on those platforms
+(namely with syslog-ng).
+
+Signed-off-by: Rolf Eike Beer 
+[ThomasDS: backport from https://github.com/buytenh/ivykis/pull/16, at this
+moment not yet merged upstream.
+See also:
+- https://github.com/buytenh/ivykis/issues/15
+- https://github.com/balabit/syslog-ng/issues/2263
+]
+Signed-off-by: Thomas De Schampheleire 
+
+---
+ configure.ac | 2 ++
+ src/pthr.h   | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/ivykis/configure.ac b/lib/ivykis/configure.ac
+index e9b10c0..56440d1 100644
+--- a/lib/ivykis/configure.ac
++++ b/lib/ivykis/configure.ac
+@@ -88,6 +88,8 @@ esac
+ # link in libpthread_nonshared.a if it is available.
+ #
+ AC_CHECK_LIB([pthread_nonshared], [pthread_atfork])
++# the lib is gone in glibc 2.28, things are now in c_nonshared
++AC_CHECK_LIB([c_nonshared], [pthread_atfork])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([process.h])
+diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h
+index a41eaf3..32c1af2 100644
+--- a/lib/ivykis/src/pthr.h
++++ b/lib/ivykis/src/pthr.h
+@@ -42,7 +42,7 @@ static inline int pthreads_available(void)
+  * symbol because that causes it to be undefined even if you link
+  * libpthread_nonshared.a in explicitly.
+  */
+-#ifndef HAVE_LIBPTHREAD_NONSHARED
++#if !defined(HAVE_LIBPTHREAD_NONSHARED) && !defined(HAVE_LIBC_NONSHARED)
+ #pragma weak pthread_atfork
+ #endif
+ 
diff --git a/buildroot/package/syslog-ng/S01logging b/buildroot/package/syslog-ng/S01logging
deleted file mode 100644
index d7c899a1e..000000000
--- a/buildroot/package/syslog-ng/S01logging
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-start() {
-	printf "Starting syslog-ng daemon: "
-	start-stop-daemon -S -q -p /var/run/syslog-ng.pid \
-		-x /usr/sbin/syslog-ng -- --pidfile /var/run/syslog-ng.pid
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
-}
-
-stop() {
-	printf "Stopping syslog-ng daemon: "
-	start-stop-daemon -K -q -p /var/run/syslog-ng.pid \
-		-x /usr/sbin/syslog-ng
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
-}
-
-restart() {
-	stop
-	sleep 1
-	start
-}
-
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart|reload)
-		restart
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-		exit 1
-esac
-
-exit $?
diff --git a/buildroot/package/syslog-ng/S01syslog-ng b/buildroot/package/syslog-ng/S01syslog-ng
new file mode 100644
index 000000000..2ced6f8b0
--- /dev/null
+++ b/buildroot/package/syslog-ng/S01syslog-ng
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+DAEMON="syslog-ng"
+PIDFILE="/var/run/$DAEMON.pid"
+
+SYSLOG_NG_ARGS=""
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# shellcheck disable=SC2086 # we need the word splitting
+	start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \
+		-- $SYSLOG_NG_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+# SIGHUP makes syslog-ng reload its configuration
+reload() {
+	printf 'Reloading %s: ' "$DAEMON"
+	start-stop-daemon -K -s HUP -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+case "$1" in
+	start|stop|restart|reload)
+		"$1";;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
diff --git a/buildroot/package/syslog-ng/syslog-ng.conf b/buildroot/package/syslog-ng/syslog-ng.conf
index e767255d7..9a56a1302 100644
--- a/buildroot/package/syslog-ng/syslog-ng.conf
+++ b/buildroot/package/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.10
+@version: 3.19
 
 source s_sys {
 	file("/proc/kmsg" program_override("kernel"));
diff --git a/buildroot/package/syslog-ng/syslog-ng.hash b/buildroot/package/syslog-ng/syslog-ng.hash
index d9c51e9f1..1f83e39ff 100644
--- a/buildroot/package/syslog-ng/syslog-ng.hash
+++ b/buildroot/package/syslog-ng/syslog-ng.hash
@@ -1,2 +1,5 @@
 # Locally computed
-sha256 a905fe7bad09dcf40bf03650ef1c287b511bf262d004464b8993a28ce58c9136  syslog-ng-3.10.1.tar.gz
+sha256 5cf931a9d7bead0e6d9a2c65eee8f6005a005878f59aa280f3c4294257ed5178  syslog-ng-3.19.1.tar.gz
+sha256 835219c8ca76156e6337236d1bcb8e617c0b1c2783b4a8bc478e18a86743d607  COPYING
+sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2  GPL.txt
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  LGPL.txt
diff --git a/buildroot/package/syslog-ng/syslog-ng.mk b/buildroot/package/syslog-ng/syslog-ng.mk
index 793fea097..4ac25a675 100644
--- a/buildroot/package/syslog-ng/syslog-ng.mk
+++ b/buildroot/package/syslog-ng/syslog-ng.mk
@@ -6,14 +6,14 @@
 
 # When updating the version, please check at runtime if the version in
 # syslog-ng.conf header needs to be updated
-SYSLOG_NG_VERSION = 3.10.1
+SYSLOG_NG_VERSION = 3.19.1
 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION)
 SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
-SYSLOG_NG_LICENSE_FILES = COPYING
+SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt
 SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
 	eventlog libglib2 openssl pcre
-# rabbit-mq needs -lrt
-SYSLOG_NG_CONF_ENV = LIBS=-lrt
+# We're patching configure.ac
+SYSLOG_NG_AUTORECONF = YES
 SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \
 	--disable-java --disable-java-modules --disable-mongodb
 
@@ -42,9 +42,7 @@ SYSLOG_NG_CONF_OPTS += \
 	--enable-python \
 	--with-python=$(PYTHON3_VERSION_MAJOR)
 else
-SYSLOG_NG_CONF_OPTS += \
-	--disable-python \
-	--without-python
+SYSLOG_NG_CONF_OPTS += --disable-python
 endif
 
 ifeq ($(BR2_PACKAGE_LIBESMTP),y)
@@ -83,6 +81,13 @@ else
 SYSLOG_NG_CONF_OPTS += --disable-http
 endif
 
+ifeq ($(BR2_PACKAGE_RABBITMQ_C),y)
+SYSLOG_NG_DEPENDENCIES += rabbitmq-c
+SYSLOG_NG_CONF_OPTS += --enable-amqp
+else
+SYSLOG_NG_CONF_OPTS += --disable-amqp
+endif
+
 ifeq ($(BR2_INIT_SYSTEMD),y)
 SYSLOG_NG_DEPENDENCIES += systemd
 SYSLOG_NG_CONF_OPTS += \
@@ -93,8 +98,18 @@ SYSLOG_NG_CONF_OPTS += --disable-systemd
 endif
 
 define SYSLOG_NG_INSTALL_INIT_SYSV
-	$(INSTALL) -m 0755 -D package/syslog-ng/S01logging \
-		$(TARGET_DIR)/etc/init.d/S01logging
+	$(INSTALL) -m 0755 -D package/syslog-ng/S01syslog-ng \
+		$(TARGET_DIR)/etc/init.d/S01syslog-ng
+endef
+
+# By default syslog-ng installs a .service that requires a config file at
+# /etc/default, so provide one with the default values.
+define SYSLOG_NG_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -m 0644 -D package/syslog-ng/syslog-ng@default \
+		$(TARGET_DIR)/etc/default/syslog-ng@default
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/syslog-ng@.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslog-ng@default.service
 endef
 
 # By default syslog-ng installs a number of sample configuration
diff --git a/buildroot/package/syslog-ng/syslog-ng@default b/buildroot/package/syslog-ng/syslog-ng@default
new file mode 100644
index 000000000..0fad00eba
--- /dev/null
+++ b/buildroot/package/syslog-ng/syslog-ng@default
@@ -0,0 +1,8 @@
+#
+# /etc/default/syslog-ng@default
+#
+CONFIG_FILE=/etc/syslog-ng.conf
+PERSIST_FILE=/var/run/syslog-ng.persist
+CONTROL_FILE=/var/run/syslog-ng.ctl
+PID_FILE=/var/run/syslog-ng.pid
+OTHER_OPTIONS="--enable-core"
diff --git a/buildroot/package/systemd-bootchart/Config.in b/buildroot/package/systemd-bootchart/Config.in
index 8deb6b9b7..9af13db1f 100644
--- a/buildroot/package/systemd-bootchart/Config.in
+++ b/buildroot/package/systemd-bootchart/Config.in
@@ -1,5 +1,18 @@
+config BR2_PACKAGE_SYSTEMD_BOOTCHART_ARCH_SUPPORTS
+	bool
+	# see src/architecture.h
+	default y if BR2_aarch64 || BR2_aarch64_be
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_i386 || BR2_x86_64
+	default y if BR2_m68k
+	default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
+	default y if BR2_sh
+	default y if BR2_sparc || BR2_sparc64
+
 config BR2_PACKAGE_SYSTEMD_BOOTCHART
 	bool "systemd-bootchart"
+	depends on BR2_PACKAGE_SYSTEMD_BOOTCHART_ARCH_SUPPORTS
 	depends on BR2_INIT_SYSTEMD
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
 	help
@@ -22,5 +35,6 @@ config BR2_PACKAGE_SYSTEMD_BOOTCHART
 	  http://www.freedesktop.org/software/systemd/man/systemd-bootchart.html
 
 comment "systemd-bootchart needs a toolchain w/ headers >= 3.17"
+	depends on BR2_PACKAGE_SYSTEMD_BOOTCHART_ARCH_SUPPORTS
 	depends on BR2_INIT_SYSTEMD
 	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
diff --git a/buildroot/package/systemd/0001-fix-getty-unit.patch b/buildroot/package/systemd/0001-fix-getty-unit.patch
index d546e1ab3..a12569f49 100644
--- a/buildroot/package/systemd/0001-fix-getty-unit.patch
+++ b/buildroot/package/systemd/0001-fix-getty-unit.patch
@@ -30,7 +30,7 @@ index 3c553240a..fd5ad9456 100644
  # option to preserve environment (-p), followed by '--' for safety, and then
  # the entered username.
 -ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM
-+ExecStart=-/sbin/getty -L %I 115200 vt100
++ExecStart=-/sbin/getty -L console 115200 vt100
  Type=idle
  Restart=always
  UtmpIdentifier=cons
diff --git a/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch b/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch
index a024ac4a2..793320778 100644
--- a/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch
+++ b/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch
@@ -33,7 +33,7 @@ diff --git a/meson.build b/meson.build
 index 04331dd41..359042c04 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -559,7 +559,7 @@ endforeach
+@@ -628,7 +628,7 @@ endforeach
  conf.set_quoted('TELINIT', get_option('telinit-path'))
  
  if run_command('ln', '--relative', '--help').returncode() != 0
diff --git a/buildroot/package/systemd/0003-build-sys-Detect-whether-struct-statx-is-defined-in-.patch b/buildroot/package/systemd/0003-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
deleted file mode 100644
index d849659c7..000000000
--- a/buildroot/package/systemd/0003-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From ebe5606eadb1241796ba9747d8e357bd6b3e912e Mon Sep 17 00:00:00 2001
-From: Filipe Brandenburger 
-Date: Sun, 15 Jul 2018 22:43:35 -0700
-Subject: [PATCH] build-sys: Detect whether struct statx is defined in
- sys/stat.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a
-definition for struct statx, in which case include file linux/stat.h should be
-avoided, in order to prevent a duplicate definition.
-
-    In file included from ../src/basic/missing.h:18,
-		     from ../src/basic/util.h:28,
-		     from ../src/basic/hashmap.h:10,
-		     from ../src/shared/bus-util.h:12,
-		     from ../src/libsystemd/sd-bus/bus-creds.c:11:
-    /usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’
-     struct statx {
-	    ^~~~~
-    In file included from /usr/include/sys/stat.h:446,
-		     from ../src/basic/util.h:19,
-		     from ../src/basic/hashmap.h:10,
-		     from ../src/shared/bus-util.h:12,
-		     from ../src/libsystemd/sd-bus/bus-creds.c:11:
-    /usr/include/bits/statx.h:36:8: note: originally defined here
-     struct statx
-	    ^~~~~
-
-Extend our meson.build to look for struct statx when only sys/stat.h is
-included and, in that case, do not include linux/stat.h anymore.
-
-Tested that systemd builds correctly when using a glibc version that includes a
-definition for struct statx.
-
-glibc Fedora RPM update:
-https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae
-
-glibc upstream commit:
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd
-
-(cherry picked from commit 75720bff62a84896e9a0654afc7cf9408cf89a38)
-Signed-off-by: Romain Naour 
----
- meson.build            | 5 +++++
- src/basic/missing.h    | 5 ++++-
- src/basic/xattr-util.c | 1 -
- 3 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 04331dd41..a0e724070 100644
---- a/meson.build
-+++ b/meson.build
-@@ -425,6 +425,7 @@ decl_headers = '''
- #include 
- '''
- # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
-+# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
- 
- foreach decl : ['char16_t',
-                 'char32_t',
-@@ -439,6 +440,10 @@ foreach decl : ['char16_t',
-         conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
- endforeach
- 
-+conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
-+#include 
-+''', args : '-D_GNU_SOURCE') > 0)
-+
- foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
-                 ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
-                 ['IFLA_VRF_TABLE',                   'linux/if_link.h'],
-diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 71a07d057..14ad3d491 100644
---- a/src/basic/missing.h
-+++ b/src/basic/missing.h
-@@ -15,7 +15,6 @@
- #include 
- #include 
- #include 
--#include 
- #include 
- #include 
- #include 
-@@ -25,6 +24,10 @@
- #include 
- #include 
- 
-+#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
-+#include 
-+#endif
-+
- #if HAVE_AUDIT
- #include 
- #endif
-diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
-index c5c55ea84..0ee097983 100644
---- a/src/basic/xattr-util.c
-+++ b/src/basic/xattr-util.c
-@@ -2,7 +2,6 @@
- 
- #include 
- #include 
--#include 
- #include 
- #include 
- #include 
--- 
-2.14.4
-
diff --git a/buildroot/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch b/buildroot/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch
new file mode 100644
index 000000000..70d816fae
--- /dev/null
+++ b/buildroot/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch
@@ -0,0 +1,60 @@
+From 180a940333c84495015bd5b24d41c1dbfff509f2 Mon Sep 17 00:00:00 2001
+From: James Hilliard 
+Date: Thu, 27 Dec 2018 09:16:20 +0800
+Subject: [PATCH] meson: use cross compilation compatible c++ check
+
+[james.hilliard1@gmail.com: backport from upstream commit
+46e63a2a3ed46ce97430ce38e4cc0798c57900eb]
+Signed-off-by: James Hilliard 
+---
+ meson.build             | 4 +---
+ src/systemd/meson.build | 3 +--
+ src/test/meson.build    | 2 +-
+ 3 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index b338886..1964b1a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -287,10 +287,8 @@ want_tests = get_option('tests')
+ slow_tests = want_tests != 'false' and get_option('slow-tests')
+ install_tests = get_option('install-tests')
+ 
+-cxx = find_program('c++', required : fuzzer_build)
+-if cxx.found()
++if add_languages('cpp', required : fuzzer_build)
+         #  Used only for tests
+-        add_languages('cpp')
+         cxx_cmd = ' '.join(meson.get_compiler('cpp').cmd_array())
+ else
+         cxx_cmd = ''
+diff --git a/src/systemd/meson.build b/src/systemd/meson.build
+index e0c967e..75c48b0 100644
+--- a/src/systemd/meson.build
++++ b/src/systemd/meson.build
+@@ -52,8 +52,7 @@ if cc.has_argument('-std=iso9899:2017')
+         opts += [['c', '-std=iso9899:2017']]
+ endif
+ 
+-cxx = find_program('c++', required : false)
+-if cxx.found()
++if add_languages('cpp', required : false)
+         opts += [['c++'],
+                  ['c++', '-std=c++98'],
+                  ['c++', '-std=c++11']]
+diff --git a/src/test/meson.build b/src/test/meson.build
+index ea049a6..d9d87e0 100644
+--- a/src/test/meson.build
++++ b/src/test/meson.build
+@@ -957,7 +957,7 @@ tests += [
+ 
+ ]
+ 
+-if cxx.found()
++if cxx_cmd != ''
+         tests += [
+                 [['src/libsystemd/sd-bus/test-bus-vtable-cc.cc'],
+                  [],
+-- 
+2.7.4
+
diff --git a/buildroot/package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch b/buildroot/package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch
new file mode 100644
index 000000000..7b240d1b1
--- /dev/null
+++ b/buildroot/package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch
@@ -0,0 +1,61 @@
+From 822809d0afd0f984750a61b2391059411afa4333 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 11 Jan 2019 16:07:00 +0100
+Subject: [PATCH] capability: fix build without PR_CAP_AMBIENT
+
+systemd fails to build on kernel without PR_CAP_AMBIENT (< 4.3) since
+https://github.com/systemd/systemd/commit/2a03bb3e65327c73008f1db485ffc75c432dc6b2
+
+To fix this error, include missing_prctl.h in all files using
+PR_CAP_AMBIENT
+
+Fixes:
+ - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/systemd/systemd/pull/11400]
+---
+ src/basic/capability-util.c | 1 +
+ src/test/test-capability.c  | 1 +
+ src/test/test-execute.c     | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
+index a3f3ca9f5..b944ee6ea 100644
+--- a/src/basic/capability-util.c
++++ b/src/basic/capability-util.c
+@@ -13,6 +13,7 @@
+ #include "fileio.h"
+ #include "log.h"
+ #include "macro.h"
++#include "missing_prctl.h"
+ #include "parse-util.h"
+ #include "user-util.h"
+ #include "util.h"
+diff --git a/src/test/test-capability.c b/src/test/test-capability.c
+index dae85f2f9..3db05878a 100644
+--- a/src/test/test-capability.c
++++ b/src/test/test-capability.c
+@@ -13,6 +13,7 @@
+ #include "fd-util.h"
+ #include "fileio.h"
+ #include "macro.h"
++#include "missing_prctl.h"
+ #include "parse-util.h"
+ #include "tests.h"
+ #include "util.h"
+diff --git a/src/test/test-execute.c b/src/test/test-execute.c
+index 2115061ad..cea68b8cf 100644
+--- a/src/test/test-execute.c
++++ b/src/test/test-execute.c
+@@ -13,6 +13,7 @@
+ #include "fs-util.h"
+ #include "macro.h"
+ #include "manager.h"
++#include "missing_prctl.h"
+ #include "mkdir.h"
+ #include "path-util.h"
+ #include "rm-rf.h"
+-- 
+2.14.1
+
diff --git a/buildroot/package/systemd/0004-meson-unify-linux-stat.h-check-with-other-checks-and.patch b/buildroot/package/systemd/0004-meson-unify-linux-stat.h-check-with-other-checks-and.patch
deleted file mode 100644
index 70c35c66e..000000000
--- a/buildroot/package/systemd/0004-meson-unify-linux-stat.h-check-with-other-checks-and.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 17bd864a04a0583cfb343c5621b591bdd76d79ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
-Date: Wed, 18 Jul 2018 17:26:17 +0200
-Subject: [PATCH] meson: unify linux/stat.h check with other checks and use
- _GNU_SOURCE
-
-Using _GNU_SOURCE is better because that's how we include the headers in the
-actual build, and some headers define different stuff when it is defined.
-sys/stat.h for example defines 'struct statx' conditionally.
-
-(cherry picked from commit 9c869d08d82c73f62ab3527567858ce4b0cf1257)
-Signed-off-by: Romain Naour 
----
- meson.build         | 20 ++++++++++++++------
- src/basic/missing.h |  2 +-
- 2 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index a0e724070..5dcabdc6c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -421,11 +421,9 @@ decl_headers = '''
- #include 
- #include 
- #include 
--#include 
- #include 
- '''
- # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
--# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
- 
- foreach decl : ['char16_t',
-                 'char32_t',
-@@ -436,13 +434,23 @@ foreach decl : ['char16_t',
-                ]
- 
-         # We get -1 if the size cannot be determined
--        have = cc.sizeof(decl, prefix : decl_headers) > 0
-+        have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
-+
-+        if decl == 'struct statx'
-+                if have
-+                        want_linux_stat_h = false
-+                else
-+                        have = cc.sizeof(decl,
-+                                         prefix : decl_headers + '#include ',
-+                                         args : '-D_GNU_SOURCE') > 0
-+                        want_linux_stat_h = have
-+                endif
-+        endif
-+
-         conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
- endforeach
- 
--conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
--#include 
--''', args : '-D_GNU_SOURCE') > 0)
-+conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
- 
- foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
-                 ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
-diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 14ad3d491..9044683b1 100644
---- a/src/basic/missing.h
-+++ b/src/basic/missing.h
-@@ -24,7 +24,7 @@
- #include 
- #include 
- 
--#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
-+#if WANT_LINUX_STAT_H
- #include 
- #endif
- 
--- 
-2.14.4
-
diff --git a/buildroot/package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch b/buildroot/package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch
new file mode 100644
index 000000000..300fc544f
--- /dev/null
+++ b/buildroot/package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch
@@ -0,0 +1,34 @@
+From b1ca50178b97b3b827b0420ec7bdf9cb1d6fec56 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 11 Jan 2019 16:36:06 +0100
+Subject: [PATCH] basic/tmpfile-util.c: fix build without O_TMPFILE
+
+systemd fails to build on kernel without O_TMPFILE (< 3.11) since
+https://github.com/systemd/systemd/commit/dea72eda9cdbfeedd24cbe8c734ad0639bf96cde
+
+To fix this error, include missing_fcntl.h
+
+Fixes:
+ - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/systemd/systemd/pull/11400]
+---
+ src/basic/tmpfile-util.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/basic/tmpfile-util.c b/src/basic/tmpfile-util.c
+index 669eb2666..bc92d6a6d 100644
+--- a/src/basic/tmpfile-util.c
++++ b/src/basic/tmpfile-util.c
+@@ -8,6 +8,7 @@
+ #include "hexdecoct.h"
+ #include "macro.h"
+ #include "memfd-util.h"
++#include "missing_fcntl.h"
+ #include "missing_syscall.h"
+ #include "path-util.h"
+ #include "process-util.h"
+-- 
+2.14.1
+
diff --git a/buildroot/package/systemd/0005-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/buildroot/package/systemd/0005-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
deleted file mode 100644
index 6a72a3898..000000000
--- a/buildroot/package/systemd/0005-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 49653743f69658aeeebdb14faf1ab158f1f2cb20 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering 
-Date: Fri, 19 Oct 2018 12:12:33 +0200
-Subject: [PATCH] dhcp6: make sure we have enough space for the DHCP6 option
- header
-
-Fixes CVE-2018-15688:
-https://security-tracker.debian.org/tracker/CVE-2018-15688
-
-Patch downloaded from upstream commit:
-https://github.com/systemd/systemd/commit/49653743f69658aeeebdb14faf1ab158f1f2cb20
-
-Signed-off-by: Bernd Kuhls 
----
- src/libsystemd-network/dhcp6-option.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
-index cbd4bc7a2a3..2806415100c 100644
---- a/src/libsystemd-network/dhcp6-option.c
-+++ b/src/libsystemd-network/dhcp6-option.c
-@@ -106,7 +106,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) {
-                 return -EINVAL;
-         }
- 
--        if (*buflen < len)
-+        if (*buflen < offsetof(DHCP6Option, data) + len)
-                 return -ENOBUFS;
- 
-         ia_hdr = *buf;
diff --git a/buildroot/package/systemd/0006-meson.build-fix-detection-of-Werror-shadow.patch b/buildroot/package/systemd/0006-meson.build-fix-detection-of-Werror-shadow.patch
deleted file mode 100644
index 0aa318920..000000000
--- a/buildroot/package/systemd/0006-meson.build-fix-detection-of-Werror-shadow.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7bd6e6db3dbb980c099b444c61d9aff7fcc636cf Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine 
-Date: Thu, 29 Nov 2018 13:22:08 +0100
-Subject: [PATCH] meson.build: fix detection of -Werror=shadow
-
-Pass -Werror=shadow in args of cc.compiles otherwise test will always
-succeed
-This fix a build failure with gcc 4.7.3
-
-Fixes:
- - http://autobuild.buildroot.org/results/ffd71c473d3b29618c18cd2e04705370266696f2
-
-Signed-off-by: Fabrice Fontaine 
-[Upstream status: https://github.com/systemd/systemd/pull/10993]
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 37ae27b4a..980150ac8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -396,7 +396,7 @@ if cc.compiles('''
-            struct timespec now;
-            return 0;
-    }
--''', name : '-Werror=shadow with local shadowing')
-+''', args: '-Werror=shadow', name : '-Werror=shadow with local shadowing')
-         add_project_arguments('-Werror=shadow', language : 'c')
- endif
- 
--- 
-2.14.1
-
diff --git a/buildroot/package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch b/buildroot/package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch
new file mode 100644
index 000000000..ace29be6a
--- /dev/null
+++ b/buildroot/package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch
@@ -0,0 +1,49 @@
+From 9ab48a9b3bfadca4fbe055ddb4f6fc677ee4ae85 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 11 Jan 2019 17:08:48 +0100
+Subject: [PATCH] missing_if_link.h: add IFLA_BOND_MODE
+
+systemd fails to build on kernel without IFLA_BOND_MODE (< 3.13) since
+https://github.com/systemd/systemd/commit/9714c020fc4cda1823c2a77e3fd08aefa7d78b25
+
+So put back IFLA_BOND_MODE definition
+
+Fixes:
+ - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/systemd/systemd/pull/11400]
+---
+ meson.build                 | 1 +
+ src/basic/missing_if_link.h | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 623c1ad6b..011e44980 100644
+--- a/meson.build
++++ b/meson.build
+@@ -476,6 +476,7 @@ foreach decl : [['ETHTOOL_LINK_MODE_10baseT_Half_BIT',      'linux/ethtool.h'],
+                 ['IFLA_TARGET_NETNSID',                     'linux/if_link.h'],
+                 ['IFLA_NEW_IFINDEX',                        'linux/if_link.h'],
+                 ['IFLA_MAX_MTU',                            'linux/if_link.h'],
++                ['IFLA_BOND_MODE',                          'linux/if_link.h'],
+                 ['IFLA_BOND_ACTIVE_SLAVE',                  'linux/if_link.h'],
+                 ['IFLA_BOND_AD_INFO',                       'linux/if_link.h'],
+                 ['IFLA_BOND_AD_ACTOR_SYSTEM',               'linux/if_link.h'],
+diff --git a/src/basic/missing_if_link.h b/src/basic/missing_if_link.h
+index 07675426b..761797f56 100644
+--- a/src/basic/missing_if_link.h
++++ b/src/basic/missing_if_link.h
+@@ -110,6 +110,9 @@ enum ipvlan_mode {
+ #define IFLA_MAX                51
+ #endif
+ 
++#if !HAVE_IFLA_BOND_MODE /* linux@90af231106c0b8d223c27d35464af95cb3d9cacf (3.13) */
++#define IFLA_BOND_MODE              1
++#endif
+ #if !HAVE_IFLA_BOND_ACTIVE_SLAVE /* linux@ec76aa49855f6d6fea5e01de179fb57dd47c619d (3.13) */
+ #define IFLA_BOND_ACTIVE_SLAVE      2
+ #endif
+-- 
+2.14.1
+
diff --git a/buildroot/package/systemd/0007-missing_syscall.h-include-errno.h.patch b/buildroot/package/systemd/0007-missing_syscall.h-include-errno.h.patch
new file mode 100644
index 000000000..eb5d9eacb
--- /dev/null
+++ b/buildroot/package/systemd/0007-missing_syscall.h-include-errno.h.patch
@@ -0,0 +1,28 @@
+From 985d15d636b4d2c7086dbd305369c02756cdbe19 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 11 Jan 2019 17:24:21 +0100
+Subject: [PATCH] missing_syscall.h: include errno.h
+
+This include is needed for errno and ENOSYS
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/systemd/systemd/pull/11400]
+---
+ src/basic/missing_syscall.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
+index d5d4b26ac..d1aa32218 100644
+--- a/src/basic/missing_syscall.h
++++ b/src/basic/missing_syscall.h
+@@ -3,6 +3,7 @@
+ 
+ /* Missing glibc definitions to access certain kernel APIs */
+ 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.14.1
+
diff --git a/buildroot/package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch b/buildroot/package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch
new file mode 100644
index 000000000..1a1542c70
--- /dev/null
+++ b/buildroot/package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch
@@ -0,0 +1,34 @@
+From badb5dafa9efc89384d9d2bea5648f7b017204d7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 11 Jan 2019 17:30:32 +0100
+Subject: [PATCH] lockfile-util.c: fix build without F_OFD_SETLK
+
+systemd fails to build on kernel without F_OFD_SETLK since
+https://github.com/systemd/systemd/commit/9714c020fc4cda1823c2a77e3fd08aefa7d78b25
+
+So put include missing_fcntl.h
+
+Fixes:
+ - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/systemd/systemd/pull/11400]
+---
+ src/shared/lockfile-util.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/shared/lockfile-util.c b/src/shared/lockfile-util.c
+index 4bae23b24..260c2088d 100644
+--- a/src/shared/lockfile-util.c
++++ b/src/shared/lockfile-util.c
+@@ -12,6 +12,7 @@
+ #include "fs-util.h"
+ #include "lockfile-util.h"
+ #include "macro.h"
++#include "missing_fcntl.h"
+ #include "path-util.h"
+ 
+ int make_lock_file(const char *p, int operation, LockFile *ret) {
+-- 
+2.14.1
+
diff --git a/buildroot/package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch b/buildroot/package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch
new file mode 100644
index 000000000..dbf9bb51c
--- /dev/null
+++ b/buildroot/package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch
@@ -0,0 +1,205 @@
+From 084eeb865ca63887098e0945fb4e93c852b91b0f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Wed, 5 Dec 2018 18:38:39 +0100
+Subject: [PATCH] journald: do not store the iovec entry for process
+ commandline on stack
+
+This fixes a crash where we would read the commandline, whose length is under
+control of the sending program, and then crash when trying to create a stack
+allocation for it.
+
+CVE-2018-16864
+https://bugzilla.redhat.com/show_bug.cgi?id=1653855
+
+The message actually doesn't get written to disk, because
+journal_file_append_entry() returns -E2BIG.
+
+[james.hilliard1@gmail.com: backport from upstream commit
+084eeb865ca63887098e0945fb4e93c852b91b0f]
+Signed-off-by: James Hilliard 
+---
+ src/basic/io-util.c           | 10 ++++++++++
+ src/basic/io-util.h           |  2 ++
+ src/coredump/coredump.c       | 31 +++++++++++--------------------
+ src/journal/journald-server.c | 25 +++++++++++++++----------
+ 4 files changed, 38 insertions(+), 30 deletions(-)
+
+diff --git a/src/basic/io-util.c b/src/basic/io-util.c
+index 1f64cc9..575398f 100644
+--- a/src/basic/io-util.c
++++ b/src/basic/io-util.c
+@@ -8,6 +8,7 @@
+ #include 
+ 
+ #include "io-util.h"
++#include "string-util.h"
+ #include "time-util.h"
+ 
+ int flush_fd(int fd) {
+@@ -252,3 +253,12 @@ ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length) {
+ 
+         return q - (const uint8_t*) p;
+ }
++
++char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value) {
++        char *x;
++
++        x = strappend(field, value);
++        if (x)
++                iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x);
++        return x;
++}
+diff --git a/src/basic/io-util.h b/src/basic/io-util.h
+index ed189b5..792a64a 100644
+--- a/src/basic/io-util.h
++++ b/src/basic/io-util.h
+@@ -71,3 +71,5 @@ static inline bool FILE_SIZE_VALID_OR_INFINITY(uint64_t l) {
+ #define IOVEC_MAKE(base, len) (struct iovec) IOVEC_INIT(base, len)
+ #define IOVEC_INIT_STRING(string) IOVEC_INIT((char*) string, strlen(string))
+ #define IOVEC_MAKE_STRING(string) (struct iovec) IOVEC_INIT_STRING(string)
++
++char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value);
+diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
+index 20c1fb0..db2cf64 100644
+--- a/src/coredump/coredump.c
++++ b/src/coredump/coredump.c
+@@ -1063,19 +1063,10 @@ static int send_iovec(const struct iovec iovec[], size_t n_iovec, int input_fd)
+         return 0;
+ }
+ 
+-static char* set_iovec_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value) {
+-        char *x;
+-
+-        x = strappend(field, value);
+-        if (x)
+-                iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x);
+-        return x;
+-}
+-
+ static char* set_iovec_field_free(struct iovec *iovec, size_t *n_iovec, const char *field, char *value) {
+         char *x;
+ 
+-        x = set_iovec_field(iovec, n_iovec, field, value);
++        x = set_iovec_string_field(iovec, n_iovec, field, value);
+         free(value);
+         return x;
+ }
+@@ -1125,36 +1116,36 @@ static int gather_pid_metadata(
+                         disable_coredumps();
+                 }
+ 
+-                set_iovec_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]);
++                set_iovec_string_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]);
+         }
+ 
+         if (cg_pid_get_user_unit(pid, &t) >= 0)
+                 set_iovec_field_free(iovec, n_iovec, "COREDUMP_USER_UNIT=", t);
+ 
+         /* The next few are mandatory */
+-        if (!set_iovec_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID]))
++        if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID]))
+                 return log_oom();
+ 
+-        if (!set_iovec_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID]))
++        if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID]))
+                 return log_oom();
+ 
+-        if (!set_iovec_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID]))
++        if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID]))
+                 return log_oom();
+ 
+-        if (!set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL]))
++        if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL]))
+                 return log_oom();
+ 
+-        if (!set_iovec_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT]))
++        if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT]))
+                 return log_oom();
+ 
+-        if (!set_iovec_field(iovec, n_iovec, "COREDUMP_HOSTNAME=", context[CONTEXT_HOSTNAME]))
++        if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_HOSTNAME=", context[CONTEXT_HOSTNAME]))
+                 return log_oom();
+ 
+-        if (!set_iovec_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM]))
++        if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM]))
+                 return log_oom();
+ 
+         if (context[CONTEXT_EXE] &&
+-            !set_iovec_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE]))
++            !set_iovec_string_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE]))
+                 return log_oom();
+ 
+         if (sd_pid_get_session(pid, &t) >= 0)
+@@ -1222,7 +1213,7 @@ static int gather_pid_metadata(
+                 iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(t);
+ 
+         if (safe_atoi(context[CONTEXT_SIGNAL], &signo) >= 0 && SIGNAL_VALID(signo))
+-                set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo));
++                set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo));
+ 
+         return 0; /* we successfully acquired all metadata */
+ }
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index f096725..2a960eb 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -905,6 +905,7 @@ static void dispatch_message_real(
+                 pid_t object_pid) {
+ 
+         char source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)];
++        _cleanup_free_ char *cmdline1 = NULL, *cmdline2 = NULL;
+         uid_t journal_uid;
+         ClientContext *o;
+ 
+@@ -921,20 +922,23 @@ static void dispatch_message_real(
+                 IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->uid, uid_t, uid_is_valid, UID_FMT, "_UID");
+                 IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->gid, gid_t, gid_is_valid, GID_FMT, "_GID");
+ 
+-                IOVEC_ADD_STRING_FIELD(iovec, n, c->comm, "_COMM");
+-                IOVEC_ADD_STRING_FIELD(iovec, n, c->exe, "_EXE");
+-                IOVEC_ADD_STRING_FIELD(iovec, n, c->cmdline, "_CMDLINE");
+-                IOVEC_ADD_STRING_FIELD(iovec, n, c->capeff, "_CAP_EFFECTIVE");
++                IOVEC_ADD_STRING_FIELD(iovec, n, c->comm, "_COMM"); /* At most TASK_COMM_LENGTH (16 bytes) */
++                IOVEC_ADD_STRING_FIELD(iovec, n, c->exe, "_EXE"); /* A path, so at most PATH_MAX (4096 bytes) */
+ 
+-                IOVEC_ADD_SIZED_FIELD(iovec, n, c->label, c->label_size, "_SELINUX_CONTEXT");
++                if (c->cmdline)
++                        /* At most _SC_ARG_MAX (2MB usually), which is too much to put on stack.
++                         * Let's use a heap allocation for this one. */
++                        cmdline1 = set_iovec_string_field(iovec, &n, "_CMDLINE=", c->cmdline);
+ 
++                IOVEC_ADD_STRING_FIELD(iovec, n, c->capeff, "_CAP_EFFECTIVE"); /* Read from /proc/.../status */
++                IOVEC_ADD_SIZED_FIELD(iovec, n, c->label, c->label_size, "_SELINUX_CONTEXT");
+                 IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->auditid, uint32_t, audit_session_is_valid, "%" PRIu32, "_AUDIT_SESSION");
+                 IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->loginuid, uid_t, uid_is_valid, UID_FMT, "_AUDIT_LOGINUID");
+ 
+-                IOVEC_ADD_STRING_FIELD(iovec, n, c->cgroup, "_SYSTEMD_CGROUP");
++                IOVEC_ADD_STRING_FIELD(iovec, n, c->cgroup, "_SYSTEMD_CGROUP"); /* A path */
+                 IOVEC_ADD_STRING_FIELD(iovec, n, c->session, "_SYSTEMD_SESSION");
+                 IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->owner_uid, uid_t, uid_is_valid, UID_FMT, "_SYSTEMD_OWNER_UID");
+-                IOVEC_ADD_STRING_FIELD(iovec, n, c->unit, "_SYSTEMD_UNIT");
++                IOVEC_ADD_STRING_FIELD(iovec, n, c->unit, "_SYSTEMD_UNIT"); /* Unit names are bounded by UNIT_NAME_MAX */
+                 IOVEC_ADD_STRING_FIELD(iovec, n, c->user_unit, "_SYSTEMD_USER_UNIT");
+                 IOVEC_ADD_STRING_FIELD(iovec, n, c->slice, "_SYSTEMD_SLICE");
+                 IOVEC_ADD_STRING_FIELD(iovec, n, c->user_slice, "_SYSTEMD_USER_SLICE");
+@@ -955,13 +959,14 @@ static void dispatch_message_real(
+                 IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->uid, uid_t, uid_is_valid, UID_FMT, "OBJECT_UID");
+                 IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->gid, gid_t, gid_is_valid, GID_FMT, "OBJECT_GID");
+ 
++                /* See above for size limits, only ->cmdline may be large, so use a heap allocation for it. */
+                 IOVEC_ADD_STRING_FIELD(iovec, n, o->comm, "OBJECT_COMM");
+                 IOVEC_ADD_STRING_FIELD(iovec, n, o->exe, "OBJECT_EXE");
+-                IOVEC_ADD_STRING_FIELD(iovec, n, o->cmdline, "OBJECT_CMDLINE");
+-                IOVEC_ADD_STRING_FIELD(iovec, n, o->capeff, "OBJECT_CAP_EFFECTIVE");
++                if (o->cmdline)
++                        cmdline2 = set_iovec_string_field(iovec, &n, "OBJECT_CMDLINE=", o->cmdline);
+ 
++                IOVEC_ADD_STRING_FIELD(iovec, n, o->capeff, "OBJECT_CAP_EFFECTIVE");
+                 IOVEC_ADD_SIZED_FIELD(iovec, n, o->label, o->label_size, "OBJECT_SELINUX_CONTEXT");
+-
+                 IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->auditid, uint32_t, audit_session_is_valid, "%" PRIu32, "OBJECT_AUDIT_SESSION");
+                 IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->loginuid, uid_t, uid_is_valid, UID_FMT, "OBJECT_AUDIT_LOGINUID");
+ 
+-- 
+2.7.4
+
diff --git a/buildroot/package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch b/buildroot/package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch
new file mode 100644
index 000000000..df1ed806a
--- /dev/null
+++ b/buildroot/package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch
@@ -0,0 +1,57 @@
+From 052c57f132f04a3cf4148f87561618da1a6908b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Wed, 5 Dec 2018 22:45:02 +0100
+Subject: [PATCH] journald: set a limit on the number of fields (1k)
+
+We allocate a iovec entry for each field, so with many short entries,
+our memory usage and processing time can be large, even with a relatively
+small message size. Let's refuse overly long entries.
+
+CVE-2018-16865
+https://bugzilla.redhat.com/show_bug.cgi?id=1653861
+
+What from I can see, the problem is not from an alloca, despite what the CVE
+description says, but from the attack multiplication that comes from creating
+many very small iovecs: (void* + size_t) for each three bytes of input message.
+
+[james.hilliard1@gmail.com: backport from upstream commit
+052c57f132f04a3cf4148f87561618da1a6908b4]
+Signed-off-by: James Hilliard 
+---
+ src/journal/journald-native.c | 5 +++++
+ src/shared/journal-importer.h | 3 +++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
+index e86178e..d0fee2a 100644
+--- a/src/journal/journald-native.c
++++ b/src/journal/journald-native.c
+@@ -141,6 +141,11 @@ static int server_process_entry(
+                 }
+ 
+                 /* A property follows */
++                if (n > ENTRY_FIELD_COUNT_MAX) {
++                        log_debug("Received an entry that has more than " STRINGIFY(ENTRY_FIELD_COUNT_MAX) " fields, ignoring entry.");
++                        r = 1;
++                        goto finish;
++                }
+ 
+                 /* n existing properties, 1 new, +1 for _TRANSPORT */
+                 if (!GREEDY_REALLOC(iovec, m,
+diff --git a/src/shared/journal-importer.h b/src/shared/journal-importer.h
+index 53354b7..7914c0c 100644
+--- a/src/shared/journal-importer.h
++++ b/src/shared/journal-importer.h
+@@ -21,6 +21,9 @@
+ #endif
+ #define LINE_CHUNK 8*1024u
+ 
++/* The maximum number of fields in an entry */
++#define ENTRY_FIELD_COUNT_MAX 1024
++
+ struct iovec_wrapper {
+         struct iovec *iovec;
+         size_t size_bytes;
+-- 
+2.7.4
+
diff --git a/buildroot/package/systemd/0011-journal-remote-verify-entry-length-from-header.patch b/buildroot/package/systemd/0011-journal-remote-verify-entry-length-from-header.patch
new file mode 100644
index 000000000..7b74a31d3
--- /dev/null
+++ b/buildroot/package/systemd/0011-journal-remote-verify-entry-length-from-header.patch
@@ -0,0 +1,112 @@
+From 7fdb237f5473cb8fc2129e57e8a0039526dcb4fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Fri, 7 Dec 2018 12:47:14 +0100
+Subject: [PATCH] journal-remote: verify entry length from header
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Calling mhd_respond(), which ulimately calls MHD_queue_response() is
+ineffective at point, becuase MHD_queue_response() immediately returns
+MHD_NO signifying an error, because the connection is in state
+MHD_CONNECTION_CONTINUE_SENT.
+
+As Christian Grothoff kindly explained:
+> You are likely calling MHD_queue_repsonse() too late: once you are
+> receiving upload_data, HTTP forces you to process it all. At this time,
+> MHD has already sent "100 continue" and cannot take it back (hence you
+> get MHD_NO!).
+>
+> In your request handler, the first time when you are called for a
+> connection (and when hence *upload_data_size == 0 and upload_data ==
+> NULL) you must check the content-length header and react (with
+> MHD_queue_response) based on this (to prevent MHD from automatically
+> generating 100 continue).
+
+If we ever encounter this kind of error, print a warning and immediately
+abort the connection. (The alternative would be to keep reading the data,
+but ignore it, and return an error after we get to the end of data.
+That is possible, but of course puts additional load on both the
+sender and reciever, and doesn't seem important enough just to return
+a good error message.)
+
+Note that sending of the error does not work (the connection is always aborted
+when MHD_queue_response is used with MHD_RESPMEM_MUST_FREE, as in this case)
+with libµhttpd 0.59, but works with 0.61:
+https://src.fedoraproject.org/rpms/libmicrohttpd/pull-request/1
+
+[james.hilliard1@gmail.com: backport from upstream commit
+7fdb237f5473cb8fc2129e57e8a0039526dcb4fd]
+Signed-off-by: James Hilliard 
+---
+ src/journal-remote/journal-remote-main.c | 34 ++++++++++++++++++++++----------
+ 1 file changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
+index e1748cb..8543dba 100644
+--- a/src/journal-remote/journal-remote-main.c
++++ b/src/journal-remote/journal-remote-main.c
+@@ -221,16 +221,14 @@ static int process_http_upload(
+                                    journal_remote_server_global->seal);
+                 if (r == -EAGAIN)
+                         break;
+-                else if (r < 0) {
+-                        log_warning("Failed to process data for connection %p", connection);
++                if (r < 0) {
+                         if (r == -E2BIG)
+-                                return mhd_respondf(connection,
+-                                                    r, MHD_HTTP_PAYLOAD_TOO_LARGE,
+-                                                    "Entry is too large, maximum is " STRINGIFY(DATA_SIZE_MAX) " bytes.");
++                                log_warning_errno(r, "Entry is too above maximum of %u, aborting connection %p.",
++                                                  DATA_SIZE_MAX, connection);
+                         else
+-                                return mhd_respondf(connection,
+-                                                    r, MHD_HTTP_UNPROCESSABLE_ENTITY,
+-                                                    "Processing failed: %m.");
++                                log_warning_errno(r, "Failed to process data, aborting connection %p: %m",
++                                                  connection);
++                        return MHD_NO;
+                 }
+         }
+ 
+@@ -264,6 +262,7 @@ static int request_handler(
+         const char *header;
+         int r, code, fd;
+         _cleanup_free_ char *hostname = NULL;
++        size_t len;
+ 
+         assert(connection);
+         assert(connection_cls);
+@@ -283,12 +282,27 @@ static int request_handler(
+         if (!streq(url, "/upload"))
+                 return mhd_respond(connection, MHD_HTTP_NOT_FOUND, "Not found.");
+ 
+-        header = MHD_lookup_connection_value(connection,
+-                                             MHD_HEADER_KIND, "Content-Type");
++        header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Content-Type");
+         if (!header || !streq(header, "application/vnd.fdo.journal"))
+                 return mhd_respond(connection, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE,
+                                    "Content-Type: application/vnd.fdo.journal is required.");
+ 
++        header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Content-Length");
++        if (!header)
++                return mhd_respond(connection, MHD_HTTP_LENGTH_REQUIRED,
++                                   "Content-Length header is required.");
++        r = safe_atozu(header, &len);
++        if (r < 0)
++                return mhd_respondf(connection, r, MHD_HTTP_LENGTH_REQUIRED,
++                                    "Content-Length: %s cannot be parsed: %m", header);
++
++        if (len > ENTRY_SIZE_MAX)
++                /* When serialized, an entry of maximum size might be slightly larger,
++                 * so this does not correspond exactly to the limit in journald. Oh well.
++                 */
++                return mhd_respondf(connection, 0, MHD_HTTP_PAYLOAD_TOO_LARGE,
++                                    "Payload larger than maximum size of %u bytes", ENTRY_SIZE_MAX);
++
+         {
+                 const union MHD_ConnectionInfo *ci;
+ 
+-- 
+2.7.4
+
diff --git a/buildroot/package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch b/buildroot/package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch
new file mode 100644
index 000000000..e0aae98d9
--- /dev/null
+++ b/buildroot/package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch
@@ -0,0 +1,81 @@
+From ef4d6abe7c7fab6cbff975b32e76b09feee56074 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Fri, 7 Dec 2018 10:48:10 +0100
+Subject: [PATCH] journal-remote: set a limit on the number of fields in a
+ message
+
+Existing use of E2BIG is replaced with ENOBUFS (entry too long), and E2BIG is
+reused for the new error condition (too many fields).
+
+This matches the change done for systemd-journald, hence forming the second
+part of the fix for CVE-2018-16865
+(https://bugzilla.redhat.com/show_bug.cgi?id=1653861).
+
+[james.hilliard1@gmail.com: backport from upstream commit
+ef4d6abe7c7fab6cbff975b32e76b09feee56074]
+Signed-off-by: James Hilliard 
+---
+ src/journal-remote/journal-remote-main.c | 7 +++++--
+ src/journal-remote/journal-remote.c      | 3 +++
+ src/shared/journal-importer.c            | 5 ++++-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
+index 8543dba..802c3ea 100644
+--- a/src/journal-remote/journal-remote-main.c
++++ b/src/journal-remote/journal-remote-main.c
+@@ -222,9 +222,12 @@ static int process_http_upload(
+                 if (r == -EAGAIN)
+                         break;
+                 if (r < 0) {
+-                        if (r == -E2BIG)
+-                                log_warning_errno(r, "Entry is too above maximum of %u, aborting connection %p.",
++                        if (r == -ENOBUFS)
++                                log_warning_errno(r, "Entry is above the maximum of %u, aborting connection %p.",
+                                                   DATA_SIZE_MAX, connection);
++                        else if (r == -E2BIG)
++                                log_warning_errno(r, "Entry with more fields than the maximum of %u, aborting connection %p.",
++                                                  ENTRY_FIELD_COUNT_MAX, connection);
+                         else
+                                 log_warning_errno(r, "Failed to process data, aborting connection %p: %m",
+                                                   connection);
+diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
+index 3c0916c..1da32c5 100644
+--- a/src/journal-remote/journal-remote.c
++++ b/src/journal-remote/journal-remote.c
+@@ -407,6 +407,9 @@ int journal_remote_handle_raw_source(
+                 log_debug("%zu active sources remaining", s->active);
+                 return 0;
+         } else if (r == -E2BIG) {
++                log_notice("Entry with too many fields, skipped");
++                return 1;
++        } else if (r == -ENOBUFS) {
+                 log_notice("Entry too big, skipped");
+                 return 1;
+         } else if (r == -EAGAIN) {
+diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
+index b0e6192..8638cd3 100644
+--- a/src/shared/journal-importer.c
++++ b/src/shared/journal-importer.c
+@@ -23,6 +23,9 @@ enum {
+ };
+ 
+ static int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) {
++        if (iovw->count >= ENTRY_FIELD_COUNT_MAX)
++                return -E2BIG;
++
+         if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1))
+                 return log_oom();
+ 
+@@ -97,7 +100,7 @@ static int get_line(JournalImporter *imp, char **line, size_t *size) {
+ 
+                 imp->scanned = imp->filled;
+                 if (imp->scanned >= DATA_SIZE_MAX)
+-                        return log_error_errno(SYNTHETIC_ERRNO(E2BIG),
++                        return log_error_errno(SYNTHETIC_ERRNO(ENOBUFS),
+                                                "Entry is bigger than %u bytes.",
+                                                DATA_SIZE_MAX);
+ 
+-- 
+2.7.4
+
diff --git a/buildroot/package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch b/buildroot/package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch
new file mode 100644
index 000000000..eb7e0a270
--- /dev/null
+++ b/buildroot/package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch
@@ -0,0 +1,116 @@
+From f5855697aa19fb92637e72ab02e4623abe77f288 Mon Sep 17 00:00:00 2001
+From: YunQiang Su 
+Date: Tue, 25 Dec 2018 19:01:17 +0800
+Subject: [PATCH] Pass separate dev_t var to device_path_parse_major_minor
+
+MIPS/O32's st_rdev member of struct stat is unsigned long, which
+is 32bit, while dev_t is defined as 64bit, which make some problems
+in device_path_parse_major_minor.
+
+Don't pass st.st_rdev, st_mode to device_path_parse_major_minor,
+while pass 2 seperate variables. The result of stat is alos copied
+out into these 2 variables. Fixes: #11247
+
+[Retrieved from:
+https://github.com/systemd/systemd/commit/f5855697aa19fb92637e72ab02e4623abe77f288]
+Signed-off-by: Fabrice Fontaine 
+---
+ src/core/cgroup.c | 35 ++++++++++++++++++++++-------------
+ 1 file changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/core/cgroup.c b/src/core/cgroup.c
+index 7b817dc225e..ed2f331b33e 100644
+--- a/src/core/cgroup.c
++++ b/src/core/cgroup.c
+@@ -396,26 +396,31 @@ static void cgroup_xattr_apply(Unit *u) {
+ }
+ 
+ static int lookup_block_device(const char *p, dev_t *ret) {
+-        struct stat st = {};
++        dev_t rdev, dev = 0;
++        mode_t mode;
+         int r;
+ 
+         assert(p);
+         assert(ret);
+ 
+-        r = device_path_parse_major_minor(p, &st.st_mode, &st.st_rdev);
++        r = device_path_parse_major_minor(p, &mode, &rdev);
+         if (r == -ENODEV) { /* not a parsable device node, need to go to disk */
++                struct stat st;
+                 if (stat(p, &st) < 0)
+                         return log_warning_errno(errno, "Couldn't stat device '%s': %m", p);
++                rdev = (dev_t)st.st_rdev;
++                dev = (dev_t)st.st_dev;
++                mode = st.st_mode;
+         } else if (r < 0)
+                 return log_warning_errno(r, "Failed to parse major/minor from path '%s': %m", p);
+ 
+-        if (S_ISCHR(st.st_mode)) {
++        if (S_ISCHR(mode)) {
+                 log_warning("Device node '%s' is a character device, but block device needed.", p);
+                 return -ENOTBLK;
+-        } else if (S_ISBLK(st.st_mode))
+-                *ret = st.st_rdev;
+-        else if (major(st.st_dev) != 0)
+-                *ret = st.st_dev; /* If this is not a device node then use the block device this file is stored on */
++        } else if (S_ISBLK(mode))
++                *ret = rdev;
++        else if (major(dev) != 0)
++                *ret = dev; /* If this is not a device node then use the block device this file is stored on */
+         else {
+                 /* If this is btrfs, getting the backing block device is a bit harder */
+                 r = btrfs_get_block_device(p, ret);
+@@ -436,7 +441,8 @@ static int lookup_block_device(const char *p, dev_t *ret) {
+ }
+ 
+ static int whitelist_device(BPFProgram *prog, const char *path, const char *node, const char *acc) {
+-        struct stat st = {};
++        dev_t rdev;
++        mode_t mode;
+         int r;
+ 
+         assert(path);
+@@ -445,11 +451,12 @@ static int whitelist_device(BPFProgram *prog, const char *path, const char *node
+         /* Some special handling for /dev/block/%u:%u, /dev/char/%u:%u, /run/systemd/inaccessible/chr and
+          * /run/systemd/inaccessible/blk paths. Instead of stat()ing these we parse out the major/minor directly. This
+          * means clients can use these path without the device node actually around */
+-        r = device_path_parse_major_minor(node, &st.st_mode, &st.st_rdev);
++        r = device_path_parse_major_minor(node, &mode, &rdev);
+         if (r < 0) {
+                 if (r != -ENODEV)
+                         return log_warning_errno(r, "Couldn't parse major/minor from device path '%s': %m", node);
+ 
++                struct stat st;
+                 if (stat(node, &st) < 0)
+                         return log_warning_errno(errno, "Couldn't stat device %s: %m", node);
+ 
+@@ -457,22 +464,24 @@ static int whitelist_device(BPFProgram *prog, const char *path, const char *node
+                         log_warning("%s is not a device.", node);
+                         return -ENODEV;
+                 }
++                rdev = (dev_t) st.st_rdev;
++                mode = st.st_mode;
+         }
+ 
+         if (cg_all_unified() > 0) {
+                 if (!prog)
+                         return 0;
+ 
+-                return cgroup_bpf_whitelist_device(prog, S_ISCHR(st.st_mode) ? BPF_DEVCG_DEV_CHAR : BPF_DEVCG_DEV_BLOCK,
+-                                                   major(st.st_rdev), minor(st.st_rdev), acc);
++                return cgroup_bpf_whitelist_device(prog, S_ISCHR(mode) ? BPF_DEVCG_DEV_CHAR : BPF_DEVCG_DEV_BLOCK,
++                                                   major(rdev), minor(rdev), acc);
+ 
+         } else {
+                 char buf[2+DECIMAL_STR_MAX(dev_t)*2+2+4];
+ 
+                 sprintf(buf,
+                         "%c %u:%u %s",
+-                        S_ISCHR(st.st_mode) ? 'c' : 'b',
+-                        major(st.st_rdev), minor(st.st_rdev),
++                        S_ISCHR(mode) ? 'c' : 'b',
++                        major(rdev), minor(rdev),
+                         acc);
+ 
+                 /* Changing the devices list of a populated cgroup might result in EINVAL, hence ignore EINVAL here. */
diff --git a/buildroot/package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch b/buildroot/package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch
new file mode 100644
index 000000000..7a91aac51
--- /dev/null
+++ b/buildroot/package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch
@@ -0,0 +1,34 @@
+From 7bd188b1e628d11011cc6c98456e2e4ed72c645b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 3 Feb 2019 17:32:46 +0100
+Subject: [PATCH] networkd-brvlan.c: fix build without
+ BRIDGE_VLAN_INFO_RANGE_END
+
+systemd fails to build on kernel without BRIDGE_VLAN_INFO_RANGE_END
+since 9714c02
+
+So put include missing_if_bridge.h
+
+Fixes:
+ - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
+
+Signed-off-by: Fabrice Fontaine 
+---
+ src/network/networkd-brvlan.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
+index 8f9103f14..8377623da 100644
+--- a/src/network/networkd-brvlan.c
++++ b/src/network/networkd-brvlan.c
+@@ -9,6 +9,7 @@
+ 
+ #include "alloc-util.h"
+ #include "conf-parser.h"
++#include "missing_if_bridge.h"
+ #include "netlink-util.h"
+ #include "networkd-brvlan.h"
+ #include "networkd-link.h"
+-- 
+2.14.1
+
diff --git a/buildroot/package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch b/buildroot/package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch
new file mode 100644
index 000000000..6351f05eb
--- /dev/null
+++ b/buildroot/package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch
@@ -0,0 +1,33 @@
+From d909e4af6ac61f6777d429a0c84ab5b3d1907c6d Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 3 Feb 2019 18:28:16 +0100
+Subject: [PATCH] networkd-ndisc.c: fix build without IFA_F_NOPREFIXROUTE
+
+systemd fails to build on kernel without IFA_F_NOPREFIXROUTE
+since 9714c02
+
+So put include missing_network.h
+
+Fixes:
+ - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
+
+Signed-off-by: Fabrice Fontaine 
+---
+ src/network/networkd-ndisc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
+index 80bfd2cba..e5b8d1155 100644
+--- a/src/network/networkd-ndisc.c
++++ b/src/network/networkd-ndisc.c
+@@ -8,6 +8,7 @@
+ 
+ #include "sd-ndisc.h"
+ 
++#include "missing_network.h"
+ #include "networkd-ndisc.h"
+ #include "networkd-route.h"
+ #include "strv.h"
+-- 
+2.14.1
+
diff --git a/buildroot/package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch b/buildroot/package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch
new file mode 100644
index 000000000..33d3328a8
--- /dev/null
+++ b/buildroot/package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch
@@ -0,0 +1,33 @@
+From 081aea25022a987d349394ada2d6a959bf3ce4cd Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 3 Feb 2019 18:33:39 +0100
+Subject: [PATCH] networkd-address.c: fix build without IFA_F_NOPREFIXROUTE
+
+systemd fails to build on kernel without IFA_F_NOPREFIXROUTE
+since 9714c02
+
+So put include missing_network.h
+
+Fixes:
+ - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
+
+Signed-off-by: Fabrice Fontaine 
+---
+ src/network/networkd-address.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
+index fa7f9b8d7..3cdbd9e37 100644
+--- a/src/network/networkd-address.c
++++ b/src/network/networkd-address.c
+@@ -5,6 +5,7 @@
+ #include "alloc-util.h"
+ #include "conf-parser.h"
+ #include "firewall-util.h"
++#include "missing_network.h"
+ #include "netlink-util.h"
+ #include "networkd-address.h"
+ #include "networkd-manager.h"
+-- 
+2.14.1
+
diff --git a/buildroot/package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch b/buildroot/package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch
new file mode 100644
index 000000000..2b7ae1898
--- /dev/null
+++ b/buildroot/package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch
@@ -0,0 +1,33 @@
+From aeed8332afa88728ed914b2917ce758d9c2218a4 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Sun, 3 Feb 2019 18:38:10 +0100
+Subject: [PATCH] networkd-dhcp6.c: fix build without IFA_F_NOPREFIXROUTE
+
+systemd fails to build on kernel without IFA_F_NOPREFIXROUTE
+since 9714c02
+
+So put include missing_network.h
+
+Fixes:
+ - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
+
+Signed-off-by: Fabrice Fontaine 
+---
+ src/network/networkd-dhcp6.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
+index f9df26d75..c1fba03f9 100644
+--- a/src/network/networkd-dhcp6.c
++++ b/src/network/networkd-dhcp6.c
+@@ -11,6 +11,7 @@
+ 
+ #include "hashmap.h"
+ #include "hostname-util.h"
++#include "missing_network.h"
+ #include "network-internal.h"
+ #include "networkd-link.h"
+ #include "networkd-manager.h"
+-- 
+2.14.1
+
diff --git a/buildroot/package/systemd/0018-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch b/buildroot/package/systemd/0018-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
new file mode 100644
index 000000000..2de3b71b5
--- /dev/null
+++ b/buildroot/package/systemd/0018-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
@@ -0,0 +1,53 @@
+From febef5e18558c114f4fb7c94f6c8ed3520c50cdf Mon Sep 17 00:00:00 2001
+From: Riccardo Schirone 
+Date: Mon, 4 Feb 2019 14:29:09 +0100
+Subject: [PATCH] Refuse dbus message paths longer than BUS_PATH_SIZE_MAX
+ limit.
+
+Even though the dbus specification does not enforce any length limit on the
+path of a dbus message, having to analyze too long strings in PID1 may be
+time-consuming and it may have security impacts.
+
+In any case, the limit is set so high that real-life applications should not
+have a problem with it.
+
+(cherry picked from commit 61397a60d98e368a5720b37e83f3169e3eb511c4)
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit 61397a60d98
+
+ src/libsystemd/sd-bus/bus-internal.c | 2 +-
+ src/libsystemd/sd-bus/bus-internal.h | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c
+index 40acae213381..598b7f110c73 100644
+--- a/src/libsystemd/sd-bus/bus-internal.c
++++ b/src/libsystemd/sd-bus/bus-internal.c
+@@ -43,7 +43,7 @@ bool object_path_is_valid(const char *p) {
+         if (slash)
+                 return false;
+ 
+-        return true;
++        return (q - p) <= BUS_PATH_SIZE_MAX;
+ }
+ 
+ char* object_path_startswith(const char *a, const char *b) {
+diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
+index f208b294d8f1..a8d61bf72a4e 100644
+--- a/src/libsystemd/sd-bus/bus-internal.h
++++ b/src/libsystemd/sd-bus/bus-internal.h
+@@ -332,6 +332,10 @@ struct sd_bus {
+ 
+ #define BUS_MESSAGE_SIZE_MAX (128*1024*1024)
+ #define BUS_AUTH_SIZE_MAX (64*1024)
++/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one
++ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however,
++ * to not clash unnecessarily with real-life applications. */
++#define BUS_PATH_SIZE_MAX (64*1024)
+ 
+ #define BUS_CONTAINER_DEPTH 128
+ 
+-- 
+2.20.1
+
diff --git a/buildroot/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch b/buildroot/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
new file mode 100644
index 000000000..bd09e6020
--- /dev/null
+++ b/buildroot/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
@@ -0,0 +1,194 @@
+From 9e3f5a77226d5320270c92df001f6c79be735af3 Mon Sep 17 00:00:00 2001
+From: Riccardo Schirone 
+Date: Mon, 4 Feb 2019 14:29:28 +0100
+Subject: [PATCH] Allocate temporary strings to hold dbus paths on the heap
+
+Paths are limited to BUS_PATH_SIZE_MAX but the maximum size is anyway too big
+to be allocated on the stack, so let's switch to the heap where there is a
+clear way to understand if the allocation fails.
+
+(cherry picked from commit f519a19bcd5afe674a9b8fc462cd77d8bad403c1)
+[baruch: backport to v240]
+Signed-off-by: Baruch Siach 
+---
+Upstream status: commit f519a19bcd5
+
+ src/libsystemd/sd-bus/bus-objects.c | 68 +++++++++++++++++++++++------
+ 1 file changed, 54 insertions(+), 14 deletions(-)
+
+diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
+index d0538104ae25..54b977418e03 100644
+--- a/src/libsystemd/sd-bus/bus-objects.c
++++ b/src/libsystemd/sd-bus/bus-objects.c
+@@ -1133,7 +1133,8 @@ static int object_manager_serialize_path_and_fallbacks(
+                 const char *path,
+                 sd_bus_error *error) {
+ 
+-        char *prefix;
++        _cleanup_free_ char *prefix = NULL;
++        size_t pl;
+         int r;
+ 
+         assert(bus);
+@@ -1149,7 +1150,12 @@ static int object_manager_serialize_path_and_fallbacks(
+                 return 0;
+ 
+         /* Second, add fallback vtables registered for any of the prefixes */
+-        prefix = alloca(strlen(path) + 1);
++        pl = strlen(path);
++        assert(pl <= BUS_PATH_SIZE_MAX);
++        prefix = new(char, pl + 1);
++        if (!prefix)
++                return -ENOMEM;
++
+         OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+                 r = object_manager_serialize_path(bus, reply, prefix, path, true, error);
+                 if (r < 0)
+@@ -1345,6 +1351,7 @@ static int object_find_and_run(
+ }
+ 
+ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
++        _cleanup_free_ char *prefix = NULL;
+         int r;
+         size_t pl;
+         bool found_object = false;
+@@ -1369,9 +1376,12 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
+         assert(m->member);
+ 
+         pl = strlen(m->path);
+-        do {
+-                char prefix[pl+1];
++        assert(pl <= BUS_PATH_SIZE_MAX);
++        prefix = new(char, pl + 1);
++        if (!prefix)
++                return -ENOMEM;
+ 
++        do {
+                 bus->nodes_modified = false;
+ 
+                 r = object_find_and_run(bus, m, m->path, false, &found_object);
+@@ -1498,9 +1508,15 @@ static int bus_find_parent_object_manager(sd_bus *bus, struct node **out, const
+ 
+         n = hashmap_get(bus->nodes, path);
+         if (!n) {
+-                char *prefix;
++                _cleanup_free_ char *prefix = NULL;
++                size_t pl;
++
++                pl = strlen(path);
++                assert(pl <= BUS_PATH_SIZE_MAX);
++                prefix = new(char, pl + 1);
++                if (!prefix)
++                        return -ENOMEM;
+ 
+-                prefix = alloca(strlen(path) + 1);
+                 OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+                         n = hashmap_get(bus->nodes, prefix);
+                         if (n)
+@@ -2083,8 +2099,9 @@ _public_ int sd_bus_emit_properties_changed_strv(
+                 const char *interface,
+                 char **names) {
+ 
++        _cleanup_free_ char *prefix = NULL;
+         bool found_interface = false;
+-        char *prefix;
++        size_t pl;
+         int r;
+ 
+         assert_return(bus, -EINVAL);
+@@ -2105,6 +2122,12 @@ _public_ int sd_bus_emit_properties_changed_strv(
+ 
+         BUS_DONT_DESTROY(bus);
+ 
++        pl = strlen(path);
++        assert(pl <= BUS_PATH_SIZE_MAX);
++        prefix = new(char, pl + 1);
++        if (!prefix)
++                return -ENOMEM;
++
+         do {
+                 bus->nodes_modified = false;
+ 
+@@ -2114,7 +2137,6 @@ _public_ int sd_bus_emit_properties_changed_strv(
+                 if (bus->nodes_modified)
+                         continue;
+ 
+-                prefix = alloca(strlen(path) + 1);
+                 OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+                         r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names);
+                         if (r != 0)
+@@ -2246,7 +2268,8 @@ static int object_added_append_all_prefix(
+ 
+ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
+         _cleanup_set_free_ Set *s = NULL;
+-        char *prefix;
++        _cleanup_free_ char *prefix = NULL;
++        size_t pl;
+         int r;
+ 
+         assert(bus);
+@@ -2291,7 +2314,12 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p
+         if (bus->nodes_modified)
+                 return 0;
+ 
+-        prefix = alloca(strlen(path) + 1);
++        pl = strlen(path);
++        assert(pl <= BUS_PATH_SIZE_MAX);
++        prefix = new(char, pl + 1);
++        if (!prefix)
++                return -ENOMEM;
++
+         OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+                 r = object_added_append_all_prefix(bus, m, s, prefix, path, true);
+                 if (r < 0)
+@@ -2430,7 +2458,8 @@ static int object_removed_append_all_prefix(
+ 
+ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
+         _cleanup_set_free_ Set *s = NULL;
+-        char *prefix;
++        _cleanup_free_ char *prefix = NULL;
++        size_t pl;
+         int r;
+ 
+         assert(bus);
+@@ -2462,7 +2491,12 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char
+         if (bus->nodes_modified)
+                 return 0;
+ 
+-        prefix = alloca(strlen(path) + 1);
++        pl = strlen(path);
++        assert(pl <= BUS_PATH_SIZE_MAX);
++        prefix = new(char, pl + 1);
++        if (!prefix)
++                return -ENOMEM;
++
+         OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+                 r = object_removed_append_all_prefix(bus, m, s, prefix, path, true);
+                 if (r < 0)
+@@ -2612,7 +2646,8 @@ static int interfaces_added_append_one(
+                 const char *path,
+                 const char *interface) {
+ 
+-        char *prefix;
++        _cleanup_free_ char *prefix = NULL;
++        size_t pl;
+         int r;
+ 
+         assert(bus);
+@@ -2626,7 +2661,12 @@ static int interfaces_added_append_one(
+         if (bus->nodes_modified)
+                 return 0;
+ 
+-        prefix = alloca(strlen(path) + 1);
++        pl = strlen(path);
++        assert(pl <= BUS_PATH_SIZE_MAX);
++        prefix = new(char, pl + 1);
++        if (!prefix)
++                return -ENOMEM;
++
+         OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+                 r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true);
+                 if (r != 0)
+-- 
+2.20.1
+
diff --git a/buildroot/package/systemd/0020-basic-process-util-limit-command-line-lengths-to-_SC.patch b/buildroot/package/systemd/0020-basic-process-util-limit-command-line-lengths-to-_SC.patch
new file mode 100644
index 000000000..90a1b57a6
--- /dev/null
+++ b/buildroot/package/systemd/0020-basic-process-util-limit-command-line-lengths-to-_SC.patch
@@ -0,0 +1,160 @@
+From 2d5d2e0cc5171c6795d2a485841474345d9e30ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Wed, 5 Dec 2018 18:48:23 +0100
+Subject: [PATCH] basic/process-util: limit command line lengths to _SC_ARG_MAX
+
+This affects systemd-journald and systemd-coredump.
+
+Example entry:
+$ journalctl -o export -n1 'MESSAGE=Something logged'
+__CURSOR=s=976542d120c649f494471be317829ef9;i=34e;b=4871e4c474574ce4a462dfe3f1c37f06;m=c7d0c37dd2;t=57c4ac58f3b98;x=67598e942bd23dc0
+__REALTIME_TIMESTAMP=1544035467475864
+__MONOTONIC_TIMESTAMP=858200964562
+_BOOT_ID=4871e4c474574ce4a462dfe3f1c37f06
+PRIORITY=6
+_UID=1000
+_GID=1000
+_CAP_EFFECTIVE=0
+_SELINUX_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
+_AUDIT_SESSION=1
+_AUDIT_LOGINUID=1000
+_SYSTEMD_OWNER_UID=1000
+_SYSTEMD_UNIT=user@1000.service
+_SYSTEMD_SLICE=user-1000.slice
+_SYSTEMD_USER_SLICE=-.slice
+_SYSTEMD_INVOCATION_ID=1c4a469986d448719cb0f9141a10810e
+_MACHINE_ID=08a5690a2eed47cf92ac0a5d2e3cf6b0
+_HOSTNAME=krowka
+_TRANSPORT=syslog
+SYSLOG_FACILITY=17
+SYSLOG_IDENTIFIER=syslog-caller
+MESSAGE=Something logged
+_COMM=poc
+_EXE=/home/zbyszek/src/systemd-work3/poc
+_SYSTEMD_CGROUP=/user.slice/user-1000.slice/user@1000.service/gnome-terminal-server.service
+_SYSTEMD_USER_UNIT=gnome-terminal-server.service
+SYSLOG_PID=4108
+SYSLOG_TIMESTAMP=Dec  5 19:44:27
+_PID=4108
+_CMDLINE=./poc AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA>
+_SOURCE_REALTIME_TIMESTAMP=1544035467475848
+
+$ journalctl -o export -n1 'MESSAGE=Something logged' --output-fields=_CMDLINE|wc
+      6    2053 2097410
+
+2MB might be hard for some clients to use meaningfully, but OTOH, it is
+important to log the full commandline sometimes. For example, when the program
+is crashing, the exact argument list is useful.
+
+Signed-off-by: Jonah Petri 
+---
+ src/basic/process-util.c | 73 +++++++++++++++++-------------------------------
+ 1 file changed, 25 insertions(+), 48 deletions(-)
+
+diff --git a/src/basic/process-util.c b/src/basic/process-util.c
+index 448503409b..31fdbd9346 100644
+--- a/src/basic/process-util.c
++++ b/src/basic/process-util.c
+@@ -129,6 +129,13 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
+ 
+         (void) __fsetlocking(f, FSETLOCKING_BYCALLER);
+ 
++        if (max_length == 0) {
++                /* This is supposed to be a safety guard against runaway command lines. */
++                long l = sysconf(_SC_ARG_MAX);
++                assert(l > 0);
++                max_length = l;
++        }
++
+         if (max_length == 1) {
+ 
+                 /* If there's only room for one byte, return the empty string */
+@@ -139,32 +146,6 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
+                 *line = ans;
+                 return 0;
+ 
+-        } else if (max_length == 0) {
+-                size_t len = 0, allocated = 0;
+-
+-                while ((c = getc(f)) != EOF) {
+-
+-                        if (!GREEDY_REALLOC(ans, allocated, len+3)) {
+-                                free(ans);
+-                                return -ENOMEM;
+-                        }
+-
+-                        if (isprint(c)) {
+-                                if (space) {
+-                                        ans[len++] = ' ';
+-                                        space = false;
+-                                }
+-
+-                                ans[len++] = c;
+-                        } else if (len > 0)
+-                                space = true;
+-               }
+-
+-                if (len > 0)
+-                        ans[len] = '\0';
+-                else
+-                        ans = mfree(ans);
+-
+         } else {
+                 bool dotdotdot = false;
+                 size_t left;
+@@ -236,34 +217,30 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
+                 if (h < 0)
+                         return h;
+ 
+-                if (max_length == 0)
+-                        ans = strjoin("[", t, "]");
+-                else {
+-                        size_t l;
++                size_t l = strlen(t);
+ 
+-                        l = strlen(t);
+-
+-                        if (l + 3 <= max_length)
+-                                ans = strjoin("[", t, "]");
+-                        else if (max_length <= 6) {
++                if (l + 3 <= max_length) {
++                        ans = strjoin("[", t, "]");
++                        if (!ans)
++                                return -ENOMEM;
+ 
+-                                ans = new(char, max_length);
+-                                if (!ans)
+-                                        return -ENOMEM;
++                } else if (max_length <= 6) {
++                        ans = new(char, max_length);
++                        if (!ans)
++                                return -ENOMEM;
+ 
+-                                memcpy(ans, "[...]", max_length-1);
+-                                ans[max_length-1] = 0;
+-                        } else {
+-                                t[max_length - 6] = 0;
++                        memcpy(ans, "[...]", max_length-1);
++                        ans[max_length-1] = 0;
++                } else {
++                        t[max_length - 6] = 0;
+ 
+-                                /* Chop off final spaces */
+-                                delete_trailing_chars(t, WHITESPACE);
++                        /* Chop off final spaces */
++                        delete_trailing_chars(t, WHITESPACE);
+ 
+-                                ans = strjoin("[", t, "...]");
+-                        }
++                        ans = strjoin("[", t, "...]");
++                        if (!ans)
++                                return -ENOMEM;
+                 }
+-                if (!ans)
+-                        return -ENOMEM;
+         }
+ 
+         *line = ans;
+-- 
+2.14.3
+
diff --git a/buildroot/package/systemd/0021-process-util-don-t-use-overly-large-buffer-to-store-.patch b/buildroot/package/systemd/0021-process-util-don-t-use-overly-large-buffer-to-store-.patch
new file mode 100644
index 000000000..d599cfe5e
--- /dev/null
+++ b/buildroot/package/systemd/0021-process-util-don-t-use-overly-large-buffer-to-store-.patch
@@ -0,0 +1,71 @@
+From eb1ec489eef8a32918bbfc56a268c9d10464584d Mon Sep 17 00:00:00 2001
+From: Michal Sekletar 
+Date: Tue, 22 Jan 2019 14:29:50 +0100
+Subject: [PATCH] process-util: don't use overly large buffer to store process command line
+
+Allocate new string as a return value and free our "scratch pad"
+buffer that is potentially much larger than needed (up to
+_SC_ARG_MAX).
+
+Fixes #11502
+
+Signed-off-by: Jonah Petri 
+---
+ src/basic/process-util.c | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/src/basic/process-util.c b/src/basic/process-util.c
+index 31fdbd9346..78ce43b944 100644
+--- a/src/basic/process-util.c
++++ b/src/basic/process-util.c
+@@ -102,7 +102,8 @@ int get_process_comm(pid_t pid, char **ret) {
+ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line) {
+         _cleanup_fclose_ FILE *f = NULL;
+         bool space = false;
+-        char *k, *ans = NULL;
++        char *k;
++        _cleanup_free_ char *ans = NULL;
+         const char *p;
+         int c;
+ 
+@@ -143,7 +144,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
+                 if (!ans)
+                         return -ENOMEM;
+ 
+-                *line = ans;
++                *line = TAKE_PTR(ans);
+                 return 0;
+ 
+         } else {
+@@ -208,7 +209,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
+                 _cleanup_free_ char *t = NULL;
+                 int h;
+ 
+-                free(ans);
++                ans = mfree(ans);
+ 
+                 if (!comm_fallback)
+                         return -ENOENT;
+@@ -241,9 +242,18 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
+                         if (!ans)
+                                 return -ENOMEM;
+                 }
++
++                *line = TAKE_PTR(ans);
++                return 0;
+         }
+ 
+-        *line = ans;
++        k = realloc(ans, strlen(ans) + 1);
++        if (!k)
++                return -ENOMEM;
++
++        ans = NULL;
++        *line = k;
++
+         return 0;
+ }
+ 
+-- 
+2.14.3
+
diff --git a/buildroot/package/systemd/Config.in b/buildroot/package/systemd/Config.in
index 25f322e8f..920b65db4 100644
--- a/buildroot/package/systemd/Config.in
+++ b/buildroot/package/systemd/Config.in
@@ -325,6 +325,7 @@ config BR2_PACKAGE_SYSTEMD_TMPFILES
 
 config BR2_PACKAGE_SYSTEMD_VCONSOLE
 	bool "enable vconsole tool"
+	default y
 	help
 	  systemd-vconsole-setup is an early boot service that
 	  configures the virtual console font and console keymap.
diff --git a/buildroot/package/systemd/systemd.hash b/buildroot/package/systemd/systemd.hash
index 012f1e595..9c1a512ce 100644
--- a/buildroot/package/systemd/systemd.hash
+++ b/buildroot/package/systemd/systemd.hash
@@ -1,5 +1,5 @@
 # sha256 locally computed
-sha256	8a11b1b07d620f4c06a16e95bba4dd2a97e90efdf2a5ba47ed0a935085787a14  	systemd-239.tar.gz
+sha256	8f15aec1ac926e13a21a04d0ca3fe371f7004951448142a6f8952075c5b5f0b5  	systemd-240.tar.gz
 sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6	LICENSE.GPL2
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	LICENSE.LGPL2.1
-sha256	37ab495827a3cdbbc35ceaba3066764d69b6490e514e0c8a1acdb3c2fdb9e921	README
+sha256	a693f8f654fdf016e2aefe6b30aa6e1211728b8269ab325408a152c6c9b6ebe8	README
diff --git a/buildroot/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk
index e53f0b699..6f0e451b5 100644
--- a/buildroot/package/systemd/systemd.mk
+++ b/buildroot/package/systemd/systemd.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 239
+SYSTEMD_VERSION = 240
 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
 SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README)
 SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
 SYSTEMD_INSTALL_STAGING = YES
 SYSTEMD_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \
 	host-gperf \
 	host-intltool \
 	kmod \
@@ -23,7 +24,6 @@ SYSTEMD_CONF_OPTS += \
 	-Dblkid=true \
 	-Dman=false \
 	-Dima=false \
-	-Dlibcryptsetup=false \
 	-Defi=false \
 	-Dgnu-efi=false \
 	-Dldconfig=false \
@@ -34,7 +34,6 @@ SYSTEMD_CONF_OPTS += \
 	-Dsystem-uid-max=999 \
 	-Dsystem-gid-max=999 \
 	-Dtelinit-path=$(TARGET_DIR)/sbin/telinit \
-	-Dkill-path=/usr/bin/kill \
 	-Dkmod-path=/usr/bin/kmod \
 	-Dkexec-path=/usr/sbin/kexec \
 	-Dsulogin-path=/usr/sbin/sulogin \
@@ -58,6 +57,13 @@ else
 SYSTEMD_CONF_OPTS += -Daudit=false
 endif
 
+ifeq ($(BR2_PACKAGE_CRYPTSETUP),y)
+SYSTEMD_DEPENDENCIES += cryptsetup
+SYSTEMD_CONF_OPTS += -Dlibcryptsetup=true
+else
+SYSTEMD_CONF_OPTS += -Dlibcryptsetup=false
+endif
+
 ifeq ($(BR2_PACKAGE_ELFUTILS),y)
 SYSTEMD_DEPENDENCIES += elfutils
 SYSTEMD_CONF_OPTS += -Delfutils=true
@@ -65,6 +71,13 @@ else
 SYSTEMD_CONF_OPTS += -Delfutils=false
 endif
 
+ifeq ($(BR2_PACKAGE_IPTABLES),y)
+SYSTEMD_DEPENDENCIES += iptables
+SYSTEMD_CONF_OPTS += -Dlibiptc=true
+else
+SYSTEMD_CONF_OPTS += -Dlibiptc=false
+endif
+
 # Both options can't be selected at the same time so prefer libidn2
 ifeq ($(BR2_PACKAGE_LIBIDN2),y)
 SYSTEMD_DEPENDENCIES += libidn2
@@ -111,6 +124,13 @@ else
 SYSTEMD_CONF_OPTS += -Dpam=false
 endif
 
+ifeq ($(BR2_PACKAGE_VALGRIND),y)
+SYSTEMD_DEPENDENCIES += valgrind
+SYSTEMD_CONF_OPTS += -Dvalgrind=true
+else
+SYSTEMD_CONF_OPTS += -Dvalgrind=false
+endif
+
 ifeq ($(BR2_PACKAGE_XZ),y)
 SYSTEMD_DEPENDENCIES += xz
 SYSTEMD_CONF_OPTS += -Dxz=true
@@ -251,9 +271,9 @@ SYSTEMD_CONF_OPTS += -Dhostnamed=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_MYHOSTNAME),y)
-SYSTEMD_CONF_OPTS += -Dmyhostname=true
+SYSTEMD_CONF_OPTS += -Dnss-myhostname=true
 else
-SYSTEMD_CONF_OPTS += -Dmyhostname=false
+SYSTEMD_CONF_OPTS += -Dnss-myhostname=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_TIMEDATED),y)
@@ -377,19 +397,26 @@ endef
 
 ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),)
 # systemd needs getty.service for VTs and serial-getty.service for serial ttys
+# note that console-getty.service should be used on /dev/console as it should not have dependencies
 # also patch the file to use the correct baud-rate, the default baudrate is 115200 so look for that
 define SYSTEMD_INSTALL_SERVICE_TTY
-	if echo $(BR2_TARGET_GENERIC_GETTY_PORT) | egrep -q 'tty[0-9]*$$'; \
+	if [ $(BR2_TARGET_GENERIC_GETTY_PORT) = "console" ]; \
 	then \
-		SERVICE="getty"; \
+		TARGET="console-getty.service"; \
+		LINK_NAME="console-getty.service"; \
+	elif echo $(BR2_TARGET_GENERIC_GETTY_PORT) | egrep -q 'tty[0-9]*$$'; \
+	then \
+		TARGET="getty@.service"; \
+		LINK_NAME="getty@$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)).service"; \
 	else \
-		SERVICE="serial-getty"; \
+		TARGET="serial-getty@.service"; \
+		LINK_NAME="serial-getty@$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)).service"; \
 	fi; \
-	ln -fs ../../../../lib/systemd/system/$${SERVICE}@.service \
-		$(TARGET_DIR)/etc/systemd/system/getty.target.wants/$${SERVICE}@$(BR2_TARGET_GENERIC_GETTY_PORT).service; \
+	ln -fs ../../../../lib/systemd/system/$${TARGET} \
+		$(TARGET_DIR)/etc/systemd/system/getty.target.wants/$${LINK_NAME}; \
 	if [ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) -gt 0 ] ; \
 	then \
-		$(SED) 's,115200,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),' $(TARGET_DIR)/lib/systemd/system/$${SERVICE}@.service; \
+		$(SED) 's,115200,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),' $(TARGET_DIR)/lib/systemd/system/$${TARGET}; \
 	fi
 endef
 endif
diff --git a/buildroot/package/targetcli-fb/S50target b/buildroot/package/targetcli-fb/S50target
old mode 100755
new mode 100644
diff --git a/buildroot/package/tcf-agent/S55tcf-agent b/buildroot/package/tcf-agent/S55tcf-agent
old mode 100755
new mode 100644
diff --git a/buildroot/package/tcpreplay/tcpreplay.hash b/buildroot/package/tcpreplay/tcpreplay.hash
index b033d3c3f..31b3d3eb2 100644
--- a/buildroot/package/tcpreplay/tcpreplay.hash
+++ b/buildroot/package/tcpreplay/tcpreplay.hash
@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256 043756c532dab93e2be33a517ef46b1341f7239278a1045ae670041dd8a4531d  tcpreplay-4.2.6.tar.gz
+# https://github.com/appneta/tcpreplay/releases/download/v4.3.1/tcpreplay-4.3.1.tar.xz.asc
+# using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E
+sha256 108924a25e616e3465139410c49cae629c338df73443dfc8fc155ea9f099c659  tcpreplay-4.3.1.tar.xz
+sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05  docs/LICENSE
diff --git a/buildroot/package/tcpreplay/tcpreplay.mk b/buildroot/package/tcpreplay/tcpreplay.mk
index adccde0eb..71e57d5bd 100644
--- a/buildroot/package/tcpreplay/tcpreplay.mk
+++ b/buildroot/package/tcpreplay/tcpreplay.mk
@@ -4,24 +4,20 @@
 #
 ################################################################################
 
-TCPREPLAY_VERSION = 4.2.6
+TCPREPLAY_VERSION = 4.3.1
 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)
+TCPREPLAY_SOURCE = tcpreplay-4.3.1.tar.xz
 TCPREPLAY_LICENSE = GPL-3.0
 TCPREPLAY_LICENSE_FILES = docs/LICENSE
 TCPREPLAY_CONF_ENV = \
-	tr_cv_libpcap_version=">= 0.7.0" \
-	ac_cv_have_bpf=no \
-	$(call AUTOCONF_AC_CHECK_FILE_VAL,$(STAGING_DIR)/usr/include/pcap-netmap.c)=no
-TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr
+	ac_cv_path_ac_pt_PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config"
+TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \
+	--enable-pcapconfig
 TCPREPLAY_DEPENDENCIES = libpcap
 
-# libpcap may depend on symbols in other libs
-TCPREPLAY_LIBS = $(STAGING_DIR)/usr/bin/pcap-config --static --libs
-TCPREPLAY_CONF_ENV += ac_cv_search_pcap_close="`$(TCPREPLAY_LIBS)`" \
-	LIBS="`$(TCPREPLAY_LIBS)`"
-
 ifeq ($(BR2_STATIC_LIBS),y)
 TCPREPLAY_CONF_OPTS += --enable-dynamic-link=no
+TCPREPLAY_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --libs`"
 endif
 
 ifeq ($(BR2_PACKAGE_TCPDUMP),y)
diff --git a/buildroot/package/tekui/tekui.mk b/buildroot/package/tekui/tekui.mk
index f9ae84903..13000edd3 100644
--- a/buildroot/package/tekui/tekui.mk
+++ b/buildroot/package/tekui/tekui.mk
@@ -11,6 +11,9 @@ TEKUI_LICENSE = MIT
 TEKUI_LICENSE_FILES = COPYRIGHT
 TEKUI_DEPENDENCIES = freetype luainterpreter
 
+# Package does not build in parallel due to improper make rules
+TEKUI_MAKE = $(MAKE1)
+
 TEKUI_MAKE_OPTS = \
 	CC="$(TARGET_CC) -fPIC" \
 	AR="$(TARGET_AR) rcu" \
diff --git a/buildroot/package/terminology/terminology.hash b/buildroot/package/terminology/terminology.hash
index f341d5c2f..1e0a85cd2 100644
--- a/buildroot/package/terminology/terminology.hash
+++ b/buildroot/package/terminology/terminology.hash
@@ -1,3 +1,3 @@
-# From https://sourceforge.net/p/enlightenment/mailman/message/36317484/
-sha256  ac8673a129ed78ef669a8c04e7a136f5ca95226ce5ef375a451421bac41828c6  terminology-1.2.1.tar.xz
+# From https://sourceforge.net/p/enlightenment/mailman/message/36497308/
+sha256  b5171181da42cc5f384238f71e43302c2c760938f6a8ab931647ccdad4ef94cd  terminology-1.3.2.tar.xz
 sha256  605988548c7a52562d6f64d936a579b53f690e62ca92261b6a440bf9023ff521  COPYING
diff --git a/buildroot/package/terminology/terminology.mk b/buildroot/package/terminology/terminology.mk
index af37187d9..c53f6829d 100644
--- a/buildroot/package/terminology/terminology.mk
+++ b/buildroot/package/terminology/terminology.mk
@@ -4,37 +4,19 @@
 #
 ################################################################################
 
-TERMINOLOGY_VERSION = 1.2.1
+TERMINOLOGY_VERSION = 1.3.2
 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz
 TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology
 TERMINOLOGY_LICENSE = BSD-2-Clause
 TERMINOLOGY_LICENSE_FILES = COPYING
 
-TERMINOLOGY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) efl host-meson host-pkgconf
-TERMINOLOGY_MESON_OPTS = \
-	--prefix=/usr \
-	--buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
-	--cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \
-	-Dedje-cc=$(HOST_DIR)/bin/edje_cc
+TERMINOLOGY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) efl host-pkgconf
+TERMINOLOGY_CONF_OPTS = -Dedje-cc=$(HOST_DIR)/bin/edje_cc
 
 ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
-TERMINOLOGY_MESON_OPTS += -Dnls=true
+TERMINOLOGY_CONF_OPTS += -Dnls=true
 else
-TERMINOLOGY_MESON_OPTS += -Dnls=false
+TERMINOLOGY_CONF_OPTS += -Dnls=false
 endif
 
-define TERMINOLOGY_CONFIGURE_CMDS
-	rm -rf $(@D)/build
-	mkdir -p $(@D)/build
-	$(TARGET_MAKE_ENV) meson $(TERMINOLOGY_MESON_OPTS) $(@D) $(@D)/build
-endef
-
-define TERMINOLOGY_BUILD_CMDS
-	$(TARGET_MAKE_ENV) ninja -C $(@D)/build
-endef
-
-define TERMINOLOGY_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja -C $(@D)/build install
-endef
-
-$(eval $(generic-package))
+$(eval $(meson-package))
diff --git a/buildroot/package/tesseract-ocr/tesseract-ocr.hash b/buildroot/package/tesseract-ocr/tesseract-ocr.hash
index 09c7a7191..d95375884 100644
--- a/buildroot/package/tesseract-ocr/tesseract-ocr.hash
+++ b/buildroot/package/tesseract-ocr/tesseract-ocr.hash
@@ -1,9 +1,9 @@
 # locally computed
-sha256  494d64ffa7069498a97b909a0e65a35a213989e0184f1ea15332933a90d43445  tesseract-ocr-3.05.02.tar.gz
+sha256  a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd  tesseract-ocr-4.0.0.tar.gz
 sha256  d770c1ac1235bc018530701da1ce453367f7952a3075d12b9029f81a26c05f13  COPYING
-sha256  c0515c9f1e0c79e1069fcc05c2b2f6a6841fb5e1082d695db160333c1154f06d  eng.traineddata
-sha256  86afb23ad146467f263e8ade56fd3951b1cc28f8c4eebc34f993d3c02d88a7ab  fra.traineddata
-sha256  cb7eb42a7e972cec7ef904fe81825d7b547c46df684c814fdb11a930b13bca3a  deu.traineddata
-sha256  f23985996bbcfe2b57864ccb082783c1c74c87429f04411a04a6ba4d3da2efda  spa.traineddata
-sha256  323ae74d4a2ff49e932dbb4d6282fe0e67ddfafda075ec85803ecd077207454c  chi_sim.traineddata
-sha256  774d566bd0b36e4b6c07415dfa5b6b57feb2575b1f5f231d7fe01a52dac5dd0e  chi_tra.traineddata
+sha256  daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047  eng.traineddata
+sha256  eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913  fra.traineddata
+sha256  896b3b4956503ab9daa10285db330881b2d74b70d889b79262cc534b9ec699a4  deu.traineddata
+sha256  0b0fcbb4665189e01ab8019e591f014dd7260460de072543edd4b2cb4ede7c96  spa.traineddata
+sha256  fc05d89ab31d8b4e226910f16a8bcbf78e43bae3e2580bb5feefd052efdab363  chi_sim.traineddata
+sha256  559067dc0f7c94788884742129d66a0117dde7f4ff12b263d92147173497db14  chi_tra.traineddata
diff --git a/buildroot/package/tesseract-ocr/tesseract-ocr.mk b/buildroot/package/tesseract-ocr/tesseract-ocr.mk
index 77b218121..74b344961 100644
--- a/buildroot/package/tesseract-ocr/tesseract-ocr.mk
+++ b/buildroot/package/tesseract-ocr/tesseract-ocr.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-TESSERACT_OCR_VERSION = 3.05.02
-TESSERACT_OCR_DATA_VERSION = 3.04.00
+TESSERACT_OCR_VERSION = 4.0.0
+TESSERACT_OCR_DATA_VERSION = 4.0.0
 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION))
 TESSERACT_OCR_LICENSE = Apache-2.0
 TESSERACT_OCR_LICENSE_FILES = COPYING
@@ -19,6 +19,7 @@ TESSERACT_OCR_AUTORECONF = YES
 TESSERACT_OCR_DEPENDENCIES = leptonica host-pkgconf
 TESSERACT_OCR_INSTALL_STAGING = YES
 TESSERACT_OCR_CONF_ENV = \
+	ac_cv_prog_have_asciidoc=false \
 	LIBLEPT_HEADERSDIR=$(STAGING_DIR)/usr/include/leptonica
 TESSERACT_OCR_CONF_OPTS = \
 	--disable-opencl
diff --git a/buildroot/package/tftpd/S80tftpd-hpa b/buildroot/package/tftpd/S80tftpd-hpa
old mode 100755
new mode 100644
diff --git a/buildroot/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch b/buildroot/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch
new file mode 100644
index 000000000..92c55d05a
--- /dev/null
+++ b/buildroot/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch
@@ -0,0 +1,31 @@
+From f87ae3963e651fe9f4b3125192c77aae86c007e0 Mon Sep 17 00:00:00 2001
+From: Patrick Havelange 
+Date: Mon, 21 Jan 2019 09:49:23 +0100
+Subject: [PATCH] Force to keep TPipedTransport::peek() to avoid linker error.
+
+Otherwise got the "defined in discarded section" linker error
+with x86-64-musl toolchain. This is probably a toolchain issue - the
+compiler shouldn't remove that function.
+
+Signed-off-by: Patrick Havelange 
+Upstream-status: Not Applicable
+---
+ lib/cpp/src/thrift/transport/TTransportUtils.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/cpp/src/thrift/transport/TTransportUtils.h b/lib/cpp/src/thrift/transport/TTransportUtils.h
+index f3b4c5a..7589182 100644
+--- a/lib/cpp/src/thrift/transport/TTransportUtils.h
++++ b/lib/cpp/src/thrift/transport/TTransportUtils.h
+@@ -114,7 +114,7 @@ public:
+ 
+   bool isOpen() { return srcTrans_->isOpen(); }
+ 
+-  bool peek() {
++  bool __attribute__ ((used)) peek() {
+     if (rPos_ >= rLen_) {
+       // Double the size of the underlying buffer if it is full
+       if (rLen_ == rBufSize_) {
+-- 
+2.17.1
+
diff --git a/buildroot/package/thrift/0001-libevent-cross.patch b/buildroot/package/thrift/0001-libevent-cross.patch
deleted file mode 100644
index f07caa762..000000000
--- a/buildroot/package/thrift/0001-libevent-cross.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Make it cross-compile happy the hard way, there's no clean way.
-
-Signed-off-by: Gustavo Zacarias 
-
-diff -Nura thrift-0.9.1.orig/aclocal/ax_lib_event.m4 thrift-0.9.1/aclocal/ax_lib_event.m4
---- thrift-0.9.1.orig/aclocal/ax_lib_event.m4	2013-08-15 11:04:29.000000000 -0300
-+++ thrift-0.9.1/aclocal/ax_lib_event.m4	2013-10-07 20:40:44.076435613 -0300
-@@ -75,7 +75,7 @@
-           AC_LANG_PUSH([C])
-           dnl This can be changed to AC_LINK_IFELSE if you are cross-compiling,
-           dnl but then the version cannot be checked.
--          AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-           #include 
-           #include 
-           ]], [[
diff --git a/buildroot/package/thrift/0002-autoreconf.patch b/buildroot/package/thrift/0002-autoreconf.patch
deleted file mode 100644
index 1a52f7c70..000000000
--- a/buildroot/package/thrift/0002-autoreconf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fillers to make autoreconf (automake) happy.
-
-Signed-off-by: Gustavo Zacarias 
-
-diff -Nura thrift-0.9.2.orig/AUTHORS thrift-0.9.2/AUTHORS
---- thrift-0.9.2.orig/AUTHORS	1969-12-31 21:00:00.000000000 -0300
-+++ thrift-0.9.2/AUTHORS	2014-12-05 14:46:20.431211224 -0300
-@@ -0,0 +1,2 @@
-+
-+
-diff -Nura thrift-0.9.2.orig/ChangeLog thrift-0.9.2/ChangeLog
---- thrift-0.9.2.orig/ChangeLog	1969-12-31 21:00:00.000000000 -0300
-+++ thrift-0.9.2/ChangeLog	2014-12-05 14:46:34.290686170 -0300
-@@ -0,0 +1,2 @@
-+
-+
-diff -Nura thrift-0.9.2.orig/NEWS thrift-0.9.2/NEWS
---- thrift-0.9.2.orig/NEWS	1969-12-31 21:00:00.000000000 -0300
-+++ thrift-0.9.2/NEWS	2014-12-05 14:46:32.308618241 -0300
-@@ -0,0 +1,2 @@
-+
-+
-diff -Nura thrift-0.9.2.orig/README thrift-0.9.2/README
---- thrift-0.9.2.orig/README	1969-12-31 21:00:00.000000000 -0300
-+++ thrift-0.9.2/README	2014-12-05 14:46:28.305481028 -0300
-@@ -0,0 +1,2 @@
-+
-+
diff --git a/buildroot/package/thrift/0003-zlib-cross.patch b/buildroot/package/thrift/0003-zlib-cross.patch
deleted file mode 100644
index 3af39c469..000000000
--- a/buildroot/package/thrift/0003-zlib-cross.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Make zlib version detection cross-compile happy.
-
-Signed-off-by: Gustavo Zacarias 
-
-diff -Nura thrift-0.9.1.orig/aclocal/ax_lib_zlib.m4 thrift-0.9.1/aclocal/ax_lib_zlib.m4
---- thrift-0.9.1.orig/aclocal/ax_lib_zlib.m4	2013-08-15 11:04:29.000000000 -0300
-+++ thrift-0.9.1/aclocal/ax_lib_zlib.m4	2013-10-07 20:47:44.523177973 -0300
-@@ -73,7 +73,7 @@
-           #   (defined in the library).
-           AC_LANG_PUSH([C])
-           dnl This can be changed to AC_LINK_IFELSE if you are cross-compiling.
--          AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-           #include 
-           #if ZLIB_VERNUM >= 0x$WANT_ZLIB_VERSION
-           #else
diff --git a/buildroot/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch b/buildroot/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch
deleted file mode 100644
index ec2e22566..000000000
--- a/buildroot/package/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9b03d2b02d32302008d2bd0218b31b9a0ca5a748 Mon Sep 17 00:00:00 2001
-From: Jens Geyer 
-Date: Fri, 3 Apr 2015 12:37:03 +0200
-Subject: [PATCH] THRIFT-3071 check minimum required version of automake in bootstrap.sh
-Client: Build process
-Patch: James E. King, III 
-
-This closes #421
-
-- remove a warning when using libtool
-
-"libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([./aclocal])' to configure.ac,"
-
-[Romain:
-  - This is upstream commit 4aa95df383bfa13c46a4dc0b41672ec29d476300
-  - remove the part for bootstrap.sh which is not
-    bundled in thrift archive.
-  - fix the commit log accordingly]
-
-Signed-off-by: Romain Naour 
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 5fa611e..8daeb03 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,6 +18,7 @@
- #
- 
- AC_PREREQ(2.65)
-+AC_CONFIG_MACRO_DIR([./aclocal])
- 
- AC_INIT([thrift], [0.9.2])
- 
-@@ -540,6 +541,7 @@ AC_CHECK_FUNCS([memset])
- AC_CHECK_FUNCS([mkdir])
- AC_CHECK_FUNCS([realpath])
- AC_CHECK_FUNCS([select])
-+AC_CHECK_FUNCS([setlocale])
- AC_CHECK_FUNCS([socket])
- AC_CHECK_FUNCS([strchr])
- AC_CHECK_FUNCS([strdup])
--- 
-1.9.3
-
diff --git a/buildroot/package/thrift/0005-configure.ac-C-11-is-optional.patch b/buildroot/package/thrift/0005-configure.ac-C-11-is-optional.patch
deleted file mode 100644
index 9ed7e0a69..000000000
--- a/buildroot/package/thrift/0005-configure.ac-C-11-is-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9c3a7e79b256730dd85a7acadbaf57ab018b3127 Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Tue, 7 Apr 2015 07:37:26 +0200
-Subject: [PATCH] configure.ac: C++11 is optional
-
-Thrift build fine whitout c++11 support.
-
-Signed-off-by: Romain Naour 
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8daeb03..bfd49ae 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -99,7 +99,7 @@ AC_PROG_AWK
- AC_PROG_RANLIB
- 
- AC_LANG([C++])
--AX_CXX_COMPILE_STDCXX_11([noext])
-+AX_CXX_COMPILE_STDCXX_11([noext], [optional])
- 
- AC_ARG_ENABLE([libs],
-   AS_HELP_STRING([--enable-libs], [build the Apache Thrift libraries [default=yes]]),
--- 
-1.9.3
-
diff --git a/buildroot/package/thrift/thrift.hash b/buildroot/package/thrift/thrift.hash
index 811aa988e..7aca8b5a7 100644
--- a/buildroot/package/thrift/thrift.hash
+++ b/buildroot/package/thrift/thrift.hash
@@ -1,2 +1,4 @@
-# From https://www.apache.org/dist/thrift/0.9.2/thrift-0.9.2.tar.gz.md5
-md5	89f63cc4d0100912f4a1f8a9dee63678	thrift-0.9.2.tar.gz
+# From https://www.apache.org/dist/thrift/0.12.0/thrift-0.12.0.tar.gz.sha256
+sha256  c336099532b765a6815173f62df0ed897528a9d551837d627c1f87fadad90428	thrift-0.12.0.tar.gz
+# License files, locally calculated
+sha256  23df881cec3192d1f4474633c14eb2ec30a45b84f8daeb82b9de5d2bd3ac8218        LICENSE
diff --git a/buildroot/package/thrift/thrift.mk b/buildroot/package/thrift/thrift.mk
index 741d33f57..6014bbfcd 100644
--- a/buildroot/package/thrift/thrift.mk
+++ b/buildroot/package/thrift/thrift.mk
@@ -4,75 +4,65 @@
 #
 ################################################################################
 
-THRIFT_VERSION = 0.9.2
+THRIFT_VERSION = 0.12.0
 THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION)
-THRIFT_DEPENDENCIES = host-autoconf-archive host-pkgconf host-thrift boost \
-	libevent openssl zlib
-THRIFT_INSTALL_STAGING = YES
-HOST_THRIFT_DEPENDENCIES = host-autoconf-archive host-bison host-boost \
-	host-flex host-libevent host-openssl host-pkgconf host-zlib
-
-THRIFT_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \
-	--with-boost \
-	--with-boost-libdir=$(STAGING_DIR)/usr/lib \
-	--disable-tests \
-	--disable-tutorial
-HOST_THRIFT_CONF_OPTS = --with-sysroot=$(HOST_DIR) \
-	--disable-tests \
-	--disable-tutorial
-THRIFT_AUTORECONF = YES
-THRIFT_AUTORECONF_OPTS = -I $(HOST_DIR)/share/autoconf-archive
 THRIFT_LICENSE = Apache-2.0
 THRIFT_LICENSE_FILES = LICENSE
 
+THRIFT_DEPENDENCIES = host-pkgconf host-thrift boost \
+	libevent openssl zlib
+THRIFT_INSTALL_STAGING = YES
+HOST_THRIFT_DEPENDENCIES = host-bison host-boost \
+	host-flex host-libevent host-openssl host-pkgconf host-zlib
+
+THRIFT_COMMON_CONF_OPTS = -DBUILD_TUTORIALS=OFF \
+	-DBUILD_TESTING=OFF \
+	-DWITH_PYTHON=OFF \
+	-DWITH_JAVA=OFF \
+	-DWITH_QT5=OFF
+
+THRIFT_CONF_OPTS = $(THRIFT_COMMON_CONF_OPTS) -DBUILD_COMPILER=OFF
+HOST_THRIFT_CONF_OPTS = $(THRIFT_COMMON_CONF_OPTS) -DBUILD_COMPILER=ON
+
 # relocation truncated to fit: R_68K_GOT16O
 ifeq ($(BR2_m68k_cf),y)
 THRIFT_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mxgot"
 endif
 
+# thrift doesn't use the regular flags BUILD_{STATIC,SHARED}_LIBS
 ifeq ($(BR2_STATIC_LIBS),y)
-# openssl uses zlib, so we need to explicitly link with it when static
-THRIFT_CONF_ENV += LIBS=-lz
+THRIFT_CONF_OPTS += -DWITH_STATIC_LIB=ON -DWITH_BOOST_STATIC=ON -DWITH_SHARED_LIB=OFF
+else ifeq ($(BR2_SHARED_LIBS),y)
+THRIFT_CONF_OPTS += -DWITH_STATIC_LIB=OFF -DWITH_BOOST_STATIC=OFF -DWITH_SHARED_LIB=ON
+else
+# BR2_SHARED_STATIC_LIBS
+THRIFT_CONF_OPTS += -DWITH_STATIC_LIB=ON -DWITH_BOOST_STATIC=OFF -DWITH_SHARED_LIB=ON
 endif
 
-# Language selection
-# The generator (host tool) works with all of them regardless
-# This is just for the libraries / bindings
-THRIFT_LANG_CONF_OPTS += --without-csharp --without-java --without-erlang \
-	--without-python --without-perl --without-php --without-php_extension \
-	--without-ruby --without-haskell --without-go --without-d \
-	--without-qt4 --without-lua
-HOST_THRIFT_CONF_OPTS += $(THRIFT_LANG_CONF_OPTS) --without-c_glib
-THRIFT_CONF_OPTS += $(THRIFT_LANG_CONF_OPTS)
+# Language selection for the compiler
+HOST_THRIFT_CONF_OPTS += -DTHRIFT_COMPILER_CSHARP=OFF \
+	-DTHRIFT_COMPILER_JAVA=OFF \
+	-DTHRIFT_COMPILER_ERL=OFF \
+	-DTHRIFT_COMPILER_PY=OFF \
+	-DTHRIFT_COMPILER_PERL=OFF \
+	-DTHRIFT_COMPILER_PHP=OFF \
+	-DTHRIFT_COMPILER_RB=OFF \
+	-DTHRIFT_COMPILER_HS=OFF \
+	-DTHRIFT_COMPILER_GO=OFF \
+	-DTHRIFT_COMPILER_D=OFF \
+	-DTHRIFT_COMPILER_LUA=OFF \
+	-DBUILD_C_GLIB=OFF
 
 # C bindings
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
 THRIFT_DEPENDENCIES += libglib2
+THRIFT_CONF_OPTS += -DBUILD_C_GLIB=ON
 else
-THRIFT_CONF_OPTS += --without-c_glib
+THRIFT_CONF_OPTS += -DBUILD_C_GLIB=OFF
 endif
 
-# De-hardcode THRIFT for cross compiling
-define THRIFT_TOOL_NO_HARDCODE
-	for f in `find $(@D) -name Makefile.am -type f`; do \
-		$(SED) "/^THRIFT =/d" $$f; \
-	done
-	$(SED) "s:top_builddir)/compiler/cpp/thrift:THRIFT):" $(@D)/tutorial/Makefile.am
-endef
-
-THRIFT_POST_PATCH_HOOKS += THRIFT_TOOL_NO_HARDCODE
-
-define THRIFT_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) THRIFT=$(HOST_DIR)/bin/thrift -C $(@D)
-endef
-
-# Install runtime only
-define THRIFT_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/lib DESTDIR=$(TARGET_DIR) install
-endef
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
 
 # to be used by other packages
 THRIFT = $(HOST_DIR)/bin/thrift
diff --git a/buildroot/package/thttpd/0001-getline.patch b/buildroot/package/thttpd/0001-getline.patch
deleted file mode 100644
index 35c366aef..000000000
--- a/buildroot/package/thttpd/0001-getline.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix glibc/eglibc getline() conflicting functions.
-
-Signed-off-by: Gustavo Zacarias 
----
-
-diff -Nura thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
---- thttpd-2.25b.orig/extras/htpasswd.c	2001-12-18 21:08:08.000000000 -0300
-+++ thttpd-2.25b/extras/htpasswd.c	2011-11-25 11:42:47.198582812 -0300
-@@ -49,7 +49,7 @@
-     while((line[y++] = line[x++]));
- }
- 
--static int getline(char *s, int n, FILE *f) {
-+static int get_line(char *s, int n, FILE *f) {
-     register int i=0;
- 
-     while(1) {
-@@ -189,7 +189,7 @@
-     strcpy(user,argv[2]);
- 
-     found = 0;
--    while(!(getline(line,MAX_STRING_LEN,f))) {
-+    while(!(get_line(line,MAX_STRING_LEN,f))) {
-         if(found || (line[0] == '#') || (!line[0])) {
-             putline(tfp,line);
-             continue;
diff --git a/buildroot/package/thttpd/thttpd.hash b/buildroot/package/thttpd/thttpd.hash
index 2400f5bc8..4bdd7fe74 100644
--- a/buildroot/package/thttpd/thttpd.hash
+++ b/buildroot/package/thttpd/thttpd.hash
@@ -1,3 +1,3 @@
-# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/t/thttpd/thttpd_2.25b-11.dsc
-sha256	07719b08b1cff6a21c08697a7bcb4395425b07ee753106262fb62a03a7d32360	thttpd_2.25b.orig.tar.gz
-sha256	4d213c18daf121d21412cc54864fbca250e1773a91df6573373e1d2273a2cec9	thttpd_2.25b-11.diff.gz
+# Locally calculated
+sha256	99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397	thttpd-2.29.tar.gz
+sha256	be059e6b8219d5bb5480fa6a2864bbb34892f56951d03d08b356bc1fa8c81a01	thttpd.c
diff --git a/buildroot/package/thttpd/thttpd.mk b/buildroot/package/thttpd/thttpd.mk
index f1bee0134..29611fff2 100644
--- a/buildroot/package/thttpd/thttpd.mk
+++ b/buildroot/package/thttpd/thttpd.mk
@@ -4,23 +4,11 @@
 #
 ################################################################################
 
-THTTPD_VERSION = 2.25b
-THTTPD_SOURCE = thttpd_$(THTTPD_VERSION).orig.tar.gz
-THTTPD_PATCH = thttpd_$(THTTPD_VERSION)-11.diff.gz
-THTTPD_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/t/thttpd
+THTTPD_VERSION = 2.29
+THTTPD_SITE = https://acme.com/software/thttpd
 THTTPD_LICENSE = BSD-2-Clause
 THTTPD_LICENSE_FILES = thttpd.c
 
-ifneq ($(THTTPD_PATCH),)
-define THTTPD_DEBIAN_PATCHES
-	if [ -d $(@D)/debian/patches ]; then \
-		$(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \
-	fi
-endef
-endif
-
-THTTPD_POST_PATCH_HOOKS = THTTPD_DEBIAN_PATCHES
-
 THTTPD_MAKE = $(MAKE1)
 
 define THTTPD_INSTALL_TARGET_CMDS
diff --git a/buildroot/package/tiff/0001-Fix-for-simple-memory-leak-that-was-assigned-CVE-2019-6128.patch b/buildroot/package/tiff/0001-Fix-for-simple-memory-leak-that-was-assigned-CVE-2019-6128.patch
new file mode 100644
index 000000000..638760b71
--- /dev/null
+++ b/buildroot/package/tiff/0001-Fix-for-simple-memory-leak-that-was-assigned-CVE-2019-6128.patch
@@ -0,0 +1,53 @@
+From 0c74a9f49b8d7a36b17b54a7428b3526d20f88a8 Mon Sep 17 00:00:00 2001
+From: Scott Gayou 
+Date: Wed, 23 Jan 2019 15:03:53 -0500
+Subject: [PATCH] Fix for simple memory leak that was assigned CVE-2019-6128.
+
+pal2rgb failed to free memory on a few errors. This was reported
+here: http://bugzilla.maptools.org/show_bug.cgi?id=2836.
+
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://gitlab.com/libtiff/libtiff/commit/ae0bed1fe530a82faf2e9ea1775109dbf301a971]
+---
+ tools/pal2rgb.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c
+index 01d8502e..9492f1cf 100644
+--- a/tools/pal2rgb.c
++++ b/tools/pal2rgb.c
+@@ -118,12 +118,14 @@ main(int argc, char* argv[])
+ 	    shortv != PHOTOMETRIC_PALETTE) {
+ 		fprintf(stderr, "%s: Expecting a palette image.\n",
+ 		    argv[optind]);
++		(void) TIFFClose(in);
+ 		return (-1);
+ 	}
+ 	if (!TIFFGetField(in, TIFFTAG_COLORMAP, &rmap, &gmap, &bmap)) {
+ 		fprintf(stderr,
+ 		    "%s: No colormap (not a valid palette image).\n",
+ 		    argv[optind]);
++		(void) TIFFClose(in);
+ 		return (-1);
+ 	}
+ 	bitspersample = 0;
+@@ -131,11 +133,14 @@ main(int argc, char* argv[])
+ 	if (bitspersample != 8) {
+ 		fprintf(stderr, "%s: Sorry, can only handle 8-bit images.\n",
+ 		    argv[optind]);
++		(void) TIFFClose(in);
+ 		return (-1);
+ 	}
+ 	out = TIFFOpen(argv[optind+1], "w");
+-	if (out == NULL)
++	if (out == NULL) {
++		(void) TIFFClose(in);
+ 		return (-2);
++	}
+ 	cpTags(in, out);
+ 	TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &imagewidth);
+ 	TIFFGetField(in, TIFFTAG_IMAGELENGTH, &imagelength);
+-- 
+2.18.1
+
diff --git a/buildroot/package/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch b/buildroot/package/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch
deleted file mode 100644
index 2be989b9e..000000000
--- a/buildroot/package/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 6173a57d39e04d68b139f8c1aa499a24dbe74ba1 Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Fri, 30 Jun 2017 17:29:44 +0000
-Subject: [PATCH] * libtiff/tif_dirwrite.c: in
- TIFFWriteDirectoryTagCheckedXXXX() functions associated with LONG8/SLONG8
- data type, replace assertion that the file is BigTIFF, by a non-fatal error.
- Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2712 Reported by team
- OWL337
-
-[Peter: drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard 
----
- libtiff/tif_dirwrite.c | 20 ++++++++++++++++----
- 1 file changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
-index 2967da58..8d6686ba 100644
---- a/libtiff/tif_dirwrite.c
-+++ b/libtiff/tif_dirwrite.c
-@@ -2111,7 +2111,10 @@ TIFFWriteDirectoryTagCheckedLong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, ui
- {
- 	uint64 m;
- 	assert(sizeof(uint64)==8);
--	assert(tif->tif_flags&TIFF_BIGTIFF);
-+	if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
-+		TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","LONG8 not allowed for ClassicTIFF");
-+		return(0);
-+	}
- 	m=value;
- 	if (tif->tif_flags&TIFF_SWAB)
- 		TIFFSwabLong8(&m);
-@@ -2124,7 +2127,10 @@ TIFFWriteDirectoryTagCheckedLong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* di
- {
- 	assert(count<0x20000000);
- 	assert(sizeof(uint64)==8);
--	assert(tif->tif_flags&TIFF_BIGTIFF);
-+	if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
-+		TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","LONG8 not allowed for ClassicTIFF");
-+		return(0);
-+	}
- 	if (tif->tif_flags&TIFF_SWAB)
- 		TIFFSwabArrayOfLong8(value,count);
- 	return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_LONG8,count,count*8,value));
-@@ -2136,7 +2142,10 @@ TIFFWriteDirectoryTagCheckedSlong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, u
- {
- 	int64 m;
- 	assert(sizeof(int64)==8);
--	assert(tif->tif_flags&TIFF_BIGTIFF);
-+	if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
-+		TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF");
-+		return(0);
-+	}
- 	m=value;
- 	if (tif->tif_flags&TIFF_SWAB)
- 		TIFFSwabLong8((uint64*)(&m));
-@@ -2149,7 +2158,10 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d
- {
- 	assert(count<0x20000000);
- 	assert(sizeof(int64)==8);
--	assert(tif->tif_flags&TIFF_BIGTIFF);
-+	if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
-+		TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF");
-+		return(0);
-+	}
- 	if (tif->tif_flags&TIFF_SWAB)
- 		TIFFSwabArrayOfLong8((uint64*)value,count);
- 	return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_SLONG8,count,count*8,value));
--- 
-2.11.0
-
diff --git a/buildroot/package/tiff/tiff.hash b/buildroot/package/tiff/tiff.hash
index 516cb0626..21eb4bd37 100644
--- a/buildroot/package/tiff/tiff.hash
+++ b/buildroot/package/tiff/tiff.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910  tiff-4.0.8.tar.gz
+sha256 2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4  tiff-4.0.10.tar.gz
+sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7  COPYRIGHT
diff --git a/buildroot/package/tiff/tiff.mk b/buildroot/package/tiff/tiff.mk
index 405cb9251..aef08b341 100644
--- a/buildroot/package/tiff/tiff.mk
+++ b/buildroot/package/tiff/tiff.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TIFF_VERSION = 4.0.8
+TIFF_VERSION = 4.0.10
 TIFF_SITE = http://download.osgeo.org/libtiff
 TIFF_LICENSE = tiff license
 TIFF_LICENSE_FILES = COPYRIGHT
diff --git a/buildroot/package/tinyhttpd/S85tinyhttpd b/buildroot/package/tinyhttpd/S85tinyhttpd
old mode 100755
new mode 100644
diff --git a/buildroot/package/tmux/tmux.hash b/buildroot/package/tmux/tmux.hash
index 27a3ccaae..306dc52c3 100644
--- a/buildroot/package/tmux/tmux.hash
+++ b/buildroot/package/tmux/tmux.hash
@@ -1,4 +1,3 @@
 # Locally computed:
-sha256 9ded7d100313f6bc5a87404a4048b3745d61f2332f99ec1400a7c4ed9485d452  tmux-2.7.tar.gz
-sha256 59ad3f5d323cb6b97bb3882c454e6176519cd580b2d4db43c5161517385569f1  README
+sha256 7f6bf335634fafecff878d78de389562ea7f73a7367f268b66d37ea13617a2ba  tmux-2.8.tar.gz
 sha256 ce75f1345a76c93bd0f413d1b93ff1baa0669f34a7242779a00c1b862b4f813a  COPYING
diff --git a/buildroot/package/tmux/tmux.mk b/buildroot/package/tmux/tmux.mk
index deae99717..8b7a96e89 100644
--- a/buildroot/package/tmux/tmux.mk
+++ b/buildroot/package/tmux/tmux.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-TMUX_VERSION = 2.7
+TMUX_VERSION = 2.8
 TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION)
 TMUX_LICENSE = ISC
-TMUX_LICENSE_FILES = README COPYING
+TMUX_LICENSE_FILES = COPYING
 TMUX_DEPENDENCIES = libevent ncurses host-pkgconf
 
 # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear
diff --git a/buildroot/package/tn5250/0001-ssldir.patch b/buildroot/package/tn5250/0001-ssldir.patch
deleted file mode 100644
index 6fc78deef..000000000
--- a/buildroot/package/tn5250/0001-ssldir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Value is assigned to $with_ssl_dir but used from $with_ssl which is wrong.
-Fix configure since it's a one-liner and avoid an autoreconf.
-
-Signed-off-by: Gustavo Zacarias 
-
-diff -Nura tn5250-0.17.4.orig/configure tn5250-0.17.4/configure
---- tn5250-0.17.4.orig/configure	2014-09-10 08:33:15.689519554 -0300
-+++ tn5250-0.17.4/configure	2014-09-10 08:33:47.428613117 -0300
-@@ -23258,7 +23258,7 @@
- if test "${with_ssl_dir+set}" = set; then
-   withval=$with_ssl_dir;
-     if test "$with_ssl_dir" != "no"; then
--         checksslinclude "$with_ssl"
-+         checksslinclude "$with_ssl_dir"
-     else
-         for topdir in /usr/local /usr /usr/pkg /usr/lib /var/ssl /opt; do
-             for subdir in $topdir $topdir/openssl $topdir/ssl; do
diff --git a/buildroot/package/tn5250/0002-Allow-building-against-OpenSSL-without-SSLv2_SSLv3.patch b/buildroot/package/tn5250/0002-Allow-building-against-OpenSSL-without-SSLv2_SSLv3.patch
deleted file mode 100644
index 67f0fa63a..000000000
--- a/buildroot/package/tn5250/0002-Allow-building-against-OpenSSL-without-SSLv2_SSLv3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-$OpenBSD: patch-lib5250_sslstream_c,v 1.1 2015/10/07 16:09:04 jca Exp $
-
-Allow building against OpenSSL without SSLv2/SSLv3 support.
-
-Download from:
-http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tn5250/patches/patch-lib5250_sslstream_c
-
-Signed-off-by: Peter Korsgaard 
---- a/lib5250/sslstream.c.orig	Fri Nov 21 09:12:21 2008
-+++ b/lib5250/sslstream.c	Tue Oct  6 21:32:29 2015
-@@ -368,13 +368,19 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
-         methstr[4] = '\0';
-    }
- 
-+#ifndef OPENSSL_NO_SSL2
-    if (!strcmp(methstr, "ssl2")) {
-         meth = SSLv2_client_method();         
-         TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
--   } else if (!strcmp(methstr, "ssl3")) {
-+   } else
-+#endif
-+#ifndef OPENSSL_NO_SSL3
-+   if (!strcmp(methstr, "ssl3")) {
-         meth = SSLv3_client_method();         
-         TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
--   } else {
-+   } else
-+#endif
-+   {
-         meth = SSLv23_client_method();         
-         TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
-    }
diff --git a/buildroot/package/tn5250/Config.in b/buildroot/package/tn5250/Config.in
deleted file mode 100644
index 01be40bb7..000000000
--- a/buildroot/package/tn5250/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_TN5250
-	bool "tn5250"
-	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_NCURSES
-	help
-	  Telnet client that emulates 5250 terminals and printers.
-
-	  http://tn5250.sourceforge.net/
diff --git a/buildroot/package/tn5250/tn5250.hash b/buildroot/package/tn5250/tn5250.hash
deleted file mode 100644
index ae65beab5..000000000
--- a/buildroot/package/tn5250/tn5250.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed:
-sha256  354237d400dc46af887cb3ffa4ed1f2c371f5b8bee8be046a683a4ac9db4f9c5  tn5250-0.17.4.tar.gz
diff --git a/buildroot/package/tn5250/tn5250.mk b/buildroot/package/tn5250/tn5250.mk
deleted file mode 100644
index 4c457a5d9..000000000
--- a/buildroot/package/tn5250/tn5250.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#
-# tn5250
-#
-################################################################################
-
-TN5250_VERSION = 0.17.4
-TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
-TN5250_MAKE_OPTS = CPPFLAGS=""
-TN5250_DEPENDENCIES = ncurses
-TN5250_LICENSE = LGPL-2.1+
-TN5250_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-TN5250_CONF_OPTS += --with-ssl-dir=$(STAGING_DIR)/usr
-TN5250_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`"
-TN5250_DEPENDENCIES += openssl host-pkgconf
-else
-TN5250_CONF_OPTS += --without-ssl
-endif
-
-define TN5250_INSTALL_FIXES
-	rm -f $(TARGET_DIR)/usr/bin/5250keys
-	rm -f $(TARGET_DIR)/usr/bin/xt5250
-endef
-
-TN5250_POST_INSTALL_TARGET_HOOKS += TN5250_INSTALL_FIXES
-
-$(eval $(autotools-package))
diff --git a/buildroot/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/buildroot/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
new file mode 100644
index 000000000..e4cd24e13
--- /dev/null
+++ b/buildroot/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
@@ -0,0 +1,109 @@
+From ba6b8ee5b6dee19493a150c3715b0e202440d206 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls 
+Date: Thu, 24 Jan 2019 18:19:51 +0100
+Subject: [PATCH] Fix static linking with OpenSSL
+
+Adjust link order of libz to solve bug with static linking
+and remove host paths when looking for openssl.
+
+[Vincent:
+ - Adapt the patch to make it apply on the new version.]
+[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10 &
+        0.3.4.8, 0.3.5.7]
+[Fabrice: fix detection of openssl functions in 0.3.5.8]
+Signed-off-by: Vicente Olivert Riera 
+Signed-off-by: Bernd Kuhls 
+Signed-off-by: Fabrice Fontaine 
+---
+ acinclude.m4         | 2 +-
+ configure.ac         | 4 ++--
+ src/test/include.am  | 8 ++++----
+ src/tools/include.am | 4 ++--
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 5ecdf1d5c..be5633f4f 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -166,7 +166,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [
+
+   for tor_trydir in "$try$1dir" "(system)" "$prefix" /usr/local /usr/pkg $8; do
+     LDFLAGS="$tor_saved_LDFLAGS"
+-    LIBS="$tor_saved_LIBS $3"
++    LIBS="$3 $tor_saved_LIBS"
+     CPPFLAGS="$tor_saved_CPPFLAGS"
+
+     if test -z "$tor_trydir" ; then
+diff --git a/configure.ac b/configure.ac
+index 05e1392cf..580befa6b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -885,7 +885,7 @@ AC_ARG_WITH(ssl-dir,
+   ])
+ 
+ AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
+-TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32],
++TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32],
+     [#include 
+      char *getenv(const char *);],
+     [struct ssl_cipher_st;
+@@ -919,7 +919,7 @@ dnl Now check for particular openssl functions.
+ save_LIBS="$LIBS"
+ save_LDFLAGS="$LDFLAGS"
+ save_CPPFLAGS="$CPPFLAGS"
+-LIBS="$TOR_OPENSSL_LIBS $LIBS"
++LIBS="$TOR_OPENSSL_LIBS -lz $LIBS"
+ LDFLAGS="$TOR_LDFLAGS_openssl $LDFLAGS"
+ CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS"
+ 
+diff --git a/src/test/include.am b/src/test/include.am
+index ecb768957..39a622e88 100644
+--- a/src/test/include.am
++++ b/src/test/include.am
+@@ -317,8 +317,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB)
+ src_test_test_ntor_cl_LDADD = \
+ 	$(TOR_INTERNAL_LIBS) \
+ 	$(rust_ldadd) \
+-	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
+-	$(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
++	@TOR_LIB_MATH@ \
++	$(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
+ 	@CURVE25519_LIBS@ @TOR_LZMA_LIBS@
+ src_test_test_ntor_cl_AM_CPPFLAGS =	       \
+ 	$(AM_CPPFLAGS)
+@@ -327,8 +327,8 @@ src_test_test_hs_ntor_cl_SOURCES  = src/test/test_hs_ntor_cl.c
+ src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB)
+ src_test_test_hs_ntor_cl_LDADD = \
+ 	$(TOR_INTERNAL_LIBS) \
+-	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
+-	$(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
++	@TOR_LIB_MATH@ \
++	$(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
+ src_test_test_hs_ntor_cl_AM_CPPFLAGS =	       \
+ 	$(AM_CPPFLAGS)
+ 
+diff --git a/src/tools/include.am b/src/tools/include.am
+index f7aa7e0d1..4c4e8aa7a 100644
+--- a/src/tools/include.am
++++ b/src/tools/include.am
+@@ -30,7 +30,7 @@ src_tools_tor_gencert_LDADD = \
+ 	$(TOR_CRYPTO_LIBS) \
+ 	$(TOR_UTIL_LIBS) \
+ 	$(rust_ldadd) \
+-	@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \
++	@TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \
+ 	@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@
+ endif
+ 
+@@ -40,7 +40,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \
+ 	src/trunnel/libor-trunnel.a \
+         $(TOR_CRYPTO_LIBS) \
+         $(TOR_UTIL_LIBS) \
+-	@TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
++	@TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \
+ 	@TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@
+ 
+ if USE_NSS
+-- 
+2.20.1
+
diff --git a/buildroot/package/tor/0001-openssl-libz.patch b/buildroot/package/tor/0001-openssl-libz.patch
deleted file mode 100644
index cb2ed46b3..000000000
--- a/buildroot/package/tor/0001-openssl-libz.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Adjust link order of libz to solve bug with static linking
-and remove host paths when looking for openssl.
-
-[Vincent:
- - Adapt the patch to make it apply on the new version.]
-[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10 &
-        0.3.4.8]
-Signed-off-by: Bernd Kuhls 
-Signed-off-by: Vicente Olivert Riera 
-
-diff -uNr tor-0.3.1.7.org/configure.ac tor-0.3.1.7/configure.ac
---- tor-0.3.1.7.org/configure.ac	2017-09-15 15:34:06.000000000 +0200
-+++ tor-0.3.1.7/configure.ac	2017-09-19 19:40:17.090538467 +0200
-@@ -735,7 +735,7 @@
-   ])
- 
- AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
--TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32],
-+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32],
-     [#include 
-      char *getenv(const char *);],
-     [struct ssl_cipher_st;
-diff -uNr tor-0.3.1.7.org/src/or/include.am tor-0.3.1.7/src/or/include.am
---- tor-0.3.1.7.org/src/or/include.am	2017-06-19 17:56:51.000000000 +0200
-+++ tor-0.3.1.7/src/or/include.am	2017-09-19 19:41:02.015861546 +0200
-@@ -135,7 +135,7 @@
- 	src/common/libor-event.a src/trunnel/libor-trunnel.a \
- 	src/trace/libor-trace.a \
- 	$(rust_ldadd) \
--	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
-+	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
- 	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
- 	@CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
- 	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
-@@ -149,7 +149,7 @@
- 	src/common/libor-ctime-testing.a \
- 	src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \
- 	src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
--	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
-+	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
- 	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
- 	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
- endif
-diff -uNr tor-0.3.1.7.org/src/test/include.am tor-0.3.1.7/src/test/include.am
---- tor-0.3.1.7.org/src/test/include.am	2017-08-29 17:01:19.000000000 +0200
-+++ tor-0.3.1.7/src/test/include.am	2017-09-19 19:42:39.103903406 +0200
-@@ -222,8 +222,8 @@
- 	src/trunnel/libor-trunnel-testing.a \
- 	src/trace/libor-trace.a \
- 	$(rust_ldadd) \
--	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
--	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-+	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
-+	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
- 	@CURVE25519_LIBS@ \
- 	@TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
- 
-@@ -248,8 +248,8 @@
- 	src/common/libor-event.a src/trunnel/libor-trunnel.a \
- 	src/trace/libor-trace.a \
- 	$(rust_ldadd) \
--	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
--	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-+	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
-+	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
- 	@CURVE25519_LIBS@ \
- 	@TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
- 
-@@ -262,8 +262,8 @@
- 	src/common/libor-event-testing.a \
- 	src/trace/libor-trace.a \
- 	$(rust_ldadd) \
--	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
--	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-+	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
-+	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
- 	@CURVE25519_LIBS@ \
- 	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
- 
-@@ -275,8 +275,8 @@
- 	src/common/libor-event-testing.a \
- 	src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \
- 	$(rust_ldadd) \
--	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
--	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-+	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
-+	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
- 	@CURVE25519_LIBS@ \
- 	@TOR_LZMA_LIBS@
- src_test_test_timers_LDFLAGS = $(src_test_test_LDFLAGS)
-@@ -307,8 +307,8 @@
- 	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
- 	src/trace/libor-trace.a \
- 	$(rust_ldadd) \
--	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
--	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-+	@TOR_LIB_MATH@ \
-+	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
- 	@CURVE25519_LIBS@ @TOR_LZMA_LIBS@
- src_test_test_ntor_cl_AM_CPPFLAGS =	       \
- 	-I"$(top_srcdir)/src/or"
-@@ -318,8 +318,8 @@
- src_test_test_hs_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
- 	src/common/libor-ctime.a \
- 	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
--	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
--	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
-+	@TOR_LIB_MATH@ \
-+	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
- src_test_test_hs_ntor_cl_AM_CPPFLAGS =	       \
- 	-I"$(top_srcdir)/src/or"
- 
-diff -uNr tor-0.3.1.7.org/src/tools/include.am tor-0.3.1.7/src/tools/include.am
---- tor-0.3.1.7.org/src/tools/include.am	2017-06-19 17:56:51.000000000 +0200
-+++ tor-0.3.1.7/src/tools/include.am	2017-09-19 19:43:08.880223260 +0200
-@@ -27,7 +27,7 @@
- 	$(LIBKECCAK_TINY) \
- 	$(LIBDONNA) \
- 	$(rust_ldadd) \
--	@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
-+	@TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
- 	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@
- 
- if COVERAGE_ENABLED
-@@ -40,7 +40,7 @@
-     src/common/libor-ctime-testing.a \
-     $(LIBKECCAK_TINY) \
-     $(LIBDONNA) \
--    @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
-+    @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
-     @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
- endif
- 
diff --git a/buildroot/package/tor/tor.hash b/buildroot/package/tor/tor.hash
index 71aef25d7..5b07981d9 100644
--- a/buildroot/package/tor/tor.hash
+++ b/buildroot/package/tor/tor.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 1a171081f02b9a6ff9e28c0898defb7670e5bbb3bdbcaddfcf4e4304aedd164a  tor-0.3.4.9.tar.gz
-sha256 f9a4f724d8037711dde7d3f1d17094fb7d211545b3a3bbb1b03e769e13ca5608  LICENSE
+sha256 d5c56603942a8927670f50a4a469fb909e29d3571fdd013389d567e57abc0b47  tor-0.3.5.8.tar.gz
+sha256 b4248f32f009d4f5cccb704b351e31a16590e0dd5fda2856382cc854d81f6234  LICENSE
diff --git a/buildroot/package/tor/tor.mk b/buildroot/package/tor/tor.mk
index 0a7691d4c..fe951fb26 100644
--- a/buildroot/package/tor/tor.mk
+++ b/buildroot/package/tor/tor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TOR_VERSION = 0.3.4.9
+TOR_VERSION = 0.3.5.8
 TOR_SITE = https://dist.torproject.org
 TOR_LICENSE = BSD-3-Clause
 TOR_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/tpm2-abrmd/Config.in b/buildroot/package/tpm2-abrmd/Config.in
index 0cac754b3..db0ea6611 100644
--- a/buildroot/package/tpm2-abrmd/Config.in
+++ b/buildroot/package/tpm2-abrmd/Config.in
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_TPM2_ABRMD
 	bool "tpm2-abrmd"
-	depends on BR2_INSTALL_LIBSTDCPP # tpm2-tss
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus, libglib2
-	depends on !BR2_TOOLCHAIN_USES_MUSL # TEMP_FAILURE_RETRY(), etc
+	depends on !BR2_STATIC_LIBS # tpm2-tss
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_TPM2_TSS
@@ -17,12 +16,12 @@ config BR2_PACKAGE_TPM2_ABRMD
 
 	  The package also provides a client library for interacting
 	  with the daemon via TPM Command Transmission Interface (TCTI).
-	  It is intended for use with the SAPI library (libsapi) like
-	  any other TCTI.
+	  It is intended for use with the SAPI library (libtss2-sys)
+	  like any other TCTI.
 
 	  https://github.com/tpm2-software/tpm2-abrmd
 
-comment "tpm2-abrmd needs a uClibc or glibc toolchain w/ C++, wchar, threads"
+comment "tpm2-abrmd needs a toolchain w/ dynamic library, wchar, threads"
 	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
-		|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		BR2_STATIC_LIBS
diff --git a/buildroot/package/tpm2-abrmd/S80tpm2-abrmd b/buildroot/package/tpm2-abrmd/S80tpm2-abrmd
old mode 100755
new mode 100644
index d54c220c0..6a0bef0a3
--- a/buildroot/package/tpm2-abrmd/S80tpm2-abrmd
+++ b/buildroot/package/tpm2-abrmd/S80tpm2-abrmd
@@ -28,7 +28,7 @@ start() {
 	printf "Starting tpm2-abrmd: "
 	check_device
 	rm_stale_pidfile /var/run/tpm2-abrmd.pid /usr/sbin/tpm2-abrmd
-	start-stop-daemon -S -q -o -b -p /var/run/tpm2-abrmd.pid -c tss:tss -x /usr/sbin/tpm2-abrmd -- ${DAEMON_OPTS} || {
+	start-stop-daemon -S -q -o -b -m -p /var/run/tpm2-abrmd.pid -c tss:tss -x /usr/sbin/tpm2-abrmd -- ${DAEMON_OPTS} || {
 		echo "FAIL"
 		exit 1
 	}
@@ -49,7 +49,7 @@ stop() {
 check_required_files /etc/dbus-1/system.d/tpm2-abrmd.conf
 
 # defaults
-DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans"
+DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20"
 
 # Read configuration variable file if it is present
 [ -r /etc/default/tpm2-abrmd ] && . /etc/default/tpm2-abrmd
diff --git a/buildroot/package/tpm2-abrmd/tpm2-abrmd.hash b/buildroot/package/tpm2-abrmd/tpm2-abrmd.hash
index 6af991d46..61a75c0d1 100644
--- a/buildroot/package/tpm2-abrmd/tpm2-abrmd.hash
+++ b/buildroot/package/tpm2-abrmd/tpm2-abrmd.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 e32e19de93b539374a485d9df7fe9415ce147ec03c8d9ba6593e50f7a67a7a51  tpm2-abrmd-1.3.0.tar.gz
+sha256 ff0ed283b0300cd784d6bf2b042e167020f8443602974e53b924e9fd98a4b515  tpm2-abrmd-2.0.3.tar.gz
 sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448  LICENSE
diff --git a/buildroot/package/tpm2-abrmd/tpm2-abrmd.mk b/buildroot/package/tpm2-abrmd/tpm2-abrmd.mk
index b918ceaa4..31f19f5d0 100644
--- a/buildroot/package/tpm2-abrmd/tpm2-abrmd.mk
+++ b/buildroot/package/tpm2-abrmd/tpm2-abrmd.mk
@@ -4,16 +4,20 @@
 #
 ################################################################################
 
-TPM2_ABRMD_VERSION = 1.3.0
+TPM2_ABRMD_VERSION = 2.0.3
 TPM2_ABRMD_SITE = https://github.com/tpm2-software/tpm2-abrmd/releases/download/$(TPM2_ABRMD_VERSION)
 TPM2_ABRMD_LICENSE = BSD-2-Clause
 TPM2_ABRMD_LICENSE_FILES = LICENSE
 TPM2_ABRMD_INSTALL_STAGING = YES
 TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf
 
-# configure.ac doesn't contain a link test, so it doesn't detect when
-# libssp is missing.
-TPM2_ABRMD_CONF_ENV = ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
+# -fstack-protector-all and FORTIFY_SOURCE=2 is used by
+# default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options
+# in the toolchain wrapper and CFLAGS are used instead
+TPM2_ABRMD_CONF_ENV = \
+	ax_cv_check_cflags___________Werror_______fstack_protector_all=no \
+	ax_cv_check_ccppflags___________Werror_______U_FORTIFY_SOURCE=no \
+	ax_cv_check_ccppflags___________Werror_______D_FORTIFY_SOURCE_2=no
 
 TPM2_ABRMD_CONF_OPTS += \
 	--with-systemdsystemunitdir=$(if $(BR2_INIT_SYSTEMD),/usr/lib/systemd/system,no) \
diff --git a/buildroot/package/tpm2-tools/0001-Fix-build-with-LibreSSL.patch b/buildroot/package/tpm2-tools/0001-Fix-build-with-LibreSSL.patch
deleted file mode 100644
index 0fdd2dc4d..000000000
--- a/buildroot/package/tpm2-tools/0001-Fix-build-with-LibreSSL.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 7f8d9359dcf9edbb13bb447f70234397afa4fb05 Mon Sep 17 00:00:00 2001
-From: Carlos Santos 
-Date: Tue, 30 Jan 2018 11:21:14 -0200
-Subject: [PATCH] Fix build with LibreSSL
-
-OPENSSL_VERSION_NUMBER is used to test the version of OpenSSL but this
-test alone breaks the build with LibreSSL due to implicit declarations
-of functions 'RSA_set0_key' and 'HMAC_CTX_free'.
-
-Test if OpenSSL < 1.1.0 or LIBRESSL_VERSION_NUMBER is defined, instead.
-
-Signed-off-by: Carlos Santos 
----
- lib/conversion.c | 2 +-
- lib/tpm_kdfa.c   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/conversion.c b/lib/conversion.c
-index 1d0a0b7..df02de4 100644
---- a/lib/conversion.c
-+++ b/lib/conversion.c
-@@ -133,7 +133,7 @@ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, c
-         goto error;
-     }
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) /* OpenSSL 1.1.0 */
-     ssl_rsa_key->e = e;
-     ssl_rsa_key->n = n;
- #else
-diff --git a/lib/tpm_kdfa.c b/lib/tpm_kdfa.c
-index ee3cf8a..e43bdeb 100644
---- a/lib/tpm_kdfa.c
-+++ b/lib/tpm_kdfa.c
-@@ -54,7 +54,7 @@ static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) {
- static HMAC_CTX *hmac_alloc()
- {
-     HMAC_CTX *ctx;
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) /* OpenSSL 1.1.0 */
-     ctx = malloc(sizeof(*ctx));
- #else
-     ctx = HMAC_CTX_new();
-@@ -62,7 +62,7 @@ static HMAC_CTX *hmac_alloc()
-     if (!ctx)
-         return NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
-     HMAC_CTX_init(ctx);
- #endif
- 
-@@ -71,7 +71,7 @@ static HMAC_CTX *hmac_alloc()
- 
- static void hmac_del(HMAC_CTX *ctx)
- {
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
-     HMAC_CTX_cleanup(ctx);
-     free(ctx);
- #else
--- 
-2.14.3
-
diff --git a/buildroot/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch b/buildroot/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch
index b472666f4..327f5e403 100644
--- a/buildroot/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch
+++ b/buildroot/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch
@@ -1,4 +1,4 @@
-From e15b01a1eb27e31964308892fcaa9c7d4f17f181 Mon Sep 17 00:00:00 2001
+From 295cd8f7fb8e1a1ad8f64d981e99969a364d941e Mon Sep 17 00:00:00 2001
 From: Carlos Santos 
 Date: Sat, 24 Mar 2018 22:46:46 -0300
 Subject: [PATCH] tpm2_certify: fix "'type' may be used uninitialized" warning
@@ -10,7 +10,7 @@ because set_scheme returns immediately if get_key_type retuns false but
 the compiler does not understand that logic and fails because warnings
 are treated as errors.
 
-Adapted for version 3.0.3 from the change submitted upstream:
+Adapted for version 3.1.3 from the change submitted upstream:
 
   https://github.com/tpm2-software/tpm2-tools/pull/954
 
@@ -20,17 +20,17 @@ Signed-off-by: Carlos Santos 
  1 file changed, 1 insertion(+)
 
 diff --git a/tools/tpm2_certify.c b/tools/tpm2_certify.c
-index eaac02f..cbc42a9 100644
+index 0575072..e562586 100644
 --- a/tools/tpm2_certify.c
 +++ b/tools/tpm2_certify.c
-@@ -107,6 +107,7 @@ static bool get_key_type(TSS2_SYS_CONTEXT *sapi_context, TPMI_DH_OBJECT object_h
+@@ -98,6 +98,7 @@ static bool get_key_type(TSS2_SYS_CONTEXT *sapi_context, TPMI_DH_OBJECT object_h
              &out_public, &name, &qualified_name, &sessions_data_out));
-     if (rval != TPM_RC_SUCCESS) {
+     if (rval != TPM2_RC_SUCCESS) {
          LOG_ERR("TPM2_ReadPublic failed. Error Code: 0x%x", rval);
-+        *type = TPM_ALG_ERROR;
++        *type = TPM2_ALG_ERROR;
          return false;
      }
  
 -- 
-2.14.3
+2.19.1
 
diff --git a/buildroot/package/tpm2-tools/Config.in b/buildroot/package/tpm2-tools/Config.in
index e5feb1878..35ca63bf6 100644
--- a/buildroot/package/tpm2-tools/Config.in
+++ b/buildroot/package/tpm2-tools/Config.in
@@ -1,15 +1,8 @@
 config BR2_PACKAGE_TPM2_TOOLS
 	bool "tpm2-tools"
-	depends on BR2_INSTALL_LIBSTDCPP # tpm2-tss
-	depends on BR2_USE_MMU # dbus, libglib
-	depends on BR2_USE_WCHAR # libglib -> gettext
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib
-	depends on !BR2_TOOLCHAIN_USES_MUSL # tpm2-abrmd
-	select BR2_PACKAGE_DBUS
+	depends on !BR2_STATIC_LIBS # tpm2-tss
 	select BR2_PACKAGE_LIBCURL
-	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_TPM2_ABRMD # run-time
 	select BR2_PACKAGE_TPM2_TSS
 	help
 	  TPM (Trusted Platform Module) 2.0 CLI tools based on system
@@ -18,9 +11,12 @@ config BR2_PACKAGE_TPM2_TOOLS
 	  and manage non-volatile storage through a TPM2.0 HW
 	  implementation.
 
+	  Notice: An in-kernel resource manager is provided by the
+	  Linux kernel since 4.12. Depending on use cases and kernel
+	  version, the user space resource manager provided by
+	  tpm2-abrmd may be needed.
+
 	  https://github.com/tpm2-software/tpm2-tools
 
-comment "tpm2-tools needs a uClibc or glibc toolchain w/ C++, wchar, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
-		|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL
+comment "tpm2-tools needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
diff --git a/buildroot/package/tpm2-tools/tpm2-tools.hash b/buildroot/package/tpm2-tools/tpm2-tools.hash
index e33b3e594..d2bd31cde 100644
--- a/buildroot/package/tpm2-tools/tpm2-tools.hash
+++ b/buildroot/package/tpm2-tools/tpm2-tools.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 c990c0656165afef0fad61e1852a9a189a4b93b43d2a684b151a5dc0b3c6249d  tpm2-tools-3.0.3.tar.gz
+sha256 2f515200e9a7958ee13015150f7958c8a332eb071c2564c33f81ebe32c4f6033  tpm2-tools-3.1.4.tar.gz
 sha256 3d6b149c8b042bd5f3db678d587fbe55230d071ca084bd38dcae451679c6dd45  LICENSE
diff --git a/buildroot/package/tpm2-tools/tpm2-tools.mk b/buildroot/package/tpm2-tools/tpm2-tools.mk
index 13fdb163b..e7423db67 100644
--- a/buildroot/package/tpm2-tools/tpm2-tools.mk
+++ b/buildroot/package/tpm2-tools/tpm2-tools.mk
@@ -4,14 +4,15 @@
 #
 ################################################################################
 
-TPM2_TOOLS_VERSION = 3.0.3
+TPM2_TOOLS_VERSION = 3.1.4
 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)
-TPM2_TOOLS_LICENSE = BSD-2-Clause
+TPM2_TOOLS_LICENSE = BSD-3-Clause
 TPM2_TOOLS_LICENSE_FILES = LICENSE
-TPM2_TOOLS_DEPENDENCIES = dbus libcurl libglib2 openssl tpm2-tss host-pkgconf
+TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf
 
-# configure.ac doesn't contain a link test, so it doesn't detect when
-# libssp is missing.
-TPM2_TOOLS_CONF_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),--enable-hardening,--disable-hardening)
+# -fstack-protector-all and FORTIFY_SOURCE=2 is used by
+# default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options
+# in the toolchain wrapper and CFLAGS are used instead
+TPM2_TOOLS_CONF_OPTS = --disable-hardening
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/tpm2-tss/0001-tcti-tcti_socket.cpp-add-missing-inclusion-of-sys-se.patch b/buildroot/package/tpm2-tss/0001-tcti-tcti_socket.cpp-add-missing-inclusion-of-sys-se.patch
deleted file mode 100644
index e8e0d842f..000000000
--- a/buildroot/package/tpm2-tss/0001-tcti-tcti_socket.cpp-add-missing-inclusion-of-sys-se.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2fdbf9f56bd6e7b00c695881a81c0df2f5088760 Mon Sep 17 00:00:00 2001
-From: Carlos Santos 
-Date: Fri, 23 Mar 2018 09:15:44 -0300
-Subject: [PATCH] tcti/tcti_socket.cpp: add missing inclusion of sys/select.h
-
-Prevents compilation errors due to undeclared "fd_set" type.
-
-Fixes:
-  http://autobuild.buildroot.net/results/09e8b3b85d7113d60e8967a2d41a6aea8f8197c0
-  http://autobuild.buildroot.net/results/2e4c70f2f1239eb19235ae04a936a6492daf316d
-  http://autobuild.buildroot.net/results/bbd68f52781da735e983b1260de5b804787374b1
-
-Signed-off-by: Carlos Santos 
----
- tcti/tcti_socket.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tcti/tcti_socket.cpp b/tcti/tcti_socket.cpp
-index e8982f1..b6e5874 100644
---- a/tcti/tcti_socket.cpp
-+++ b/tcti/tcti_socket.cpp
-@@ -28,6 +28,8 @@
- #include 
- #include    // Needed for _wtoi
- 
-+#include    // for fd_set
-+
- #include "sapi/tpm20.h"
- #include "tcti/tcti_socket.h"
- #include "sysapi_util.h"
--- 
-2.14.3
-
diff --git a/buildroot/package/tpm2-tss/0001-tpm2b-types.c-fix-maybe-uninitialized-error.patch b/buildroot/package/tpm2-tss/0001-tpm2b-types.c-fix-maybe-uninitialized-error.patch
new file mode 100644
index 000000000..712583571
--- /dev/null
+++ b/buildroot/package/tpm2-tss/0001-tpm2b-types.c-fix-maybe-uninitialized-error.patch
@@ -0,0 +1,37 @@
+From 815f2bcbdfe5d9aff2cd3acbbb105daf1f5e9d7f Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Thu, 7 Feb 2019 09:58:07 +0100
+Subject: [PATCH] tpm2b-types.c: fix maybe-uninitialized error
+
+src/tss2-mu/tpm2b-types.c: In function 'Tss2_MU_TPM2B_ECC_POINT_Marshal':
+src/tss2-mu/tpm2b-types.c:201:24: error: 'ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+         *(UINT16 *)ptr = HOST_TO_BE_16(buffer + local_offset - ptr - 2); \
+                        ^
+src/tss2-mu/tpm2b-types.c:152:12: note: 'ptr' was declared here
+     UINT8 *ptr; \
+
+Fixes:
+ - http://autobuild.buildroot.org/results/8d7b6dad6602fe67338abc696bc4752dda8e9717
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status: https://github.com/tpm2-software/tpm2-tss/pull/1265]
+---
+ src/tss2-mu/tpm2b-types.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tss2-mu/tpm2b-types.c b/src/tss2-mu/tpm2b-types.c
+index 9c1003ab..7632febb 100644
+--- a/src/tss2-mu/tpm2b-types.c
++++ b/src/tss2-mu/tpm2b-types.c
+@@ -150,7 +150,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \
+                                  size_t buffer_size, size_t *offset) \
+ { \
+     size_t local_offset = 0; \
+-    UINT8 *ptr; \
++    UINT8 *ptr = NULL; \
+     TSS2_RC rc; \
+ \
+     if (src == NULL) { \
+-- 
+2.14.1
+
diff --git a/buildroot/package/tpm2-tss/Config.in b/buildroot/package/tpm2-tss/Config.in
index 7a757bd70..2d619750f 100644
--- a/buildroot/package/tpm2-tss/Config.in
+++ b/buildroot/package/tpm2-tss/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_TPM2_TSS
 	bool "tpm2-tss"
-	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS # dlfcn.h
 	select BR2_PACKAGE_LIBURIPARSER
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
 	help
 	  OSS implementation of the Trusted Computing Group's (TCG) TPM2
 	  Software Stack (TSS). This stack consists of the following
@@ -15,7 +17,7 @@ config BR2_PACKAGE_TPM2_TSS
 	    variants may be useful for integration into event-driven
 	    programming environments. Both the synchronous and
 	    asynchronous API are exposed through a single library:
-	    libsapi.
+	    libtss2-sys.
 
 	  * TPM Command Transmission Interface (TCTI) that is described
 	    in the same specification. This API provides a standard
@@ -24,12 +26,12 @@ config BR2_PACKAGE_TPM2_TSS
 	    implementing the TCTI API will be implemented as a way to
 	    abstract various platform specific IPC mechanisms. Currently
 	    this repository provides two TCTI implementations:
-	    libtcti-device and libtcti-socket.  The prior should be used
-	    for direct access to the TPM through the Linux kernel
-	    driver. The later implements the protocol exposed by the
-	    Microsoft software TPM2 simulator.
+	    libtss2-tcti-device and libtss2-tcti-mssim. The prior should
+	    be used for direct access to the TPM through the Linux
+	    kernel driver. The later implements the protocol exposed by
+	    the Microsoft software TPM2 simulator.
 
 	  https://github.com/tpm2-software/tpm2-tss
 
-comment "tpm2-tss needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "tpm2-tss needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
diff --git a/buildroot/package/tpm2-tss/tpm2-tss.hash b/buildroot/package/tpm2-tss/tpm2-tss.hash
index 67c5a8584..9368357c7 100644
--- a/buildroot/package/tpm2-tss/tpm2-tss.hash
+++ b/buildroot/package/tpm2-tss/tpm2-tss.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 cf8784cc536be16e6fba47f77033e093a6aeaed8420877ac9f42f77fb7b09031  tpm2-tss-1.4.0.tar.gz
-sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448  LICENSE
+sha256 bddfa4ab2ceb6394bcacf7db5d6419cbfabdb22702b6df75c59e60dd5f3fafb5  tpm2-tss-2.1.3.tar.gz
+sha256 f7da3c2da12cec3348bb7ee9e2a9e651a241450b2efb67da29d5a75ef2da058a  LICENSE
diff --git a/buildroot/package/tpm2-tss/tpm2-tss.mk b/buildroot/package/tpm2-tss/tpm2-tss.mk
index dcc1e5d74..e02abb446 100644
--- a/buildroot/package/tpm2-tss/tpm2-tss.mk
+++ b/buildroot/package/tpm2-tss/tpm2-tss.mk
@@ -4,15 +4,20 @@
 #
 ################################################################################
 
-TPM2_TSS_VERSION = 1.4.0
+TPM2_TSS_VERSION = 2.1.3
 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)
 TPM2_TSS_LICENSE = BSD-2-Clause
 TPM2_TSS_LICENSE_FILES = LICENSE
 TPM2_TSS_INSTALL_STAGING = YES
-TPM2_TSS_DEPENDENCIES = liburiparser host-pkgconf
+TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf
+TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc
 
-# configure.ac doesn't contain a link test, so it doesn't detect when
-# libssp is missing.
-TPM2_TSS_CONF_ENV = ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
+# -fstack-protector-all and FORTIFY_SOURCE=2 is used by
+# default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options
+# in the toolchain wrapper and CFLAGS are used instead
+TPM2_TSS_CONF_ENV = \
+	ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=no \
+	ax_cv_check_ccppflags___________Wall__Werror_______U_FORTIFY_SOURCE=no \
+	ax_cv_check_ccppflags___________Wall__Werror_______D_FORTIFY_SOURCE_2=no
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/trace-cmd/trace-cmd.hash b/buildroot/package/trace-cmd/trace-cmd.hash
index 5bf4154bd..c6447f34d 100644
--- a/buildroot/package/trace-cmd/trace-cmd.hash
+++ b/buildroot/package/trace-cmd/trace-cmd.hash
@@ -1,2 +1,4 @@
 # Locally computed
-sha256 f088534808274f6233fe15130791238fb14ce9bf6e7234f9b3fe6b5a42a1245d  trace-cmd-trace-cmd-v2.6.1.tar.gz
+sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0  trace-cmd-trace-cmd-v2.7.tar.gz
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
+sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB
diff --git a/buildroot/package/trace-cmd/trace-cmd.mk b/buildroot/package/trace-cmd/trace-cmd.mk
index 578e9f124..dfca6a170 100644
--- a/buildroot/package/trace-cmd/trace-cmd.mk
+++ b/buildroot/package/trace-cmd/trace-cmd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TRACE_CMD_VERSION = trace-cmd-v2.6.1
+TRACE_CMD_VERSION = trace-cmd-v2.7
 TRACE_CMD_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
 TRACE_CMD_SITE_METHOD = git
 TRACE_CMD_INSTALL_STAGING = YES
diff --git a/buildroot/package/triggerhappy/S10triggerhappy b/buildroot/package/triggerhappy/S10triggerhappy
old mode 100755
new mode 100644
diff --git a/buildroot/package/trinity/0004-Check-if-VIDIOC_RESERVED-is-defined.patch b/buildroot/package/trinity/0004-Check-if-VIDIOC_RESERVED-is-defined.patch
new file mode 100644
index 000000000..54f8bea63
--- /dev/null
+++ b/buildroot/package/trinity/0004-Check-if-VIDIOC_RESERVED-is-defined.patch
@@ -0,0 +1,56 @@
+From a5f32b9714613404e9f4699aaaad720f2bb033b4 Mon Sep 17 00:00:00 2001
+From: Vinson Lee 
+Date: Thu, 23 Aug 2018 22:28:49 +0000
+Subject: [PATCH] Check if VIDIOC_RESERVED is defined.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+VIDIOC_RESERVED was removed in Linux 4.19.
+
+commit ea8532daee31bc72abfbc9ca7a43cbec0f6c05af
+Author: Mauro Carvalho Chehab 
+Date:   Wed May 30 11:07:05 2018 -0400
+
+    media: videodev2: get rid of VIDIOC_RESERVED
+
+    While this ioctl is there at least since Kernel 2.6.12-rc2, it
+    was never used by any upstream driver.
+
+    Get rid of it.
+
+    Signed-off-by: Mauro Carvalho Chehab 
+
+This patch fixes this build error.
+
+  CC	ioctls/videodev2.o
+In file included from ioctls/videodev2.c:4:
+ioctls/videodev2.c:8:8: error: ‘VIDIOC_RESERVED’ undeclared here (not in a function); did you mean ‘VIDIOC_G_STD’?
+  IOCTL(VIDIOC_RESERVED),
+        ^~~~~~~~~~~~~~~
+include/ioctls.h:53:15: note: in definition of macro ‘IOCTL’
+  { .request = _request, .name = #_request, }
+               ^~~~~~~~
+
+Signed-off-by: Vinson Lee 
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/kernelslacker/trinity/commit/a5f32b9714613404e9f4699aaaad720f2bb033b4]
+---
+ ioctls/videodev2.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ioctls/videodev2.c b/ioctls/videodev2.c
+index f7183f29..67089abf 100644
+--- a/ioctls/videodev2.c
++++ b/ioctls/videodev2.c
+@@ -5,7 +5,9 @@
+ 
+ static const struct ioctl videodev2_ioctls[] = {
+ 	IOCTL(VIDIOC_QUERYCAP),
++#ifdef VIDIOC_RESERVED
+ 	IOCTL(VIDIOC_RESERVED),
++#endif
+ 	IOCTL(VIDIOC_ENUM_FMT),
+ 	IOCTL(VIDIOC_G_FMT),
+ 	IOCTL(VIDIOC_S_FMT),
diff --git a/buildroot/package/trinity/0005-proto-rds-include-libc-network-headers-first.patch b/buildroot/package/trinity/0005-proto-rds-include-libc-network-headers-first.patch
new file mode 100644
index 000000000..438bbfb56
--- /dev/null
+++ b/buildroot/package/trinity/0005-proto-rds-include-libc-network-headers-first.patch
@@ -0,0 +1,48 @@
+From 350c05e5c0d7af5941a9c17f2f86e1c6297d7475 Mon Sep 17 00:00:00 2001
+From: Baruch Siach 
+Date: Wed, 12 Dec 2018 20:52:50 +0200
+Subject: [PATCH] proto-rds: include libc network headers first
+
+To avoid collisions between libc networking headers and header kernels
+the libc headers must appear first in the list of headers. This fixes a
+build issue with kernel headers v4.19:
+
+In file included from include/net.h:5:0,
+                 from net/proto-rds.c:6:
+.../sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr'
+ struct in6_addr {
+        ^~~~~~~~
+In file included from .../sysroot/usr/include/linux/rds.h:40:0,
+                 from net/proto-rds.c:4:
+.../sysroot/usr/include/linux/in6.h:33:8: note: originally defined here
+ struct in6_addr {
+		^~~~~~~~
+
+Signed-off-by: Baruch Siach 
+---
+Upstream status: https://github.com/kernelslacker/trinity/pull/29
+
+ net/proto-rds.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/proto-rds.c b/net/proto-rds.c
+index c8ff22f886c3..06e36e82d990 100644
+--- a/net/proto-rds.c
++++ b/net/proto-rds.c
+@@ -1,12 +1,12 @@
+ #ifdef USE_RDS
+ #include 
+ #include 
+-#include 
+ #include 
+ #include "net.h"
+ #include "compat.h"
+ #include "random.h"
+ #include "utils.h"	// RAND_ARRAY
++#include 
+ 
+ static void rds_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
+ {
+-- 
+2.19.2
+
diff --git a/buildroot/package/tslib/tslib.hash b/buildroot/package/tslib/tslib.hash
index c5fc836d6..b250783fd 100644
--- a/buildroot/package/tslib/tslib.hash
+++ b/buildroot/package/tslib/tslib.hash
@@ -1,5 +1,5 @@
-# https://github.com/kergoth/tslib/releases/download/1.17/tslib-1.17.tar.xz.sha256
-sha256  9fdd33e66976bf9cc799be33824ba66672f892826e9b22de12b14df15cb0fddc  tslib-1.17.tar.xz
+# https://github.com/libts/tslib/releases/download/1.20/tslib-1.20.tar.xz.sha256
+sha256  fda8c088e348b40cc68269460d562778aa4ad8f8c2281f147b09f305ba714777  tslib-1.20.tar.xz
 
 # Locally computed
 sha256  9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9  COPYING
diff --git a/buildroot/package/tslib/tslib.mk b/buildroot/package/tslib/tslib.mk
index bd5311b93..6d6e85033 100644
--- a/buildroot/package/tslib/tslib.mk
+++ b/buildroot/package/tslib/tslib.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-TSLIB_VERSION = 1.17
-TSLIB_SITE = https://github.com/kergoth/tslib/releases/download/$(TSLIB_VERSION)
+TSLIB_VERSION = 1.20
+TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION)
 TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz
 TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 TSLIB_LICENSE_FILES = COPYING
diff --git a/buildroot/package/turbolua/Config.in b/buildroot/package/turbolua/Config.in
index 34f66ef13..6e792ebba 100644
--- a/buildroot/package/turbolua/Config.in
+++ b/buildroot/package/turbolua/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_TURBOLUA
 	  uses a event-driven, non-blocking, no thread design to deliver
 	  excellent performance and minimal footprint to high-load
 	  applications while also providing excellent support for
-	  embedded uses. The toolkit can be used for HTTP REST API’s,
+	  embedded uses. The toolkit can be used for HTTP REST API's,
 	  traditional dynamic web pages through templating, open
 	  connections like WebSockets, or just as high level building
 	  blocks for native speed network applications.
diff --git a/buildroot/package/uclibc/0001-Revert-ldconfig-add-glibc-compatibility-fix.patch b/buildroot/package/uclibc/0001-Revert-ldconfig-add-glibc-compatibility-fix.patch
deleted file mode 100644
index 7ba3b2866..000000000
--- a/buildroot/package/uclibc/0001-Revert-ldconfig-add-glibc-compatibility-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 92d250d387e247029900c9074150f45866b29781 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb 
-Date: Sun, 29 Apr 2018 19:34:11 +0200
-Subject: [PATCH] Revert "ldconfig: add glibc compatibility fix"
-
-This reverts commit 2a3bb4daf5778c5875674cd26a3c75b3d460a042.
-
-This is breaking ld.so.cache usage. Seen on Gentoo/amd64.
-
-Reported-by: "Anthony G. Basile" 
-Signed-off-by: Waldemar Brodkorb 
----
- utils/ldconfig.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/utils/ldconfig.c b/utils/ldconfig.c
-index 58939d6..e6b7881 100644
---- a/utils/ldconfig.c
-+++ b/utils/ldconfig.c
-@@ -184,9 +184,10 @@ static char *readsoname(char *name, FILE *infile, int expected_type,
- 		res = readsoname32(name, infile, expected_type, type);
- 	else {
- 		res = readsoname64(name, infile, expected_type, type);
--
--		// For 64-bit glibc compatibility
--		*type |= FLAG_X8664_LIB64;
-+#if 0
-+		/* relies on multilib support which we dont have ... */
-+		*type |= LIB_ELF64;
-+#endif
- 	}
- 
- 	return res;
-@@ -757,7 +758,7 @@ void cache_print(void)
- 
- 	for (fd = 0; fd < header->nlibs; fd++) {
- 		printf("\t%s ", strs + libent[fd].sooffset);
--		switch (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) {
-+		switch (libent[fd].flags & ~LIB_ELF64) {
- 		case LIB_DLL:
- 			printf("(libc4)");
- 			break;
-@@ -770,7 +771,7 @@ void cache_print(void)
- 		case LIB_ELF_LIBC5:
- 		case LIB_ELF_LIBC6:
- 			printf("(libc%d%s)",
--			       (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) + 3,
-+			       (libent[fd].flags & ~LIB_ELF64) + 3,
- 			       libent[fd].flags & LIB_ELF64 ? "/64" : "");
- 			break;
- 		default:
--- 
-2.1.4
-
diff --git a/buildroot/package/uclibc/0005-statfs.h-sync-generic-header-with-glibc.patch b/buildroot/package/uclibc/0001-statfs.h-sync-generic-header-with-glibc.patch
similarity index 100%
rename from buildroot/package/uclibc/0005-statfs.h-sync-generic-header-with-glibc.patch
rename to buildroot/package/uclibc/0001-statfs.h-sync-generic-header-with-glibc.patch
diff --git a/buildroot/package/uclibc/0002-librt-declare-clock_nanosleep-independent-of-thread-.patch b/buildroot/package/uclibc/0002-librt-declare-clock_nanosleep-independent-of-thread-.patch
deleted file mode 100644
index bb9ef18b4..000000000
--- a/buildroot/package/uclibc/0002-librt-declare-clock_nanosleep-independent-of-thread-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 368a1df04a32c3b95859b0ca588da8548a5f39ca Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb 
-Date: Tue, 1 May 2018 19:35:20 +0200
-Subject: [PATCH] librt: declare clock_nanosleep independent of thread support
-
-Reported-by: Baruch Siach 
-Signed-off-by: Waldemar Brodkorb 
----
- include/time.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/include/time.h b/include/time.h
-index 785c8f6..1a14089 100644
---- a/include/time.h
-+++ b/include/time.h
-@@ -356,7 +356,6 @@ extern int clock_settime (clockid_t __clock_id, const struct timespec *__tp)
- #  endif /* __UCLIBC_HAS_REALTIME__ */
- 
- #  if defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__
--#   ifdef __UCLIBC_HAS_THREADS_NATIVE__
- /* High-resolution sleep with the specified clock.
- 
-    This function is a cancellation point and therefore not marked with
-@@ -367,7 +366,6 @@ extern int clock_nanosleep (clockid_t __clock_id, int __flags,
- 
- /* Return clock ID for CPU-time clock.  */
- extern int clock_getcpuclockid (pid_t __pid, clockid_t *__clock_id) __THROW;
--#   endif /* __UCLIBC_HAS_THREADS_NATIVE__ */
- #  endif
- 
- #  if defined __UCLIBC_HAS_REALTIME__
--- 
-2.1.4
-
diff --git a/buildroot/package/uclibc/0003-ldso-arc-fix-LD_DEBUG-segv-when-printing-R_ARC_NONE.patch b/buildroot/package/uclibc/0003-ldso-arc-fix-LD_DEBUG-segv-when-printing-R_ARC_NONE.patch
deleted file mode 100644
index ad87698f5..000000000
--- a/buildroot/package/uclibc/0003-ldso-arc-fix-LD_DEBUG-segv-when-printing-R_ARC_NONE.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 269a2a2a0f863e1b43dc02f2f4f0f3c50299456e Mon Sep 17 00:00:00 2001
-From: Vineet Gupta 
-Date: Tue, 26 Jun 2018 18:26:24 -0700
-Subject: [PATCH] ldso/arc: fix LD_DEBUG segv when printing R_ARC_NONE
-
-Signed-off-by: Vineet Gupta 
-Signed-off-by: Alexey Brodkin 
----
- ldso/ldso/arc/elfinterp.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ldso/ldso/arc/elfinterp.c b/ldso/ldso/arc/elfinterp.c
-index 5a02bc234..a30c19bcb 100644
---- a/ldso/ldso/arc/elfinterp.c
-+++ b/ldso/ldso/arc/elfinterp.c
-@@ -64,7 +64,7 @@ _dl_linux_resolver(struct elf_resolve *tpnt, unsigned int plt_pc)
- 	if (_dl_debug_bindings) {
- 		_dl_dprintf(_dl_debug_file, "\nresolve function: %s", symname);
- 		if (_dl_debug_detail)
--			_dl_dprintf(_dl_debug_file, "\n\tpatched %x ==> %pc @ %pl\n",
-+			_dl_dprintf(_dl_debug_file, "\n\tpatched %x ==> %pc @ %p\n",
- 					*got_addr, new_addr, got_addr);
- 	}
- 
-@@ -178,7 +178,7 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,
- 
- log_entry:
- #if defined __SUPPORT_LD_DEBUG__
--	if (_dl_debug_detail)
-+	if (_dl_debug_detail && (reloc_type != R_ARC_NONE))
- 		_dl_dprintf(_dl_debug_file,"\tpatched: %x ==> %x @ %x",
- 				old_val, *reloc_addr, reloc_addr);
- #endif
-@@ -214,7 +214,7 @@ _dl_do_lazy_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,
- 	}
- 
- #if defined __SUPPORT_LD_DEBUG__
--	if (_dl_debug_reloc && _dl_debug_detail)
-+	if (_dl_debug_reloc && _dl_debug_detail && (reloc_type != R_ARC_NONE))
- 		_dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x\n",
- 				old_val, *reloc_addr, reloc_addr);
- #endif
--- 
-2.16.2
-
diff --git a/buildroot/package/uclibc/0003-preadv-pwritev-fix-offset-argument-type.patch b/buildroot/package/uclibc/0003-preadv-pwritev-fix-offset-argument-type.patch
new file mode 100644
index 000000000..ccc262b9c
--- /dev/null
+++ b/buildroot/package/uclibc/0003-preadv-pwritev-fix-offset-argument-type.patch
@@ -0,0 +1,71 @@
+From 1077d5bebffacfd4b09896ed890fb45a5b3c6dc6 Mon Sep 17 00:00:00 2001
+From: Max Filippov 
+Date: Fri, 10 May 2019 07:13:19 -0700
+Subject: [PATCH] preadv/pwritev: fix offset argument type
+
+preadv/pwritev don't provide separate version for 64-bit wide off_t,
+and default to 32-bit wide off_t, which results in a mismatch between
+declaration and definition for user programs built with
+-D_FILE_OFFSET_BITS=64.
+Make offset argument of both functions __off64_t.
+This fixes test misc/tst-preadvwritev on xtensa.
+
+Backported from: 423e49023eeb ("preadv/pwritev: fix offset argument type")
+Signed-off-by: Max Filippov 
+---
+ include/sys/uio.h                   | 4 ++--
+ libc/sysdeps/linux/common/preadv.c  | 2 +-
+ libc/sysdeps/linux/common/pwritev.c | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/sys/uio.h b/include/sys/uio.h
+index aa766f9b1187..330426fec492 100644
+--- a/include/sys/uio.h
++++ b/include/sys/uio.h
+@@ -59,7 +59,7 @@ extern ssize_t writev (int __fd, const struct iovec *__iovec, int __count);
+    This function is a cancellation point and therefore not marked with
+    __THROW.  */
+ extern ssize_t preadv (int __fd, const struct iovec *__iovec, int __count,
+-		       off_t __offset) __wur;
++		       __off64_t __offset) __wur;
+ 
+ /* Write data pointed by the buffers described by IOVEC, which is a
+    vector of COUNT 'struct iovec's, to file descriptor FD at the given
+@@ -71,7 +71,7 @@ extern ssize_t preadv (int __fd, const struct iovec *__iovec, int __count,
+    This function is a cancellation point and therefore not marked with
+    __THROW.  */
+ extern ssize_t pwritev (int __fd, const struct iovec *__iovec, int __count,
+-			off_t __offset) __wur;
++			__off64_t __offset) __wur;
+ #endif	/* Use misc.  */
+ 
+ __END_DECLS
+diff --git a/libc/sysdeps/linux/common/preadv.c b/libc/sysdeps/linux/common/preadv.c
+index fd9dde4b999c..6a07d5df87e0 100644
+--- a/libc/sysdeps/linux/common/preadv.c
++++ b/libc/sysdeps/linux/common/preadv.c
+@@ -21,7 +21,7 @@
+ 
+ #ifdef __NR_preadv
+ ssize_t
+-preadv (int fd, const struct iovec *vector, int count, off_t offset)
++preadv (int fd, const struct iovec *vector, int count, __off64_t offset)
+ {
+   unsigned long pos_l, pos_h;
+ 
+diff --git a/libc/sysdeps/linux/common/pwritev.c b/libc/sysdeps/linux/common/pwritev.c
+index bef5bcf69b46..f07c40e6de3c 100644
+--- a/libc/sysdeps/linux/common/pwritev.c
++++ b/libc/sysdeps/linux/common/pwritev.c
+@@ -21,7 +21,7 @@
+ 
+ #ifdef __NR_pwritev
+ ssize_t
+-pwritev (int fd, const struct iovec *vector, int count, off_t offset)
++pwritev (int fd, const struct iovec *vector, int count, __off64_t offset)
+ {
+   unsigned long pos_l, pos_h;
+ 
+-- 
+2.11.0
+
diff --git a/buildroot/package/uclibc/0004-mkostemp64-clear-flags-as-mkostemp-does.patch b/buildroot/package/uclibc/0004-mkostemp64-clear-flags-as-mkostemp-does.patch
deleted file mode 100644
index f87abd884..000000000
--- a/buildroot/package/uclibc/0004-mkostemp64-clear-flags-as-mkostemp-does.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 09a776103e4aa75f95c9ad44554a9c2b56de3535 Mon Sep 17 00:00:00 2001
-From: Carlos Santos 
-Date: Mon, 29 Oct 2018 01:17:38 -0300
-Subject: [PATCH] mkostemp64: clear flags, as mkostemp does
-
-This should have been made in commit 9649721950 but was forgotten.
-
-Signed-off-by: Carlos Santos 
----
- libc/stdlib/mkostemp64.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libc/stdlib/mkostemp64.c b/libc/stdlib/mkostemp64.c
-index aa9736cd6..f4674bb0c 100644
---- a/libc/stdlib/mkostemp64.c
-+++ b/libc/stdlib/mkostemp64.c
-@@ -15,9 +15,9 @@
-    License along with the GNU C Library; if not, see
-    .  */
- 
--#include 
- #include 
- #include 
-+#include 
- #include "../misc/internals/tempname.h"
- 
- /* Generate a unique temporary file name from TEMPLATE.
-@@ -27,6 +27,7 @@
- int
- mkostemp64 (char *template, int flags)
- {
-+  flags -= flags & O_ACCMODE; /* Remove O_RDONLY, O_WRONLY, and O_RDWR. */
-   return __gen_tempname (template, __GT_BIGFILE, flags | O_LARGEFILE, 0,
-                          S_IRUSR | S_IWUSR);
- }
--- 
-2.14.5
-
diff --git a/buildroot/package/uclibc/uclibc.hash b/buildroot/package/uclibc/uclibc.hash
index 81936f363..d1cbdb6c7 100644
--- a/buildroot/package/uclibc/uclibc.hash
+++ b/buildroot/package/uclibc/uclibc.hash
@@ -1,2 +1,4 @@
-# From https://uclibc-ng.org/
-sha256  992bd9a2889ea385902b87e3d3d30603741eb16728288fbf537ff2027f770496        uClibc-ng-1.0.30.tar.xz
+# From https://downloads.uclibc-ng.org/releases/1.0.31/uClibc-ng-1.0.31.tar.xz.sha256
+sha256  2215d7377118434d1697fd575f10d7a6be3f29e460d6b0e1ee9f6f5306288060  uClibc-ng-1.0.31.tar.xz
+# Locally calculated
+sha256  6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3  COPYING.LIB
diff --git a/buildroot/package/uclibc/uclibc.mk b/buildroot/package/uclibc/uclibc.mk
index 27e4d5873..afc4872b6 100644
--- a/buildroot/package/uclibc/uclibc.mk
+++ b/buildroot/package/uclibc/uclibc.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-UCLIBC_VERSION = 1.0.30
+UCLIBC_VERSION = 1.0.31
 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
-UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
+UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
 UCLIBC_LICENSE = LGPL-2.1+
 UCLIBC_LICENSE_FILES = COPYING.LIB
 UCLIBC_INSTALL_STAGING = YES
diff --git a/buildroot/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch b/buildroot/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch
new file mode 100644
index 000000000..71152e5de
--- /dev/null
+++ b/buildroot/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch
@@ -0,0 +1,81 @@
+From d934b0fa5ce24a8fd1987b916e435ba991c2ef64 Mon Sep 17 00:00:00 2001
+From: Vadim Kochan 
+Date: Mon, 31 Dec 2018 11:00:46 +0200
+Subject: [PATCH] Fix compilation issue due to missing sys/sysmacros.h include
+
+glibc 2.28+ no longer include  from , so
+ must now be explicitly included to use the major,
+minor and makedev macros.
+
+Signed-off-by: Vadim Kochan 
+---
+ src/daemon.c          | 1 +
+ src/device.c          | 1 +
+ src/mount-monitor.c   | 1 +
+ tools/udisks.c        | 1 +
+ tools/umount-udisks.c | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index fafcf9a..4303a6d 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -45,6 +45,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/device.c b/src/device.c
+index 2ae7f38..20920df 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -33,6 +33,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/mount-monitor.c b/src/mount-monitor.c
+index 573a69c..0cfa167 100644
+--- a/src/mount-monitor.c
++++ b/src/mount-monitor.c
+@@ -29,6 +29,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include 
+diff --git a/tools/udisks.c b/tools/udisks.c
+index 97e80d7..22a7d87 100644
+--- a/tools/udisks.c
++++ b/tools/udisks.c
+@@ -31,6 +31,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
+index 2813fe0..d915660 100644
+--- a/tools/umount-udisks.c
++++ b/tools/umount-udisks.c
+@@ -30,6 +30,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.14.1
+
diff --git a/buildroot/package/unixodbc/Config.in b/buildroot/package/unixodbc/Config.in
index d5434d1ef..eb0ad9c54 100644
--- a/buildroot/package/unixodbc/Config.in
+++ b/buildroot/package/unixodbc/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_UNIXODBC
 	bool "unixodbc"
+	depends on !BR2_STATIC_LIBS # dlopen()
 	help
 	  The unixODBC Project goals are to develop and promote
 	  unixODBC to be the definitive standard for ODBC on non MS
 	  Windows platforms.
 
 	  http://www.unixodbc.org
+
+comment "unixodbc needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
diff --git a/buildroot/package/unzip/unzip.hash b/buildroot/package/unzip/unzip.hash
index a138cc27c..fbf2615ad 100644
--- a/buildroot/package/unzip/unzip.hash
+++ b/buildroot/package/unzip/unzip.hash
@@ -1,2 +1,15 @@
 # Locally computed:
 sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip60.tgz
+sha256 66a364d75cea29363768ca6d43dd11b9913a59e42b8da16c4f63516c3e4ce7c1 07-increase-size-of-cfactorstr.patch
+sha256 3a8cfd2702d220c6c119eaf805b018b66460284e585e92adc8a572d190471724 08-allow-greater-hostver-values.patch
+sha256 0a1b23118b2f4a3ed097348ab33050d4f79b3863ab30e6d64ac382589834e3de 09-cve-2014-8139-crc-overflow.patch
+sha256 32b1eda30644c44a8bdb9a02ff08bb2eca107f8eb16dda6992a9b778a0de395e 10-cve-2014-8140-test-compr-eb.patch
+sha256 1f60f6e28b36f3cddb7da64c528cfe29160cefa1232e13bb8a47561f574067a9 11-cve-2014-8141-getzip64data.patch
+sha256 c05885bb48b41603f0893ada88f15c0fae3b3f9f6489f24ad630a400f6271351 12-cve-2014-9636-test-compr-eb.patch
+sha256 788c29727ff0689c3b1828466127758426f6d2c769048aa985950373747c76f3 14-cve-2015-7696.patch
+sha256 e85dab65c3ebf3c4ab3359a4143cfd0efccfd1cac517a4e7bd5f518f41a02b6f 15-cve-2015-7697.patch
+sha256 95dd15d5d9cdf5cea18c357b152930d6d52660599e0fd4907d6405870fdd9fe1 16-fix-integer-underflow-csiz-decrypted.patch
+sha256 ea04cfc8b7ca3b3c03117da0d891870b8c542d26188ef5593fd7e479f4f29f4e 17-restore-unix-timestamps-accurately.patch
+sha256 1872ffdd4d82edd7b1e62c469642bf16a1ca12dd26d41bd3f0b44f0f7602eb63 18-cve-2014-9913-unzip-buffer-overflow.patch
+sha256 60840ea8f5d11a276972fb5b43652cdd49a9ed93b2cc0586ad309bf52104b012 19-cve-2016-9844-zipinfo-buffer-overflow.patch
+sha256 4eabc3faeddd56ebc3d5053486b61f8758d840902725fd555d3472cffb094437 20-cve-2018-1000035-unzip-buffer-overflow.patch
diff --git a/buildroot/package/unzip/unzip.mk b/buildroot/package/unzip/unzip.mk
index cff5951ac..43e90125e 100644
--- a/buildroot/package/unzip/unzip.mk
+++ b/buildroot/package/unzip/unzip.mk
@@ -10,4 +10,19 @@ UNZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
 UNZIP_LICENSE = Info-ZIP
 UNZIP_LICENSE_FILES = LICENSE
 
+UNZIP_PATCH = \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/07-increase-size-of-cfactorstr.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/08-allow-greater-hostver-values.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/09-cve-2014-8139-crc-overflow.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/10-cve-2014-8140-test-compr-eb.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/11-cve-2014-8141-getzip64data.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/12-cve-2014-9636-test-compr-eb.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/14-cve-2015-7696.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/15-cve-2015-7697.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/16-fix-integer-underflow-csiz-decrypted.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/17-restore-unix-timestamps-accurately.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/18-cve-2014-9913-unzip-buffer-overflow.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/19-cve-2016-9844-zipinfo-buffer-overflow.patch \
+	https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/20-cve-2018-1000035-unzip-buffer-overflow.patch
+
 $(eval $(cmake-package))
diff --git a/buildroot/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch b/buildroot/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch
new file mode 100644
index 000000000..69e05827c
--- /dev/null
+++ b/buildroot/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch
@@ -0,0 +1,72 @@
+From 256394399f57ba6e3057ee2c981127a14e4623f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= 
+Date: Tue, 22 Jan 2019 09:07:56 +0100
+Subject: [PATCH] Use uint64_t instead of u_int64_t
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+`uintN_t` is standard C99 type available in ``, whereas `u_intN_t`
+is defined ``
+
+As upmpdcli already uses the `uintN_t` type, replace the few existing
+`u_intN_t` types, as it breaks build with the musl C library, which is
+very strict, because of the missing ``:
+
+```
+src/mediaserver/cdplugins/netfetch.h:71:5: error: ‘u_int64_t’ does not name a type
+     u_int64_t datacount() {
+```
+
+Backported from: 256394399f57ba6e3057ee2c981127a14e4623f8
+
+Signed-off-by: Jörg Krause 
+---
+ src/mediaserver/cdplugins/netfetch.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/mediaserver/cdplugins/netfetch.h b/src/mediaserver/cdplugins/netfetch.h
+index d7e9df4..d105e53 100644
+--- a/src/mediaserver/cdplugins/netfetch.h
++++ b/src/mediaserver/cdplugins/netfetch.h
+@@ -68,7 +68,7 @@ public:
+     /// Reset after transfer done, for retrying for exemple.
+     virtual bool reset() = 0;
+ 
+-    u_int64_t datacount() {
++    uint64_t datacount() {
+         return fetch_data_count;
+     }
+ 
+@@ -84,11 +84,11 @@ public:
+         buf1cb = f;
+     }
+     // Called when the network transfer is done
+-    void setEOFetchCB(std::function f) {
++    void setEOFetchCB(std::function f) {
+         eofcb = f;
+     }
+     // Called every time we get new data from the remote
+-    void setFetchBytesCB(std::function f) {
++    void setFetchBytesCB(std::function f) {
+         fbcb = f;
+     }
+ 
+@@ -98,11 +98,11 @@ protected:
+     std::string _url;
+     uint64_t startoffset;
+     int timeoutsecs{0};
+-    u_int64_t fetch_data_count{0};
++    uint64_t fetch_data_count{0};
+     BufXChange *outqueue{nullptr};
+     std::function buf1cb;
+-    std::function fbcb;
+-    std::function eofcb;
++    std::function fbcb;
++    std::function eofcb;
+ };
+ 
+ #endif /* _MEDIAFETCH_H_INCLUDED_ */
+-- 
+2.20.1
+
diff --git a/buildroot/package/upmpdcli/Config.in b/buildroot/package/upmpdcli/Config.in
index cf85a793e..74eb76883 100644
--- a/buildroot/package/upmpdcli/Config.in
+++ b/buildroot/package/upmpdcli/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_UPMPDCLI
 	bool "upmpdcli"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libupnpp, libmicrohttpd
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11, libupnpp
 	select BR2_PACKAGE_JSONCPP
 	select BR2_PACKAGE_LIBMICROHTTPD
@@ -15,6 +15,8 @@ config BR2_PACKAGE_UPMPDCLI
 
 	  http://www.lesbonscomptes.com/upmpdcli/
 
-comment "upmpdcli needs a toolchain w/ C++, threads, gcc >= 4.9"
+comment "upmpdcli needs a toolchain w/ C++, NPTL, gcc >= 4.9"
 	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
diff --git a/buildroot/package/upmpdcli/upmpdcli.hash b/buildroot/package/upmpdcli/upmpdcli.hash
index c59655c9f..cbd12fe29 100644
--- a/buildroot/package/upmpdcli/upmpdcli.hash
+++ b/buildroot/package/upmpdcli/upmpdcli.hash
@@ -1,5 +1,5 @@
-# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.16.tar.gz.sha256:
-sha256  b0dfd33cd5c1c2e4f770660c12d7303b6d8b3fdca4f63530c6a235ce279a9d98  upmpdcli-1.2.16.tar.gz
+# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.0.tar.gz.sha256:
+sha256  28742910fa16b72f0c4e5b7dc561f59aa7f1a5fdd3e8e4f72f359d2e4af90d35  upmpdcli-1.4.0.tar.gz
 
 # Hash for license file:
-sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
diff --git a/buildroot/package/upmpdcli/upmpdcli.mk b/buildroot/package/upmpdcli/upmpdcli.mk
index 069b14399..22a5bf242 100644
--- a/buildroot/package/upmpdcli/upmpdcli.mk
+++ b/buildroot/package/upmpdcli/upmpdcli.mk
@@ -4,12 +4,17 @@
 #
 ################################################################################
 
-UPMPDCLI_VERSION = 1.2.16
+UPMPDCLI_VERSION = 1.4.0
 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
-UPMPDCLI_LICENSE = GPL-2.0+
+UPMPDCLI_LICENSE = LGPL-2.1+
 UPMPDCLI_LICENSE_FILES = COPYING
 UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp
 
+# Disable spotify plugin which requires dlfcn.h
+ifeq ($(BR2_STATIC_LIBS),y)
+UPMPDCLI_CONF_OPTS = --disable-spotify
+endif
+
 # Upmpdcli only runs if user upmpdcli exists
 define UPMPDCLI_USERS
 	upmpdcli -1 upmpdcli -1 * - - audio Upmpdcli MPD UPnP Renderer Front-End
diff --git a/buildroot/package/usb_modeswitch/usb_modeswitch.mk b/buildroot/package/usb_modeswitch/usb_modeswitch.mk
index bb0d6ab1b..9832d3c80 100644
--- a/buildroot/package/usb_modeswitch/usb_modeswitch.mk
+++ b/buildroot/package/usb_modeswitch/usb_modeswitch.mk
@@ -10,16 +10,16 @@ USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DEPENDENCIES = libusb
 USB_MODESWITCH_LICENSE = GPL-2.0+
 USB_MODESWITCH_LICENSE_FILES = COPYING
-# Package does not build in parallel due to improper make rules
+# Package does not build in parallel due to improper make rules
 USB_MODESWITCH_MAKE = $(MAKE1)
 
-USB_MODESWITCH_BUILD_TARGETS = static
-USB_MODESWITCH_INSTALL_TARGETS = install-static
-
 ifeq ($(BR2_PACKAGE_TCL)$(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
 USB_MODESWITCH_DEPENDENCIES += tcl
 USB_MODESWITCH_BUILD_TARGETS = script
 USB_MODESWITCH_INSTALL_TARGETS = install-script
+else
+USB_MODESWITCH_BUILD_TARGETS = static
+USB_MODESWITCH_INSTALL_TARGETS = install-static
 endif
 
 # build system of embedded jimtcl doesn't use autotools, but does use
diff --git a/buildroot/package/util-linux/0001-rtcwake-use-poweroff-if-shutdown-is-not-found.patch b/buildroot/package/util-linux/0001-rtcwake-use-poweroff-if-shutdown-is-not-found.patch
new file mode 100644
index 000000000..b97be2ef0
--- /dev/null
+++ b/buildroot/package/util-linux/0001-rtcwake-use-poweroff-if-shutdown-is-not-found.patch
@@ -0,0 +1,86 @@
+From e1686b25acdedb34cc357f08f0dd3ca01c559dfd Mon Sep 17 00:00:00 2001
+From: Justin Chen 
+Date: Thu, 1 Nov 2018 11:10:38 -0700
+Subject: [PATCH] rtcwake: use poweroff if shutdown is not found
+
+Some systems do not have the shutdown command. Use poweroff as an
+alternative.
+
+Signed-off-by: Justin Chen 
+---
+ include/pathnames.h |  1 +
+ sys-utils/rtcwake.c | 39 +++++++++++++++++++++++++++------------
+ 2 files changed, 28 insertions(+), 12 deletions(-)
+
+diff --git a/include/pathnames.h b/include/pathnames.h
+index 3d5052e6f..ed8ea330d 100644
+--- a/include/pathnames.h
++++ b/include/pathnames.h
+@@ -53,6 +53,7 @@
+ # define _PATH_LOGIN		"/bin/login"
+ #endif
+ #define _PATH_SHUTDOWN		"/sbin/shutdown"
++#define _PATH_POWEROFF		"/sbin/poweroff"
+ 
+ #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
+ #define _PATH_TERMCOLORS_DIR	"/etc/" _PATH_TERMCOLORS_DIRNAME
+diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
+index b63c64627..029f00f9b 100644
+--- a/sys-utils/rtcwake.c
++++ b/sys-utils/rtcwake.c
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -582,18 +583,32 @@ int main(int argc, char **argv)
+ 		char *arg[5];
+ 		int i = 0;
+ 
+-		if (ctl.verbose)
+-			printf(_("suspend mode: off; executing %s\n"),
+-						_PATH_SHUTDOWN);
+-		arg[i++] = _PATH_SHUTDOWN;
+-		arg[i++] = "-h";
+-		arg[i++] = "-P";
+-		arg[i++] = "now";
+-		arg[i]   = NULL;
+-		if (!ctl.dryrun) {
+-			execv(arg[0], arg);
+-			warn(_("failed to execute %s"), _PATH_SHUTDOWN);
+-			rc = EXIT_FAILURE;
++		if (!access(_PATH_SHUTDOWN, X_OK)) {
++			arg[i++] = _PATH_SHUTDOWN;
++			arg[i++] = "-h";
++			arg[i++] = "-P";
++			arg[i++] = "now";
++			arg[i]   = NULL;
++		} else if (!access(_PATH_POWEROFF, X_OK)) {
++			arg[i++] = _PATH_POWEROFF;
++			arg[i]   = NULL;
++		} else {
++			arg[i] 	 = NULL;
++		}
++
++		if (arg[0]) {
++			if (ctl.verbose)
++				printf(_("suspend mode: off; executing %s\n"),
++						arg[0]);
++			if (!ctl.dryrun) {
++				execv(arg[0], arg);
++				warn(_("failed to execute %s"), arg[0]);
++				rc = EX_EXEC_ENOENT;
++			}
++		} else {
++			/* Failed to find shutdown command */
++			warn(_("failed to find shutdown command"));
++			rc = EX_EXEC_ENOENT;
+ 		}
+ 		break;
+ 	}
+-- 
+2.17.1
+
diff --git a/buildroot/package/util-linux/0002-agetty-fix-output-of-escaped-characters.patch b/buildroot/package/util-linux/0002-agetty-fix-output-of-escaped-characters.patch
new file mode 100644
index 000000000..fcd973134
--- /dev/null
+++ b/buildroot/package/util-linux/0002-agetty-fix-output-of-escaped-characters.patch
@@ -0,0 +1,26 @@
+From 73c5a3cc748b853936319e6cdc94159a6974db52 Mon Sep 17 00:00:00 2001
+From: Christian Hesse 
+Date: Wed, 7 Nov 2018 13:55:06 +0100
+Subject: [PATCH] agetty: fix output of escaped characters
+
+Signed-off-by: Christian Hesse 
+---
+ term-utils/agetty.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/term-utils/agetty.c b/term-utils/agetty.c
+index 05a269abb..b9f08728e 100644
+--- a/term-utils/agetty.c
++++ b/term-utils/agetty.c
+@@ -2755,7 +2755,7 @@ static void output_special_char(struct issue *ie,
+ 		break;
+ 	}
+ 	default:
+-		putchar(c);
++		putc(c, ie->output);
+ 		break;
+ 	}
+ }
+-- 
+2.17.1
+
diff --git a/buildroot/package/util-linux/0003-setarch-fix-obscure-sparc32bash-use-case.patch b/buildroot/package/util-linux/0003-setarch-fix-obscure-sparc32bash-use-case.patch
new file mode 100644
index 000000000..70588b863
--- /dev/null
+++ b/buildroot/package/util-linux/0003-setarch-fix-obscure-sparc32bash-use-case.patch
@@ -0,0 +1,84 @@
+From 3fa06e049012218d883d0e1251df86bafbc446bf Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+Date: Thu, 22 Nov 2018 11:03:35 +0100
+Subject: [PATCH] setarch: fix obscure sparc32bash use-case
+
+Reported-by: Carlos Santos 
+Signed-off-by: Karel Zak 
+Signed-off-by: Carlos Santos 
+---
+ sys-utils/setarch.c | 28 ++++++++++++++++++----------
+ 1 file changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
+index a733f7b3c..7c0a63fbb 100644
+--- a/sys-utils/setarch.c
++++ b/sys-utils/setarch.c
+@@ -268,6 +268,7 @@ int main(int argc, char *argv[])
+ 	int c;
+ 	struct arch_domain *doms, *target;
+ 	unsigned long pers_value = 0;
++	char *shell = NULL, *shell_arg = NULL;
+ 
+ 	/* Options without equivalent short options */
+ 	enum {
+@@ -310,14 +311,14 @@ int main(int argc, char *argv[])
+ 	archwrapper = strcmp(program_invocation_short_name, "setarch") != 0;
+ 	if (archwrapper) {
+ 		arch = program_invocation_short_name;	/* symlinks to setarch */
+-#if defined(__sparc64__) || defined(__sparc__)
++
++		/* Don't use ifdef sparc here, we get "Unrecognized architecture"
++		 * error message later if necessary */
+ 		if (strcmp(arch, "sparc32bash") == 0) {
+-			if (set_arch(arch, 0L, 0))
+-				err(EXIT_FAILURE, _("Failed to set personality to %s"), arch);
+-			execl("/bin/bash", "", NULL);
+-			errexec("/bin/bash");
++			shell = "/bin/bash";
++			shell_arg = "";
++			goto set_arch;
+ 		}
+-#endif
+ 	} else {
+ 		if (1 < argc && *argv[1] != '-') {
+ 			arch = argv[1];
+@@ -391,6 +392,7 @@ int main(int argc, char *argv[])
+ 	argc -= optind;
+ 	argv += optind;
+ 
++set_arch:
+ 	/* get execution domain (architecture) */
+ 	if (arch) {
+ 		doms = init_arch_domains();
+@@ -422,17 +424,23 @@ int main(int argc, char *argv[])
+ 	if (arch)
+ 		verify_arch_domain(target, arch);
+ 
++	if (!argc) {
++		shell = "/bin/sh";
++		shell_arg = "-sh";
++	}
+ 	if (verbose) {
+-		printf(_("Execute command `%s'.\n"), argc ? argv[0] : "/bin/sh");
++		printf(_("Execute command `%s'.\n"), shell ? shell : argv[0]);
+ 		/* flush all output streams before exec */
+ 		fflush(NULL);
+ 	}
+ 
+-	if (!argc) {
+-		execl("/bin/sh", "-sh", NULL);
+-		errexec("/bin/sh");
++	/* Execute shell */
++	if (shell) {
++		execl(shell, shell_arg, NULL);
++		errexec(shell);
+ 	}
+ 
++	/* Execute on command line specified command */
+ 	execvp(argv[0], argv);
+ 	errexec(argv[0]);
+ }
+-- 
+2.14.5
+
diff --git a/buildroot/package/util-linux/Config.in b/buildroot/package/util-linux/Config.in
index 5f0a35cdb..a5a137bfe 100644
--- a/buildroot/package/util-linux/Config.in
+++ b/buildroot/package/util-linux/Config.in
@@ -53,7 +53,7 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES
 	help
 	  Install the basic set of util-linux binaries.
 
-	  blkdiscard, blkid, blockdev, chcpu, col, colcrt, colrm,
+	  blkdiscard, blkid, blockdev, chcpu, choom, col, colcrt, colrm,
 	  column, ctrlaltdel, dmesg, fdisk, fincore, findfs, findmnt,
 	  flock, fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize,
 	  ldattach, look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie,
diff --git a/buildroot/package/util-linux/util-linux.hash b/buildroot/package/util-linux/util-linux.hash
index 1b7d6db45..ed503a12e 100644
--- a/buildroot/package/util-linux/util-linux.hash
+++ b/buildroot/package/util-linux/util-linux.hash
@@ -1,9 +1,9 @@
-# From https://www.kernel.org/pub/linux/utils/util-linux/v2.32/sha256sums.asc
-sha256 86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2  util-linux-2.32.1.tar.xz
+# From https://www.kernel.org/pub/linux/utils/util-linux/v2.33/sha256sums.asc
+sha256 f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a  util-linux-2.33.tar.xz
 # License files, locally calculated
-sha256 1e4b65802b0df8115395c697029d03339f983d451a473a08643309c684410d9a  README.licensing
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/licenses/COPYING.GPLv2
-sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8  Documentation/licenses/COPYING.UCB
-sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Documentation/licenses/COPYING.LGPLv2.1
-sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d  Documentation/licenses/COPYING.BSD-3
+sha256 4335620e8f478ee4dc4d26540448d39469091ef1d8e3fbbbb8bf753206ceac74  README.licensing
+sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d  Documentation/licenses/COPYING.BSD-3-Clause
+sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8  Documentation/licenses/COPYING.BSD-4-Clause-UC
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/licenses/COPYING.GPL-2.0-or-later
 sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63  Documentation/licenses/COPYING.ISC
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Documentation/licenses/COPYING.LGPL-2.1-or-later
diff --git a/buildroot/package/util-linux/util-linux.mk b/buildroot/package/util-linux/util-linux.mk
index d6b3c33b2..c176d364c 100644
--- a/buildroot/package/util-linux/util-linux.mk
+++ b/buildroot/package/util-linux/util-linux.mk
@@ -4,15 +4,20 @@
 #
 ################################################################################
 
-UTIL_LINUX_VERSION_MAJOR = 2.32
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
+UTIL_LINUX_VERSION_MAJOR = 2.33
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 
 # README.licensing claims that some files are GPL-2.0 only, but this is not true.
 # Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license.
 UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid) ISC (rfkill)
-UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 Documentation/licenses/COPYING.ISC
+UTIL_LINUX_LICENSE_FILES = README.licensing \
+	Documentation/licenses/COPYING.BSD-3-Clause \
+	Documentation/licenses/COPYING.BSD-4-Clause-UC \
+	Documentation/licenses/COPYING.GPL-2.0-or-later \
+	Documentation/licenses/COPYING.ISC \
+	Documentation/licenses/COPYING.LGPL-2.1-or-later
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 UTIL_LINUX_CONF_OPTS += \
diff --git a/buildroot/package/utp_com/Config.in.host b/buildroot/package/utp_com/Config.in.host
new file mode 100644
index 000000000..8f733de8c
--- /dev/null
+++ b/buildroot/package/utp_com/Config.in.host
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_HOST_UTP_COM
+	bool "host utp_com"
+	help
+	  This package is used to send commands to hardware
+	  via Freescale's UTP protocol (similar to MFGTools)
+
+	  https://github.com/ixonos/utp_com
diff --git a/buildroot/package/utp_com/utp_com.hash b/buildroot/package/utp_com/utp_com.hash
new file mode 100644
index 000000000..bc25be209
--- /dev/null
+++ b/buildroot/package/utp_com/utp_com.hash
@@ -0,0 +1,3 @@
+# locally computed
+sha256  8b5ba0058a78de69faf6822bb10b457fff2f9e55dc112ccb81c35214b061c6e6 utp_com-dee512ced1e9367d223d22f10797fbf9aeacfab6.tar.gz
+sha256  a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE
diff --git a/buildroot/package/utp_com/utp_com.mk b/buildroot/package/utp_com/utp_com.mk
new file mode 100644
index 000000000..5890a70d0
--- /dev/null
+++ b/buildroot/package/utp_com/utp_com.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# utp_com
+#
+################################################################################
+
+UTP_COM_VERSION = dee512ced1e9367d223d22f10797fbf9aeacfab6
+UTP_COM_SITE = $(call github,freescale,utp_com,$(UTP_COM_VERSION))
+UTP_COM_LICENSE = GPL-2.0+
+UTP_COM_LICENSE_FILES = LICENSE
+HOST_UTP_COM_DEPENDENCIES = host-sg3_utils
+
+define HOST_UTP_COM_BUILD_CMDS
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define HOST_UTP_COM_INSTALL_CMDS
+	$(INSTALL) -D -m 755 $(@D)/utp_com $(HOST_DIR)/bin/utp_com
+endef
+
+$(eval $(host-generic-package))
diff --git a/buildroot/package/v4l2loopback/v4l2loopback.hash b/buildroot/package/v4l2loopback/v4l2loopback.hash
index 1f368121c..0598be486 100644
--- a/buildroot/package/v4l2loopback/v4l2loopback.hash
+++ b/buildroot/package/v4l2loopback/v4l2loopback.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	419354f1de98b4f25be75decde942026c7e9e2d2c2def283c2988875e4a16aa6  v4l2loopback-v0.12.0.tar.gz
+sha256	6d2c27a69d982bf39d7330b92f084fd0388beef486879320ccf263e4716cd549  v4l2loopback-v0.12.2.tar.gz
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/buildroot/package/v4l2loopback/v4l2loopback.mk b/buildroot/package/v4l2loopback/v4l2loopback.mk
index a6dedb2a3..15c1ed610 100644
--- a/buildroot/package/v4l2loopback/v4l2loopback.mk
+++ b/buildroot/package/v4l2loopback/v4l2loopback.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-V4L2LOOPBACK_VERSION = v0.12.0
+V4L2LOOPBACK_VERSION = v0.12.2
 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,$(V4L2LOOPBACK_VERSION))
 V4L2LOOPBACK_LICENSE = GPL-2.0+
 V4L2LOOPBACK_LICENSE_FILES = COPYING
diff --git a/buildroot/package/valijson/valijson.hash b/buildroot/package/valijson/valijson.hash
index 79b3fb7d6..ffa128179 100644
--- a/buildroot/package/valijson/valijson.hash
+++ b/buildroot/package/valijson/valijson.hash
@@ -1,2 +1,2 @@
 # Locally Computed:
-sha256  f2346e995bd95c6b86b0b9e9dd228fe134d529565fa86db764c48496805dd9bc  valijson-424b706f990a9eb96dfc19cc8e54f2cd6ce5e186.tar.gz
+sha256  d22c1f8fe27d43e5a27aad1d3cbe9f1318ec28ccfa913e615663ed2bd6a5d063  valijson-v0.1.tar.gz
diff --git a/buildroot/package/valijson/valijson.mk b/buildroot/package/valijson/valijson.mk
index 71bd6a8fb..e1b816ddd 100644
--- a/buildroot/package/valijson/valijson.mk
+++ b/buildroot/package/valijson/valijson.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-VALIJSON_VERSION = 424b706f990a9eb96dfc19cc8e54f2cd6ce5e186
+VALIJSON_VERSION = v0.1
 VALIJSON_SITE = $(call github,tristanpenman,valijson,$(VALIJSON_VERSION))
 VALIJSON_LICENSE = BSD-2-Clause
 VALIJSON_LICENSE_FILES = LICENSE
diff --git a/buildroot/package/vboot-utils/0006-Update-for-openssl-1.1.patch b/buildroot/package/vboot-utils/0006-Update-for-openssl-1.1.patch
new file mode 100644
index 000000000..77e71e58b
--- /dev/null
+++ b/buildroot/package/vboot-utils/0006-Update-for-openssl-1.1.patch
@@ -0,0 +1,268 @@
+From 2e730b2259c701f16d473dbfb7e58e86a6e71b01 Mon Sep 17 00:00:00 2001
+From: Daniel Kurtz 
+Date: Fri, 18 Jan 2019 13:04:59 +0200
+Subject: [PATCH] Update for openssl 1.1
+
+OpenSSL 1.1 has made significant non-backwards compatible changes to its
+API as outlined in:
+https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes
+
+BRANCH=none
+BUG=chromium:738114
+TEST=cros_workon --host start vboot_reference
+TEST=w/ openssl-1.0.2k: sudo emerge vboot_reference
+TEST=w/ openssl-1.1.0e: sudo emerge vboot_reference
+ => both build ok
+ $ futility version
+  => command runs without error
+TEST=cros_workon --board=soraka start vboot_reference coreboot
+TEST=w/ openssl-1.0.2k: emerge-soraka vboot_reference coreboot
+TEST=w/ openssl-1.1.0e: emerge-soraka vboot_reference coreboot
+ => All build ok
+
+Change-Id: I37cfc8cbb04a092eab7b0b3224f475b82609447c
+Reviewed-on: https://chromium-review.googlesource.com/557739
+Commit-Ready: Daniel Kurtz 
+Tested-by: Daniel Kurtz 
+Reviewed-by: Randall Spangler 
+Reviewed-by: Mike Frysinger 
+
+(cherry-picked from bce7904376beee2912932433a4634c1c25afe2f5)
+Signed-off-by: Vadim Kochan 
+---
+ futility/cmd_create.c         |  5 ++++-
+ futility/vb2_helper.c         |  7 +++++--
+ host/include/openssl_compat.h | 26 ++++++++++++++++++++++++++
+ host/lib/util_misc.c          |  7 +++++--
+ host/lib21/host_key.c         |  8 +++++++-
+ utility/dumpRSAPublicKey.c    | 19 ++++++++++++++-----
+ 6 files changed, 61 insertions(+), 11 deletions(-)
+ create mode 100644 host/include/openssl_compat.h
+
+diff --git a/futility/cmd_create.c b/futility/cmd_create.c
+index 143ea9ae..80d3fd90 100644
+--- a/futility/cmd_create.c
++++ b/futility/cmd_create.c
+@@ -13,6 +13,7 @@
+ #include "2common.h"
+ #include "2id.h"
+ #include "2rsa.h"
++#include "openssl_compat.h"
+ #include "util_misc.h"
+ #include "vb2_common.h"
+ #include "vb2_struct.h"
+@@ -170,6 +171,7 @@ static int vb2_make_keypair()
+ 	enum vb2_signature_algorithm sig_alg;
+ 	uint8_t *pubkey_buf = 0;
+ 	int has_priv = 0;
++	const BIGNUM *rsa_d;
+ 
+ 	FILE *fp;
+ 	int ret = 1;
+@@ -193,7 +195,8 @@ static int vb2_make_keypair()
+ 		goto done;
+ 	}
+ 	/* Public keys doesn't have the private exponent */
+-	has_priv = !!rsa_key->d;
++	RSA_get0_key(rsa_key, NULL, NULL, &rsa_d);
++	has_priv = !!rsa_d;
+ 	if (!has_priv)
+ 		fprintf(stderr, "%s has a public key only.\n", infile);
+ 
+diff --git a/futility/vb2_helper.c b/futility/vb2_helper.c
+index 51a78375..c6cc0fdd 100644
+--- a/futility/vb2_helper.c
++++ b/futility/vb2_helper.c
+@@ -11,6 +11,7 @@
+ #include "2common.h"
+ #include "2id.h"
+ #include "2rsa.h"
++#include "openssl_compat.h"
+ #include "util_misc.h"
+ #include "vb2_common.h"
+ #include "vb2_struct.h"
+@@ -216,6 +217,7 @@ int ft_show_pem(const char *name, uint8_t *buf, uint32_t len, void *data)
+ 	uint8_t *keyb, *digest;
+ 	uint32_t keyb_len;
+ 	int i, bits;
++	const BIGNUM *rsa_key_n, *rsa_key_d;
+ 
+ 	/* We're called only after ft_recognize_pem, so this should work. */
+ 	rsa_key = rsa_from_buffer(buf, len);
+@@ -223,10 +225,11 @@ int ft_show_pem(const char *name, uint8_t *buf, uint32_t len, void *data)
+ 		DIE;
+ 
+ 	/* Use to presence of the private exponent to decide if it's public */
+-	printf("%s Key file:      %s\n", rsa_key->d ? "Private" : "Public",
++	RSA_get0_key(rsa_key, &rsa_key_n, NULL, &rsa_key_d);
++	printf("%s Key file:      %s\n", rsa_key_d ? "Private" : "Public",
+ 					 name);
+ 
+-	bits = BN_num_bits(rsa_key->n);
++	bits = BN_num_bits(rsa_key_n);
+ 	printf("  Key length:          %d\n", bits);
+ 
+ 	if (vb_keyb_from_rsa(rsa_key, &keyb, &keyb_len)) {
+diff --git a/host/include/openssl_compat.h b/host/include/openssl_compat.h
+new file mode 100644
+index 00000000..7771f32a
+--- /dev/null
++++ b/host/include/openssl_compat.h
+@@ -0,0 +1,26 @@
++/* Copyright 2017 The Chromium OS Authors. All rights reserved.
++ * Use of this source code is governed by a BSD-style license that can be
++ * found in the LICENSE file.
++ */
++
++#ifndef VBOOT_REFERENCE_OPENSSL_COMPAT_H_
++#define VBOOT_REFERENCE_OPENSSL_COMPAT_H_
++
++#include 
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++
++static inline void RSA_get0_key(const RSA *rsa, const BIGNUM **n,
++				const BIGNUM **e, const BIGNUM **d)
++{
++	if (n != NULL)
++		*n = rsa->n;
++	if (e != NULL)
++		*e = rsa->e;
++	if (d != NULL)
++		*d = rsa->d;
++}
++
++#endif  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
++
++#endif  /* VBOOT_REFERENCE_OPENSSL_COMPAT_H_ */
+diff --git a/host/lib/util_misc.c b/host/lib/util_misc.c
+index 03ec683f..f0a1f7ad 100644
+--- a/host/lib/util_misc.c
++++ b/host/lib/util_misc.c
+@@ -15,6 +15,7 @@
+ 
+ #include "cryptolib.h"
+ #include "host_common.h"
++#include "openssl_compat.h"
+ #include "util_misc.h"
+ #include "vboot_common.h"
+ 
+@@ -58,6 +59,7 @@ int vb_keyb_from_rsa(struct rsa_st *rsa_private_key,
+ 	BIGNUM *N0inv = NULL, *R = NULL, *RR = NULL;
+ 	BIGNUM *RRTemp = NULL, *NnumBits = NULL;
+ 	BIGNUM *n = NULL, *rr = NULL;
++	const BIGNUM *rsa_private_key_n;
+ 	BN_CTX *bn_ctx = BN_CTX_new();
+ 	uint32_t n0invout;
+ 	uint32_t bufsize;
+@@ -65,7 +67,7 @@ int vb_keyb_from_rsa(struct rsa_st *rsa_private_key,
+ 	int retval = 1;
+ 
+ 	/* Size of RSA key in 32-bit words */
+-	nwords = BN_num_bits(rsa_private_key->n) / 32;
++	nwords = RSA_size(rsa_private_key) / 4;
+ 
+ 	bufsize = (2 + nwords + nwords) * sizeof(uint32_t);
+ 	outbuf = malloc(bufsize);
+@@ -94,7 +96,8 @@ int vb_keyb_from_rsa(struct rsa_st *rsa_private_key,
+ 	NEW_BIGNUM(B);
+ #undef NEW_BIGNUM
+ 
+-	BN_copy(N, rsa_private_key->n);
++	RSA_get0_key(rsa_private_key, &rsa_private_key_n, NULL, NULL);
++	BN_copy(N, rsa_private_key_n);
+ 	BN_set_word(Big1, 1L);
+ 	BN_set_word(Big2, 2L);
+ 	BN_set_word(Big32, 32L);
+diff --git a/host/lib21/host_key.c b/host/lib21/host_key.c
+index f7ea1622..f9419ad3 100644
+--- a/host/lib21/host_key.c
++++ b/host/lib21/host_key.c
+@@ -17,6 +17,7 @@
+ #include "host_common.h"
+ #include "host_key2.h"
+ #include "host_misc.h"
++#include "openssl_compat.h"
+ 
+ struct vb2_text_vs_enum vb2_text_vs_algorithm[] = {
+ 	{"RSA1024 SHA1",   VB2_ALG_RSA1024_SHA1},
+@@ -544,7 +545,12 @@ int vb2_public_key_hash(struct vb2_public_key *key,
+ 
+ enum vb2_signature_algorithm vb2_rsa_sig_alg(struct rsa_st *rsa)
+ {
+-	int bits = BN_num_bits(rsa->n);
++	const BIGNUM *e, *n;
++	int exp, bits;
++
++	RSA_get0_key(rsa, &n, &e, NULL);
++	exp = BN_get_word(e);
++	bits = BN_num_bits(n);
+ 
+ 	switch (bits) {
+ 	case 1024:
+diff --git a/utility/dumpRSAPublicKey.c b/utility/dumpRSAPublicKey.c
+index b3b7b96b..a17b159e 100644
+--- a/utility/dumpRSAPublicKey.c
++++ b/utility/dumpRSAPublicKey.c
+@@ -14,14 +14,20 @@
+ #include 
+ #include 
+ 
++#include "openssl_compat.h"
++
+ /* Command line tool to extract RSA public keys from X.509 certificates
+  * and output a pre-processed version of keys for use by RSA verification
+  * routines.
+  */
+ 
+ int check(RSA* key) {
+-  int public_exponent = BN_get_word(key->e);
+-  int modulus = BN_num_bits(key->n);
++  const BIGNUM *n, *e;
++  int public_exponent, modulus;
++
++  RSA_get0_key(key, &n, &e, NULL);
++  public_exponent = BN_get_word(e);
++  modulus = BN_num_bits(n);
+ 
+   if (public_exponent != 65537) {
+     fprintf(stderr, "WARNING: Public exponent should be 65537 (but is %d).\n",
+@@ -40,7 +46,8 @@ int check(RSA* key) {
+  */
+ void output(RSA* key) {
+   int i, nwords;
+-  BIGNUM *N = key->n;
++  const BIGNUM *key_n;
++  BIGNUM *N = NULL;
+   BIGNUM *Big1 = NULL, *Big2 = NULL, *Big32 = NULL, *BigMinus1 = NULL;
+   BIGNUM *B = NULL;
+   BIGNUM *N0inv= NULL, *R = NULL, *RR = NULL, *RRTemp = NULL, *NnumBits = NULL;
+@@ -48,14 +55,15 @@ void output(RSA* key) {
+   BN_CTX *bn_ctx = BN_CTX_new();
+   uint32_t n0invout;
+ 
+-  N = key->n;
+   /* Output size of RSA key in 32-bit words */
+-  nwords = BN_num_bits(N) / 32;
++  nwords = RSA_size(key) / 4;
+   if (-1 == write(1, &nwords, sizeof(nwords)))
+     goto failure;
+ 
+ 
+   /* Initialize BIGNUMs */
++  RSA_get0_key(key, &key_n, NULL, NULL);
++  N = BN_dup(key_n);
+   Big1 = BN_new();
+   Big2 = BN_new();
+   Big32 = BN_new();
+@@ -120,6 +128,7 @@ void output(RSA* key) {
+ 
+ failure:
+   /* Free BIGNUMs. */
++  BN_free(N);
+   BN_free(Big1);
+   BN_free(Big2);
+   BN_free(Big32);
+-- 
+2.14.1
+
diff --git a/buildroot/package/vde2/vde2.mk b/buildroot/package/vde2/vde2.mk
index e2ec12416..29337601c 100644
--- a/buildroot/package/vde2/vde2.mk
+++ b/buildroot/package/vde2/vde2.mk
@@ -15,7 +15,7 @@ VDE2_INSTALL_STAGING = YES
 VDE2_AUTORECONF = YES
 
 # Reasons for enabling/disabling stuff:
-# - tuntap is enabled in the hope we're using a recent-enough toolchain
+# - tuntap is enabled in the hope we're using a recent-enough toolchain
 #   that does have if_tun.h (virtually everything these days)
 # - kvde_switch is disabled because it requires a patched kernel
 # - cryptcab is disabled to not depend on openSSL
@@ -34,7 +34,7 @@ VDE2_CONF_OPTS = \
 	--disable-python \
 	--enable-tuntap
 
-# Package does not build in parallel due to improper make rules
+# Package does not build in parallel due to improper make rules
 VDE2_MAKE = $(MAKE1)
 
 HOST_VDE2_CONF_OPTS = \
diff --git a/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk b/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
index a25a99dfa..f41ad701d 100644
--- a/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
+++ b/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
@@ -19,7 +19,8 @@ endef
 
 define VDR_PLUGIN_VNSISERVER_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		install DESTDIR=$(TARGET_DIR) LIBDIR=/usr/lib/vdr
+		install DESTDIR=$(TARGET_DIR) LIBDIR=/usr/lib/vdr \
+		LOCDIR=/usr/share/locale
 endef
 
 $(eval $(generic-package))
diff --git a/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch b/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch
index 685befa6e..677508655 100644
--- a/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch
+++ b/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch
@@ -11,6 +11,7 @@ Fix compile error
 Code for #else condition was taken from
 http://patches.osdyson.org/patch/series/view/vlc/2.2.0~rc2-1+dyson2/dyson.patch
 
+[Bernd: rebased for vlc-3.0.6]
 Signed-off-by: Bernd Kuhls 
 ---
  configure.ac      | 2 +-
@@ -27,7 +28,7 @@ index dfb4c1c329..bfe43512a2 100644
  dnl Check for usual libc functions
 -AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
 +AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale strerror_l stricmp strnicmp strptime uselocale])
- AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
+ AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
  AC_REPLACE_FUNCS([gettimeofday])
  AC_CHECK_FUNC(fdatasync,,
 diff --git a/src/posix/error.c b/src/posix/error.c
diff --git a/buildroot/package/vlc/0009-Add-support-for-freerdp2.patch b/buildroot/package/vlc/0008-Add-support-for-freerdp2.patch
similarity index 100%
rename from buildroot/package/vlc/0009-Add-support-for-freerdp2.patch
rename to buildroot/package/vlc/0008-Add-support-for-freerdp2.patch
diff --git a/buildroot/package/vlc/0008-x264-drop-148-build-support-and-fix-10bit-support.patch b/buildroot/package/vlc/0008-x264-drop-148-build-support-and-fix-10bit-support.patch
deleted file mode 100644
index 102ac7b65..000000000
--- a/buildroot/package/vlc/0008-x264-drop-148-build-support-and-fix-10bit-support.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From dd37405dc527c5653f512966263284e7e18b7f9f Mon Sep 17 00:00:00 2001
-From: Ilkka Ollakka 
-Date: Sat, 24 Mar 2018 11:23:33 +0200
-Subject: [PATCH] x264: drop <148 build support and fix 10bit support
-
-x264: drop <148 build support and fix 10bit support
-
-Drop old #if as 148 is not that recent anymore.
-
-fixes #19581
-
-Downloaded from upstream commit
-http://git.videolan.org/?p=vlc.git;a=commitdiff;h=a8953ba707cca1f2de372ca24513296bcfcdaaa8
-
-Signed-off-by: Bernd Kuhls 
----
- modules/codec/x264.c | 65 ++++++++--------------------------------------------
- 1 file changed, 10 insertions(+), 55 deletions(-)
-
-diff --git a/modules/codec/x264.c b/modules/codec/x264.c
-index e02048f075..bcf3c89a10 100644
---- a/modules/codec/x264.c
-+++ b/modules/codec/x264.c
-@@ -84,13 +84,7 @@ static void x264_log( void *, int i_level, const char *psz, va_list );
-     "I-frames, but do not start a new GOP." )
- 
- #define OPENGOP_TEXT N_("Use recovery points to close GOPs")
--#if X264_BUILD < 115
--#define OPENGOP_LONGTEXT N_("none: use closed GOPs only\n"\
--    "normal: use standard open GOPs\n" \
--    "bluray: use Blu-ray compatible open GOPs" )
--#else
- #define OPENGOP_LONGTEXT N_("use open GOP, for bluray compatibility use also bluray-compat option")
--#endif
- 
- #define BLURAY_TEXT N_("Enable compatibility hacks for Blu-ray support")
- #define BLURAY_LONGTEXT N_("Enable hacks for Blu-ray support, this doesn't enforce every aspect of Blu-ray compatibility\n" \
-@@ -469,16 +463,10 @@ vlc_module_begin ()
-     add_integer( SOUT_CFG_PREFIX "min-keyint", 25, MIN_KEYINT_TEXT,
-                  MIN_KEYINT_LONGTEXT, true )
- 
--#if X264_BUILD >= 102 && X264_BUILD <= 114
--    add_string( SOUT_CFG_PREFIX "opengop", "none", OPENGOP_TEXT,
--               OPENGOP_LONGTEXT, true )
--        change_string_list( x264_open_gop_names, x264_open_gop_names )
--#elif X264_BUILD > 114
-     add_bool( SOUT_CFG_PREFIX "opengop", false, OPENGOP_TEXT,
-                OPENGOP_LONGTEXT, true )
-     add_bool( SOUT_CFG_PREFIX "bluray-compat", false, BLURAY_TEXT,
-                BLURAY_LONGTEXT, true )
--#endif
- 
-     add_integer( SOUT_CFG_PREFIX "scenecut", 40, SCENE_TEXT,
-                  SCENE_LONGTEXT, true )
-@@ -498,13 +486,8 @@ vlc_module_begin ()
-                  B_BIAS_LONGTEXT, true )
-         change_integer_range( -100, 100 )
- 
--#if X264_BUILD >= 87
-     add_string( SOUT_CFG_PREFIX "bpyramid", "normal", BPYRAMID_TEXT,
-               BPYRAMID_LONGTEXT, true )
--#else
--    add_string( SOUT_CFG_PREFIX "bpyramid", "none", BPYRAMID_TEXT,
--              BPYRAMID_LONGTEXT, true )
--#endif
-         change_string_list( bpyramid_list, bpyramid_list )
- 
-     add_bool( SOUT_CFG_PREFIX "cabac", true, CABAC_TEXT, CABAC_LONGTEXT,
-@@ -541,22 +524,18 @@ vlc_module_begin ()
-     add_bool( SOUT_CFG_PREFIX "interlaced", false, INTERLACED_TEXT, INTERLACED_LONGTEXT,
-               true )
- 
--#if X264_BUILD >= 111
-     add_integer( SOUT_CFG_PREFIX "frame-packing", -1, FRAMEPACKING_TEXT, FRAMEPACKING_LONGTEXT, true )
-         change_integer_list( framepacking_list, framepacking_list_text )
-         change_integer_range( -1, 6)
--#endif
- 
-     add_integer( SOUT_CFG_PREFIX "slices", 0, SLICE_COUNT, SLICE_COUNT_LONGTEXT, true )
-     add_integer( SOUT_CFG_PREFIX "slice-max-size", 0, SLICE_MAX_SIZE, SLICE_MAX_SIZE_LONGTEXT, true )
-     add_integer( SOUT_CFG_PREFIX "slice-max-mbs", 0, SLICE_MAX_MBS, SLICE_MAX_MBS_LONGTEXT, true )
- 
--#if X264_BUILD >= 89
-     add_string( SOUT_CFG_PREFIX "hrd", "none", HRD_TEXT, HRD_TEXT, true )
-         vlc_config_set (VLC_CONFIG_LIST,
-             (sizeof(x264_nal_hrd_names) / sizeof (char*)) - 1,
-             x264_nal_hrd_names, x264_nal_hrd_names);
--#endif
- 
- 
- /* Ratecontrol */
-@@ -842,20 +821,14 @@ static int  Open ( vlc_object_t *p_this )
-     fullrange |= p_enc->fmt_in.video.b_color_range_full;
-     p_enc->fmt_in.i_codec = fullrange ? VLC_CODEC_J420 : VLC_CODEC_I420;
-     p_sys->i_colorspace = X264_CSP_I420;
--#if X264_BUILD >= 118
-     char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
--    if( psz_profile )
--    {
--        const int mask = x264_bit_depth > 8 ? X264_CSP_HIGH_DEPTH : 0;
--
--
- # ifdef MODULE_NAME_IS_x26410b
--        if( mask == 0)
--        {
--            msg_Err( p_enc, "Only high bit depth encoding supported, bit depth:%d", x264_bit_depth);
--            return VLC_EGENERIC;
--        }
-+    const int mask = X264_CSP_HIGH_DEPTH;
-+# else
-+    const int mask = 0;
- # endif
-+    if( psz_profile )
-+    {
- 
-         if( !strcmp( psz_profile, "high10" ) )
-         {
-@@ -878,7 +851,6 @@ static int  Open ( vlc_object_t *p_this )
-             msg_Err( p_enc, "Only high-profiles and 10-bit are supported");
-             return VLC_EGENERIC;
-         }
--
- # endif
-     }
- # ifdef MODULE_NAME_IS_x26410b
-@@ -889,7 +861,6 @@ static int  Open ( vlc_object_t *p_this )
-     }
- # endif
-     free( psz_profile );
--#endif //X264_BUILD
- 
-     p_enc->pf_encode_video = Encode;
-     p_enc->pf_encode_audio = NULL;
-@@ -912,6 +883,10 @@ static int  Open ( vlc_object_t *p_this )
- #else
-     x264_param_default( &p_sys->param );
-     x264_param_default_preset( &p_sys->param, psz_preset, psz_tune );
-+# if X264_BUILD > 152
-+    if( mask )
-+        p_sys->param.i_bitdepth = 10;
-+# endif
- #endif
-     free( psz_preset );
-     free( psz_tune );
-@@ -1089,10 +1064,8 @@ static int  Open ( vlc_object_t *p_this )
-     if( fabs( var_GetFloat( p_enc, SOUT_CFG_PREFIX "aq-strength" ) - 1.0) > 0.005 )
-        p_sys->param.rc.f_aq_strength = var_GetFloat( p_enc, SOUT_CFG_PREFIX "aq-strength" );
- 
--#if X264_BUILD >= 111
-     if( var_GetInteger( p_enc, SOUT_CFG_PREFIX "frame-packing" ) > -1 )
-        p_sys->param.i_frame_packing = var_GetInteger( p_enc, SOUT_CFG_PREFIX "frame-packing" );
--#endif
- 
-     if( var_GetBool( p_enc, SOUT_CFG_PREFIX "verbose" ) )
-         p_sys->param.i_log_level = X264_LOG_DEBUG;
-@@ -1108,26 +1081,14 @@ static int  Open ( vlc_object_t *p_this )
- 
-     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "keyint" );
-     if( i_val > 0 && i_val != 250 ) p_sys->param.i_keyint_max = i_val;
--#if X264_BUILD >= 102
-     if( i_val == -1 ) p_sys->param.i_keyint_max = X264_KEYINT_MAX_INFINITE;
--#endif
- 
-     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "min-keyint" );
-     if( i_val > 0 && i_val != 25 ) p_sys->param.i_keyint_min = i_val;
- 
--#if X264_BUILD >= 102 && X264_BUILD <= 114
--    psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "opengop" );
--    if( !strcmp( psz_val, "none" ) )
--        p_sys->param.i_open_gop = X264_OPEN_GOP_NONE;
--    else if( !strcmp( psz_val, "normal" ) )
--        p_sys->param.i_open_gop = X264_OPEN_GOP_NORMAL;
--    else if( !strcmp( psz_val, "bluray" ) )
--        p_sys->param.i_open_gop = X264_OPEN_GOP_BLURAY;
--    free( psz_val );
--#elif X264_BUILD >= 115
-     p_sys->param.b_open_gop = var_GetBool( p_enc, SOUT_CFG_PREFIX "opengop" );
-     p_sys->param.b_bluray_compat = var_GetBool( p_enc, SOUT_CFG_PREFIX "bluray-compat" );
--#endif
-+
-     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "bframes" );
-     if( i_val >= 0 && i_val <= 16 && i_val != 3 )
-         p_sys->param.i_bframe = i_val;
-@@ -1165,14 +1126,12 @@ static int  Open ( vlc_object_t *p_this )
-     if( i_val >= 1 && i_val != 7 )
-         p_sys->param.analyse.i_subpel_refine = i_val;
- 
--#if X264_BUILD >= 89
-     psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "hrd");
-     if( !strcmp( psz_val, "vbr" ) )
-         p_sys->param.i_nal_hrd = X264_NAL_HRD_VBR;
-     else if( !strcmp( psz_val, "cbr" ) )
-         p_sys->param.i_nal_hrd = X264_NAL_HRD_CBR;
-     free( psz_val );
--#endif
- 
-     //TODO: psz_val == NULL ?
-     psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "me" );
-@@ -1531,11 +1490,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
-     int i_nal=0, i_out=0, i=0;
- 
-     /* init pic */
--#if X264_BUILD >= 98
-     x264_picture_init( &pic );
--#else
--    memset( &pic, 0, sizeof( x264_picture_t ) );
--#endif
-     if( likely(p_pict) ) {
-        pic.i_pts = p_pict->date;
-        pic.img.i_csp = p_sys->i_colorspace;
--- 
-2.14.4
-
diff --git a/buildroot/package/vlc/0010-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch b/buildroot/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
similarity index 100%
rename from buildroot/package/vlc/0010-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
rename to buildroot/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
diff --git a/buildroot/package/vlc/vlc.hash b/buildroot/package/vlc/vlc.hash
index af1d936f1..e2c5fecfa 100644
--- a/buildroot/package/vlc/vlc.hash
+++ b/buildroot/package/vlc/vlc.hash
@@ -1,9 +1,9 @@
-# From http://download.videolan.org/pub/videolan/vlc/3.0.4/vlc-3.0.4.tar.xz.sha256
-sha256 01f3db3790714038c01f5e23c709e31ecd6f1c046ac93d19e1dde38b3fc05a9e vlc-3.0.4.tar.xz
-# From http://download.videolan.org/pub/videolan/vlc/3.0.4/vlc-3.0.4.tar.xz.sha1
-sha1 218603f05ab5f30de0cc87b0ccceb57bb1efcfa4 vlc-3.0.4.tar.xz
-# From http://download.videolan.org/pub/videolan/vlc/3.0.4/vlc-3.0.4.tar.xz.md5
-md5 f5e49a0fb9594ab8debf934a710e92f1 vlc-3.0.4.tar.xz
+# From http://download.videolan.org/pub/videolan/vlc/3.0.6/vlc-3.0.6.tar.xz.sha256
+sha256 18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3 vlc-3.0.6.tar.xz
+# From http://download.videolan.org/pub/videolan/vlc/3.0.6/vlc-3.0.6.tar.xz.sha1
+sha1 b35168c1811b07844d861311bd0f2194f4bb82ac vlc-3.0.6.tar.xz
+# From http://download.videolan.org/pub/videolan/vlc/3.0.6/vlc-3.0.6.tar.xz.md5
+md5 4ff71d262e070fd19f86a1c3542c7b4e vlc-3.0.6.tar.xz
 # Locally computed
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
diff --git a/buildroot/package/vlc/vlc.mk b/buildroot/package/vlc/vlc.mk
index 73f84d5eb..8dbaf86a0 100644
--- a/buildroot/package/vlc/vlc.mk
+++ b/buildroot/package/vlc/vlc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-VLC_VERSION = 3.0.4
+VLC_VERSION = 3.0.6
 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION)
 VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
 VLC_LICENSE = GPL-2.0+, LGPL-2.1+
diff --git a/buildroot/package/vmtouch/Config.in b/buildroot/package/vmtouch/Config.in
new file mode 100644
index 000000000..daae03aa3
--- /dev/null
+++ b/buildroot/package/vmtouch/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_VMTOUCH
+	bool "vmtouch"
+	depends on BR2_USE_MMU # fork()
+	help
+	  vmtouch is a tool for learning about and controlling
+	  the file system cache of unix and unix-like systems. It
+	  can discover which files the OS is caching, tell the OS
+	  to cache or evict some files or regions of files, lock
+	  files into memory so the OS won't evict them, and more.
+
+	  https://hoytech.com/vmtouch/
diff --git a/buildroot/package/vmtouch/vmtouch.hash b/buildroot/package/vmtouch/vmtouch.hash
new file mode 100644
index 000000000..2b98891d1
--- /dev/null
+++ b/buildroot/package/vmtouch/vmtouch.hash
@@ -0,0 +1,5 @@
+# Locally computed
+sha256 d57b7b3ae1146c4516429ab7d6db6f2122401db814ddd9cdaad10980e9c8428c  vmtouch-v1.3.1.tar.gz
+
+# Hash for license files:
+sha256 13258709ed29c17394e0a3ba8c8b9360af35b85231db514f11a0ba385cecd08e  LICENSE
diff --git a/buildroot/package/vmtouch/vmtouch.mk b/buildroot/package/vmtouch/vmtouch.mk
new file mode 100644
index 000000000..856835acd
--- /dev/null
+++ b/buildroot/package/vmtouch/vmtouch.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# vmtouch
+#
+################################################################################
+
+VMTOUCH_VERSION = v1.3.1
+VMTOUCH_SITE = $(call github,hoytech,vmtouch,$(VMTOUCH_VERSION))
+VMTOUCH_LICENSE = BSD-3-Clause
+VMTOUCH_LICENSE_FILES = LICENSE
+
+define VMTOUCH_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define VMTOUCH_INSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \
+		DESTDIR=$(TARGET_DIR) PREFIX=/usr
+endef
+
+$(eval $(generic-package))
diff --git a/buildroot/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch b/buildroot/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch
new file mode 100644
index 000000000..0732c5f63
--- /dev/null
+++ b/buildroot/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch
@@ -0,0 +1,87 @@
+From 1e65a0a15f819b8bf1b551bd84f71d0da1f5a00c Mon Sep 17 00:00:00 2001
+From: Martin Sehnoutka 
+Date: Thu, 17 Nov 2016 13:02:27 +0100
+Subject: [PATCH] Prevent hanging in SIGCHLD handler.
+
+vsftpd can now handle pam_exec.so in pam.d config without hanging
+in SIGCHLD handler.
+
+[Abdelmalek:
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1198259
+Fetched from:
+https://src.fedoraproject.org/cgit/rpms/vsftpd.git/plain/0026-Prevent-hanging-in-SIGCHLD-handler.patch]
+Signed-off-by: Abdelmalek Benelouezzane 
+---
+ sysutil.c    |  4 ++--
+ sysutil.h    |  2 +-
+ twoprocess.c | 13 +++++++++++--
+ 3 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/sysutil.c b/sysutil.c
+index 6d7cb3f..099748f 100644
+--- a/sysutil.c
++++ b/sysutil.c
+@@ -608,13 +608,13 @@ vsf_sysutil_exit(int exit_code)
+ }
+ 
+ struct vsf_sysutil_wait_retval
+-vsf_sysutil_wait(void)
++vsf_sysutil_wait(int hang)
+ {
+   struct vsf_sysutil_wait_retval retval;
+   vsf_sysutil_memclr(&retval, sizeof(retval));
+   while (1)
+   {
+-    int sys_ret = wait(&retval.exit_status);
++    int sys_ret = waitpid(-1, &retval.exit_status, hang ? 0 : WNOHANG);
+     if (sys_ret < 0 && errno == EINTR)
+     {
+       vsf_sysutil_check_pending_actions(kVSFSysUtilUnknown, 0, 0);
+diff --git a/sysutil.h b/sysutil.h
+index c145bdf..13153cd 100644
+--- a/sysutil.h
++++ b/sysutil.h
+@@ -177,7 +177,7 @@ struct vsf_sysutil_wait_retval
+   int PRIVATE_HANDS_OFF_syscall_retval;
+   int PRIVATE_HANDS_OFF_exit_status;
+ };
+-struct vsf_sysutil_wait_retval vsf_sysutil_wait(void);
++struct vsf_sysutil_wait_retval vsf_sysutil_wait(int hang);
+ int vsf_sysutil_wait_reap_one(void);
+ int vsf_sysutil_wait_get_retval(
+   const struct vsf_sysutil_wait_retval* p_waitret);
+diff --git a/twoprocess.c b/twoprocess.c
+index 33d84dc..b1891e7 100644
+--- a/twoprocess.c
++++ b/twoprocess.c
+@@ -47,8 +47,17 @@ static void
+ handle_sigchld(void* duff)
+ {
+ 
+-  struct vsf_sysutil_wait_retval wait_retval = vsf_sysutil_wait();
++  struct vsf_sysutil_wait_retval wait_retval = vsf_sysutil_wait(0);
+   (void) duff;
++  if (!vsf_sysutil_wait_get_exitcode(&wait_retval) &&
++      !vsf_sysutil_wait_get_retval(&wait_retval))
++    /* There was nobody to wait for, possibly caused by underlying library
++     * which created a new process through fork()/vfork() and already picked
++     * it up, e.g. by pam_exec.so or integrity check routines for libraries
++     * when FIPS mode is on (nss freebl), which can lead to calling prelink
++     * if the prelink package is installed.
++     */
++    return;
+   /* Child died, so we'll do the same! Report it as an error unless the child
+    * exited normally with zero exit code
+    */
+@@ -390,7 +399,7 @@ common_do_login(struct vsf_session* p_sess, const struct mystr* p_user_str,
+   priv_sock_send_result(p_sess->parent_fd, PRIV_SOCK_RESULT_OK);
+   if (!p_sess->control_use_ssl)
+   {
+-    (void) vsf_sysutil_wait();
++    (void) vsf_sysutil_wait(1);
+   }
+   else
+   {
+-- 
+2.14.4
+
diff --git a/buildroot/package/vsftpd/S70vsftpd b/buildroot/package/vsftpd/S70vsftpd
old mode 100755
new mode 100644
diff --git a/buildroot/package/waf/waf.mk b/buildroot/package/waf/waf.mk
index cb738a38f..97bc2a896 100644
--- a/buildroot/package/waf/waf.mk
+++ b/buildroot/package/waf/waf.mk
@@ -6,7 +6,7 @@
 
 WAF_VERSION = 1.9.5
 WAF_SOURCE = waf-$(WAF_VERSION)
-WAF_SITE = https://waf.io/
+WAF_SITE = https://waf.io
 
 define HOST_WAF_EXTRACT_CMDS
 	$(INSTALL) -D -m 0755 $(HOST_WAF_DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf
diff --git a/buildroot/package/wavemon/0001-Drop-on_exit-use-standard-atexit-instead.patch b/buildroot/package/wavemon/0001-Drop-on_exit-use-standard-atexit-instead.patch
new file mode 100644
index 000000000..67292539c
--- /dev/null
+++ b/buildroot/package/wavemon/0001-Drop-on_exit-use-standard-atexit-instead.patch
@@ -0,0 +1,73 @@
+From f6e20c9c6e9b50963caaf5483248d329473a6815 Mon Sep 17 00:00:00 2001
+From: Gerrit Renker 
+Date: Mon, 21 Jan 2019 09:23:43 -0700
+Subject: [PATCH] Drop on_exit(), use standard atexit() instead
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+`on_exit()` is a GLIBC specific extension and not available in musl and uClibc.
+
+Portable applications should avoid this function, and use the standard
+`atexit()` instead.
+
+Backported from:f6e20c9c6e9b50963caaf5483248d329473a6815
+
+Signed-off-by: Jörg Krause 
+---
+ iw_if.c   | 10 ++++++----
+ iw_if.h   |  2 +-
+ iw_scan.c |  2 +-
+ 3 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/iw_if.c b/iw_if.c
+index c0b0128..d8bacbc 100644
+--- a/iw_if.c
++++ b/iw_if.c
+@@ -87,11 +87,13 @@ int if_set_down(const char *ifname)
+ 	return if_set_up_or_down(ifname, false);
+ }
+ 
+-/** Exit handler to restore interface 'down' state on exit via on_exit(3). */
+-void if_set_down_on_exit(int rc, void *arg)
++/** Exit handler to restore interface 'down' state on exit via atexit(3). */
++void if_set_down_on_exit(void)
+ {
+-	if (if_set_down(arg) < 0) {
+-		err_msg("unable to restore %s interface state - set down manually", arg);
++	const char *ifname = conf_ifname();
++
++	if (ifname && if_set_down(ifname) < 0) {
++		err_msg("unable to restore %s interface state - set down manually", ifname);
+ 	}
+ }
+ 
+diff --git a/iw_if.h b/iw_if.h
+index 50f5a47..e2199d3 100644
+--- a/iw_if.h
++++ b/iw_if.h
+@@ -76,7 +76,7 @@ struct if_info {
+ };
+ extern bool if_is_up(const char *ifname);
+ extern int  if_set_up(const char *ifname);
+-extern void if_set_down_on_exit(int rc, void *arg);
++extern void if_set_down_on_exit(void);
+ extern void if_getinf(const char *ifname, struct if_info *info);
+ 
+ /**
+diff --git a/iw_scan.c b/iw_scan.c
+index 18e9e06..e2b3067 100644
+--- a/iw_scan.c
++++ b/iw_scan.c
+@@ -430,7 +430,7 @@ void *do_scan(void *sr_ptr)
+ 
+ 				if (if_set_up(conf_ifname()) < 0)
+ 					err_sys("Can not bring up interface '%s'", conf_ifname());
+-				if (on_exit(if_set_down_on_exit, (void *)conf_ifname()) < 0)
++				if (atexit(if_set_down_on_exit) < 0)
+ 					snprintf(sr->msg, sizeof(sr->msg), "Warning: unable to restore %s down state on exit", conf_ifname());
+ 				break;
+ 			}
+-- 
+2.20.1
+
diff --git a/buildroot/package/wavemon/Config.in b/buildroot/package/wavemon/Config.in
index b72a61775..0cb4cb5c6 100644
--- a/buildroot/package/wavemon/Config.in
+++ b/buildroot/package/wavemon/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_WAVEMON
 	bool "wavemon"
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBNL
 	help
@@ -15,5 +15,5 @@ config BR2_PACKAGE_WAVEMON
 
 	  https://github.com/uoaerg/wavemon
 
-comment "wavemon needs a toolchain w/ NPTL"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
+comment "wavemon needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/buildroot/package/wavemon/wavemon.hash b/buildroot/package/wavemon/wavemon.hash
index 99d738245..798e2973c 100644
--- a/buildroot/package/wavemon/wavemon.hash
+++ b/buildroot/package/wavemon/wavemon.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  4199e2ad11a036f4289f5ad42a8b0fe518f2b5ff77447f4c366dbcf3f23e91d5  wavemon-v0.8.2.tar.gz
+sha256  5823ef9459d6147a457b390b6744a77465584e93d37c2809fa7a0be557070166  wavemon-v0.9.0.tar.gz
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/buildroot/package/wavemon/wavemon.mk b/buildroot/package/wavemon/wavemon.mk
index 0639c3450..864e0709d 100644
--- a/buildroot/package/wavemon/wavemon.mk
+++ b/buildroot/package/wavemon/wavemon.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAVEMON_VERSION = v0.8.2
+WAVEMON_VERSION = v0.9.0
 WAVEMON_SITE = $(call github,uoaerg,wavemon,$(WAVEMON_VERSION))
 WAVEMON_LICENSE = GPL-3.0+
 WAVEMON_LICENSE_FILES = COPYING
diff --git a/buildroot/package/wayland-protocols/wayland-protocols.hash b/buildroot/package/wayland-protocols/wayland-protocols.hash
index 9cbb4fef7..d62a433df 100644
--- a/buildroot/package/wayland-protocols/wayland-protocols.hash
+++ b/buildroot/package/wayland-protocols/wayland-protocols.hash
@@ -1,5 +1,5 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2018-February/036992.html
-md5 29312149dafcd4a0e739ba94995a574d  wayland-protocols-1.13.tar.xz
-sha1 1b4b3385e168c361b4d350668d92f3a90ceee189  wayland-protocols-1.13.tar.xz
-sha256 0758bc8008d5332f431b2a84fea7de64d971ce270ed208206a098ff2ebc68f38  wayland-protocols-1.13.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2018-November/039662.html
+md5 55ddd5fdb02b73b9de9559aaec267315  wayland-protocols-1.17.tar.xz
+sha1 7d2569c838c776545e3eb1b1049b9c37178aae24  wayland-protocols-1.17.tar.xz
+sha256 df1319cf9705643aea9fd16f9056f4e5b2471bd10c0cc3713d4a4cdc23d6812f  wayland-protocols-1.17.tar.xz
 sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124  COPYING
diff --git a/buildroot/package/wayland-protocols/wayland-protocols.mk b/buildroot/package/wayland-protocols/wayland-protocols.mk
index bba097993..5ed4c3bc9 100644
--- a/buildroot/package/wayland-protocols/wayland-protocols.mk
+++ b/buildroot/package/wayland-protocols/wayland-protocols.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_PROTOCOLS_VERSION = 1.13
+WAYLAND_PROTOCOLS_VERSION = 1.17
 WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz
 WAYLAND_PROTOCOLS_LICENSE = MIT
diff --git a/buildroot/package/wayland/wayland.hash b/buildroot/package/wayland/wayland.hash
index 4fa83a424..3f2846091 100644
--- a/buildroot/package/wayland/wayland.hash
+++ b/buildroot/package/wayland/wayland.hash
@@ -1,5 +1,5 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html
-md5  b7393c17fdce9a8d383edab656c92fd2  wayland-1.15.0.tar.xz
-sha1 374e07b4f3b7fdfa7c4206cdd48224ea00d69d68  wayland-1.15.0.tar.xz
-sha256 eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0  wayland-1.15.0.tar.xz
-sha512 f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8  wayland-1.15.0.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2018-August/039358.html
+md5  0c215e53de71d6fb26f7102cdc6432d3  wayland-1.16.0.tar.xz
+sha1 24c63a5045c653dcfa24efd10fa7c7de89aca9ef  wayland-1.16.0.tar.xz
+sha256 4e72c2b56109ccfb6610d776e465f4ca0af2280c9c2f7d5cc23f0ed2548752f5  wayland-1.16.0.tar.xz
+sha512 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c  wayland-1.16.0.tar.xz
diff --git a/buildroot/package/wayland/wayland.mk b/buildroot/package/wayland/wayland.mk
index 827924e40..6c2997be8 100644
--- a/buildroot/package/wayland/wayland.mk
+++ b/buildroot/package/wayland/wayland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.15.0
+WAYLAND_VERSION = 1.16.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT
diff --git a/buildroot/package/webkitgtk/0001-Build-failure-after-r243644-in-GTK-Li.patch b/buildroot/package/webkitgtk/0001-Build-failure-after-r243644-in-GTK-Li.patch
new file mode 100644
index 000000000..748fc8e46
--- /dev/null
+++ b/buildroot/package/webkitgtk/0001-Build-failure-after-r243644-in-GTK-Li.patch
@@ -0,0 +1,36 @@
+From a672bbd75f257dd65844ad53dd21fb37345999b5 Mon Sep 17 00:00:00 2001
+From: "aperez@igalia.com"
+ 
+Date: Mon, 20 May 2019 21:20:02 +0000
+Subject: [PATCH] Build failure after r243644 in GTK
+ Linux 64-bit stable builds https://bugs.webkit.org/show_bug.cgi?id=196440
+
+Patch by Pablo Saavedra  on 2019-04-01
+Reviewed by Philippe Normand.
+
+* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
+
+Signed-off-by: Adrian Perez de Castro 
+
+diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
+index 608aee2e1b3..c614050972a 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
+@@ -1000,11 +1000,13 @@ void MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags()
+         break;
+     }
+ 
++#if USE(GSTREAMER_GL)
+     // When the imxvpudecoder is used, the texture sampling of the
+     // directviv-uploaded texture returns an RGB value, so there's no need to
+     // convert it.
+     if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU)
+         m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG;
++#endif
+ }
+ #endif
+ 
+-- 
+2.21.0
+
diff --git a/buildroot/package/webkitgtk/Config.in b/buildroot/package/webkitgtk/Config.in
index 8714677b6..9f0d4a776 100644
--- a/buildroot/package/webkitgtk/Config.in
+++ b/buildroot/package/webkitgtk/Config.in
@@ -12,22 +12,6 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 
-config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT
-	bool
-	# ARM needs NEON for JIT.
-	default y if BR2_ARM_CPU_HAS_NEON
-	# AArch64 is supported upstream but not well tested on big-endian mode.
-	default y if BR2_aarch64
-	# i386 & x86_64 don't have any special requirements.
-	default y if BR2_i386
-	default y if BR2_x86_64
-	# JIT is known not to work on MIPS64.
-	# Plain MIPS32 (pre R2) is not well tested and likely broken, and R6
-	# is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258
-	# The MIPS support is completely untested in big-endian mode.
-	default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2
-	default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5
-
 comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8"
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
@@ -56,6 +40,7 @@ config BR2_PACKAGE_WEBKITGTK
 	select BR2_PACKAGE_LIBTASN1
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
+	select BR2_PACKAGE_OPENJPEG
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_WEBP
 	select BR2_PACKAGE_WEBP_DEMUX
diff --git a/buildroot/package/webkitgtk/webkitgtk.hash b/buildroot/package/webkitgtk/webkitgtk.hash
index 4cdefa75b..40bb6f7b6 100644
--- a/buildroot/package/webkitgtk/webkitgtk.hash
+++ b/buildroot/package/webkitgtk/webkitgtk.hash
@@ -1,7 +1,7 @@
-# From https://webkitgtk.org/releases/webkitgtk-2.22.5.tar.xz.sums
-md5 96a731522b800f38e70f85c22f8de477 webkitgtk-2.22.5.tar.xz
-sha1 809b067a1672a81a4ce31363a0872c668cc72953 webkitgtk-2.22.5.tar.xz
-sha256 99d3863f418a7c3a3e37e5062950dbf2d91fb106ec1633459b0ef6f2d5f6cb13 webkitgtk-2.22.5.tar.xz
+# From https://webkitgtk.org/releases/webkitgtk-2.24.2.tar.xz.sums
+md5 83012998e1b9f71abb37d8baf6f9c7e6 webkitgtk-2.24.2.tar.xz
+sha1 632a65d93beb996bebdf7592ef9591f3993dea91 webkitgtk-2.24.2.tar.xz
+sha256 019cb1f0d05bf6148b72c7a85734bcd006388a1c14132843ef9a1b2cb7b4321c webkitgtk-2.24.2.tar.xz
 
 # Hashes for license files:
 sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
diff --git a/buildroot/package/webkitgtk/webkitgtk.mk b/buildroot/package/webkitgtk/webkitgtk.mk
index f86c073d6..e81ba047e 100644
--- a/buildroot/package/webkitgtk/webkitgtk.mk
+++ b/buildroot/package/webkitgtk/webkitgtk.mk
@@ -4,17 +4,17 @@
 #
 ################################################################################
 
-WEBKITGTK_VERSION = 2.22.5
-WEBKITGTK_SITE = http://www.webkitgtk.org/releases
+WEBKITGTK_VERSION = 2.24.2
+WEBKITGTK_SITE = https://www.webkitgtk.org/releases
 WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
 WEBKITGTK_INSTALL_STAGING = YES
 WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2-Clause
 WEBKITGTK_LICENSE_FILES = \
 	Source/WebCore/LICENSE-APPLE \
 	Source/WebCore/LICENSE-LGPL-2.1
-WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \
+WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \
 	enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
-	libtasn1 libxml2 libxslt sqlite webp woff2
+	libtasn1 libxml2 libxslt openjpeg sqlite webp woff2
 WEBKITGTK_CONF_OPTS = \
 	-DENABLE_API_TESTS=OFF \
 	-DENABLE_GEOLOCATION=OFF \
@@ -25,27 +25,18 @@ WEBKITGTK_CONF_OPTS = \
 	-DPORT=GTK \
 	-DUSE_LIBNOTIFY=OFF \
 	-DUSE_LIBHYPHEN=OFF \
+	-DUSE_OPENJPEG=ON \
 	-DUSE_WOFF2=ON
 
-ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y)
-WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON
-else
-WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y)
 WEBKITGTK_CONF_OPTS += \
 	-DENABLE_VIDEO=ON \
 	-DENABLE_WEB_AUDIO=ON
 WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good
 else
-# ENABLE_MEDIA_STREAM has to be explicitly disabled because there is a missing
-# feature dependency in the WebKitGTK+ CMake files. This can be removed once
-# https://bugs.webkit.org/show_bug.cgi?id=174940 makes it into a release.
 WEBKITGTK_CONF_OPTS += \
 	-DENABLE_VIDEO=OFF \
-	-DENABLE_WEB_AUDIO=OFF \
-	-DENABLE_MEDIA_STREAM=OFF
+	-DENABLE_WEB_AUDIO=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_WEBKITGTK_WEBDRIVER),y)
diff --git a/buildroot/package/webp/webp.hash b/buildroot/package/webp/webp.hash
index 7dd954ef0..ed4b127e5 100644
--- a/buildroot/package/webp/webp.hash
+++ b/buildroot/package/webp/webp.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	84259c4388f18637af3c5a6361536d754a5394492f91be1abc2e981d4983225b	libwebp-1.0.0.tar.gz
+sha256	8c744a5422dbffa0d1f92e90b34186fb8ed44db93fbacb55abd751ac8808d922	libwebp-1.0.1.tar.gz
 sha256	5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf	COPYING
diff --git a/buildroot/package/webp/webp.mk b/buildroot/package/webp/webp.mk
index 30364743e..1aa81a071 100644
--- a/buildroot/package/webp/webp.mk
+++ b/buildroot/package/webp/webp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBP_VERSION = 1.0.0
+WEBP_VERSION = 1.0.1
 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz
 WEBP_SITE = http://downloads.webmproject.org/releases/webp
 WEBP_LICENSE = BSD-3-Clause
diff --git a/buildroot/package/websocketpp/Config.in b/buildroot/package/websocketpp/Config.in
new file mode 100644
index 000000000..cadb9ff69
--- /dev/null
+++ b/buildroot/package/websocketpp/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_WEBSOCKETPP
+	bool "websocketpp"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  WebSocket++ is a header only C++ library that implements
+	  RFC6455 The WebSocket Protocol. It allows integrating
+	  WebSocket client and server functionality into C++ programs.
+	  It uses interchangeable network transport modules including
+	  one based on C++ iostreams and one based on Boost Asio.
+
+	  http://www.zaphoyd.com/websocketpp
+
+comment "websocketpp needs a toolchain w/ C++ and gcc >= 4.8"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
diff --git a/buildroot/package/websocketpp/websocketpp.hash b/buildroot/package/websocketpp/websocketpp.hash
new file mode 100644
index 000000000..8bf671d96
--- /dev/null
+++ b/buildroot/package/websocketpp/websocketpp.hash
@@ -0,0 +1,3 @@
+# Locally Computed:
+sha256  178899de48c02853b55b1ea8681599641cedcdfce59e56beaff3dd0874bf0286  websocketpp-0.8.1.tar.gz
+sha256  b31e597bc777d884a39663c11d0557a0af40780e1f451de11ea5103924a69667  COPYING
diff --git a/buildroot/package/websocketpp/websocketpp.mk b/buildroot/package/websocketpp/websocketpp.mk
new file mode 100644
index 000000000..47da4dbe2
--- /dev/null
+++ b/buildroot/package/websocketpp/websocketpp.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# websocketpp
+#
+################################################################################
+
+WEBSOCKETPP_VERSION = 0.8.1
+WEBSOCKETPP_SITE = $(call github,zaphoyd,websocketpp,$(WEBSOCKETPP_VERSION))
+WEBSOCKETPP_LICENSE = BSD-3c, MIT, Zlib
+WEBSOCKETPP_LICENSE_FILES = COPYING
+WEBSOCKETPP_INSTALL_STAGING = YES
+# Only installs headers
+WEBSOCKETPP_INSTALL_TARGET = NO
+
+$(eval $(cmake-package))
diff --git a/buildroot/package/weston/0002-rdp-compositor-fix-compilation-against-FreeRDP-2.0.0.patch b/buildroot/package/weston/0002-rdp-compositor-fix-compilation-against-FreeRDP-2.0.0.patch
deleted file mode 100644
index 1d02e0c0d..000000000
--- a/buildroot/package/weston/0002-rdp-compositor-fix-compilation-against-FreeRDP-2.0.0.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 029583e56e6eaad4139e39b4cf908158ab8cc91a Mon Sep 17 00:00:00 2001
-From: David Fort 
-Date: Sun, 27 May 2018 23:56:43 +0200
-Subject: [PATCH] rdp-compositor: fix compilation against FreeRDP 2.0.0 rc2
-
-The SURFACE_BITS_COMMAND struct has changed and some members have been moved in the
-bmp field.
-
-Reviewed-by: Pekka Paalanen 
-Tested-by: Pekka Paalanen 
-[yann.morin.1998@free.fr: backported from upstream]
-Signed-off-by: "Yann E. MORIN" 
----
- configure.ac               |  9 +++++-
- libweston/compositor-rdp.c | 69 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 26 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index da3f7342..1dce05fa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -264,10 +264,17 @@ if test x$enable_rdp_compositor = xyes; then
-     [],
-     [PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp >= 1.1.0],[])]
-   )
--
-   SAVED_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $RDP_COMPOSITOR_CFLAGS"
-+
-   AC_CHECK_HEADERS([freerdp/version.h])
-+  AC_CHECK_MEMBER([SURFACE_BITS_COMMAND.bmp],
-+	[AC_DEFINE([HAVE_SURFACE_BITS_BMP], [1], [SURFACE_BITS_CMD has bmp field])],
-+	[],
-+	[[#include ]]
-+  )
-+
-+
-   CPPFLAGS="$SAVED_CPPFLAGS"
- fi
- 
-diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c
-index fd0651af..134e7298 100644
---- a/libweston/compositor-rdp.c
-+++ b/libweston/compositor-rdp.c
-@@ -66,6 +66,22 @@
- #define FREERDP_CB_RETURN(V) return TRUE
- #endif
- 
-+#ifdef HAVE_SURFACE_BITS_BMP
-+#define SURFACE_BPP(cmd) cmd->bmp.bpp
-+#define SURFACE_CODECID(cmd) cmd->bmp.codecID
-+#define SURFACE_WIDTH(cmd) cmd->bmp.width
-+#define SURFACE_HEIGHT(cmd) cmd->bmp.height
-+#define SURFACE_BITMAP_DATA(cmd) cmd->bmp.bitmapData
-+#define SURFACE_BITMAP_DATA_LEN(cmd) cmd->bmp.bitmapDataLength
-+#else
-+#define SURFACE_BPP(cmd) cmd->bpp
-+#define SURFACE_CODECID(cmd) cmd->codecID
-+#define SURFACE_WIDTH(cmd) cmd->width
-+#define SURFACE_HEIGHT(cmd) cmd->height
-+#define SURFACE_BITMAP_DATA(cmd) cmd->bitmapData
-+#define SURFACE_BITMAP_DATA_LEN(cmd) cmd->bitmapDataLength
-+#endif
-+
- #include 
- #include 
- #include 
-@@ -200,10 +216,10 @@ rdp_peer_refresh_rfx(pixman_region32_t *damage, pixman_image_t *image, freerdp_p
- 	cmd->destTop = damage->extents.y1;
- 	cmd->destRight = damage->extents.x2;
- 	cmd->destBottom = damage->extents.y2;
--	cmd->bpp = 32;
--	cmd->codecID = peer->settings->RemoteFxCodecId;
--	cmd->width = width;
--	cmd->height = height;
-+	SURFACE_BPP(cmd) = 32;
-+	SURFACE_CODECID(cmd) = peer->settings->RemoteFxCodecId;
-+	SURFACE_WIDTH(cmd) = width;
-+	SURFACE_HEIGHT(cmd) = height;
- 
- 	ptr = pixman_image_get_data(image) + damage->extents.x1 +
- 				damage->extents.y1 * (pixman_image_get_stride(image) / sizeof(uint32_t));
-@@ -226,8 +242,8 @@ rdp_peer_refresh_rfx(pixman_region32_t *damage, pixman_image_t *image, freerdp_p
- 			pixman_image_get_stride(image)
- 	);
- 
--	cmd->bitmapDataLength = Stream_GetPosition(context->encode_stream);
--	cmd->bitmapData = Stream_Buffer(context->encode_stream);
-+	SURFACE_BITMAP_DATA_LEN(cmd) = Stream_GetPosition(context->encode_stream);
-+	SURFACE_BITMAP_DATA(cmd) = Stream_Buffer(context->encode_stream);
- 
- 	update->SurfaceBits(update->context, cmd);
- }
-@@ -253,23 +269,26 @@ rdp_peer_refresh_nsc(pixman_region32_t *damage, pixman_image_t *image, freerdp_p
- #else
- 	memset(cmd, 0, sizeof(*cmd));
- #endif
-+
- 	cmd->destLeft = damage->extents.x1;
- 	cmd->destTop = damage->extents.y1;
- 	cmd->destRight = damage->extents.x2;
- 	cmd->destBottom = damage->extents.y2;
--	cmd->bpp = 32;
--	cmd->codecID = peer->settings->NSCodecId;
--	cmd->width = width;
--	cmd->height = height;
-+	SURFACE_BPP(cmd) = 32;
-+	SURFACE_CODECID(cmd) = peer->settings->NSCodecId;
-+	SURFACE_WIDTH(cmd) = width;
-+	SURFACE_HEIGHT(cmd) = height;
- 
- 	ptr = pixman_image_get_data(image) + damage->extents.x1 +
- 				damage->extents.y1 * (pixman_image_get_stride(image) / sizeof(uint32_t));
- 
- 	nsc_compose_message(context->nsc_context, context->encode_stream, (BYTE *)ptr,
--			cmd->width,	cmd->height,
-+			width, height,
- 			pixman_image_get_stride(image));
--	cmd->bitmapDataLength = Stream_GetPosition(context->encode_stream);
--	cmd->bitmapData = Stream_Buffer(context->encode_stream);
-+
-+	SURFACE_BITMAP_DATA_LEN(cmd) = Stream_GetPosition(context->encode_stream);
-+	SURFACE_BITMAP_DATA(cmd) = Stream_Buffer(context->encode_stream);
-+
- 	update->SurfaceBits(update->context, cmd);
- }
- 
-@@ -306,16 +325,16 @@ rdp_peer_refresh_raw(pixman_region32_t *region, pixman_image_t *image, freerdp_p
- 	update->SurfaceFrameMarker(peer->context, marker);
- 
- 	memset(cmd, 0, sizeof(*cmd));
--	cmd->bpp = 32;
--	cmd->codecID = 0;
-+	SURFACE_BPP(cmd) = 32;
-+	SURFACE_CODECID(cmd) = 0;
- 
- 	for (i = 0; i < nrects; i++, rect++) {
- 		/*weston_log("rect(%d,%d, %d,%d)\n", rect->x1, rect->y1, rect->x2, rect->y2);*/
- 		cmd->destLeft = rect->x1;
- 		cmd->destRight = rect->x2;
--		cmd->width = rect->x2 - rect->x1;
-+		SURFACE_WIDTH(cmd) = rect->x2 - rect->x1;
- 
--		heightIncrement = peer->settings->MultifragMaxRequestSize / (16 + cmd->width * 4);
-+		heightIncrement = peer->settings->MultifragMaxRequestSize / (16 + SURFACE_WIDTH(cmd) * 4);
- 		remainingHeight = rect->y2 - rect->y1;
- 		top = rect->y1;
- 
-@@ -323,21 +342,21 @@ rdp_peer_refresh_raw(pixman_region32_t *region, pixman_image_t *image, freerdp_p
- 		subrect.x2 = rect->x2;
- 
- 		while (remainingHeight) {
--			   cmd->height = (remainingHeight > heightIncrement) ? heightIncrement : remainingHeight;
-+			   SURFACE_HEIGHT(cmd) = (remainingHeight > heightIncrement) ? heightIncrement : remainingHeight;
- 			   cmd->destTop = top;
--			   cmd->destBottom = top + cmd->height;
--			   cmd->bitmapDataLength = cmd->width * cmd->height * 4;
--			   cmd->bitmapData = (BYTE *)realloc(cmd->bitmapData, cmd->bitmapDataLength);
-+			   cmd->destBottom = top + SURFACE_HEIGHT(cmd);
-+			   SURFACE_BITMAP_DATA_LEN(cmd) = SURFACE_WIDTH(cmd) * SURFACE_HEIGHT(cmd) * 4;
-+			   SURFACE_BITMAP_DATA(cmd) = (BYTE *)realloc(SURFACE_BITMAP_DATA(cmd), SURFACE_BITMAP_DATA_LEN(cmd));
- 
- 			   subrect.y1 = top;
--			   subrect.y2 = top + cmd->height;
--			   pixman_image_flipped_subrect(&subrect, image, cmd->bitmapData);
-+			   subrect.y2 = top + SURFACE_HEIGHT(cmd);
-+			   pixman_image_flipped_subrect(&subrect, image, SURFACE_BITMAP_DATA(cmd));
- 
- 			   /*weston_log("*  sending (%d,%d, %d,%d)\n", subrect.x1, subrect.y1, subrect.x2, subrect.y2); */
- 			   update->SurfaceBits(peer->context, cmd);
- 
--			   remainingHeight -= cmd->height;
--			   top += cmd->height;
-+			   remainingHeight -= SURFACE_HEIGHT(cmd);
-+			   top += SURFACE_HEIGHT(cmd);
- 		}
- 	}
- 
--- 
-2.14.1
-
diff --git a/buildroot/package/weston/weston.hash b/buildroot/package/weston/weston.hash
index 55d87ac3b..799d371dc 100644
--- a/buildroot/package/weston/weston.hash
+++ b/buildroot/package/weston/weston.hash
@@ -1,5 +1,7 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2018-April/037768.html
-md5 33709aa4d5916f89643fca0fc0064b39  weston-4.0.0.tar.xz
-sha1 df1da4a880920c515162e95b18f3709a46690be7  weston-4.0.0.tar.xz
-sha256 a0fc0ae7ef83dfbed12abfe9b8096a24a7dd00705e86fa0db1e619ded18b4b58  weston-4.0.0.tar.xz
-sha512 0af41016ff4eae85779f95b5c5e44b9683f4ef681a8e52256efeebfa38073082b83e039d0db3c94ac22f22f8d8314c9d6cd16611144b260b353fc5bfdd1ded19  weston-4.0.0.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2018-August/039359.html
+md5 752a04ce3c65af4884cfac4e57231bdb  weston-5.0.0.tar.xz
+sha1 56b42b1fbea9e120a8127736328e4c71ac781a57  weston-5.0.0.tar.xz
+sha256 15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf  weston-5.0.0.tar.xz
+sha512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf  weston-5.0.0.tar.xz
+# locally computed
+sha256 0f0de7b7b1f65870139c95dde7abc19ed305631ae7c5d37c386db40cde108632  weston-rel_imx_4.9.51_8mq_ga.tar.gz
diff --git a/buildroot/package/weston/weston.mk b/buildroot/package/weston/weston.mk
index 71211fe5e..7fbe39b98 100644
--- a/buildroot/package/weston/weston.mk
+++ b/buildroot/package/weston/weston.mk
@@ -4,15 +4,19 @@
 #
 ################################################################################
 
-WESTON_VERSION = 4.0.0
+ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y)
+WESTON_VERSION = rel_imx_4.9.51_8mq_ga
+WESTON_SITE = https://source.codeaurora.org/external/imx/weston-imx
+WESTON_SITE_METHOD = git
+WESTON_AUTORECONF = YES
+else
+WESTON_VERSION = 5.0.0
 WESTON_SITE = http://wayland.freedesktop.org/releases
 WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
+endif
 WESTON_LICENSE = MIT
 WESTON_LICENSE_FILES = COPYING
 
-# 0002-rdp-compositor-fix-compilation-against-FreeRDP-2.0.0.patch
-WESTON_AUTORECONF = YES
-
 WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
 	libxkbcommon pixman libpng jpeg udev cairo libinput libdrm \
 	$(if $(BR2_PACKAGE_WEBP),webp)
@@ -53,6 +57,15 @@ else
 WESTON_CONF_OPTS += --disable-weston-launch
 endif
 
+ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y)
+ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y)
+WESTON_DEPENDENCIES += imx-gpu-g2d
+# --enable-imxg2d actually disables it, so no CONF_OPTS
+else
+WESTON_CONF_OPTS += --disable-imxg2d
+endif
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy)
 WESTON_CONF_OPTS += --enable-egl
 WESTON_DEPENDENCIES += libegl libgles
@@ -63,12 +76,6 @@ WESTON_CONF_OPTS += \
 	--disable-simple-egl-clients
 endif
 
-ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
-WESTON_DEPENDENCIES += libunwind
-else
-WESTON_CONF_OPTS += --disable-libunwind
-endif
-
 ifeq ($(BR2_PACKAGE_WESTON_RDP),y)
 WESTON_DEPENDENCIES += freerdp
 WESTON_CONF_OPTS += --enable-rdp-compositor
diff --git a/buildroot/package/wget/wget.hash b/buildroot/package/wget/wget.hash
index eee4a5194..956e1127f 100644
--- a/buildroot/package/wget/wget.hash
+++ b/buildroot/package/wget/wget.hash
@@ -1,5 +1,6 @@
 # Locally calculated after checking pgp signature
-# https://ftp.gnu.org/gnu/wget/wget-1.19.5.tar.lz.sig
-sha256 29fbe6f3d5408430c572a63fe32bd43d5860f32691173dfd84edc06869edca75  wget-1.19.5.tar.lz
+# https://ftp.gnu.org/gnu/wget/wget-1.20.3.tar.lz.sig
+# with key 1CB27DBC98614B2D5841646D08302DB6A2670428
+sha256 69607ce8216c2d1126b7a872db594b3f21e511e660e07ca1f81be96650932abb  wget-1.20.3.tar.lz
 # Locally calculated
 sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b  COPYING
diff --git a/buildroot/package/wget/wget.mk b/buildroot/package/wget/wget.mk
index 28bd0a264..7b9c3e75d 100644
--- a/buildroot/package/wget/wget.mk
+++ b/buildroot/package/wget/wget.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WGET_VERSION = 1.19.5
+WGET_VERSION = 1.20.3
 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz
 WGET_SITE = $(BR2_GNU_MIRROR)/wget
 WGET_DEPENDENCIES = host-pkgconf
@@ -39,4 +39,14 @@ else
 WGET_CONF_OPTS += --without-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_PCRE2),y)
+WGET_CONF_OPTS += --disable-pcre --enable-pcre2
+WGET_DEPENDENCIES += pcre2
+else ifeq ($(BR2_PACKAGE_PCRE),y)
+WGET_CONF_OPTS += --enable-pcre --disable-pcre2
+WGET_DEPENDENCIES += pcre
+else
+WGET_CONF_OPTS += --disable-pcre --disable-pcre2
+endif
+
 $(eval $(autotools-package))
diff --git a/buildroot/package/whois/whois.hash b/buildroot/package/whois/whois.hash
index 4fdfebce0..41ef935c1 100644
--- a/buildroot/package/whois/whois.hash
+++ b/buildroot/package/whois/whois.hash
@@ -1,5 +1,5 @@
-# From http://snapshot.debian.org/archive/debian/20180715T153200Z/pool/main/w/whois/whois_5.3.2.dsc
-sha256	79714ba89172bca08a2443f59885daa4af0c5f8d6a49bc9e7f2a83559a286354	whois_5.3.2.tar.xz
+# From http://snapshot.debian.org/archive/debian/20181026T220636Z/pool/main/w/whois/whois_5.4.0.dsc
+sha256	3775ae0cfaa6dd8d886e5233c4826225cddcb88c99c2a08130d14e15fe58e378	whois_5.4.0.tar.xz
 
 # Hash for license file:
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYING
diff --git a/buildroot/package/whois/whois.mk b/buildroot/package/whois/whois.mk
index c162f1cf3..712ad911d 100644
--- a/buildroot/package/whois/whois.mk
+++ b/buildroot/package/whois/whois.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-WHOIS_VERSION = 5.3.2
-WHOIS_SITE = http://snapshot.debian.org/archive/debian/20180715T153200Z/pool/main/w/whois
+WHOIS_VERSION = 5.4.0
+WHOIS_SITE = http://snapshot.debian.org/archive/debian/20181026T220636Z/pool/main/w/whois
 WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz
 WHOIS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
diff --git a/buildroot/package/wine/wine.hash b/buildroot/package/wine/wine.hash
index 855130c6f..ba007142e 100644
--- a/buildroot/package/wine/wine.hash
+++ b/buildroot/package/wine/wine.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256 eb645999ea6f6455a5275bf267e19a32497c8f5aac818ea40afe7c8c396a4da1 wine-3.0.3.tar.xz
+sha256 d45a88edbe7db363e297cacedc94e66df3464504a01c2eccf04f518066a6fb0c wine-3.0.4.tar.xz
diff --git a/buildroot/package/wine/wine.mk b/buildroot/package/wine/wine.mk
index 06436cc17..7e44e3c81 100644
--- a/buildroot/package/wine/wine.mk
+++ b/buildroot/package/wine/wine.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WINE_VERSION = 3.0.3
+WINE_VERSION = 3.0.4
 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz
 WINE_SITE = https://dl.winehq.org/wine/source/3.0
 WINE_LICENSE = LGPL-2.1+
@@ -307,8 +307,12 @@ WINE_CONF_OPTS += --without-zlib
 endif
 
 # host-gettext is essential for .po file support in host-wine wrc
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
 HOST_WINE_DEPENDENCIES += host-gettext
 HOST_WINE_CONF_OPTS += --with-gettext --with-gettextpo
+else
+HOST_WINE_CONF_OPTS += --without-gettext --without-gettextpo
+endif
 
 # Wine needs to enable 64-bit build tools on 64-bit host
 ifeq ($(HOSTARCH),x86_64)
diff --git a/buildroot/package/wireguard/wireguard.hash b/buildroot/package/wireguard/wireguard.hash
index 737f7b49c..70558de72 100644
--- a/buildroot/package/wireguard/wireguard.hash
+++ b/buildroot/package/wireguard/wireguard.hash
@@ -1,4 +1,4 @@
-# From https://lists.zx2c4.com/pipermail/wireguard/2018-October/003479.html
-sha256 af05824211b27cbeeea2b8d6b76be29552c0d80bfe716471215e4e43d259e327  WireGuard-0.0.20181018.tar.xz
+# https://lists.zx2c4.com/pipermail/wireguard/2019-January/003805.html
+sha256 edd13c7631af169e3838621b1a1bff3ef73cf7bc778eec2bd55f7c1089ffdf9b  WireGuard-0.0.20190123.tar.xz
 # Locally calculated
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/buildroot/package/wireguard/wireguard.mk b/buildroot/package/wireguard/wireguard.mk
index f3ea1bccf..8d6cdb8e5 100644
--- a/buildroot/package/wireguard/wireguard.mk
+++ b/buildroot/package/wireguard/wireguard.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIREGUARD_VERSION = 0.0.20181018
+WIREGUARD_VERSION = 0.0.20190123
 WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot
 WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz
 WIREGUARD_LICENSE = GPL-2.0
diff --git a/buildroot/package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch b/buildroot/package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch
new file mode 100644
index 000000000..0a894a282
--- /dev/null
+++ b/buildroot/package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch
@@ -0,0 +1,75 @@
+From 020e25b660250c97c8085e64cf85074ccfcdd06b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Tue, 5 Mar 2019 20:59:49 +0100
+Subject: [PATCH] packet-gtp.c: remove unneeded named structures
+
+In uclibc, _header is already in sigcontext.h:
+
+packet-gtp.c:2361:16: error: redefinition of 'struct _header'
+ typedef struct _header {
+                ^~~~~~~
+In file included from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/bits/sigcontext.h:30:0,
+                 from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/signal.h:311,
+                 from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36,
+                 from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:34,
+                 from ../../epan/proto.h:28,
+                 from ../../epan/packet.h:14,
+                 from packet-gtp.c:43:
+/home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/asm/sigcontext.h:173:8: note: originally defined here
+ struct _header {
+
+To fix this issue, transform _header and other named structures (with
+the exception of gtp_conv_info_t) into unnamed structures
+
+Fixes:
+ - http://autobuild.buildroot.org/results/c41d42fe3489bc63c42e7ce7a9eccb1b4ca7b9b2
+
+Change-Id: I78116233c2a8dd7c54723b7cb558254bd5143bd2
+Signed-off-by: Fabrice Fontaine 
+Reviewed-on: https://code.wireshark.org/review/32335
+Petri-Dish: Guy Harris 
+Tested-by: Petri Dish Buildbot
+Reviewed-by: Guy Harris 
+[Retrieved from:
+https://github.com/wireshark/wireshark/commit/020e25b660250c97c8085e64cf85074ccfcdd06b]
+---
+ epan/dissectors/packet-gtp.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
+index 4c40e7aa54..971197e4ae 100644
+--- a/epan/dissectors/packet-gtp.c
++++ b/epan/dissectors/packet-gtp.c
+@@ -2170,7 +2170,7 @@ GHashTable* session_table;
+ /* Relation between  -> frame */
+ wmem_tree_t* frame_tree;
+ 
+-typedef struct gtp_info {
++typedef struct {
+     guint32 teid;
+     guint32 frame;
+ } gtp_info_t;
+@@ -2482,7 +2482,7 @@ static int decode_gtp_node_addr(tvbuff_t * tvb, int offset, packet_info * pinfo,
+ static int decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_);
+ static int decode_gtp_unknown(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_);
+ 
+-typedef struct _gtp_opt {
++typedef struct {
+     int optcode;
+     int (*decode) (tvbuff_t *, int, packet_info *, proto_tree *, session_args_t *);
+ } gtp_opt_t;
+@@ -2661,12 +2661,12 @@ id_to_str(tvbuff_t *tvb, gint offset)
+ /* Next definitions and function check_field_presence checks if given field
+  * in GTP packet is compliant with ETSI
+  */
+-typedef struct _header {
++typedef struct {
+     guint8 code;
+     guint8 presence;
+ } ext_header;
+ 
+-typedef struct _message {
++typedef struct {
+     guint8 code;
+     ext_header fields[32];
+ } _gtp_mess_items;
diff --git a/buildroot/package/wireshark/wireshark.hash b/buildroot/package/wireshark/wireshark.hash
index a0178b9f5..071940e1c 100644
--- a/buildroot/package/wireshark/wireshark.hash
+++ b/buildroot/package/wireshark/wireshark.hash
@@ -1,4 +1,4 @@
-# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.4.txt
-sha256 a06b007e6343f148b8b93443b2fcfc9bb3204311cd268565d54d1b71660bc861  wireshark-2.6.4.tar.xz
+# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.7.txt
+sha256 747b3e7a37414942959f76f198be49dcbcca936bda538c4408942ce71bfd2b71  wireshark-2.6.7.tar.xz
 # Locally calculated
 sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf  COPYING
diff --git a/buildroot/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk
index 4720960e5..a917efb5f 100644
--- a/buildroot/package/wireshark/wireshark.mk
+++ b/buildroot/package/wireshark/wireshark.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIRESHARK_VERSION = 2.6.4
+WIRESHARK_VERSION = 2.6.7
 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz
 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license
@@ -107,7 +107,7 @@ WIRESHARK_CONF_OPTS += --without-libxml2
 endif
 
 # no support for lua53 yet
-ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_2),y)
+ifeq ($(BR2_PACKAGE_LUA_5_1),y)
 WIRESHARK_CONF_OPTS += --with-lua
 WIRESHARK_DEPENDENCIES += lua
 else
@@ -145,6 +145,13 @@ else
 WIRESHARK_CONF_OPTS += --without-snappy
 endif
 
+ifeq ($(BR2_PACKAGE_SPANDSP),y)
+WIRESHARK_CONF_OPTS += --with-spandsp
+WIRESHARK_DEPENDENCIES += spandsp
+else
+WIRESHARK_CONF_OPTS += --without-spandsp
+endif
+
 define WIRESHARK_REMOVE_DOCS
 	find $(TARGET_DIR)/usr/share/wireshark -name '*.txt' -print0 \
 		-o -name '*.html' -print0 | xargs -0 rm -f
diff --git a/buildroot/package/woff2/Config.in b/buildroot/package/woff2/Config.in
index 48672570d..d280414d4 100644
--- a/buildroot/package/woff2/Config.in
+++ b/buildroot/package/woff2/Config.in
@@ -7,3 +7,6 @@ config BR2_PACKAGE_WOFF2
 	  typically used for Web fonts
 
 	  https://github.com/google/woff2
+
+comment "woff2 needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/buildroot/package/woff2/woff2.mk b/buildroot/package/woff2/woff2.mk
index 2f0206c82..b2ff33fe9 100644
--- a/buildroot/package/woff2/woff2.mk
+++ b/buildroot/package/woff2/woff2.mk
@@ -21,10 +21,4 @@ ifneq ($(BR2_SHARED_LIBS),y)
 WOFF2_CONF_OPTS += -DCMAKE_SKIP_RPATH=ON
 endif
 
-# Internal error, aborting at dw2gencfi.c:215 in emit_expr_encoded
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
-ifeq ($(BR2_m68k_cf),y)
-WOFF2_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
-endif
-
 $(eval $(cmake-package))
diff --git a/buildroot/package/wolfssl/0001-Fix-issue-with-the-creation-of-dummy-fips.h-header.patch b/buildroot/package/wolfssl/0001-Fix-issue-with-the-creation-of-dummy-fips.h-header.patch
deleted file mode 100644
index 0e9dec751..000000000
--- a/buildroot/package/wolfssl/0001-Fix-issue-with-the-creation-of-dummy-fips.h-header.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a7fe5e35025227e348eaef5a15fd55f591d77206 Mon Sep 17 00:00:00 2001
-From: John Safranek 
-Date: Tue, 6 Mar 2018 13:15:35 -0800
-Subject: [PATCH] Fix issue with the creation of dummy fips.h header.
-
-Signed-off-by: Peter Korsgaard 
----
- wolfssl/wolfcrypt/include.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/wolfssl/wolfcrypt/include.am b/wolfssl/wolfcrypt/include.am
-index c81bdd13..6e84ed9d 100644
---- a/wolfssl/wolfcrypt/include.am
-+++ b/wolfssl/wolfcrypt/include.am
-@@ -20,7 +20,6 @@ nobase_include_HEADERS+= \
-                          wolfssl/wolfcrypt/fe_operations.h \
-                          wolfssl/wolfcrypt/ge_operations.h \
-                          wolfssl/wolfcrypt/error-crypt.h \
--                         wolfssl/wolfcrypt/fips.h \
-                          wolfssl/wolfcrypt/fips_test.h \
-                          wolfssl/wolfcrypt/hash.h \
-                          wolfssl/wolfcrypt/hc128.h \
-@@ -99,3 +98,7 @@ if BUILD_SELFTEST
- nobase_include_HEADERS+= wolfssl/wolfcrypt/selftest.h
- endif
- 
-+if BUILD_FIPS_V2
-+nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
-+endif
-+
--- 
-2.11.0
-
diff --git a/buildroot/package/wolfssl/wolfssl.hash b/buildroot/package/wolfssl/wolfssl.hash
index 76c7db25a..1ff9fc61d 100644
--- a/buildroot/package/wolfssl/wolfssl.hash
+++ b/buildroot/package/wolfssl/wolfssl.hash
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256 4ab543c869a65a77dc5d0bc934b9d4852aa3d5834bd2f707a74a936602bd3687  v3.14.0-stable.tar.gz
+sha256 70e4fbeb91284a269b25a84fc526755c670475aee4034a6f237b1f754d108af3  v3.15.7-stable.tar.gz
 
 # Hash for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/buildroot/package/wolfssl/wolfssl.mk b/buildroot/package/wolfssl/wolfssl.mk
index c246b0851..42198cb81 100644
--- a/buildroot/package/wolfssl/wolfssl.mk
+++ b/buildroot/package/wolfssl/wolfssl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WOLFSSL_VERSION = 3.14.0
+WOLFSSL_VERSION = 3.15.7
 WOLFSSL_SITE = https://github.com/wolfSSL/wolfssl/archive
 WOLFSSL_SOURCE = v$(WOLFSSL_VERSION)-stable.tar.gz
 WOLFSSL_INSTALL_STAGING = YES
@@ -30,7 +30,17 @@ else
 WOLFSSL_CONF_OPTS += --disable-sslv3
 endif
 
-# build fails when ARMv8 hardware acceleration is enabled
+# enable ARMv8 hardware acceleration
+ifeq ($(BR2_ARM_CPU_ARMV8A),y)
+WOLFSSL_CONF_OPTS += --enable-armasm
+# the flag -mstrict-align is needed to prevent build errors caused by
+# some inline assembly in parts of the AES structure using the "m"
+# constraint
+ifeq ($(BR2_aarch64),y)
+WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align"
+endif
+else
 WOLFSSL_CONF_OPTS += --disable-armasm
+endif
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch b/buildroot/package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch
new file mode 100644
index 000000000..eb00d9c15
--- /dev/null
+++ b/buildroot/package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch
@@ -0,0 +1,43 @@
+From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen 
+Date: Mon, 3 Dec 2018 12:00:26 +0200
+Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y
+
+remove_ie() was defined within an ifdef CONFIG_FILS block while it is
+now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition
+there.
+
+Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol")
+Signed-off-by: Jouni Malinen 
+
+Downloaded from upstream commit
+http://w1.fi/cgit/hostap/commit/?id=f2973fa39d6109f0f34969e91551a98dc340d537
+
+Signed-off-by: Bernd Kuhls 
+---
+ wpa_supplicant/sme.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
+index 39c8069..f77f751 100644
+--- a/wpa_supplicant/sme.c
++++ b/wpa_supplicant/sme.c
+@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data)
+ }
+ 
+ 
+-#ifdef CONFIG_FILS
+ #ifdef CONFIG_IEEE80211R
+ static void remove_ie(u8 *buf, size_t *len, u8 eid)
+ {
+@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid)
+ 	}
+ }
+ #endif /* CONFIG_IEEE80211R */
+-#endif /* CONFIG_FILS */
+ 
+ 
+ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
+-- 
+cgit v0.12
+
diff --git a/buildroot/package/wpa_supplicant/wpa_supplicant.hash b/buildroot/package/wpa_supplicant/wpa_supplicant.hash
index dbc443821..2da15f7f5 100644
--- a/buildroot/package/wpa_supplicant/wpa_supplicant.hash
+++ b/buildroot/package/wpa_supplicant/wpa_supplicant.hash
@@ -1,11 +1,19 @@
 # Locally calculated
-sha256  b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450  wpa_supplicant-2.6.tar.gz
-sha256  529113cc81256c6178f3c1cf25dd8d3f33e6d770e4a180bd31c6ab7e4917f40b  rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
-sha256  d86d47ab74170f3648b45b91bce780949ca92b09ab43df065178850ec0c335d7  rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
-sha256  d4535e36739a0cc7f3585e6bcba3c0bb8fc67cb3e729844e448c5dc751f47e81  rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
-sha256  793a54748161b5af430dd9de4a1988d19cb8e85ab29bc2340f886b0297cee20b  rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
-sha256  596d4d3b63ea859ed7ea9791b3a21cb11b6173b04c0a14a2afa47edf1666afa6  rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
-sha256  c5a17af84aec2d88c56ce0da2d6945be398fe7cab5c0c340deb30973900c2736  rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
-sha256  c8840d857b9432f3b488113c85c1ff5d4a4b8d81078b7033388dae1e990843b1  rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
-sha256  960c3cf2a514479b0b4cf09665186a1a9f5d28e8b05dec23db75c6cc13eb1f7c  rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
-sha256  3f6ca36d86668d6607389e01cf4766f38aa3b8ab2c144ad132541087b41c061d  README
+sha256  76ea6b06b7a2ea8e6d9eb1a9166166f1656e6d48c7508914f592100c95c73074  wpa_supplicant-2.7.tar.gz
+sha256  86979655f1c5a9578acbf83e8acdf69a36dcc0966a8819f3b6918530ad3e0c67  0001-OpenSSL-Use-constant-time-operations-for-private-big.patch
+sha256  5663da175ecc344c90bea8c95ab831ad47a8002ccbb834f6c091705b92e90e71  0002-Add-helper-functions-for-constant-time-operations.patch
+sha256  e5a6bc9f587351d4495740239ceb0a64958a59b3e875722dcaeb4c93fa517f64  0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch
+sha256  aa5b722bebbaf175ff89a3653c3d048afe0d0f866989fca6b4c8e882a864392a  0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch
+sha256  bad9eeaeb118f88303a7a718820b3ba03d705e99b6183b3c44556bedf99db423  0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch
+sha256  ae7be450f652f6f77ad868856ab61ba6cb6d7e768585cf5f9f9f674a66e05b40  0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch
+sha256  86b731c787ca58ac001d20fb769b136e2ca76bf81a8465a8e72c50573cfc4b09  0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch
+sha256  ff7305005217a34818dae247886b9fb1b1db781ab31fb5eac9ebdd9cb0d1edfe  0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch
+sha256  707057cc0e60fe763350f82135dbe407bc289a4958879c8ff1e9413243a1caa4  0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch
+sha256  82d8ae4fabfe3674bcb5412befe3a74e40d6485906589c219be72e4fd1e70baa  0010-SAE-Fix-confirm-message-validation-in-error-cases.patch
+sha256  ff8d6d92ad4b01987be63cdaf67a24d2eba5b3cd654f37664a8a198e501c0e3b  0011-EAP-pwd-server-Verify-received-scalar-and-element.patch
+sha256  d5ebf4e5a810e9a0c035f9268195c542273998ea70fd58697ee25965094062cc  0012-EAP-pwd-server-Detect-reflection-attacks.patch
+sha256  7156656498f03b24a0b69a26a59d17a9fcc8e76761f1dabe6d13b4176ffd2ef8  0013-EAP-pwd-client-Verify-received-scalar-and-element.patch
+sha256  69926854ec2a79dada290f79f04202764c5d6400d232e3a567ebe633a02c1c66  0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch
+sha256	cba82a051a39c48872250b2e85ca8ebc628cfe75a9ccec29f3e994abd4156152  0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch
+sha256	dc0e015463e1fd1f230795e1a49ddd1b9d00e726cd9f38846d0f4892d7978162  0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch
+sha256  76eeecd8fc291a71f29189ea20e6a34387b8048a959cbc6a65c41b98194643a2  README
diff --git a/buildroot/package/wpa_supplicant/wpa_supplicant.mk b/buildroot/package/wpa_supplicant/wpa_supplicant.mk
index 2b451996e..a518ecc21 100644
--- a/buildroot/package/wpa_supplicant/wpa_supplicant.mk
+++ b/buildroot/package/wpa_supplicant/wpa_supplicant.mk
@@ -4,17 +4,25 @@
 #
 ################################################################################
 
-WPA_SUPPLICANT_VERSION = 2.6
+WPA_SUPPLICANT_VERSION = 2.7
 WPA_SUPPLICANT_SITE = http://w1.fi/releases
 WPA_SUPPLICANT_PATCH = \
-	http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch \
-	http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch \
-	http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch \
-	http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch \
-	http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch \
-	http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch \
-	http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch \
-	http://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
+	https://w1.fi/security/2019-1/0001-OpenSSL-Use-constant-time-operations-for-private-big.patch \
+	https://w1.fi/security/2019-1/0002-Add-helper-functions-for-constant-time-operations.patch \
+	https://w1.fi/security/2019-1/0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch \
+	https://w1.fi/security/2019-2/0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch \
+	https://w1.fi/security/2019-1/0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch \
+	https://w1.fi/security/2019-1/0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch \
+	https://w1.fi/security/2019-1/0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch \
+	https://w1.fi/security/2019-1/0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch \
+	https://w1.fi/security/2019-1/0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch \
+	https://w1.fi/security/2019-3/0010-SAE-Fix-confirm-message-validation-in-error-cases.patch \
+	https://w1.fi/security/2019-4/0011-EAP-pwd-server-Verify-received-scalar-and-element.patch \
+	https://w1.fi/security/2019-4/0012-EAP-pwd-server-Detect-reflection-attacks.patch \
+	https://w1.fi/security/2019-4/0013-EAP-pwd-client-Verify-received-scalar-and-element.patch \
+	https://w1.fi/security/2019-4/0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch \
+	https://w1.fi/security/2019-5/0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch \
+	https://w1.fi/security/2019-5/0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch
 WPA_SUPPLICANT_LICENSE = BSD-3-Clause
 WPA_SUPPLICANT_LICENSE_FILES = README
 WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config
@@ -99,8 +107,8 @@ endif
 
 # Try to use openssl if it's already available
 ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
-WPA_SUPPLICANT_DEPENDENCIES += libopenssl
-WPA_SUPPLICANT_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz)
+WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf libopenssl
+WPA_SUPPLICANT_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
 else
 WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_PWD
diff --git a/buildroot/package/wsapi-fcgi/Config.in b/buildroot/package/wsapi-fcgi/Config.in
index b4304a065..73ef8cb00 100644
--- a/buildroot/package/wsapi-fcgi/Config.in
+++ b/buildroot/package/wsapi-fcgi/Config.in
@@ -2,11 +2,10 @@ config BR2_PACKAGE_WSAPI_FCGI
 	bool "wsapi-fcgi"
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBFCGI
-	# Runtime dependency only
-	select BR2_PACKAGE_WSAPI
+	select BR2_PACKAGE_WSAPI # runtime
 	help
 	  WSAPI is an API that abstracts the web server from Lua web
 	  applications. This is the rock that contains the FCGI module
 	  lfcgi.
 
-	  http://keplerproject.github.com/wsapi/
+	  http://www.keplerproject.org/wsapi
diff --git a/buildroot/package/wsapi-fcgi/wsapi-fcgi.hash b/buildroot/package/wsapi-fcgi/wsapi-fcgi.hash
index f82ce9cfc..0e3e5933c 100644
--- a/buildroot/package/wsapi-fcgi/wsapi-fcgi.hash
+++ b/buildroot/package/wsapi-fcgi/wsapi-fcgi.hash
@@ -1,2 +1,4 @@
-# locally computed hash
-sha256 73dc200889bc185953cd3a7c5350c998c090f901fcd10771273b7a63a3ffcdcf  wsapi-fcgi-1.6.1-1.src.rock
+# computed by luarocks/buildroot
+sha256 14b77861638a5e863fd10d60ad460a961dc108ea5b915f71461a18d5e6be8e4e  wsapi-fcgi-1.7-1.src.rock
+sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159  wsapi/doc/us/license.html
+sha256 c7bf3061d00a96d10cb9dbc3a737d0af22594e2ef8f788842d7ab92eeaa864f2  wsapi/doc/us/license.md
diff --git a/buildroot/package/wsapi-fcgi/wsapi-fcgi.mk b/buildroot/package/wsapi-fcgi/wsapi-fcgi.mk
index 2b0e6b255..677bb774b 100644
--- a/buildroot/package/wsapi-fcgi/wsapi-fcgi.mk
+++ b/buildroot/package/wsapi-fcgi/wsapi-fcgi.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-WSAPI_FCGI_VERSION_MAJOR = 1.6.1
-WSAPI_FCGI_VERSION = $(WSAPI_FCGI_VERSION_MAJOR)-1
-WSAPI_FCGI_SUBDIR = wsapi-$(WSAPI_FCGI_VERSION_MAJOR)
-WSAPI_FCGI_DEPENDENCIES = libfcgi
+WSAPI_FCGI_VERSION = 1.7-1
+WSAPI_FCGI_SUBDIR = wsapi
 WSAPI_FCGI_LICENSE = MIT
-WSAPI_FCGI_LICENSE_FILES = $(WSAPI_FCGI_SUBDIR)/doc/us/license.html
+WSAPI_FCGI_LICENSE_FILES = \
+	$(WSAPI_FCGI_SUBDIR)/doc/us/license.html \
+	$(WSAPI_FCGI_SUBDIR)/doc/us/license.md
+WSAPI_FCGI_DEPENDENCIES = libfcgi
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/wsapi-xavante/Config.in b/buildroot/package/wsapi-xavante/Config.in
index 3e494bba8..7079ad4ed 100644
--- a/buildroot/package/wsapi-xavante/Config.in
+++ b/buildroot/package/wsapi-xavante/Config.in
@@ -1,13 +1,10 @@
 config BR2_PACKAGE_WSAPI_XAVANTE
 	bool "wsapi-xavante"
-	# Runtime dependencies
-	select BR2_PACKAGE_COXPCALL
-	select BR2_PACKAGE_RINGS
-	select BR2_PACKAGE_WSAPI
-	select BR2_PACKAGE_XAVANTE
+	select BR2_PACKAGE_WSAPI # runtime
+	select BR2_PACKAGE_XAVANTE # runtime
 	help
 	  WSAPI is an API that abstracts the web server from Lua web
 	  applications. This is the rock that contains the Xavante
 	  adapter and launcher.
 
-	  http://keplerproject.github.com/wsapi/
+	  http://www.keplerproject.org/wsapi
diff --git a/buildroot/package/wsapi-xavante/wsapi-xavante.hash b/buildroot/package/wsapi-xavante/wsapi-xavante.hash
index 9e8132df5..6045117b9 100644
--- a/buildroot/package/wsapi-xavante/wsapi-xavante.hash
+++ b/buildroot/package/wsapi-xavante/wsapi-xavante.hash
@@ -1,2 +1,4 @@
-# locally computed hash
-sha256 b30b171e3d4d6fd7e129f14576e1cfc5adf00c0780ef8350f2f9e6f1d4259346  wsapi-xavante-1.6.1-1.src.rock
+# computed by luarocks/buildroot
+sha256 01211bb80dab92f87cece6e31854d73ae4a2ce06af7c48423a54313d72adf9fb  wsapi-xavante-1.7-1.src.rock
+sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159  wsapi/doc/us/license.html
+sha256 c7bf3061d00a96d10cb9dbc3a737d0af22594e2ef8f788842d7ab92eeaa864f2  wsapi/doc/us/license.md
diff --git a/buildroot/package/wsapi-xavante/wsapi-xavante.mk b/buildroot/package/wsapi-xavante/wsapi-xavante.mk
index 86f5dee50..3a747e9b0 100644
--- a/buildroot/package/wsapi-xavante/wsapi-xavante.mk
+++ b/buildroot/package/wsapi-xavante/wsapi-xavante.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-WSAPI_XAVANTE_VERSION_MAJOR = 1.6.1
-WSAPI_XAVANTE_VERSION = $(WSAPI_XAVANTE_VERSION_MAJOR)-1
-WSAPI_XAVANTE_SUBDIR = wsapi-$(WSAPI_XAVANTE_VERSION_MAJOR)
+WSAPI_XAVANTE_VERSION = 1.7-1
+WSAPI_XAVANTE_SUBDIR = wsapi
 WSAPI_XAVANTE_LICENSE = MIT
-WSAPI_XAVANTE_LICENSE_FILES = $(WSAPI_XAVANTE_SUBDIR)/doc/us/license.html
+WSAPI_XAVANTE_LICENSE_FILES = \
+	$(WSAPI_XAVANTE_SUBDIR)/doc/us/license.html \
+	$(WSAPI_XAVANTE_SUBDIR)/doc/us/license.md
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/wsapi/0001-Lua-5.3-compatibility.patch b/buildroot/package/wsapi/0001-Lua-5.3-compatibility.patch
deleted file mode 100644
index 9165ef2b9..000000000
--- a/buildroot/package/wsapi/0001-Lua-5.3-compatibility.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2d824d2fce31b6a9cc60b2c3f215fbbf1d99c611 Mon Sep 17 00:00:00 2001
-From: mpeterv 
-Date: Thu, 3 Dec 2015 13:10:14 +0300
-Subject: [PATCH] Lua 5.3 compatibility
-
-Fetched from: https://github.com/keplerproject/wsapi/commit/2d824d2fce31b6a9cc60b2c3f215fbbf1d99c611
-
-Signed-off-by: Francois Perrad 
----
- src/wsapi/ringer.lua | 1 +
- src/wsapi/util.lua   | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/wsapi-1.6.1/src/wsapi/ringer.lua b/wsapi-1.6.1/src/wsapi/ringer.lua
-index 58309f2..db7b68f 100644
---- a/wsapi-1.6.1/src/wsapi/ringer.lua
-+++ b/wsapi-1.6.1/src/wsapi/ringer.lua
-@@ -5,6 +5,7 @@ local rings = require "rings"
- local _M = {}
- 
- local init = [==[
-+  local loadstring = loadstring or load
-   local app_name, bootstrap_code, is_file = ...
-   if bootstrap_code then
-     local bootstrap, err
-diff --git a/wsapi-1.6.1/src/wsapi/util.lua b/wsapi-1.6.1/src/wsapi/util.lua
-index 24d3cfe..34e5816 100644
---- a/wsapi-1.6.1/src/wsapi/util.lua
-+++ b/wsapi-1.6.1/src/wsapi/util.lua
-@@ -174,7 +174,7 @@ function _M.make_env_post(pd, type, qs)
- end
- 
- function _M.loadfile(filename, env)
--  if _VERSION == "Lua 5.2" then
-+  if _VERSION ~= "Lua 5.1" then
-     return loadfile(filename, "bt", env)
-   else
-     local f, err = loadfile(filename)
--- 
-2.14.1
-
diff --git a/buildroot/package/wsapi/Config.in b/buildroot/package/wsapi/Config.in
index 348a0404b..72e2dcd8e 100644
--- a/buildroot/package/wsapi/Config.in
+++ b/buildroot/package/wsapi/Config.in
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_WSAPI
 	bool "wsapi"
-	# Runtime dependency only
-	select BR2_PACKAGE_COXPCALL
-	select BR2_PACKAGE_LUAFILESYSTEM
-	select BR2_PACKAGE_RINGS
+	select BR2_PACKAGE_COXPCALL if BR2_PACKAGE_LUA_5_1 # runtime
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
+	select BR2_PACKAGE_RINGS # runtime
 	help
 	  API that abstracts the web server from Lua web applications.
 
-	  http://keplerproject.github.com/wsapi/
+	  http://www.keplerproject.org/wsapi
diff --git a/buildroot/package/wsapi/wsapi.hash b/buildroot/package/wsapi/wsapi.hash
index 3abbfc979..a89853de2 100644
--- a/buildroot/package/wsapi/wsapi.hash
+++ b/buildroot/package/wsapi/wsapi.hash
@@ -1,2 +1,4 @@
-# locally computed hash
-sha256 f7f1b0ddc68c257965c42ac7155904d8ff7c2b7256f65ef1b82fda0039137d61 wsapi-1.6.1-1.src.rock
+# computed by luarocks/buildroot
+sha256 1a0829dffd6bdbf99f5c4278d504cda5ede9344d5089bdcf5216c9eb2999ae22  wsapi-1.7-1.src.rock
+sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159  wsapi/doc/us/license.html
+sha256 c7bf3061d00a96d10cb9dbc3a737d0af22594e2ef8f788842d7ab92eeaa864f2  wsapi/doc/us/license.md
diff --git a/buildroot/package/wsapi/wsapi.mk b/buildroot/package/wsapi/wsapi.mk
index 64a27579f..d67efd0e7 100644
--- a/buildroot/package/wsapi/wsapi.mk
+++ b/buildroot/package/wsapi/wsapi.mk
@@ -4,8 +4,11 @@
 #
 ################################################################################
 
-WSAPI_VERSION = 1.6.1-1
+WSAPI_VERSION = 1.7-1
+WSAPI_SUBDIR = wsapi
 WSAPI_LICENSE = MIT
-WSAPI_LICENSE_FILES = $(WSAPI_SUBDIR)/doc/us/license.html
+WSAPI_LICENSE_FILES = \
+	$(WSAPI_SUBDIR)/doc/us/license.html \
+	$(WSAPI_SUBDIR)/doc/us/license.md
 
 $(eval $(luarocks-package))
diff --git a/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.mk
index b39fe7870..7dcb715ef 100644
--- a/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.mk
+++ b/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -10,5 +10,6 @@ XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BEFORELIGHT_LICENSE = MIT
 XAPP_BEFORELIGHT_LICENSE_FILES = COPYING
 XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
+XAPP_BEFORELIGHT_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 851af3138..1ee2880ad 100644
--- a/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -10,5 +10,6 @@ XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BITMAP_LICENSE = MIT
 XAPP_BITMAP_LICENSE_FILES = COPYING
 XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
+XAPP_BITMAP_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_editres/xapp_editres.mk b/buildroot/package/x11r7/xapp_editres/xapp_editres.mk
index 1a947d478..108a0ec35 100644
--- a/buildroot/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/buildroot/package/x11r7/xapp_editres/xapp_editres.mk
@@ -10,5 +10,6 @@ XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_EDITRES_LICENSE = MIT
 XAPP_EDITRES_LICENSE_FILES = COPYING
 XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
+XAPP_EDITRES_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_oclock/xapp_oclock.mk b/buildroot/package/x11r7/xapp_oclock/xapp_oclock.mk
index 833d15140..0f94cf8c1 100644
--- a/buildroot/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/buildroot/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -10,6 +10,7 @@ XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_OCLOCK_LICENSE = MIT
 XAPP_OCLOCK_LICENSE_FILES = COPYING
 XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
+XAPP_OCLOCK_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y)
 XAPP_OCLOCK_CONF_OPTS += --with-xkb
diff --git a/buildroot/package/x11r7/xapp_rgb/xapp_rgb.mk b/buildroot/package/x11r7/xapp_rgb/xapp_rgb.mk
index d63576f44..b2d5d7774 100644
--- a/buildroot/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/buildroot/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -9,6 +9,6 @@ XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2
 XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_RGB_LICENSE = MIT
 XAPP_RGB_LICENSE_FILES = COPYING
-XAPP_RGB_DEPENDENCIES = xorgproto
+XAPP_RGB_DEPENDENCIES = xorgproto host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk b/buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk
index 95205b435..e32de0f73 100644
--- a/buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -10,5 +10,6 @@ XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_VIEWRES_LICENSE = MIT
 XAPP_VIEWRES_LICENSE_FILES = COPYING
 XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
+XAPP_VIEWRES_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk
index 58fbdf571..9445af75e 100644
--- a/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -11,5 +11,6 @@ XAPP_XCALC_LICENSE = MIT
 XAPP_XCALC_LICENSE_FILES = COPYING
 XAPP_XCALC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec install-data
 XAPP_XCALC_DEPENDENCIES = xlib_libXaw
+XAPP_XCALC_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index 3620f757d..d77ac9862 100644
--- a/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -10,5 +10,6 @@ XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLIPBOARD_LICENSE = MIT
 XAPP_XCLIPBOARD_LICENSE_FILES = COPYING
 XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw xlib_libXmu xlib_libXt
+XAPP_XCLIPBOARD_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk b/buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk
index 282d753ff..6f8044ef6 100644
--- a/buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -10,5 +10,6 @@ XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLOCK_LICENSE = MIT
 XAPP_XCLOCK_LICENSE_FILES = COPYING
 XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
+XAPP_XCLOCK_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.mk b/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.mk
index a91b98dc6..ddec4cfaa 100644
--- a/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.mk
+++ b/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.mk
@@ -12,5 +12,6 @@ XAPP_XCONSOLE_LICENSE_FILES = COPYING
 XAPP_XCONSOLE_DEPENDENCIES = \
 	xlib_libX11 xlib_libXaw xlib_libXt xorgproto \
 	xlib_libXmu
+XAPP_XCONSOLE_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash b/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash
index b98d449c1..51031d62b 100644
--- a/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash
+++ b/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash
@@ -1,2 +1,7 @@
-# From http://lists.x.org/archives/xorg-announce/2014-May/002438.html
-sha256	31c8910f54eb175a8a74a60e7662697467e21a8bf948220a6048a93924b3f66c	xcursorgen-1.0.6.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2019-January/002936.html
+md5 25cc7ca1ce5dcbb61c2b471c55e686b5  xcursorgen-1.0.7.tar.bz2
+sha1 109367eb23b0ad52cf5de15f50c02ebe872698ae  xcursorgen-1.0.7.tar.bz2
+sha256 35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d  xcursorgen-1.0.7.tar.bz2
+sha512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2  xcursorgen-1.0.7.tar.bz2
+# Locally computed
+sha256 8c773336b654442ac8018715a52be1a8254895c57c898d5387016e9488cc2009  COPYING
diff --git a/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index 4bee26b5d..bcc696b01 100644
--- a/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XCURSORGEN_VERSION = 1.0.6
+XAPP_XCURSORGEN_VERSION = 1.0.7
 XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2
 XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCURSORGEN_LICENSE = MIT
diff --git a/buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk b/buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk
index 4744c1fef..e8d72770e 100644
--- a/buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -10,5 +10,6 @@ XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDITVIEW_LICENSE = MIT
 XAPP_XDITVIEW_LICENSE_FILES = COPYING
 XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw
+XAPP_XDITVIEW_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_xdm/xapp_xdm.hash b/buildroot/package/x11r7/xapp_xdm/xapp_xdm.hash
index 207d769fb..605be9deb 100644
--- a/buildroot/package/x11r7/xapp_xdm/xapp_xdm.hash
+++ b/buildroot/package/x11r7/xapp_xdm/xapp_xdm.hash
@@ -1,2 +1,7 @@
-# From http://lists.x.org/archives/xorg-announce/2011-September/001737.html
-sha256	d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47	xdm-1.1.11.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2019-March/002959.html
+md5 47c4c3bf8d59b64b64d134df8b5e5ec5  xdm-1.1.12.tar.bz2
+sha1 5cc5590e40837949b1a63cb030878f8ceebd4d85  xdm-1.1.12.tar.bz2
+sha256 0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4  xdm-1.1.12.tar.bz2
+sha512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb  xdm-1.1.12.tar.bz2
+# Locally computed
+sha256 b33b4bebbd6511b3e15315e8e29d67f25334ee45da8b7da6e6e97c53a70c6923  COPYING
diff --git a/buildroot/package/x11r7/xapp_xdm/xapp_xdm.mk b/buildroot/package/x11r7/xapp_xdm/xapp_xdm.mk
index 2c213a6bf..3c91e2157 100644
--- a/buildroot/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/buildroot/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XDM_VERSION = 1.1.11
+XAPP_XDM_VERSION = 1.1.12
 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
 XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDM_LICENSE = MIT
@@ -20,6 +20,7 @@ XAPP_XDM_DEPENDENCIES = \
 	xlib_libXt \
 	xorgproto
 XAPP_XDM_CONF_OPTS = \
+	--with-appdefaultdir=/usr/share/X11/app-defaults \
 	--with-utmp-file=/var/adm/utmpx \
 	--with-wtmp-file=/var/adm/wtmpx
 
diff --git a/buildroot/package/x11r7/xapp_xedit/xapp_xedit.mk b/buildroot/package/x11r7/xapp_xedit/xapp_xedit.mk
index 0f42e2cb0..1cb99dc6f 100644
--- a/buildroot/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/buildroot/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -11,6 +11,8 @@ XAPP_XEDIT_LICENSE = MIT
 XAPP_XEDIT_LICENSE_FILES = COPYING
 XAPP_XEDIT_DEPENDENCIES = xlib_libXaw
 
-XAPP_XEDIT_CONF_OPTS = --disable-selective-werror
+XAPP_XEDIT_CONF_OPTS = \
+	--disable-selective-werror \
+	--with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk b/buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk
index e3c770b37..89b3f299f 100644
--- a/buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -9,6 +9,13 @@ XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2
 XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFD_LICENSE = MIT
 XAPP_XFD_LICENSE_FILES = COPYING
-XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
+XAPP_XFD_DEPENDENCIES = \
+	freetype \
+	fontconfig \
+	xlib_libXaw \
+	xlib_libXft \
+	$(TARGET_NLS_DEPENDENCIES)
+XAPP_XFD_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
+XAPP_XFD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_xload/xapp_xload.mk b/buildroot/package/x11r7/xapp_xload/xapp_xload.mk
index b44a51b5f..4bb21ecf0 100644
--- a/buildroot/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/buildroot/package/x11r7/xapp_xload/xapp_xload.mk
@@ -9,7 +9,9 @@ XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2
 XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLOAD_LICENSE = MIT
 XAPP_XLOAD_LICENSE_FILES = COPYING
-XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
+XAPP_XLOAD_DEPENDENCIES = xlib_libXaw $(TARGET_NLS_DEPENDENCIES)
+XAPP_XLOAD_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
+XAPP_XLOAD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 
 ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
 # musl doesn't have rwhod.h, but xload can replace it with stubs
diff --git a/buildroot/package/x11r7/xapp_xmag/xapp_xmag.mk b/buildroot/package/x11r7/xapp_xmag/xapp_xmag.mk
index bfc60c3ef..113c328e2 100644
--- a/buildroot/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/buildroot/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -10,5 +10,6 @@ XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMAG_LICENSE = MIT
 XAPP_XMAG_LICENSE_FILES = COPYING
 XAPP_XMAG_DEPENDENCIES = xlib_libXaw
+XAPP_XMAG_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xapp_xman/xapp_xman.mk b/buildroot/package/x11r7/xapp_xman/xapp_xman.mk
index bca6bbff8..0d744cc39 100644
--- a/buildroot/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/buildroot/package/x11r7/xapp_xman/xapp_xman.mk
@@ -10,6 +10,7 @@ XAPP_XMAN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMAN_LICENSE = MIT
 XAPP_XMAN_LICENSE_FILES = COPYING
 XAPP_XMAN_DEPENDENCIES = xlib_libXaw
+XAPP_XMAN_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 XAPP_XMAN_CONF_ENV = \
 	ac_cv_file__etc_man_conf=no \
diff --git a/buildroot/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/buildroot/package/x11r7/xapp_xmessage/xapp_xmessage.mk
index bae5da670..9d426974b 100644
--- a/buildroot/package/x11r7/xapp_xmessage/xapp_xmessage.mk
+++ b/buildroot/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -10,5 +10,6 @@ XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMESSAGE_LICENSE = MIT
 XAPP_XMESSAGE_LICENSE_FILES = COPYING
 XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw
+XAPP_XMESSAGE_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
index 43090c755..c42255f55 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
+++ b/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU
 	bool "xf86-video-amdgpu"
+	depends on BR2_USE_MMU # libdrm
 	depends on BR2_PACKAGE_MESA3D_DRI_DRIVER
 	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm
 	select BR2_PACKAGE_LIBDRM
@@ -11,5 +12,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU
 	  AMD GPU video driver
 
 comment "xf86-video-amdgpu needs egl/opengl support from mesa3d"
+	depends on BR2_USE_MMU
 	depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
 		!BR2_PACKAGE_MESA3D_DRI_DRIVER
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash b/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash
index 0f34e5178..d0cbc0903 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash
+++ b/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash
@@ -1,2 +1,2 @@
 # From http://lists.x.org/archives/xorg-announce/2013-September/002324.html
-sha256	9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b	xf86-video-fbdev-0.4.4.tar.bz2
+sha256	dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699	xf86-video-fbdev-0.5.0.tar.bz2
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index f39311e61..a480befdd 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.4
+XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.5.0
 XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_FBDEV_LICENSE = MIT
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-i128/0001-mbstring.patch b/buildroot/package/x11r7/xdriver_xf86-video-i128/0001-mbstring.patch
deleted file mode 100644
index 40bb1ea2b..000000000
--- a/buildroot/package/x11r7/xdriver_xf86-video-i128/0001-mbstring.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
-From: Adam Jackson 
-Date: Tue, 25 Sep 2012 12:54:40 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson 
----
-Fetch from:
-http://cgit.freedesktop.org/xorg/driver/xf86-video-i128/commit/?id=c87753733a6e1f85d1d037dced0b47ce0cf41658
-
-Signed-off-by: Bernd Kuhls 
-
-diff --git a/src/i128_driver.c b/src/i128_driver.c
-index a0f08c0..51a4135 100644
---- a/src/i128_driver.c
-+++ b/src/i128_driver.c
-@@ -50,8 +50,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
- #include "micmap.h"
- 
- #include "xf86DDC.h"
-@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
-         return FALSE;
-     }
-     
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash b/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash
index 9600c4565..325e754fb 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash
+++ b/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash
@@ -1,2 +1,7 @@
-# From http://lists.x.org/archives/xorg-announce/2012-July/002012.html
-sha256	f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c	xf86-video-i128-1.3.6.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2018-December/002932.html
+md5  a980f1b8532ccfe81932580bc4e0f2a0  xf86-video-i128-1.4.0.tar.bz2
+sha1 56d5b897b2695222c13e59d2ade74620a99e1011  xf86-video-i128-1.4.0.tar.bz2
+sha256 8f2c0a6bf5a169dad3fc07c6dd4537b492d0e44489e4a1297311e617c3bed0ea  xf86-video-i128-1.4.0.tar.bz2
+sha512 d58baee3f20b3ad2ece6853da0ff20a6d54b984c6e3289bad2715cc003b277a0b44d20ded25cfc116400468df552390bdb5d80fbd3fb60861488ee5d027664b2  xf86-video-i128-1.4.0.tar.bz2
+# Locally computed
+sha256 7677424d79633dbf255a81bd4e05dd621931b89997af33c31522269ec2ed391e  COPYING
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 148fc3d1d..e44deaf62 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.6
+XDRIVER_XF86_VIDEO_I128_VERSION = 1.4.0
 XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I128_LICENSE = MIT
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
index 469649ec3..2443dc288 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
+++ b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 8a008db80964700c57db407fe9fab78884d6919bd5343a269f681625132b4687  xdriver_xf86-video-intel-3d395062ce73f85e8340218df01c2ebf4bc25023.tar.gz
+sha256 685a1b3e1b486f4fb02dd14adc33b8ce215bb96ed8e26787ee8b7bda4c0d6cce  xdriver_xf86-video-intel-33ee0c3b21ea279e08d0863fcb2e874f0974b00e.tar.gz
 sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa  COPYING
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index 66b0f9def..bd315c8d9 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 3d395062ce73f85e8340218df01c2ebf4bc25023
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 33ee0c3b21ea279e08d0863fcb2e874f0974b00e
 XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
 XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT
 XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash b/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash
index 0187e6fbb..218e52e19 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash
+++ b/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash
@@ -1,2 +1,7 @@
-# From https://lists.x.org/archives/xorg-announce/2017-January/002765.html
-sha256 b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422  xf86-video-mga-1.6.5.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2018-December/002933.html
+md5 b8fc99b4adea8bfe80156b13df4b6c9c  xf86-video-mga-2.0.0.tar.bz2
+sha1 833f2710a1fd7b3f2db3700b2ad055527da5033b  xf86-video-mga-2.0.0.tar.bz2
+sha256 268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79  xf86-video-mga-2.0.0.tar.bz2
+sha512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540  xf86-video-mga-2.0.0.tar.bz2
+# Locally computed
+sha256 6c567575e381478c7616eedff3ea2ae5228a5b54fbdd22d4070ebae312fa085c  COPYING
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index bdc9f3588..2720848a1 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_MGA_VERSION = 1.6.5
+XDRIVER_XF86_VIDEO_MGA_VERSION = 2.0.0
 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/archive/individual/driver
 XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash b/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash
index fc830661b..55996f5b0 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash
+++ b/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash
@@ -1,2 +1,7 @@
-# From http://lists.x.org/archives/xorg-announce/2015-May/002602.html
-sha256	72f89396b10527549337cb72a7eafb1194cf140144f9236a94ad2becdf140bf2	xf86-video-neomagic-1.2.9.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2018-December/002934.html
+md5 349d5254d09eb46f2a1f151cd423b89a  xf86-video-neomagic-1.3.0.tar.bz2
+sha1 6bccfa15ea05d5264120cd96ccf13687642e8f6d  xf86-video-neomagic-1.3.0.tar.bz2
+sha256 93833950fae7757088eb6abb125e15e8c245e5e25681c19c3ad4213ec7319064  xf86-video-neomagic-1.3.0.tar.bz2
+sha512 25d019a2556e52aeb4e25942f444437a921e76d527c10ddd420f16aa7d85bf2b8a51612c382a2a7e3e407bb1e8d610d063101184eea0889c3e1a69bfb3b37735  xf86-video-neomagic-1.3.0.tar.bz2
+# Locally computed
+sha256 95063ce9aa09850025dd317549ce688519079a8d3cf66ceb3d882cb2bafcced9  COPYING
diff --git a/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index 93cd55a11..8dd2777ff 100644
--- a/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.9
+XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.3.0
 XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE = MIT
diff --git a/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash b/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash
index 6b50cb1c7..0dbea635f 100644
--- a/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash
+++ b/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash
@@ -1,2 +1,7 @@
-# From http://lists.x.org/archives/xorg-announce/2015-March/002554.html
-sha256	81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2	libXdmcp-1.1.2.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2019-March/002974.html
+md5 115c5c12ecce0e749cd91d999a5fd160  libXdmcp-1.1.3.tar.bz2
+sha1 0a8f8a274f829331efb1e8e2027c38631b204dd0  libXdmcp-1.1.3.tar.bz2
+sha256 20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529  libXdmcp-1.1.3.tar.bz2
+sha512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec  libXdmcp-1.1.3.tar.bz2
+# Locally computed
+sha256 8a3c3f35b0dbcb60a4e242b9e4394a352a65bb27deb2938ea1e2e62a626e16e9  COPYING
diff --git a/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 44a6f0054..1182903e8 100644
--- a/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXDMCP_VERSION = 1.1.2
+XLIB_LIBXDMCP_VERSION = 1.1.3
 XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDMCP_LICENSE = MIT
diff --git a/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 7e11c4b5a..391493a4b 100644
--- a/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -15,9 +15,10 @@ XLIB_LIBXPM_AUTORECONF = YES
 XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	$(TARGET_NLS_DEPENDENCIES)
+XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 
 ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
-XLIB_LIBXPM_CONF_ENV = ac_cv_search_gettext=no
+XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no
 endif
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.3/0001-modesettings-needs-dri2.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.4/0001-modesettings-needs-dri2.patch
similarity index 100%
rename from buildroot/package/x11r7/xserver_xorg-server/1.20.3/0001-modesettings-needs-dri2.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.4/0001-modesettings-needs-dri2.patch
diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.4/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
similarity index 100%
rename from buildroot/package/x11r7/xserver_xorg-server/1.20.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.4/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.3/0003-Remove-check-for-useSIGIO-option.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.4/0003-Remove-check-for-useSIGIO-option.patch
similarity index 100%
rename from buildroot/package/x11r7/xserver_xorg-server/1.20.3/0003-Remove-check-for-useSIGIO-option.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.4/0003-Remove-check-for-useSIGIO-option.patch
diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.3/0004-include-misc.h-fix-uClibc-build.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.4/0004-include-misc.h-fix-uClibc-build.patch
similarity index 100%
rename from buildroot/package/x11r7/xserver_xorg-server/1.20.3/0004-include-misc.h-fix-uClibc-build.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.4/0004-include-misc.h-fix-uClibc-build.patch
diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.4/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.4/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch
new file mode 100644
index 000000000..5f19a26d1
--- /dev/null
+++ b/buildroot/package/x11r7/xserver_xorg-server/1.20.4/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch
@@ -0,0 +1,45 @@
+From b1d2a82d644518c1a75775244ac63be738aaf062 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Fri, 19 Apr 2019 10:19:50 +0200
+Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx
+
+Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to
+Xwayland_LDFLAGS but GLX can be disabled through --disable-glx.
+In this case, build fails on:
+
+make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'.  Stop.
+make[3]: *** Waiting for unfinished jobs....
+
+Fixes:
+ - http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef
+
+Signed-off-by: Fabrice Fontaine 
+[Upstream status:
+https://gitlab.freedesktop.org/xorg/xserver/merge_requests/173]
+---
+ hw/xwayland/Makefile.am | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
+index bc1cb8506..502879e2a 100644
+--- a/hw/xwayland/Makefile.am
++++ b/hw/xwayland/Makefile.am
+@@ -21,10 +21,14 @@ Xwayland_SOURCES =				\
+ 	$(top_srcdir)/Xi/stubs.c		\
+ 	$(top_srcdir)/mi/miinitext.c
+ 
++if GLX
++GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la
++endif
++
+ Xwayland_LDADD =				\
+ 	$(glamor_lib)				\
+ 	$(XWAYLAND_LIBS)			\
+-	$(top_builddir)/glx/libglxvnd.la	\
++	$(GLXVND_LIB)				\
+ 	$(XWAYLAND_SYS_LIBS)			\
+ 	$(top_builddir)/Xext/libXvidmode.la	\
+ 	$(XSERVER_SYS_LIBS)
+-- 
+2.20.1
+
diff --git a/buildroot/package/x11r7/xserver_xorg-server/Config.in b/buildroot/package/x11r7/xserver_xorg-server/Config.in
index 7ccb2bd9c..ed238d570 100644
--- a/buildroot/package/x11r7/xserver_xorg-server/Config.in
+++ b/buildroot/package/x11r7/xserver_xorg-server/Config.in
@@ -61,7 +61,7 @@ choice
 	bool "X Window System server version"
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
-	bool "1.20.3"
+	bool "1.20.4"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24
 	select BR2_PACKAGE_XLIB_LIBXFONT2
 
@@ -79,7 +79,7 @@ endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
 	string
-	default "1.20.3" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
+	default "1.20.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
 	default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
 	default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
 
diff --git a/buildroot/package/x11r7/xserver_xorg-server/S40xorg b/buildroot/package/x11r7/xserver_xorg-server/S40xorg
old mode 100755
new mode 100644
diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
index 4cde15e5d..5c1beb137 100644
--- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
+++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
@@ -3,8 +3,8 @@ sha1   7a95765e56b124758fcd7b609589e65b8870880b                                x
 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        xorg-server-1.14.7.tar.bz2
 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
 sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457        xorg-server-1.17.4.tar.bz2
-# From https://lists.x.org/archives/xorg-announce/2018-October/002928.html
-md5 8ee29e8b24cef6b3cfa747ec01b9155a  xorg-server-1.20.3.tar.bz2
-sha1 a522cd543606b4d0509d821b8061904951171c50  xorg-server-1.20.3.tar.bz2
-sha256 1b3ce466c12cacbe2252b3ad5b0ed561972eef9d09e75900d65fb1e21f9201de  xorg-server-1.20.3.tar.bz2
-sha512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba  xorg-server-1.20.3.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2019-February/002957.html
+md5 c4841cc24b79420205d082fe82e0a650  xorg-server-1.20.4.tar.bz2
+sha1 1a79da92122124cb782a4eebfd83fd33d5c0d7d4  xorg-server-1.20.4.tar.bz2
+sha256 fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee  xorg-server-1.20.4.tar.bz2
+sha512 f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8  xorg-server-1.20.4.tar.bz2
diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 14f810476..a33cb2507 100644
--- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -47,6 +47,7 @@ XSERVER_XORG_SERVER_CONF_OPTS = \
 	--disable-xnest \
 	--disable-xephyr \
 	--disable-dmx \
+	--disable-unit-tests \
 	--with-builder-addr=buildroot@buildroot.org \
 	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \
 	--with-fontrootdir=/usr/share/fonts/X11/ \
diff --git a/buildroot/package/x11vnc/x11vnc.hash b/buildroot/package/x11vnc/x11vnc.hash
index 86f41044d..ca0b48964 100644
--- a/buildroot/package/x11vnc/x11vnc.hash
+++ b/buildroot/package/x11vnc/x11vnc.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256  3e43bd875edc3c7f52a0d3676c4ec7de910fcd210240ee20b4522deb2bf84cff  x11vnc-0.9.15.tar.gz
+sha256  885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd  x11vnc-0.9.16.tar.gz
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/buildroot/package/x11vnc/x11vnc.mk b/buildroot/package/x11vnc/x11vnc.mk
index 0fa87d2d8..9daf49058 100644
--- a/buildroot/package/x11vnc/x11vnc.mk
+++ b/buildroot/package/x11vnc/x11vnc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-X11VNC_VERSION = 0.9.15
+X11VNC_VERSION = 0.9.16
 X11VNC_SITE = $(call github,LibVNC,x11vnc,$(X11VNC_VERSION))
 # sdl support is not used in x11vnc, but host include / library search paths
 # leak in if host has sdl-config
diff --git a/buildroot/package/xapian/xapian.hash b/buildroot/package/xapian/xapian.hash
index 4fd0dd134..4e4140227 100644
--- a/buildroot/package/xapian/xapian.hash
+++ b/buildroot/package/xapian/xapian.hash
@@ -1,3 +1,3 @@
 # locally computed
-sha256 13f08a0b649c7afa804fa0e85678d693fd6069dd394c9b9e7d41973d74a3b5d3 xapian-core-1.4.7.tar.xz
+sha256 cde9c39d014f04c09b59d9c21551db9794c10617dc69ab4c9826352a533df5cc xapian-core-1.4.9.tar.xz
 sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING
diff --git a/buildroot/package/xapian/xapian.mk b/buildroot/package/xapian/xapian.mk
index 241f37b22..df039d444 100644
--- a/buildroot/package/xapian/xapian.mk
+++ b/buildroot/package/xapian/xapian.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPIAN_VERSION = 1.4.7
+XAPIAN_VERSION = 1.4.9
 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz
 XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION)
 XAPIAN_LICENSE = GPL-2.0+
diff --git a/buildroot/package/xavante/Config.in b/buildroot/package/xavante/Config.in
index d66ca1f0a..209ec2d2c 100644
--- a/buildroot/package/xavante/Config.in
+++ b/buildroot/package/xavante/Config.in
@@ -1,9 +1,8 @@
 config BR2_PACKAGE_XAVANTE
 	bool "xavante"
-	# Runtime dependency only
-	select BR2_PACKAGE_COPAS
-	select BR2_PACKAGE_LUAFILESYSTEM
-	select BR2_PACKAGE_LUASOCKET
+	select BR2_PACKAGE_COPAS # runtime
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
+	select BR2_PACKAGE_LUASOCKET # runtime
 	help
 	  Xavante is a Lua HTTP 1.1 Web server that uses a modular
 	  architecture based on URI mapped handlers. Xavante currently
@@ -11,4 +10,4 @@ config BR2_PACKAGE_XAVANTE
 	  Those are used for general files, URI remapping and WSAPI
 	  applications respectively.
 
-	  http://keplerproject.github.com/xavante/
+	  http://keplerproject.github.io/xavante
diff --git a/buildroot/package/xavante/xavante.hash b/buildroot/package/xavante/xavante.hash
index 09b2a22d4..b2e8633bc 100644
--- a/buildroot/package/xavante/xavante.hash
+++ b/buildroot/package/xavante/xavante.hash
@@ -1,2 +1,3 @@
-# Locally calculated
+# computed by luarocks/buildroot
 sha256 67c738f981e7d65d18c717f3acac59a37f95d5139c00fb0de5d3167262025273  xavante-2.4.0-1.src.rock
+sha256 57b2c50f08bf500c969fe13500f217adb36582e4d8e75c9e2ed04191cb4a045c  xavante-2.4.0/doc/us/license.html
diff --git a/buildroot/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch b/buildroot/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch
new file mode 100644
index 000000000..9c51c554c
--- /dev/null
+++ b/buildroot/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch
@@ -0,0 +1,79 @@
+From e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8 Mon Sep 17 00:00:00 2001
+From: Wei Liu 
+Date: Thu, 26 Jul 2018 15:58:54 +0100
+Subject: [PATCH] xenpmd: make 32 bit gcc 8.1 non-debug build work
+
+32 bit gcc 8.1 non-debug build yields:
+
+xenpmd.c:354:23: error: '%02x' directive output may be truncated writing between 2 and 8 bytes into a region of size 3 [-Werror=format-truncation=]
+     snprintf(val, 3, "%02x",
+                       ^~~~
+xenpmd.c:354:22: note: directive argument in the range [40, 2147483778]
+     snprintf(val, 3, "%02x",
+                      ^~~~~~
+xenpmd.c:354:5: note: 'snprintf' output between 3 and 9 bytes into a destination of size 3
+     snprintf(val, 3, "%02x",
+     ^~~~~~~~~~~~~~~~~~~~~~~~
+              (unsigned int)(9*4 +
+              ~~~~~~~~~~~~~~~~~~~~
+                             strlen(info->model_number) +
+                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                             strlen(info->serial_number) +
+                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                             strlen(info->battery_type) +
+                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                             strlen(info->oem_info) + 4));
+                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+All info->* used in calculation are 32 bytes long, and the parsing
+code makes sure they are null-terminated, so the end result of the
+expression won't exceed 255, which should be able to be fit into 3
+bytes in hexadecimal format.
+
+Add an assertion to make gcc happy.
+
+Signed-off-by: Wei Liu 
+Acked-by: Ian Jackson 
+Signed-off-by: Fabrice Fontaine 
+[Retrieved from:
+https://github.com/xen-project/xen/commit/e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8]
+---
+ tools/xenpmd/xenpmd.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c
+index 56412a9a81c..1c801caa712 100644
+--- a/tools/xenpmd/xenpmd.c
++++ b/tools/xenpmd/xenpmd.c
+@@ -40,6 +40,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ /* #define RUN_STANDALONE */
+ #define RUN_IN_SIMULATE_MODE
+@@ -345,18 +346,17 @@ void write_ulong_lsb_first(char *temp_val, unsigned long val)
+ void write_battery_info_to_xenstore(struct battery_info *info)
+ {
+     char val[1024], string_info[256];
++    unsigned int len;
+ 
+     xs_mkdir(xs, XBT_NULL, "/pm");
+    
+     memset(val, 0, 1024);
+     memset(string_info, 0, 256);
+     /* write 9 dwords (so 9*4) + length of 4 strings + 4 null terminators */
+-    snprintf(val, 3, "%02x", 
+-             (unsigned int)(9*4 +
+-                            strlen(info->model_number) +
+-                            strlen(info->serial_number) +
+-                            strlen(info->battery_type) +
+-                            strlen(info->oem_info) + 4));
++    len = 9 * 4 + strlen(info->model_number) + strlen(info->serial_number) +
++          strlen(info->battery_type) + strlen(info->oem_info) + 4;
++    assert(len < 255);
++    snprintf(val, 3, "%02x", len);
+     write_ulong_lsb_first(val+2, info->present);
+     write_ulong_lsb_first(val+10, info->design_capacity);
+     write_ulong_lsb_first(val+18, info->last_full_capacity);
diff --git a/buildroot/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch b/buildroot/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch
new file mode 100644
index 000000000..f91a31daa
--- /dev/null
+++ b/buildroot/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch
@@ -0,0 +1,91 @@
+From cdc63fe259c70a8a5304aa07087650ebf4ee6b5d Mon Sep 17 00:00:00 2001
+From: Philippe Gerum 
+Date: Wed, 24 Oct 2018 11:28:49 +0200
+Subject: [PATCH] demos/posix: prevent unterminated destination buffer with
+ strncpy()
+
+GCC 8.x introduced -Wstringop-truncation to help detecting likely
+unwanted outcomes of strncpy(dst, src, n), such as omitting the NUL
+character into the destination buffer whenever n < sizeof(src).
+
+Fix unsafe strncpy() calls when we do expect a null-terminated
+destination buffer.
+
+Signed-off-by: Philippe Gerum 
+[Retrieved from
+https://gitlab.denx.de/Xenomai/xenomai/commit/cdc63fe259c70a8a5304aa07087650ebf4ee6b5d]
+Signed-off-by: Fabrice Fontaine 
+---
+ demo/posix/cobalt/can-rtt.c        | 4 ++--
+ demo/posix/cobalt/eth_p_all.c      | 3 ++-
+ demo/posix/cyclictest/cyclictest.c | 4 ++--
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/demo/posix/cobalt/can-rtt.c b/demo/posix/cobalt/can-rtt.c
+index 61cad05e5..dd212d804 100644
+--- a/demo/posix/cobalt/can-rtt.c
++++ b/demo/posix/cobalt/can-rtt.c
+@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
+ 	return -1;
+     }
+ 
+-    strncpy(ifr.ifr_name, rxdev, IFNAMSIZ);
++    namecpy(ifr.ifr_name, rxdev);
+     printf("RX rxsock=%d, ifr_name=%s\n", rxsock, ifr.ifr_name);
+ 
+     if (ioctl(rxsock, SIOCGIFINDEX, &ifr) < 0) {
+@@ -282,7 +282,7 @@ int main(int argc, char *argv[])
+ 	    goto failure1;
+ 	}
+ 
+-	strncpy(ifr.ifr_name, txdev, IFNAMSIZ);
++	namecpy(ifr.ifr_name, txdev);
+ 	printf("TX txsock=%d, ifr_name=%s\n", txsock, ifr.ifr_name);
+ 
+ 	if (ioctl(txsock, SIOCGIFINDEX, &ifr) < 0) {
+diff --git a/demo/posix/cobalt/eth_p_all.c b/demo/posix/cobalt/eth_p_all.c
+index 6ac12ab3e..91aef9fbd 100644
+--- a/demo/posix/cobalt/eth_p_all.c
++++ b/demo/posix/cobalt/eth_p_all.c
+@@ -40,6 +40,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ char buffer[10*1024];
+ int sock;
+@@ -72,7 +73,7 @@ int main(int argc, char *argv[])
+ 	if (argc > 1) {
+ 		struct ifreq ifr;
+ 
+-		strncpy(ifr.ifr_name, argv[1], IFNAMSIZ);
++		namecpy(ifr.ifr_name, argv[1]);
+ 		if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0) {
+ 			perror("cannot get interface index");
+ 			close(sock);
+diff --git a/demo/posix/cyclictest/cyclictest.c b/demo/posix/cyclictest/cyclictest.c
+index ebe5461db..76983bd02 100644
+--- a/demo/posix/cyclictest/cyclictest.c
++++ b/demo/posix/cyclictest/cyclictest.c
+@@ -1353,7 +1353,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
+ 		case 'F':
+ 		case OPT_FIFO:
+ 			use_fifo = 1;
+-			strncpy(fifopath, optarg, strlen(optarg));
++			strncpy(fifopath, optarg, sizeof(fifopath) - 1);
+ 			break;
+ 
+ 		case 'H':
+@@ -1458,7 +1458,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
+ 		case 'T':
+ 		case OPT_TRACER:
+ 			tracetype = CUSTOM;
+-			strncpy(tracer, optarg, sizeof(tracer));
++			strncpy(tracer, optarg, sizeof(tracer) - 1);
+ 			break;
+ 		case 'u':
+ 		case OPT_UNBUFFERED:
+-- 
+2.18.1
+
diff --git a/buildroot/package/xenomai/Config.in b/buildroot/package/xenomai/Config.in
index f3d8ea4ba..83ba8ca16 100644
--- a/buildroot/package/xenomai/Config.in
+++ b/buildroot/package/xenomai/Config.in
@@ -1,16 +1,18 @@
-config BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
+config BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS
 	bool
 	default y
 	depends on BR2_i386 || BR2_x86_64 || (BR2_arm && !BR2_ARM_CPU_ARMV7M) || \
 		BR2_powerpc
 
-comment "xenomai needs an glibc or uClibc toolchain w/ threads"
+comment "xenomai needs a glibc or uClibc toolchain w/ threads"
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL
-	depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
 
 config BR2_PACKAGE_XENOMAI
 	bool "Xenomai Userspace"
-	depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# uses , __WORDSIZE and bits/local_lim.h
 	depends on !BR2_TOOLCHAIN_USES_MUSL
@@ -67,6 +69,7 @@ config BR2_PACKAGE_XENOMAI_MERCURY
 
 config BR2_PACKAGE_XENOMAI_COBALT
 	bool "Cobalt"
+	depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS
 	help
 	  Select Cobalt core (dual kernel) for the Xenomai
 	  userspace. Use this if you use a Xenomai-patched
diff --git a/buildroot/package/xenomai/xenomai.mk b/buildroot/package/xenomai/xenomai.mk
index 6bf08edfb..98f550af6 100644
--- a/buildroot/package/xenomai/xenomai.mk
+++ b/buildroot/package/xenomai/xenomai.mk
@@ -24,9 +24,6 @@ XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \
 
 XENOMAI_DEPENDENCIES = host-pkgconf
 
-# 0002-boilerplate-build-obstack-support-conditionally.patch
-XENOMAI_AUTORECONF = YES
-
 XENOMAI_INSTALL_STAGING = YES
 XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
 XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
diff --git a/buildroot/package/xerces/Config.in b/buildroot/package/xerces/Config.in
index 8d55a5cbc..2edc4346b 100644
--- a/buildroot/package/xerces/Config.in
+++ b/buildroot/package/xerces/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_XERCES
 	help
 	  Xerces-C++ is a validating XML parser written in portable C++.
 
-	  http://xml.apache.org/xerces-c/
+	  http://xerces.apache.org/xerces-c/
 
 comment "xerces-c++ needs a toolchain w/ C++, wchar"
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
diff --git a/buildroot/package/xz/xz.hash b/buildroot/package/xz/xz.hash
index 20a4a4743..28018c76c 100644
--- a/buildroot/package/xz/xz.hash
+++ b/buildroot/package/xz/xz.hash
@@ -1,2 +1,8 @@
 # Locally calculated after checking pgp signature
 sha256 fd9ca16de1052aac899ad3495ad20dfa906c27b4a5070102a2ec35ca3a4740c1  xz-5.2.3.tar.bz2
+
+# Hash for license files
+sha256 c4f8e14fafe458d84808a4cd8b69f94673ebe2bf8fc992291629a69ac12218f8  COPYING
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING.GPLv2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING.GPLv3
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPLv2.1
diff --git a/buildroot/package/xz/xz.mk b/buildroot/package/xz/xz.mk
index bcdac13ee..6a0dc2581 100644
--- a/buildroot/package/xz/xz.mk
+++ b/buildroot/package/xz/xz.mk
@@ -9,8 +9,8 @@ XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = http://tukaani.org/xz
 XZ_INSTALL_STAGING = YES
 XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-XZ_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-2.1+
-XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
+XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+
+XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 XZ_CONF_OPTS = --enable-threads
diff --git a/buildroot/package/yaffs2utils/yaffs2utils.mk b/buildroot/package/yaffs2utils/yaffs2utils.mk
index c2a87eac7..d3a8bdc9d 100644
--- a/buildroot/package/yaffs2utils/yaffs2utils.mk
+++ b/buildroot/package/yaffs2utils/yaffs2utils.mk
@@ -15,6 +15,7 @@ define HOST_YAFFS2UTILS_BUILD_CMDS
 endef
 
 define HOST_YAFFS2UTILS_INSTALL_CMDS
+	mkdir -p $(HOST_DIR)/bin
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) INSTALLDIR=$(HOST_DIR)/bin install
 endef
 
diff --git a/buildroot/package/zbar/0001-Fix-autoreconf-by-reducing-the-warning-error-checkin.patch b/buildroot/package/zbar/0001-Fix-autoreconf-by-reducing-the-warning-error-checkin.patch
deleted file mode 100644
index 57fbeb1e7..000000000
--- a/buildroot/package/zbar/0001-Fix-autoreconf-by-reducing-the-warning-error-checkin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e593d6529cff515d94d80a24b5f3a953fd46004c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Sat, 19 Dec 2015 18:56:36 +0100
-Subject: [PATCH] Fix autoreconf by reducing the warning/error checking
-
-Signed-off-by: Thomas Petazzoni 
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 256aedb..e0b6046 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@ AC_PREREQ([2.61])
- AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(config)
--AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2])
-+AM_INIT_AUTOMAKE([1.10 foreign subdir-objects std-options dist-bzip2])
- AC_CONFIG_HEADERS([include/config.h])
- AC_CONFIG_SRCDIR(zbar/scanner.c)
- LT_PREREQ([2.2])
--- 
-2.6.4
-
diff --git a/buildroot/package/zbar/0002-Fix-function-protoype-to-be-compatible-with-recent-l.patch b/buildroot/package/zbar/0002-Fix-function-protoype-to-be-compatible-with-recent-l.patch
deleted file mode 100644
index 82dd4e96e..000000000
--- a/buildroot/package/zbar/0002-Fix-function-protoype-to-be-compatible-with-recent-l.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5dc8322b4f9a3de29b3da70b69e16356a2a1764c Mon Sep 17 00:00:00 2001
-From: Viacheslav Volkov 
-Date: Sat, 19 Dec 2015 19:07:09 +0100
-Subject: [PATCH] Fix function protoype to be compatible with recent libjpeg
-
-Signed-off-by: Viacheslav Volkov 
-Signed-off-by: Thomas Petazzoni 
----
- zbar/jpeg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zbar/jpeg.c b/zbar/jpeg.c
-index 972bfea..fdd1619 100644
---- a/zbar/jpeg.c
-+++ b/zbar/jpeg.c
-@@ -68,7 +68,7 @@ void init_source (j_decompress_ptr cinfo)
-     cinfo->src->bytes_in_buffer = img->datalen;
- }
- 
--int fill_input_buffer (j_decompress_ptr cinfo)
-+boolean fill_input_buffer (j_decompress_ptr cinfo)
- {
-     /* buffer underrun error case */
-     cinfo->src->next_input_byte = fake_eoi;
--- 
-2.6.4
-
diff --git a/buildroot/package/zbar/0003-Disable-building-documentation.patch b/buildroot/package/zbar/0003-Disable-building-documentation.patch
deleted file mode 100644
index 729f926cc..000000000
--- a/buildroot/package/zbar/0003-Disable-building-documentation.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 58027d5bb0492142a5b72ded772d3a1be9fa8d87 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Sun, 20 Dec 2015 12:05:57 +0100
-Subject: [PATCH] Disable building documentation
-
-The documentation requires xmlto, and we don't need it in Buildroot.
-
-Signed-off-by: Thomas Petazzoni 
----
- Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e18499a..db4411f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -45,7 +45,6 @@ if HAVE_NPAPI
- include $(srcdir)/plugin/Makefile.am.inc
- endif
- include $(srcdir)/test/Makefile.am.inc
--include $(srcdir)/doc/Makefile.am.inc
- 
- EXTRA_DIST += zbar.ico zbar.nsi
- 
--- 
-2.6.4
-
diff --git a/buildroot/package/zbar/0004-Wrap-logical-not-operations-into-parentheses.patch b/buildroot/package/zbar/0004-Wrap-logical-not-operations-into-parentheses.patch
deleted file mode 100644
index 6d39b1bd9..000000000
--- a/buildroot/package/zbar/0004-Wrap-logical-not-operations-into-parentheses.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 7e69cdc8dfdf07701ba551985ee49d48e64d730f Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera 
-Date: Mon, 25 Jan 2016 11:58:59 +0000
-Subject: [PATCH] Wrap logical not operations into parentheses
-
-Otherwise it fails like this:
-
-zbar/decoder/ean.c: In function 'ean_part_end4':
-zbar/decoder/ean.c:297:13: error: logical not is only applied to the
-left hand side of comparison [-Werror=logical-not-parentheses]
-     if(!par == fwd) {
-
-This patch has been sent upstream as a pull request:
-
-  https://github.com/ZBar/ZBar/pull/9
-
-Signed-off-by: Vicente Olivert Riera 
----
- zbar/decoder/ean.c  | 4 ++--
- zbar/qrcode/qrdec.c | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c
-index c20f538..41d1493 100644
---- a/zbar/decoder/ean.c
-+++ b/zbar/decoder/ean.c
-@@ -294,7 +294,7 @@ static inline zbar_symbol_type_t ean_part_end4 (ean_pass_t *pass,
-         /* invalid parity combination */
-         return(ZBAR_NONE);
- 
--    if(!par == fwd) {
-+    if((!par) == fwd) {
-         /* reverse sampled digits */
-         unsigned char tmp = pass->raw[1];
-         pass->state |= STATE_REV;
-@@ -380,7 +380,7 @@ static inline zbar_symbol_type_t ean_part_end7 (ean_decoder_t *ean,
-         /* invalid parity combination */
-         return(ZBAR_NONE);
- 
--    if(!par == fwd) {
-+    if((!par) == fwd) {
-         unsigned char i;
-         pass->state |= STATE_REV;
-         /* reverse sampled digits */
-diff --git a/zbar/qrcode/qrdec.c b/zbar/qrcode/qrdec.c
-index d8fa802..5d3d265 100644
---- a/zbar/qrcode/qrdec.c
-+++ b/zbar/qrcode/qrdec.c
-@@ -1219,8 +1219,8 @@ static int qr_finder_quick_crossing_check(const unsigned char *_img,
-    _x1<0||_x1>=_width||_y1<0||_y1>=_height){
-     return -1;
-   }
--  if(!_img[_y0*_width+_x0]!=_v||!_img[_y1*_width+_x1]!=_v)return 1;
--  if(!_img[(_y0+_y1>>1)*_width+(_x0+_x1>>1)]==_v)return -1;
-+  if((!_img[_y0*_width+_x0])!=_v||(!_img[_y1*_width+_x1])!=_v)return 1;
-+  if((!_img[(_y0+_y1>>1)*_width+(_x0+_x1>>1)])==_v)return -1;
-   return 0;
- }
- 
-@@ -1261,7 +1261,7 @@ static int qr_finder_locate_crossing(const unsigned char *_img,
-       x0[1-steep]+=step[1-steep];
-       err-=dx[steep];
-     }
--    if(!_img[x0[1]*_width+x0[0]]!=_v)break;
-+    if((!_img[x0[1]*_width+x0[0]])!=_v)break;
-   }
-   /*Find the last crossing from _v to !_v.*/
-   err=0;
-@@ -1273,7 +1273,7 @@ static int qr_finder_locate_crossing(const unsigned char *_img,
-       x1[1-steep]-=step[1-steep];
-       err-=dx[steep];
-     }
--    if(!_img[x1[1]*_width+x1[0]]!=_v)break;
-+    if((!_img[x1[1]*_width+x1[0]])!=_v)break;
-   }
-   /*Return the midpoint of the _v segment.*/
-   _p[0]=(x0[0]+x1[0]+1<>1;
--- 
-2.4.10
-
diff --git a/buildroot/package/zbar/Config.in b/buildroot/package/zbar/Config.in
index 05c9b769c..e850c1f02 100644
--- a/buildroot/package/zbar/Config.in
+++ b/buildroot/package/zbar/Config.in
@@ -3,15 +3,15 @@ config BR2_PACKAGE_ZBAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l
 	depends on BR2_USE_MMU # libv4l
 	depends on BR2_INSTALL_LIBSTDCPP # libv4l
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # v4l2_query_ext_ctrl
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBV4L
 	help
 	  QR and barcode scanner
 
-	  http://zbar.sourceforge.net/
+	  https://git.linuxtv.org/zbar.git/about/
 
-comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.0"
+comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.17"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS \
-		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
diff --git a/buildroot/package/zbar/zbar.hash b/buildroot/package/zbar/zbar.hash
index 54441a8f3..6735bc67d 100644
--- a/buildroot/package/zbar/zbar.hash
+++ b/buildroot/package/zbar/zbar.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256 38f8535a3c4c526ecaa968a992efcbf7392623e68db45dc2f181d4c9d3002d69 zbar-854a5d97059e395807091ac4d80c53f7968abb8f.tar.gz
+sha256 94c71c6110c705f07ba5ba2803583d09b3853e8773169c86bdcf831443156aaa zbar-57d601e82089f2f31de9e1683c3834f237421f5d.tar.gz
+sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 LICENSE
diff --git a/buildroot/package/zbar/zbar.mk b/buildroot/package/zbar/zbar.mk
index c8fc89951..c3f0797c5 100644
--- a/buildroot/package/zbar/zbar.mk
+++ b/buildroot/package/zbar/zbar.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-# github have some additional commits for compiling with recent kernel
-ZBAR_VERSION = 854a5d97059e395807091ac4d80c53f7968abb8f
-ZBAR_SITE = $(call github,ZBar,Zbar,$(ZBAR_VERSION))
+ZBAR_VERSION = 57d601e82089f2f31de9e1683c3834f237421f5d
+ZBAR_SITE = git://linuxtv.org/zbar.git
 ZBAR_LICENSE = LGPL-2.1+
 ZBAR_LICENSE_FILES = LICENSE
 ZBAR_INSTALL_STAGING = YES
@@ -14,11 +13,16 @@ ZBAR_AUTORECONF = YES
 ZBAR_DEPENDENCIES = libv4l jpeg
 # add host-gettext for AM_ICONV macro
 ZBAR_DEPENDENCIES += host-gettext
+# uses C99 features
+ZBAR_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
 ZBAR_CONF_OPTS = \
+	--disable-doc \
 	--without-imagemagick \
 	--without-qt \
+	--without-qt5 \
 	--without-gtk \
-	--without-python \
-	--without-x
+	--without-python2 \
+	--without-x \
+	--without-java
 
 $(eval $(autotools-package))
diff --git a/buildroot/package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch b/buildroot/package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch
deleted file mode 100644
index 1037a67fe..000000000
--- a/buildroot/package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 194b3836c87f77aca34581656ff99da49813d8c3 Mon Sep 17 00:00:00 2001
-From: Asaf Kahlon 
-Date: Fri, 13 Apr 2018 11:56:46 +0300
-Subject: [PATCH] configure.ac: search for dladdr only on libunwind
-
-The original configure.ac tries to check for dladdr, but it actually needs
-it only in case we have libunwind (which has a another section and checks for it
-too).
-This can fail the build on systems without dynamic linking support.
-Therefore, the dladdr check has to be performed only when checking libunwind.
-
-Signed-off-by: Asaf Kahlon 
-Upstream-status: https://github.com/zeromq/libzmq/commit/c971445025535b9f989ab0b78f5ddd1c026f1878
----
- configure.ac | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 216b2bc4..0858a6c1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -174,11 +174,6 @@ case "${host_os}" in
-         AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS])
-         libzmq_on_linux="yes"
- 
--        # dladdr/dlopen is in libdl on glibc
--        AC_SEARCH_LIBS([dladdr], [dl dld], [], [
--          AC_MSG_ERROR([unable to find the dladdr() function])
--        ])
--
-         if test "x$libzmq_tipc_support" = "xyes"; then
-             AC_DEFINE(ZMQ_HAVE_TIPC, 1, [Have TIPC support])
-         fi
-@@ -783,7 +778,7 @@ if test "x$enable_libunwind" != "xno"; then
-             AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
-             AC_SUBST([LIBUNWIND_CFLAGS])
-             AC_SUBST([LIBUNWIND_LIBS])
--            AC_CHECK_LIB([dl], [dladdr])
-+            AC_SEARCH_LIBS([dladdr], [dl dld])
-         ],
-         [
-             if test "x$enable_libunwind" = "xyes"; then
--- 
-2.17.0
-
diff --git a/buildroot/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch b/buildroot/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch
deleted file mode 100644
index 233b36466..000000000
--- a/buildroot/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 9f4ca582555b208d065f730b5ce3b1901136b275 Mon Sep 17 00:00:00 2001
-From: Asaf Kahlon 
-Date: Mon, 7 May 2018 23:19:09 +0300
-Subject: [PATCH] acinclude.m4: check if -latomic is needed
-
-On some cases, -latomic is needed for linking, and since the current
-acinclude.m4 checks only compilation we can sometimes miss the need for -latomic
-and the linking process will fail.
-Therefore, the AC_CHECK_IFELSE was replaced with AC_LINK_IFELSE. If the first
-try fails, we try to link again with -latomic and add LIBS="-latomic" in case we
-succeeded.
-
-Signed-off-by: Asaf Kahlon 
-Signed-off-by: Fabrice Fontaine 
-[Update to use LIBS: https://github.com/zeromq/libzmq/pull/3250]
----
- acinclude.m4 | 31 +++++++++++++++++++++++++++----
- 1 file changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index f648ed0f..aa35195f 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -668,7 +668,7 @@ dnl # Check if compiler supoorts __atomic_Xxx intrinsics
- dnl ################################################################################
- AC_DEFUN([LIBZMQ_CHECK_ATOMIC_INTRINSICS], [{
-     AC_MSG_CHECKING(whether compiler supports __atomic_Xxx intrinsics)
--    AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+    AC_LINK_IFELSE([AC_LANG_SOURCE([
- /* atomic intrinsics test */
- int v = 0;
- int main (int, char **)
-@@ -677,9 +677,32 @@ int main (int, char **)
-     return t;
- }
-     ])],
--    [AC_MSG_RESULT(yes) ; libzmq_cv_has_atomic_instrisics="yes" ; $1],
--    [AC_MSG_RESULT(no)  ; libzmq_cv_has_atomic_instrisics="no"  ; $2]
--    )
-+    [libzmq_cv_has_atomic_instrisics="yes"],
-+    [libzmq_cv_has_atomic_instrisics="no"])
-+
-+    if test "x$libzmq_cv_has_atomic_instrisics" = "xno"; then
-+        save_LIBS=$LIBS
-+        LIBS="$LIBS -latomic"
-+        AC_LINK_IFELSE([AC_LANG_SOURCE([
-+        /* atomic intrinsics test */
-+        int v = 0;
-+        int main (int, char **)
-+        {
-+            int t = __atomic_add_fetch (&v, 1, __ATOMIC_ACQ_REL);
-+            return t;
-+        }
-+        ])],
-+        [libzmq_cv_has_atomic_instrisics="yes"],
-+        [libzmq_cv_has_atomic_instrisics="no" LIBS=$save_LIBS])
-+    fi
-+
-+    if test "x$libzmq_cv_has_atomic_instrisics" = "xyes"; then
-+        AC_MSG_RESULT(yes)
-+        $1
-+    else
-+        AC_MSG_RESULT(no)
-+        $2
-+    fi
- }])
- 
- dnl ################################################################################
--- 
-2.17.0
-
diff --git a/buildroot/package/zeromq/Config.in b/buildroot/package/zeromq/Config.in
index 69be9f002..aeedff17b 100644
--- a/buildroot/package/zeromq/Config.in
+++ b/buildroot/package/zeromq/Config.in
@@ -52,4 +52,11 @@ config BR2_PACKAGE_ZEROMQ_PGM
 	  3208) implemented either over raw IP packets or UDP
 	  datagrams (encapsulated PGM).
 
+config BR2_PACKAGE_ZEROMQ_DRAFTS
+	bool "Draft APIs support"
+	help
+	  Enable unstable draft ZeroMQ APIs
+
+	  https://pyzmq.readthedocs.io/en/latest/draft.html
+
 endif
diff --git a/buildroot/package/zeromq/zeromq.hash b/buildroot/package/zeromq/zeromq.hash
index 86380c029..5af6a3ff8 100644
--- a/buildroot/package/zeromq/zeromq.hash
+++ b/buildroot/package/zeromq/zeromq.hash
@@ -1,5 +1,7 @@
 # From https://github.com/zeromq/libzmq/releases
-md5  a1c95b34384257e986842f4d006957b8  zeromq-4.2.5.tar.gz
-sha1 1132f839d703486c4ee1cf22f056585dfbb329c2  zeromq-4.2.5.tar.gz
+md5  64cbf3577afdbfda30358bc757a6ac83  zeromq-4.3.1.tar.gz
+sha1 6cce22d830eaf95feff7cab00744df13ad7ab7f3  zeromq-4.3.1.tar.gz
 # Locally computed
-sha256 cc9090ba35713d59bb2f7d7965f877036c49c5558ea0c290b0dcc6f2a17e489f  zeromq-4.2.5.tar.gz
+sha256 bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb  zeromq-4.3.1.tar.gz
+sha256 4fd86507c9b486764343065a9e035222869a27b5789efeb4fd93edc85412d7a3  COPYING
+sha256 83f32abe61ee58ffb1b007412c08415168c052501dbf56d7a47aaaac52b03ef6  COPYING.LESSER
diff --git a/buildroot/package/zeromq/zeromq.mk b/buildroot/package/zeromq/zeromq.mk
index 4b25c7d67..d799f863c 100644
--- a/buildroot/package/zeromq/zeromq.mk
+++ b/buildroot/package/zeromq/zeromq.mk
@@ -4,15 +4,13 @@
 #
 ################################################################################
 
-ZEROMQ_VERSION = 4.2.5
+ZEROMQ_VERSION = 4.3.1
 ZEROMQ_SITE = https://github.com/zeromq/libzmq/releases/download/v$(ZEROMQ_VERSION)
 ZEROMQ_INSTALL_STAGING = YES
 ZEROMQ_DEPENDENCIES = util-linux
 ZEROMQ_CONF_OPTS = --without-documentation
 ZEROMQ_LICENSE = LGPL-3.0+ with exceptions
 ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER
-# 0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch touches configure.ac
-ZEROMQ_AUTORECONF = YES
 
 # Assume these flags are always available. It is true, at least for
 # SOCK_CLOEXEC, since linux v2.6.27.
@@ -49,6 +47,12 @@ else
 ZEROMQ_CONF_OPTS += --without-pgm
 endif
 
+ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y)
+ZEROMQ_CONF_OPTS += --enable-drafts
+else
+ZEROMQ_CONF_OPTS += --disable-drafts
+endif
+
 # ZeroMQ uses libsodium if it's available.
 ifeq ($(BR2_PACKAGE_LIBSODIUM),y)
 ZEROMQ_DEPENDENCIES += libsodium
diff --git a/buildroot/package/zmqpp/zmqpp.mk b/buildroot/package/zmqpp/zmqpp.mk
index 801766a7d..ea6b50e82 100644
--- a/buildroot/package/zmqpp/zmqpp.mk
+++ b/buildroot/package/zmqpp/zmqpp.mk
@@ -19,6 +19,7 @@ ZMQPP_CONFIG = $(if $(BR2_ENABLE_DEBUG),debug,release)
 # By setting CONFIG to empty, all optimizations such as -funroll-loops
 # -ffast-math -finline-functions -fomit-frame-pointer are disabled
 ifeq ($(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:)
+# check-package OverriddenVariable
 ZMQPP_CONFIG =
 endif
 
diff --git a/buildroot/package/znc/znc.hash b/buildroot/package/znc/znc.hash
index 7a1459590..b685a7bf7 100644
--- a/buildroot/package/znc/znc.hash
+++ b/buildroot/package/znc/znc.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 44cfea7158ea05dc2547c7c6bc22371e66c869def90351de0ab90a9c200d39c4  znc-1.7.1.tar.gz
+sha256 1e4cc31837a1e8e6cc310873659a167cec16a3fd4281cbc3bf364e42352c113d  znc-1.7.3.tar.gz
 sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/buildroot/package/znc/znc.mk b/buildroot/package/znc/znc.mk
index 5235fd919..fdc147a8a 100644
--- a/buildroot/package/znc/znc.mk
+++ b/buildroot/package/znc/znc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZNC_VERSION = 1.7.1
+ZNC_VERSION = 1.7.3
 ZNC_SITE = http://znc.in/releases/archive
 ZNC_LICENSE = Apache-2.0
 ZNC_LICENSE_FILES = LICENSE
diff --git a/buildroot/support/config-fragments/autobuild/armv5-ctng-linux-gnueabi.config b/buildroot/support/config-fragments/autobuild/armv5-ctng-linux-gnueabi.config
deleted file mode 100644
index c2f4cb62c..000000000
--- a/buildroot/support/config-fragments/autobuild/armv5-ctng-linux-gnueabi.config
+++ /dev/null
@@ -1,10 +0,0 @@
-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/armv5-ctng-linux-gnueabi.tar.xz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv5-ctng-linux-gnueabi"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/armv7-ctng-linux-gnueabihf.config b/buildroot/support/config-fragments/autobuild/armv7-ctng-linux-gnueabihf.config
deleted file mode 100644
index 60ec95294..000000000
--- a/buildroot/support/config-fragments/autobuild/armv7-ctng-linux-gnueabihf.config
+++ /dev/null
@@ -1,13 +0,0 @@
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-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/armv7-ctng-linux-gnueabihf.tar.xz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv7-ctng-linux-gnueabihf"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config b/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config
index 19c9473a7..048c27d6c 100644
--- a/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config b/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config
index 280f8524c..0832ddd30 100644
--- a/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config
+++ b/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config
@@ -3,9 +3,9 @@ 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-2018.02-926-gb393c24.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-arm-basic.config b/buildroot/support/config-fragments/autobuild/br-arm-basic.config
index eadf78f71..c576b248b 100644
--- a/buildroot/support/config-fragments/autobuild/br-arm-basic.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config
index f67d955e8..63fb66983 100644
--- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_20=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config
index 8db615c13..3a1499e32 100644
--- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config
index 1ce4bdc5b..36f164773 100644
--- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=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/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config b/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config
index 1120f4619..a777d24e6 100644
--- a/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full-static.config b/buildroot/support/config-fragments/autobuild/br-arm-full-static.config
index 157fc0222..2e41e0b34 100644
--- a/buildroot/support/config-fragments/autobuild/br-arm-full-static.config
+++ b/buildroot/support/config-fragments/autobuild/br-arm-full-static.config
@@ -3,9 +3,9 @@ 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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full.config b/buildroot/support/config-fragments/autobuild/br-arm-full.config
index 07c773e90..7462706a0 100644
--- a/buildroot/support/config-fragments/autobuild/br-arm-full.config
+++ b/buildroot/support/config-fragments/autobuild/br-arm-full.config
@@ -2,9 +2,9 @@ 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-2018.05.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2019.02-rc1.tar.bz2"
 BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config
index 9eee78079..fa91cfefe 100644
--- a/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config
+++ b/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config
@@ -2,9 +2,9 @@ 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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config
index e7a97351c..bf0d4165c 100644
--- a/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config
+++ b/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config
@@ -2,9 +2,9 @@ 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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_2=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config
index 3f809ea4a..f75cf3ac5 100644
--- a/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=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/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config
index 27ce4e349..1bb6aeb8b 100644
--- a/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=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/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config b/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config
index 8c4778770..035cb72e8 100644
--- a/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config
+++ b/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config
@@ -1,9 +1,9 @@
 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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config
index 818f99e53..7454a4da2 100644
--- a/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config b/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config
index ca625c9e4..3f2e5d9ba 100644
--- a/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config
+++ b/buildroot/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-2018.05.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2019.02-rc1.tar.bz2"
 BR2_TOOLCHAIN_EXTERNAL_GCC_5=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config
index 96a333c6b..b47b43416 100644
--- a/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config b/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config
index aae01a919..6cf919b1e 100644
--- a/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config b/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config
index be5cb7e29..e25ea65a3 100644
--- a/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config
+++ b/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config
@@ -2,9 +2,9 @@ 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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config b/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config
index 37c3989b5..0f19616ab 100644
--- a/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config b/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config
index 08cb3f382..1673adbc0 100644
--- a/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config
index bc9968263..fb5159341 100644
--- a/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config
index 15703e60d..964a13e2b 100644
--- a/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-riscv32.config b/buildroot/support/config-fragments/autobuild/br-riscv32.config
new file mode 100644
index 000000000..9565a0b70
--- /dev/null
+++ b/buildroot/support/config-fragments/autobuild/br-riscv32.config
@@ -0,0 +1,8 @@
+BR2_riscv=y
+BR2_RISCV_32=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv32-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64-internal-glibc.config b/buildroot/support/config-fragments/autobuild/br-riscv64-internal-glibc.config
deleted file mode 100644
index 75aa5dd91..000000000
--- a/buildroot/support/config-fragments/autobuild/br-riscv64-internal-glibc.config
+++ /dev/null
@@ -1,2 +0,0 @@
-BR2_riscv=y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64.config b/buildroot/support/config-fragments/autobuild/br-riscv64.config
new file mode 100644
index 000000000..61912cfd7
--- /dev/null
+++ b/buildroot/support/config-fragments/autobuild/br-riscv64.config
@@ -0,0 +1,7 @@
+BR2_riscv=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-sh4-full.config b/buildroot/support/config-fragments/autobuild/br-sh4-full.config
index 018706d9e..3651fb6ee 100644
--- a/buildroot/support/config-fragments/autobuild/br-sh4-full.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config b/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config
index 2e13937b9..d6b8d69e6 100644
--- a/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config
+++ b/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config
@@ -1,9 +1,9 @@
 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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config b/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config
index 78a8216e2..a4d1cc668 100644
--- a/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config
+++ b/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config
@@ -1,8 +1,8 @@
 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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config b/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config
index 7cdb738b3..29ac6891f 100644
--- a/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config
+++ b/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config
@@ -3,9 +3,9 @@ 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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config b/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config
index 5a59485aa..595d968f3 100644
--- a/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/br-xtensa-full.config b/buildroot/support/config-fragments/autobuild/br-xtensa-full.config
index 44845cd32..bd531abbf 100644
--- a/buildroot/support/config-fragments/autobuild/br-xtensa-full.config
+++ b/buildroot/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-2018.05.tar.bz2"
-BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2019.02-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
 # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/i686-ctng-linux-gnu.config b/buildroot/support/config-fragments/autobuild/i686-ctng-linux-gnu.config
deleted file mode 100644
index 9a961123c..000000000
--- a/buildroot/support/config-fragments/autobuild/i686-ctng-linux-gnu.config
+++ /dev/null
@@ -1,10 +0,0 @@
-BR2_x86_i686=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/i686-ctng-linux-gnu.tar.xz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i686-ctng-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/mips64el-ctng_n32-linux-gnu.config b/buildroot/support/config-fragments/autobuild/mips64el-ctng_n32-linux-gnu.config
deleted file mode 100644
index cf33ea26f..000000000
--- a/buildroot/support/config-fragments/autobuild/mips64el-ctng_n32-linux-gnu.config
+++ /dev/null
@@ -1,9 +0,0 @@
-BR2_mips64el=y
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mips64el-ctng_n32-linux-gnu.tar.xz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="mips64el-ctng_n32-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/mips64el-ctng_n64-linux-gnu.config b/buildroot/support/config-fragments/autobuild/mips64el-ctng_n64-linux-gnu.config
deleted file mode 100644
index 942a1b13b..000000000
--- a/buildroot/support/config-fragments/autobuild/mips64el-ctng_n64-linux-gnu.config
+++ /dev/null
@@ -1,11 +0,0 @@
-BR2_mips64el=y
-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/mips64el-ctng_n64-linux-gnu.tar.xz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="mips64el-ctng_n64-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/powerpc-ctng_e500v2-linux-gnuspe.config b/buildroot/support/config-fragments/autobuild/powerpc-ctng_e500v2-linux-gnuspe.config
deleted file mode 100644
index e82d3fbda..000000000
--- a/buildroot/support/config-fragments/autobuild/powerpc-ctng_e500v2-linux-gnuspe.config
+++ /dev/null
@@ -1,11 +0,0 @@
-BR2_powerpc=y
-BR2_powerpc_8548=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/powerpc-ctng_e500v2-linux-gnuspe.tar.xz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="powerpc-ctng_e500v2-linux-gnuspe"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_7=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/config-fragments/autobuild/toolchain-configs.csv b/buildroot/support/config-fragments/autobuild/toolchain-configs.csv
index f24ec9ced..60ce1a978 100644
--- a/buildroot/support/config-fragments/autobuild/toolchain-configs.csv
+++ b/buildroot/support/config-fragments/autobuild/toolchain-configs.csv
@@ -19,11 +19,10 @@ support/config-fragments/autobuild/br-x86-64-musl.config,x86_64
 support/config-fragments/autobuild/br-arm-full-static.config,x86_64
 
 # Test a toolchain with an old gcc version (gcc 4.8)
-support/config-fragments/autobuild/armv5-ctng-linux-gnueabi.config,x86
+support/config-fragments/autobuild/sourcery-arm.config,x86
 
 # Toolchains used by test-pkg only when the '-a' option is passed:
 support/config-fragments/autobuild/arm-aarch64.config,x86_64
-support/config-fragments/autobuild/armv7-ctng-linux-gnueabihf.config,x86
 support/config-fragments/autobuild/br-aarch64-glibc.config,x86_64
 support/config-fragments/autobuild/br-arc-full-internal.config,any
 support/config-fragments/autobuild/br-arc-internal-glibc.config,any
@@ -51,25 +50,20 @@ support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config,x86_64
 support/config-fragments/autobuild/br-powerpc64-power7-glibc.config,x86_64
 support/config-fragments/autobuild/br-powerpc-e500mc-full.config,x86_64
 support/config-fragments/autobuild/br-powerpc-internal-full.config,any
-support/config-fragments/autobuild/br-riscv64-internal-glibc.config,any
+support/config-fragments/autobuild/br-riscv32.config,x86_64
+support/config-fragments/autobuild/br-riscv64.config,x86_64
 support/config-fragments/autobuild/br-sh4-full.config,x86_64
 support/config-fragments/autobuild/br-sparc-uclibc.config,x86_64
 support/config-fragments/autobuild/br-sparc64-glibc.config,x86_64
 support/config-fragments/autobuild/br-x86-64-core2-full.config,x86_64
 support/config-fragments/autobuild/br-xtensa-full.config,x86_64
 support/config-fragments/autobuild/br-xtensa-full-internal.config,any
-support/config-fragments/autobuild/i686-ctng-linux-gnu.config,x86
 support/config-fragments/autobuild/linaro-aarch64.config,x86
 support/config-fragments/autobuild/linaro-aarch64-be.config,x86
 support/config-fragments/autobuild/linaro-arm.config,x86
-support/config-fragments/autobuild/mips64el-ctng_n32-linux-gnu.config,x86
-support/config-fragments/autobuild/mips64el-ctng_n64-linux-gnu.config,x86
-support/config-fragments/autobuild/powerpc-ctng_e500v2-linux-gnuspe.config,x86
 support/config-fragments/autobuild/sourcery-arm-armv4t.config,x86
-support/config-fragments/autobuild/sourcery-arm.config,x86
 support/config-fragments/autobuild/sourcery-arm-thumb2.config,x86
 support/config-fragments/autobuild/sourcery-mips64.config,x86
 support/config-fragments/autobuild/sourcery-mips.config,x86
 support/config-fragments/autobuild/sourcery-nios2.config,x86
 support/config-fragments/autobuild/sourcery-x86-64.config,x86
-support/config-fragments/autobuild/x86_64-ctng_locales-linux-gnu.config,x86
diff --git a/buildroot/support/config-fragments/autobuild/x86_64-ctng_locales-linux-gnu.config b/buildroot/support/config-fragments/autobuild/x86_64-ctng_locales-linux-gnu.config
deleted file mode 100644
index 435034be2..000000000
--- a/buildroot/support/config-fragments/autobuild/x86_64-ctng_locales-linux-gnu.config
+++ /dev/null
@@ -1,11 +0,0 @@
-BR2_x86_64=y
-BR2_x86_corei7=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/x86_64-ctng_locales-linux-gnu.tar.xz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="x86_64-ctng_locales-linux-gnu"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/buildroot/support/dependencies/check-host-cmake.mk b/buildroot/support/dependencies/check-host-cmake.mk
index 4300e6f60..5604713de 100644
--- a/buildroot/support/dependencies/check-host-cmake.mk
+++ b/buildroot/support/dependencies/check-host-cmake.mk
@@ -1,14 +1,9 @@
-# Versions before 3.0 are affected by the bug described in
-# https://git.busybox.net/buildroot/commit/?id=ef2c1970e4bff3be3992014070392b0e6bc28bd2
-# and fixed in upstream CMake in version 3.0:
-# https://cmake.org/gitweb?p=cmake.git;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568
-#
-# Set this to either 3.0 or higher, depending on the highest minimum
+# Set this to either 3.8 or higher, depending on the highest minimum
 # version required by any of the packages bundled in Buildroot. If a
 # package is bumped or a new one added, and it requires a higher
-# version, our cmake infra will catch it and whine.
+# version, our cmake infra will catch it and build its own.
 #
-BR2_CMAKE_VERSION_MIN = 3.1
+BR2_CMAKE_VERSION_MIN = 3.8
 
 BR2_CMAKE_CANDIDATES ?= cmake cmake3
 BR2_CMAKE ?= $(call suitable-host-package,cmake,\
diff --git a/buildroot/support/dependencies/check-host-gzip.mk b/buildroot/support/dependencies/check-host-gzip.mk
new file mode 100644
index 000000000..bf9a369a7
--- /dev/null
+++ b/buildroot/support/dependencies/check-host-gzip.mk
@@ -0,0 +1,3 @@
+ifeq (,$(call suitable-host-package,gzip))
+BR2_GZIP_HOST_DEPENDENCY = host-gzip
+endif
diff --git a/buildroot/support/dependencies/check-host-gzip.sh b/buildroot/support/dependencies/check-host-gzip.sh
new file mode 100755
index 000000000..5f344c5f9
--- /dev/null
+++ b/buildroot/support/dependencies/check-host-gzip.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+candidate="$1" # ignored
+
+gzip="$(which gzip)"
+if [ ! -x "${gzip}" ]; then
+    # echo nothing: no suitable gzip found
+    exit 1
+fi
+
+# gzip displays its version string on stdout
+# pigz displays its version string on stderr
+version="$("${gzip}" --version 2>&1)"
+case "${version}" in
+  (*pigz*)
+    # echo nothing: no suitable gzip found
+    exit 1
+    ;;
+esac
+
+printf "%s" "${gzip}"
diff --git a/buildroot/support/dependencies/check-host-tar.sh b/buildroot/support/dependencies/check-host-tar.sh
index 085730739..934cb6129 100755
--- a/buildroot/support/dependencies/check-host-tar.sh
+++ b/buildroot/support/dependencies/check-host-tar.sh
@@ -20,10 +20,11 @@ major=`echo "$version" | cut -d. -f1`
 minor=`echo "$version" | cut -d. -f2`
 bugfix=`echo "$version" | cut -d. -f3`
 version_bsd=`$tar --version | grep 'bsdtar'`
-if [ ! -z "${version_bsd}" ] ; then 
-  # mark as invalid version - not all command line options are available
-  major=0
-  minor=0
+
+# BSD tar does not have all the command-line options
+if [ -n "${version_bsd}" ] ; then
+    # echo nothing: no suitable tar found
+    exit 1
 fi
 
 # Minimal version = 1.27 (previous versions do not correctly unpack archives
diff --git a/buildroot/support/dependencies/dependencies.mk b/buildroot/support/dependencies/dependencies.mk
index 563574d6a..4fac5c731 100644
--- a/buildroot/support/dependencies/dependencies.mk
+++ b/buildroot/support/dependencies/dependencies.mk
@@ -5,6 +5,11 @@
 #
 ################################################################################
 
+ifeq ($(BR2_FORCE_HOST_BUILD),y)
+# ignore all available host packages
+define suitable-host-package
+endef
+else
 # suitable-host-pkg: calls check-host-$(1).sh shell script. Parameter (2)
 # can be the candidate to be checked. If not present, the check-host-$(1).sh
 # script should use 'which' to find a candidate. The script should return
@@ -12,6 +17,7 @@
 define suitable-host-package
 $(shell support/dependencies/check-host-$(1).sh $(2))
 endef
+endif
 # host utilities needs host-tar to extract the source code tarballs, so
 # ensure check-host-tar.mk is included before the rest
 include support/dependencies/check-host-tar.mk
diff --git a/buildroot/support/dependencies/dependencies.sh b/buildroot/support/dependencies/dependencies.sh
index 58c34d880..60c63d774 100755
--- a/buildroot/support/dependencies/dependencies.sh
+++ b/buildroot/support/dependencies/dependencies.sh
@@ -181,6 +181,14 @@ if test "${missing_progs}" = "yes" ; then
 	exit 1
 fi
 
+# Check that the python version is at least 2.7
+PYTHON_VERSION=$(python -V 2>&1 |awk '{ split($2, v, "."); print v[1] v[2] }')
+if [ $PYTHON_VERSION -lt 27 ]; then
+	echo
+	echo "You have '$(python -V 2>&1)' installed.  Python >= 2.7 is required"
+	exit 1;
+fi
+
 if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then
 	if ! which locale > /dev/null ; then
 		echo
@@ -224,6 +232,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then
 		echo "libstdc++6:i386, and zlib1g:i386)."
 		echo "If you're running a RedHat/Fedora distribution, install the glibc.i686 and"
 		echo "zlib.i686 packages."
+		echo "If you're running an ArchLinux distribution, install lib32-glibc."
 		echo "For other distributions, refer to the documentation on how to install the 32 bits"
 		echo "compatibility libraries."
 		exit 1
diff --git a/buildroot/support/download/scp b/buildroot/support/download/scp
index 8ecf2f4b2..80cf495c4 100755
--- a/buildroot/support/download/scp
+++ b/buildroot/support/download/scp
@@ -8,7 +8,8 @@ set -e
 # Options:
 #   -q          Be quiet.
 #   -o FILE     Copy to local file FILE.
-#   -u FILE     Copy from remote file FILE.
+#   -f FILE     Copy from remote file FILE.
+#   -u URI      Download file at URI.
 #
 # Environment:
 #   SCP       : the scp command to call
@@ -18,6 +19,7 @@ while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do
     case "${OPT}" in
     q)  verbose=-q;;
     o)  output="${OPTARG}";;
+    f)  filename="${OPTARG}";;
     u)  uri="${OPTARG}";;
     :)  printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;;
     \?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;;
@@ -32,4 +34,7 @@ _scp() {
     eval ${SCP} "${@}"
 }
 
-_scp ${verbose} "${@}" "'${uri}'" "'${output}'"
+# Remove any scheme prefix
+uri="${uri##scp://}"
+
+_scp ${verbose} "${@}" "'${uri}/${filename}'" "'${output}'"
diff --git a/buildroot/support/gnuconfig/config.sub b/buildroot/support/gnuconfig/config.sub
index 6d86a1e2f..45dd0a7d0 100755
--- a/buildroot/support/gnuconfig/config.sub
+++ b/buildroot/support/gnuconfig/config.sub
@@ -254,6 +254,7 @@ case $basic_machine in
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
+	| csky \
 	| ba \
 	| be32 | be64 \
 	| bfin \
@@ -376,6 +377,7 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| csky-* \
 	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
diff --git a/buildroot/support/kconfig/merge_config.sh b/buildroot/support/kconfig/merge_config.sh
index 50de5114d..14917806a 100755
--- a/buildroot/support/kconfig/merge_config.sh
+++ b/buildroot/support/kconfig/merge_config.sh
@@ -34,12 +34,16 @@ usage() {
 	echo "  -r    list redundant entries when merging fragments"
 	echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
 	echo "  -e    colon-separated list of br2-external trees to use (optional)"
+	echo
+	echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_
+	environment variable."
 }
 
 RUNMAKE=true
 ALLTARGET=alldefconfig
 WARNREDUN=false
 OUTPUT=.
+CONFIG_PREFIX=${CONFIG_-CONFIG_}
 
 while true; do
 	case $1 in
@@ -105,7 +109,9 @@ if [ ! -r "$INITFILE" ]; then
 fi
 
 MERGE_LIST=$*
-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
+SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p"
+SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p"
+
 TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
 
 echo "Using $INITFILE as base"
@@ -118,7 +124,7 @@ for MERGE_FILE in $MERGE_LIST ; do
 		echo "The merge file '$MERGE_FILE' does not exist.  Exit." >&2
 		exit 1
 	fi
-	CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
+	CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $MERGE_FILE)
 
 	for CFG in $CFG_LIST ; do
 		grep -q -w $CFG $TMP_FILE || continue
@@ -161,7 +167,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)
-for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
+for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do
 
 	REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
 	ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG")
diff --git a/buildroot/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch b/buildroot/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch
new file mode 100644
index 000000000..645043b16
--- /dev/null
+++ b/buildroot/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch
@@ -0,0 +1,31 @@
+Index: kconfig/merge_config.sh
+===================================================================
+--- kconfig.orig/merge_config.sh
++++ kconfig/merge_config.sh
+@@ -34,12 +34,16 @@ usage() {
+ 	echo "  -r    list redundant entries when merging fragments"
+ 	echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
+ 	echo "  -e    colon-separated list of br2-external trees to use (optional)"
++	echo
++	echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_
++	environment variable."
+ }
+ 
+ RUNMAKE=true
+ ALLTARGET=alldefconfig
+ WARNREDUN=false
+ OUTPUT=.
++CONFIG_PREFIX=${CONFIG_-CONFIG_}
+ 
+ while true; do
+ 	case $1 in
+@@ -105,7 +109,8 @@ if [ ! -r "$INITFILE" ]; then
+ fi
+ 
+ MERGE_LIST=$*
+-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
++SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
++
+ TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
+ 
+ echo "Using $INITFILE as base"
diff --git a/buildroot/support/kconfig/patches/21-Avoid-false-positive-matches-from-comment-lines.patch b/buildroot/support/kconfig/patches/21-Avoid-false-positive-matches-from-comment-lines.patch
new file mode 100644
index 000000000..c11144e47
--- /dev/null
+++ b/buildroot/support/kconfig/patches/21-Avoid-false-positive-matches-from-comment-lines.patch
@@ -0,0 +1,32 @@
+Index: kconfig/merge_config.sh
+===================================================================
+--- kconfig.orig/merge_config.sh
++++ kconfig/merge_config.sh
+@@ -109,7 +109,8 @@ if [ ! -r "$INITFILE" ]; then
+ fi
+ 
+ MERGE_LIST=$*
+-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
++SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p"
++SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p"
+ 
+ TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
+ 
+@@ -123,7 +124,7 @@ for MERGE_FILE in $MERGE_LIST ; do
+ 		echo "The merge file '$MERGE_FILE' does not exist.  Exit." >&2
+ 		exit 1
+ 	fi
+-	CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
++	CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $MERGE_FILE)
+ 
+ 	for CFG in $CFG_LIST ; do
+ 		grep -q -w $CFG $TMP_FILE || continue
+@@ -166,7 +167,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERN
+ 
+ 
+ # Check all specified config values took (might have missed-dependency issues)
+-for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
++for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do
+ 
+ 	REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
+ 	ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG")
diff --git a/buildroot/support/kconfig/patches/series b/buildroot/support/kconfig/patches/series
index e136de793..e5a6f69d8 100644
--- a/buildroot/support/kconfig/patches/series
+++ b/buildroot/support/kconfig/patches/series
@@ -8,3 +8,5 @@
 17-backport-kecho.patch
 18-merge-config.sh-create-temporary-files-in-tmp.patch
 19-merge_config.sh-add-br2-external-support.patch
+20-merge_config.sh-Allow-to-define-config-prefix.patch
+21-Avoid-false-positive-matches-from-comment-lines.patch
diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile
index 1ca5edc64..6168f0581 100644
--- a/buildroot/support/misc/Vagrantfile
+++ b/buildroot/support/misc/Vagrantfile
@@ -5,7 +5,7 @@
 ################################################################################
 
 # Buildroot version to use
-RELEASE='2018.11'
+RELEASE='2019.02'
 
 ### Change here for more memory/cores ###
 VM_MEMORY=2048
diff --git a/buildroot/support/misc/toolchainfile.cmake.in b/buildroot/support/misc/toolchainfile.cmake.in
index 6f3c8ca97..b25031a65 100644
--- a/buildroot/support/misc/toolchainfile.cmake.in
+++ b/buildroot/support/misc/toolchainfile.cmake.in
@@ -15,6 +15,7 @@ string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
 set(CMAKE_SYSTEM_NAME Buildroot)
+set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@)
 
 # Set the {C,CXX}FLAGS appended by CMake depending on the build type
diff --git a/buildroot/support/scripts/check-bin-arch b/buildroot/support/scripts/check-bin-arch
index 7f9769673..3449bd1ae 100755
--- a/buildroot/support/scripts/check-bin-arch
+++ b/buildroot/support/scripts/check-bin-arch
@@ -20,6 +20,11 @@ declare -a IGNORES=(
 	# pru-software-support) legitimately install ELF binaries that
 	# are not for the target architecture
 	"/usr/share"
+
+	# Skip files in {/usr,}/lib/grub, since it is possible to have
+	# it for a different architecture (e.g. i386 grub on x86_64).
+	"/lib/grub"
+	"/usr/lib/grub"
 )
 
 while getopts p:l:r:a:i: OPT ; do
diff --git a/buildroot/support/scripts/check-host-rpath b/buildroot/support/scripts/check-host-rpath
index 169628dec..c8939569e 100755
--- a/buildroot/support/scripts/check-host-rpath
+++ b/buildroot/support/scripts/check-host-rpath
@@ -39,6 +39,11 @@ is_elf() {
     |grep -E 'Requesting program interpreter:' >/dev/null 2>&1
 }
 
+# This function tells whether a given ELF executable (first argument)
+# needs a RPATH pointing to the host library directory or not. It
+# needs such an RPATH if at least of the libraries used by the ELF
+# executable is available in the host library directory. This function
+# returns 0 when a RPATH is needed, 1 otherwise.
 elf_needs_rpath() {
     local file="${1}"
     local hostdir="${2}"
@@ -54,6 +59,13 @@ elf_needs_rpath() {
     return 1
 }
 
+# This function checks whether at least one of the RPATH of the given
+# ELF executable (first argument) properly points to the host library
+# directory (second argument), either through an absolute RPATH or a
+# relative RPATH. Having such a RPATH will make sure the ELF
+# executable will find at runtime the shared libraries it depends
+# on. This function returns 0 when a proper RPATH was found, or 1
+# otherwise.
 check_elf_has_rpath() {
     local file="${1}"
     local hostdir="${2}"
@@ -63,7 +75,8 @@ check_elf_has_rpath() {
         for dir in ${rpath//:/ }; do
             # Remove duplicate and trailing '/' for proper match
             dir="$( sed -r -e 's:/+:/:g; s:/$::;' <<<"${dir}" )"
-            [ "${dir}" = "${hostdir}/lib" -o "${dir}" = "\$ORIGIN/../lib" ] && return 0
+            [ "${dir}" = "${hostdir}/lib" ] && return 0
+            [ "${dir}" = "\$ORIGIN/../lib" ] && return 0
         done
     done < <( readelf -d "${file}"                                              \
               |sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \
diff --git a/buildroot/support/scripts/check-merged-usr.sh b/buildroot/support/scripts/check-merged-usr.sh
new file mode 100755
index 000000000..433857cd8
--- /dev/null
+++ b/buildroot/support/scripts/check-merged-usr.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Check if a given custom skeleton or overlay complies to the merged /usr
+# requirements:
+# /
+# /bin -> usr/bin
+# /lib -> usr/lib
+# /sbin -> usr/sbin
+# /usr/bin/
+# /usr/lib/
+# /usr/sbin/
+#
+# Output: the list of non-compliant paths (empty if compliant).
+#
+
+# Extract the inode numbers for all of those directories. In case any is
+# a symlink, we want to get the inode of the pointed-to directory, so we
+# append '/.' to be sure we get the target directory. Since the symlinks
+# can be anyway (/bin -> /usr/bin or /usr/bin -> /bin), we do that for
+# all of them.
+#
+lib_inode=$(stat -c '%i' "${1}/lib/." 2>/dev/null)
+bin_inode=$(stat -c '%i' "${1}/bin/." 2>/dev/null)
+sbin_inode=$(stat -c '%i' "${1}/sbin/." 2>/dev/null)
+usr_lib_inode=$(stat -c '%i' "${1}/usr/lib/." 2>/dev/null)
+usr_bin_inode=$(stat -c '%i' "${1}/usr/bin/." 2>/dev/null)
+usr_sbin_inode=$(stat -c '%i' "${1}/usr/sbin/." 2>/dev/null)
+
+not_merged_dirs=""
+test -z "$lib_inode" || \
+	test "$lib_inode" = "$usr_lib_inode" || \
+		not_merged_dirs="/lib"
+test -z "$bin_inode" || \
+	test "$bin_inode" = "$usr_bin_inode" || \
+		not_merged_dirs="$not_merged_dirs /bin"
+test -z "$sbin_inode" || \
+	test "$sbin_inode" = "$usr_sbin_inode" || \
+		not_merged_dirs="$not_merged_dirs /sbin"
+echo "${not_merged_dirs# }"
diff --git a/buildroot/support/scripts/generate-gitlab-ci-yml b/buildroot/support/scripts/generate-gitlab-ci-yml
new file mode 100755
index 000000000..262a7649b
--- /dev/null
+++ b/buildroot/support/scripts/generate-gitlab-ci-yml
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -e
+set -o pipefail
+
+input="${1}"
+
+cat "${input}"
+
+(
+    cd configs
+    LC_ALL=C ls -1 *_defconfig
+) \
+    | sed 's/$/: { extends: .defconfig }/'
+
+./support/testing/run-tests -l 2>&1 \
+    | sed -r -e '/^test_run \((.*)\).*/!d; s//\1: { extends: .runtime_test }/' \
+    | LC_ALL=C sort
diff --git a/buildroot/support/scripts/graph-build-time b/buildroot/support/scripts/graph-build-time
index 892e08bf0..ba3cdad85 100755
--- a/buildroot/support/scripts/graph-build-time
+++ b/buildroot/support/scripts/graph-build-time
@@ -69,14 +69,14 @@ import matplotlib.font_manager as fm  # noqa: E402
 import csv                            # noqa: E402
 import argparse                       # noqa: E402
 
-steps = ['extract', 'patch', 'configure', 'build',
+steps = ['download', 'extract', 'patch', 'configure', 'build',
          'install-target', 'install-staging', 'install-images',
          'install-host']
 
-default_colors = ['#e60004', '#009836', '#2e1d86', '#ffed00',
+default_colors = ['#8d02ff', '#e60004', '#009836', '#2e1d86', '#ffed00',
                   '#0068b5', '#f28e00', '#940084', '#97c000']
 
-alternate_colors = ['#00e0e0', '#3f7f7f', '#ff0000', '#00c000',
+alternate_colors = ['#ffbe0a', '#96bdff', '#3f7f7f', '#ff0000', '#00c000',
                     '#0080ff', '#c000ff', '#00eeee', '#e0e000']
 
 
diff --git a/buildroot/support/scripts/graph-depends b/buildroot/support/scripts/graph-depends
index 3c091da5e..d2b100f38 100755
--- a/buildroot/support/scripts/graph-depends
+++ b/buildroot/support/scripts/graph-depends
@@ -100,12 +100,6 @@ def pkg_node_name(pkg):
     return "_" + pkg.replace("-", "")
 
 
-TARGET_EXCEPTIONS = [
-    "target-finalize",
-    "target-post-image",
-]
-
-
 # Basic cache for the results of the is_dep() function, in order to
 # optimize the execution time. The cache is a dict of dict of boolean
 # values. The key to the primary dict is "pkg", and the key of the
@@ -176,10 +170,15 @@ def remove_transitive_deps(pkg, deps):
     return new_d
 
 
+# List of dependencies that all/many packages have, and that we want
+# to trim when generating the dependency graph.
+MANDATORY_DEPS = ['toolchain', 'skeleton']
+
+
 # This function removes the dependency on some 'mandatory' package, like the
 # 'toolchain' package, or the 'skeleton' package
 def remove_mandatory_deps(pkg, deps):
-    return [p for p in deps[pkg] if p not in ['toolchain', 'skeleton']]
+    return [p for p in deps[pkg] if p not in MANDATORY_DEPS]
 
 
 # This function will check that there is no loop in the dependency chain
@@ -211,12 +210,12 @@ def check_circular_deps(deps):
 
 # This functions trims down the dependency list of all packages.
 # It applies in sequence all the dependency-elimination methods.
-def remove_extra_deps(deps, transitive):
+def remove_extra_deps(deps, rootpkg, transitive):
     for pkg in list(deps.keys()):
-        if not pkg == 'all':
+        if not pkg == rootpkg:
             deps[pkg] = remove_mandatory_deps(pkg, deps)
     for pkg in list(deps.keys()):
-        if not transitive or pkg == 'all':
+        if not transitive or pkg == rootpkg:
             deps[pkg] = remove_transitive_deps(pkg, deps)
     return deps
 
@@ -384,9 +383,6 @@ def main():
         allpkgs.append('all')
         filtered_targets = []
         for tg in targets:
-            # Skip uninteresting targets
-            if tg in TARGET_EXCEPTIONS:
-                continue
             dependencies.append(('all', tg))
             filtered_targets.append(tg)
         deps = get_all_depends(filtered_targets, get_depends_func)
@@ -410,7 +406,7 @@ def main():
     if check_only:
         sys.exit(0)
 
-    dict_deps = remove_extra_deps(dict_deps, args.transitive)
+    dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive)
     dict_version = brpkgutil.get_version([pkg for pkg in allpkgs
                                           if pkg != "all" and not pkg.startswith("root")])
 
diff --git a/buildroot/support/scripts/pkg-stats b/buildroot/support/scripts/pkg-stats
index d0b06b1e7..b0be7d919 100755
--- a/buildroot/support/scripts/pkg-stats
+++ b/buildroot/support/scripts/pkg-stats
@@ -25,10 +25,19 @@ import re
 import subprocess
 import sys
 import requests  # URL checking
+import json
+import certifi
+from urllib3 import HTTPSConnectionPool
+from urllib3.exceptions import HTTPError
 from multiprocessing import Pool
 
-INFRA_RE = re.compile("\$\(eval \$\(([a-z-]*)-package\)\)")
-URL_RE = re.compile("\s*https?://\S*\s*$")
+INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)")
+URL_RE = re.compile(r"\s*https?://\S*\s*$")
+
+RM_API_STATUS_ERROR = 1
+RM_API_STATUS_FOUND_BY_DISTRO = 2
+RM_API_STATUS_FOUND_BY_PATTERN = 3
+RM_API_STATUS_NOT_FOUND = 4
 
 
 class Package:
@@ -49,6 +58,7 @@ class Package:
         self.url = None
         self.url_status = None
         self.url_worker = None
+        self.latest_version = (RM_API_STATUS_ERROR, None, None)
 
     def pkgvar(self):
         return self.name.upper().replace("-", "_")
@@ -298,6 +308,73 @@ def check_package_urls(packages):
         pkg.url_status = pkg.url_worker.get(timeout=3600)
 
 
+def release_monitoring_get_latest_version_by_distro(pool, name):
+    try:
+        req = pool.request('GET', "/api/project/Buildroot/%s" % name)
+    except HTTPError:
+        return (RM_API_STATUS_ERROR, None, None)
+
+    if req.status != 200:
+        return (RM_API_STATUS_NOT_FOUND, None, None)
+
+    data = json.loads(req.data)
+
+    if 'version' in data:
+        return (RM_API_STATUS_FOUND_BY_DISTRO, data['version'], data['id'])
+    else:
+        return (RM_API_STATUS_FOUND_BY_DISTRO, None, data['id'])
+
+
+def release_monitoring_get_latest_version_by_guess(pool, name):
+    try:
+        req = pool.request('GET', "/api/projects/?pattern=%s" % name)
+    except HTTPError:
+        return (RM_API_STATUS_ERROR, None, None)
+
+    if req.status != 200:
+        return (RM_API_STATUS_NOT_FOUND, None, None)
+
+    data = json.loads(req.data)
+
+    projects = data['projects']
+    projects.sort(key=lambda x: x['id'])
+
+    for p in projects:
+        if p['name'] == name and 'version' in p:
+            return (RM_API_STATUS_FOUND_BY_PATTERN, p['version'], p['id'])
+
+    return (RM_API_STATUS_NOT_FOUND, None, None)
+
+
+def check_package_latest_version(packages):
+    """
+    Fills in the .latest_version field of all Package objects
+
+    This field has a special format:
+      (status, version, id)
+    with:
+    - status: one of RM_API_STATUS_ERROR,
+      RM_API_STATUS_FOUND_BY_DISTRO, RM_API_STATUS_FOUND_BY_PATTERN,
+      RM_API_STATUS_NOT_FOUND
+    - version: string containing the latest version known by
+      release-monitoring.org for this package
+    - id: string containing the id of the project corresponding to this
+      package, as known by release-monitoring.org
+    """
+    pool = HTTPSConnectionPool('release-monitoring.org', port=443,
+                               cert_reqs='CERT_REQUIRED', ca_certs=certifi.where(),
+                               timeout=30)
+    count = 0
+    for pkg in packages:
+        v = release_monitoring_get_latest_version_by_distro(pool, pkg.name)
+        if v[0] == RM_API_STATUS_NOT_FOUND:
+            v = release_monitoring_get_latest_version_by_guess(pool, pkg.name)
+
+        pkg.latest_version = v
+        print("[%d/%d] Package %s" % (count, len(packages), pkg.name))
+        count += 1
+
+
 def calculate_stats(packages):
     stats = defaultdict(int)
     for pkg in packages:
@@ -322,6 +399,16 @@ def calculate_stats(packages):
             stats["hash"] += 1
         else:
             stats["no-hash"] += 1
+        if pkg.latest_version[0] == RM_API_STATUS_FOUND_BY_DISTRO:
+            stats["rmo-mapping"] += 1
+        else:
+            stats["rmo-no-mapping"] += 1
+        if not pkg.latest_version[1]:
+            stats["version-unknown"] += 1
+        elif pkg.latest_version[1] == pkg.current_version:
+            stats["version-uptodate"] += 1
+        else:
+            stats["version-not-uptodate"] += 1
         stats["patches"] += pkg.patch_count
     return stats
 
@@ -354,6 +441,7 @@ td.somepatches {
 td.lotsofpatches {
   background: #ff9a69;
 }
+
 td.good_url {
   background: #d2ffc4;
 }
@@ -363,6 +451,20 @@ td.missing_url {
 td.invalid_url {
   background: #ff9a69;
 }
+
+td.version-good {
+  background: #d2ffc4;
+}
+td.version-needs-update {
+  background: #ff9a69;
+}
+td.version-unknown {
+ background: #ffd870;
+}
+td.version-error {
+ background: #ccc;
+}
+
 
 Statistics of Buildroot packages
 
@@ -465,6 +567,37 @@ def dump_html_pkg(f, pkg):
         current_version = pkg.current_version
     f.write("
    		%s%sLicense files Hash file Current versionLatest version Warnings Upstream URL
    Total number of patches%s
    Packages having a mapping on release-monitoring.org%s
    Packages lacking a mapping on release-monitoring.org%s
    Packages that are up-to-date%s
    Packages that are not up-to-date%s
    Packages with no known upstream version%s
    \n") @@ -587,6 +731,8 @@ def __main__(): pkg.set_url() print("Checking URL status") check_package_urls(packages) + print("Getting latest versions ...") + check_package_latest_version(packages) print("Calculate stats") stats = calculate_stats(packages) print("Write HTML") diff --git a/buildroot/support/scripts/setlocalversion b/buildroot/support/scripts/setlocalversion index 33cd605bf..b39b751f0 100755 --- a/buildroot/support/scripts/setlocalversion +++ b/buildroot/support/scripts/setlocalversion @@ -53,7 +53,7 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then fi # Check for mercurial and a mercurial repo. -if hgid=`hg id 2>/dev/null`; then +if hgid=`HGRCPATH= hg id --id --tags 2>/dev/null`; then tag=`printf '%s' "$hgid" | cut -d' ' -f2 --only-delimited` # Do we have an untagged version? diff --git a/buildroot/support/testing/conf/docker-compose-kernel.config b/buildroot/support/testing/conf/docker-compose-kernel.config new file mode 100644 index 000000000..9468ef8db --- /dev/null +++ b/buildroot/support/testing/conf/docker-compose-kernel.config @@ -0,0 +1,103 @@ +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +# CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_HIGH_RES_TIMERS=y +CONFIG_CGROUPS=y +CONFIG_MEMCG=y +CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_SCHED=y +CONFIG_CGROUP_PIDS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_IOSF_MBI=y +CONFIG_MCORE2=y +# CONFIG_X86_MCE is not set +# CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set +CONFIG_LEGACY_VSYSCALL_NONE=y +# CONFIG_SUSPEND is not set +# CONFIG_ACPI is not set +CONFIG_CPU_IDLE=y +CONFIG_PCI_MSI=y +# CONFIG_VIRTUALIZATION is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_MQ_IOSCHED_DEADLINE is not set +# CONFIG_MQ_IOSCHED_KYBER is not set +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_IPV6 is not set +CONFIG_NETFILTER=y +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +# CONFIG_NF_CT_PROTO_DCCP is not set +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +CONFIG_NETFILTER_XT_MATCH_IPVS=y +CONFIG_IP_VS=y +CONFIG_IP_VS_RR=y +CONFIG_IP_VS_NFCT=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_BRIDGE=y +# CONFIG_BRIDGE_IGMP_SNOOPING is not set +# CONFIG_WIRELESS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_VIRTIO_BLK=y +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +CONFIG_MACVLAN=y +CONFIG_VXLAN=y +CONFIG_VETH=y +CONFIG_VIRTIO_NET=y +# CONFIG_ETHERNET is not set +# CONFIG_WLAN is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_DEVMEM is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_LPSS is not set +# CONFIG_SERIAL_8250_MID is not set +# CONFIG_HW_RANDOM_INTEL is not set +# CONFIG_HW_RANDOM_AMD is not set +# CONFIG_HW_RANDOM_VIA is not set +CONFIG_HW_RANDOM_VIRTIO=y +# CONFIG_DEVPORT is not set +# CONFIG_HWMON is not set +# CONFIG_USB_SUPPORT is not set +CONFIG_RTC_CLASS=y +CONFIG_VIRTIO_PCI=y +# CONFIG_VIRTIO_PCI_LEGACY is not set +# CONFIG_X86_PLATFORM_DEVICES is not set +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_EXT4_FS=y +CONFIG_OVERLAY_FS=y +CONFIG_OVERLAY_FS_REDIRECT_DIR=y +CONFIG_TMPFS=y +# CONFIG_MISC_FILESYSTEMS is not set +# CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_KEYS=y +CONFIG_SECURITYFS=y +# CONFIG_CRYPTO_ECHAINIV is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/buildroot/support/testing/conf/docker-compose.yml b/buildroot/support/testing/conf/docker-compose.yml new file mode 100644 index 000000000..49ff2677d --- /dev/null +++ b/buildroot/support/testing/conf/docker-compose.yml @@ -0,0 +1,4 @@ +version: '3' +services: + busybox: + image: "busybox:latest" diff --git a/buildroot/support/testing/infra/basetest.py b/buildroot/support/testing/infra/basetest.py index 5014fefaf..a176bc328 100644 --- a/buildroot/support/testing/infra/basetest.py +++ b/buildroot/support/testing/infra/basetest.py @@ -28,8 +28,9 @@ MINIMAL_CONFIG = \ """ -class BRTest(unittest.TestCase): +class BRConfigTest(unittest.TestCase): config = None + br2_external = list() downloaddir = None outputdir = None logtofile = True @@ -38,10 +39,9 @@ class BRTest(unittest.TestCase): timeout_multiplier = 1 def __init__(self, names): - super(BRTest, self).__init__(names) + super(BRConfigTest, self).__init__(names) self.testname = self.__class__.__name__ self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname) - self.emulator = None self.config += '\nBR2_DL_DIR="{}"\n'.format(self.downloaddir) self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel) @@ -56,9 +56,24 @@ class BRTest(unittest.TestCase): if not self.keepbuilds: self.b.delete() + if not self.b.is_finished(): + self.b.configure(make_extra_opts=["BR2_EXTERNAL={}".format(":".join(self.br2_external))]) + + def tearDown(self): + self.show_msg("Cleaning up") + if self.b and not self.keepbuilds: + self.b.delete() + + +class BRTest(BRConfigTest): + def __init__(self, names): + super(BRTest, self).__init__(names) + self.emulator = None + + def setUp(self): + super(BRTest, self).setUp() if not self.b.is_finished(): self.show_msg("Building") - self.b.configure() self.b.build() self.show_msg("Building done") @@ -66,8 +81,6 @@ class BRTest(unittest.TestCase): self.logtofile, self.timeout_multiplier) def tearDown(self): - self.show_msg("Cleaning up") if self.emulator: self.emulator.stop() - if self.b and not self.keepbuilds: - self.b.delete() + super(BRTest, self).tearDown() diff --git a/buildroot/support/testing/infra/builder.py b/buildroot/support/testing/infra/builder.py index fc318fe26..018747555 100644 --- a/buildroot/support/testing/infra/builder.py +++ b/buildroot/support/testing/infra/builder.py @@ -12,7 +12,17 @@ class Builder(object): self.builddir = builddir self.logfile = infra.open_log_file(builddir, "build", logtofile) - def configure(self): + def configure(self, make_extra_opts=[], make_extra_env={}): + """Configure the build. + + make_extra_opts: a list of arguments to be passed to the make + command. + e.g. make_extra_opts=["BR2_EXTERNAL=/path"] + + make_extra_env: a dict of variables to be appended (or replaced) + in the environment that calls make. + e.g. make_extra_env={"BR2_DL_DIR": "/path"} + """ if not os.path.isdir(self.builddir): os.makedirs(self.builddir) @@ -25,22 +35,40 @@ class Builder(object): self.logfile.flush() env = {"PATH": os.environ["PATH"]} + env.update(make_extra_env) + cmd = ["make", - "O={}".format(self.builddir), - "olddefconfig"] + "O={}".format(self.builddir)] + cmd += make_extra_opts + cmd += ["olddefconfig"] + ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, env=env) if ret != 0: raise SystemError("Cannot olddefconfig") - def build(self): + def build(self, make_extra_opts=[], make_extra_env={}): + """Perform the build. + + make_extra_opts: a list of arguments to be passed to the make + command. It can include a make target. + e.g. make_extra_opts=["foo-source"] + + make_extra_env: a dict of variables to be appended (or replaced) + in the environment that calls make. + e.g. make_extra_env={"BR2_DL_DIR": "/path"} + """ env = {"PATH": os.environ["PATH"]} if "http_proxy" in os.environ: self.logfile.write("Using system proxy: " + os.environ["http_proxy"] + "\n") env['http_proxy'] = os.environ["http_proxy"] env['https_proxy'] = os.environ["http_proxy"] + env.update(make_extra_env) + cmd = ["make", "-C", self.builddir] + cmd += make_extra_opts + ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, env=env) if ret != 0: diff --git a/buildroot/support/testing/run-tests b/buildroot/support/testing/run-tests index 76dd15e9f..813b92704 100755 --- a/buildroot/support/testing/run-tests +++ b/buildroot/support/testing/run-tests @@ -5,7 +5,7 @@ import os import nose2 import multiprocessing -from infra.basetest import BRTest +from infra.basetest import BRConfigTest def main(): @@ -38,7 +38,7 @@ def main(): test_dir = os.path.dirname(script_path) if args.stdout: - BRTest.logtofile = False + BRConfigTest.logtofile = False if args.list: print("List of tests") @@ -57,7 +57,7 @@ def main(): parser.print_help() return 1 - BRTest.downloaddir = os.path.abspath(args.download) + BRConfigTest.downloaddir = os.path.abspath(args.download) if args.output is None: print("Missing output directory, please use -o/--output") @@ -68,7 +68,7 @@ def main(): if not os.path.exists(args.output): os.mkdir(args.output) - BRTest.outputdir = os.path.abspath(args.output) + BRConfigTest.outputdir = os.path.abspath(args.output) if args.all is False and len(args.testname) == 0: print("No test selected") @@ -76,7 +76,7 @@ def main(): parser.print_help() return 1 - BRTest.keepbuilds = args.keep + BRConfigTest.keepbuilds = args.keep if args.testcases != 1: if args.testcases < 1: @@ -89,7 +89,7 @@ def main(): each_testcase = br2_jlevel / args.testcases if each_testcase < 1: each_testcase = 1 - BRTest.jlevel = each_testcase + BRConfigTest.jlevel = each_testcase if args.jlevel: if args.jlevel < 0: @@ -98,14 +98,14 @@ def main(): parser.print_help() return 1 # the user can override the auto calculated value - BRTest.jlevel = args.jlevel + BRConfigTest.jlevel = args.jlevel if args.timeout_multiplier < 1: print("Invalid multiplier for timeout values") print("") parser.print_help() return 1 - BRTest.timeout_multiplier = args.timeout_multiplier + BRConfigTest.timeout_multiplier = args.timeout_multiplier nose2_args = ["-v", "-N", str(args.testcases), diff --git a/buildroot/board/digilent/zybo/system.bit b/buildroot/support/testing/tests/download/__init__.py similarity index 100% rename from buildroot/board/digilent/zybo/system.bit rename to buildroot/support/testing/tests/download/__init__.py diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/Config.in b/buildroot/support/testing/tests/download/br2-external/git-hash/Config.in new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/external.desc b/buildroot/support/testing/tests/download/br2-external/git-hash/external.desc new file mode 100644 index 000000000..41316c8b2 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-hash/external.desc @@ -0,0 +1 @@ +name: GIT_HASH diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/external.mk b/buildroot/support/testing/tests/download/br2-external/git-hash/external.mk new file mode 100644 index 000000000..4646dfe2b --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-hash/external.mk @@ -0,0 +1,4 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_GIT_HASH_PATH)/package/*/*.mk)) + +# Get the git server port number from the test infra +GITREMOTE_PORT_NUMBER ?= 9418 diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash b/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash new file mode 100644 index 000000000..b9e1baec8 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash @@ -0,0 +1 @@ +sha256 0000000000000000000000000000000000000000000000000000000000000000 bad-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk b/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk new file mode 100644 index 000000000..5497bd6bf --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk @@ -0,0 +1,10 @@ +################################################################################ +# +# bad +# +################################################################################ + +BAD_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d +BAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.hash b/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.hash new file mode 100644 index 000000000..9e92ab8ab --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.hash @@ -0,0 +1 @@ +sha256 d00ae598e9e770d607621a86766030b42eaa58156cb8d482b043969da7963c23 good-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.mk b/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.mk new file mode 100644 index 000000000..0f0eefd94 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.mk @@ -0,0 +1,10 @@ +################################################################################ +# +# good +# +################################################################################ + +GOOD_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d +GOOD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk b/buildroot/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk new file mode 100644 index 000000000..1da19d88c --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk @@ -0,0 +1,10 @@ +################################################################################ +# +# nohash +# +################################################################################ + +NOHASH_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d +NOHASH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/Config.in b/buildroot/support/testing/tests/download/br2-external/git-refs/Config.in new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/external.desc b/buildroot/support/testing/tests/download/br2-external/git-refs/external.desc new file mode 100644 index 000000000..69f40d46c --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/external.desc @@ -0,0 +1 @@ +name: GIT_REFS diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/external.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/external.mk new file mode 100644 index 000000000..ab38c27eb --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/external.mk @@ -0,0 +1,4 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_GIT_REFS_PATH)/package/*/*.mk)) + +# Get the git server port number from the test infra +GITREMOTE_PORT_NUMBER ?= 9418 diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash new file mode 100644 index 000000000..648bcceca --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash @@ -0,0 +1,2 @@ +sha256 70b76187369e47db69dac02c5696e63b35199cd20490fa473d289dd377774613 git-partial-sha1-branch-head-68c197d0879d485f4f6c.tar.gz +sha256 2c1126513651b0d346a4e6d1bb75ac1c9999217e18026302d27bea47b06c7fb2 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk new file mode 100644 index 000000000..6d4177c5b --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-partial-sha1-branch-head +# +################################################################################ + +GIT_PARTIAL_SHA1_BRANCH_HEAD_VERSION = 68c197d0879d485f4f6c +GIT_PARTIAL_SHA1_BRANCH_HEAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_BRANCH_HEAD_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash new file mode 100644 index 000000000..d064362e2 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash @@ -0,0 +1,2 @@ +sha256 9db079b9e215799d59975db7b2b26671eff1932ee6cf1075296f2ace3e2cb746 git-partial-sha1-reachable-by-branch-317406308d9259e2231b.tar.gz +sha256 fabbc65c442bacb5e69b7adfea6d14fbbfc1327134322efd12771dc84387d507 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk new file mode 100644 index 000000000..2f65b5c9a --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-partial-sha1-reachable-by-branch +# +################################################################################ + +GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_VERSION = 317406308d9259e2231b +GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash new file mode 100644 index 000000000..769608669 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash @@ -0,0 +1,2 @@ +sha256 f2ef9772f13a9ef9a2c7cde0795e179defb12320d1747fc8d2408748ef5844c2 git-partial-sha1-reachable-by-tag-46bae5b639e5a18e2cc4.tar.gz +sha256 2de87d77a2f226813f2d9bda906e970e4195605cdba6680443c0c04d89c532b6 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk new file mode 100644 index 000000000..05aa659dd --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-partial-sha1-reachable-by-tag +# +################################################################################ + +GIT_PARTIAL_SHA1_REACHABLE_BY_TAG_VERSION = 46bae5b639e5a18e2cc4 +GIT_PARTIAL_SHA1_REACHABLE_BY_TAG_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_REACHABLE_BY_TAG_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash new file mode 100644 index 000000000..e627caf91 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash @@ -0,0 +1,2 @@ +sha256 721143b41b8e56cfd9025833f1602e900a490627db2504e5b4907baa23e0019e git-partial-sha1-tag-itself-2b0e0d98a49c97da6a61.tar.gz +sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk new file mode 100644 index 000000000..515492397 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-partial-sha1-tag-itself +# +################################################################################ + +GIT_PARTIAL_SHA1_TAG_ITSELF_VERSION = 2b0e0d98a49c97da6a61 +GIT_PARTIAL_SHA1_TAG_ITSELF_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_TAG_ITSELF_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash new file mode 100644 index 000000000..f957a0e23 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash @@ -0,0 +1,2 @@ +sha256 0fbf7fe935f962ceaafcf8e0ffd25dd2a83752c3f0fd055a942a53f8c9235fa7 git-partial-sha1-tag-points-to-516c9c5f64ec66534d4d.tar.gz +sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk new file mode 100644 index 000000000..c810e8117 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-partial-sha1-tag-points-to +# +################################################################################ + +GIT_PARTIAL_SHA1_TAG_POINTS_TO_VERSION = 516c9c5f64ec66534d4d +GIT_PARTIAL_SHA1_TAG_POINTS_TO_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_PARTIAL_SHA1_TAG_POINTS_TO_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash new file mode 100644 index 000000000..3e8f76d31 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash @@ -0,0 +1,2 @@ +sha256 a21a2507b6d94ad484e49e3a9ae698f672a57469aab8e1779da77df7c9d4d337 git-sha1-branch-head-68c197d0879d485f4f6cee85544722b79e68e59f.tar.gz +sha256 2c1126513651b0d346a4e6d1bb75ac1c9999217e18026302d27bea47b06c7fb2 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk new file mode 100644 index 000000000..d3ecaa859 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-sha1-branch-head +# +################################################################################ + +GIT_SHA1_BRANCH_HEAD_VERSION = 68c197d0879d485f4f6cee85544722b79e68e59f +GIT_SHA1_BRANCH_HEAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_BRANCH_HEAD_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash new file mode 100644 index 000000000..f8d7b5dc4 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash @@ -0,0 +1,2 @@ +sha256 8909e76d898e651af0bc23fae4103b87888bfe77448d71aaf1fbec3da97a3ce2 git-sha1-reachable-by-branch-317406308d9259e2231bd0d6ddad3de3832bce08.tar.gz +sha256 fabbc65c442bacb5e69b7adfea6d14fbbfc1327134322efd12771dc84387d507 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk new file mode 100644 index 000000000..badf9e13c --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-sha1-reachable-by-branch +# +################################################################################ + +GIT_SHA1_REACHABLE_BY_BRANCH_VERSION = 317406308d9259e2231bd0d6ddad3de3832bce08 +GIT_SHA1_REACHABLE_BY_BRANCH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_REACHABLE_BY_BRANCH_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash new file mode 100644 index 000000000..0eb0ca091 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash @@ -0,0 +1,2 @@ +sha256 9b20256a3058221a8e91031f11700d9945ea84e8f328fa8e42e1cb9f7a30e3b2 git-sha1-reachable-by-tag-46bae5b639e5a18e2cc4dc508f080d566baeff59.tar.gz +sha256 2de87d77a2f226813f2d9bda906e970e4195605cdba6680443c0c04d89c532b6 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk new file mode 100644 index 000000000..b5fde7b58 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-sha1-reachable-by-tag +# +################################################################################ + +GIT_SHA1_REACHABLE_BY_TAG_VERSION = 46bae5b639e5a18e2cc4dc508f080d566baeff59 +GIT_SHA1_REACHABLE_BY_TAG_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_REACHABLE_BY_TAG_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash new file mode 100644 index 000000000..48c134853 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash @@ -0,0 +1,2 @@ +sha256 7d301c1a1054d6aee49193ca9e938f4da561ff73fb01719662865aa38bdc4361 git-sha1-tag-itself-2b0e0d98a49c97da6a618ab36337e2058eb733a2.tar.gz +sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk new file mode 100644 index 000000000..891449665 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-sha1-tag-itself +# +################################################################################ + +GIT_SHA1_TAG_ITSELF_VERSION = 2b0e0d98a49c97da6a618ab36337e2058eb733a2 +GIT_SHA1_TAG_ITSELF_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_TAG_ITSELF_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash new file mode 100644 index 000000000..3dcafc209 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash @@ -0,0 +1,2 @@ +sha256 c1f9f5734529a31140a71c031534460811f001b4db37d26833f386358150ab47 git-sha1-tag-points-to-516c9c5f64ec66534d4d069c2e408d9ae4dce023.tar.gz +sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk new file mode 100644 index 000000000..adaae7329 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-sha1-tag-points-to +# +################################################################################ + +GIT_SHA1_TAG_POINTS_TO_VERSION = 516c9c5f64ec66534d4d069c2e408d9ae4dce023 +GIT_SHA1_TAG_POINTS_TO_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SHA1_TAG_POINTS_TO_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash new file mode 100644 index 000000000..3bd0a4469 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash @@ -0,0 +1,2 @@ +sha256 f9d46ff8a1a344c6c31fa4211220f3085c446abd31626232540703158276f22c git-submodule-disabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f.tar.gz +sha256 ba8b6ddc4726bfb6a05045ebfd8c43263c968ad1bc601bd46a25bc055008eddc file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk new file mode 100644 index 000000000..7a35b3b51 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-submodule-disabled +# +################################################################################ + +GIT_SUBMODULE_DISABLED_VERSION = a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f +GIT_SUBMODULE_DISABLED_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SUBMODULE_DISABLED_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash new file mode 100644 index 000000000..7f92c652d --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash @@ -0,0 +1 @@ +sha256 139a34c3c844c844dee74b6746418cfa75fbcc4205794ac8c0b3cd7d55a76792 git-submodule-enabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f.tar.gz diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk new file mode 100644 index 000000000..48a42f5e8 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-submodule-enabled +# +################################################################################ + +GIT_SUBMODULE_ENABLED_VERSION = a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f +GIT_SUBMODULE_ENABLED_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_SUBMODULE_ENABLED_GIT_SUBMODULES = YES + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash new file mode 100644 index 000000000..1cd0b15f2 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash @@ -0,0 +1,2 @@ +sha256 85dcb5bcf9bed496688d0eb01c7a3ce05c5b46b984cc1e9e76a6dbefd976e6b3 git-tag-mytag.tar.gz +sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk new file mode 100644 index 000000000..6960ceb2c --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-tag +# +################################################################################ + +GIT_TAG_VERSION = mytag +GIT_TAG_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_TAG_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash new file mode 100644 index 000000000..47b2b8b7d --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash @@ -0,0 +1,2 @@ + sha256 04715901977503d1df650e0959f4d31d8e7b105e2ac99a2182e0652b8f13baa1 git-wrong-content-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz + sha256 0000000000000000000000000000000000000000000000000000000000000000 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk new file mode 100644 index 000000000..786224dad --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-wrong-content +# +################################################################################ + +GIT_WRONG_CONTENT_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d +GIT_WRONG_CONTENT_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_WRONG_CONTENT_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk new file mode 100644 index 000000000..f9d0d2226 --- /dev/null +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# git-wrong-sha1 +# +################################################################################ + +GIT_WRONG_SHA1_VERSION = 0000000000000000000000000000000000000000 +GIT_WRONG_SHA1_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git +GIT_WRONG_SHA1_LICENSE_FILES = file + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes new file mode 100644 index 000000000..eb50c64a2 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes @@ -0,0 +1 @@ +objects/*/* binary diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/HEAD b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/HEAD new file mode 100644 index 000000000..4e92c1f20 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/HEAD @@ -0,0 +1 @@ +cb545facf77bbc5f24f95b6d503c338d10b7b717 diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/config b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/config new file mode 100644 index 000000000..07d359d07 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570 new file mode 100644 index 000000000..cbf5085af Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f new file mode 100644 index 000000000..04055b899 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e new file mode 100644 index 000000000..2b78a0196 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab new file mode 100644 index 000000000..9db72668c Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a new file mode 100644 index 000000000..f49d53326 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23 new file mode 100644 index 000000000..7d2a9d55c Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717 new file mode 100644 index 000000000..dc7de2945 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717 @@ -0,0 +1 @@ +x­Î½ Â0@ajOq $:;²#„X€&8ÿ…q,S°=‘(èíW<=_ræjœv­ÆÖ&‡(½“:Y§U"e“1a˜0B#ƒ•#9AÏv+.쩆gªW_w†Cý`Ÿ¿xš3ñÒû’ 5N¨4*D±é6ÑâŸr‚WnL‹Wž×º’Rç^û_fÅW` \ No newline at end of file diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6 new file mode 100644 index 000000000..37037d392 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 new file mode 100644 index 000000000..df2037a2d Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3 new file mode 100644 index 000000000..d824d3c17 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule new file mode 100644 index 000000000..bf97dc418 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule @@ -0,0 +1 @@ +1df823cb8a6d1866148ae50a8009762a9c4c777f diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes new file mode 100644 index 000000000..eb50c64a2 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes @@ -0,0 +1 @@ +objects/*/* binary diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/HEAD b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/HEAD new file mode 100644 index 000000000..bbf19a4bb --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/HEAD @@ -0,0 +1 @@ +32d61bae693af7879da63b89a60d3ae67f851e56 diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/config b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/config new file mode 100644 index 000000000..07d359d07 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7 new file mode 100644 index 000000000..aaa29dbd8 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585 new file mode 100644 index 000000000..50caf8b62 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56 new file mode 100644 index 000000000..a8887b1e6 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56 @@ -0,0 +1 @@ +x­Î½ Â0@ajOq $:;²#„X€&8ÿ…q,S°=‘(èíW<=_ræjœv­ÆÖ&‡(½“:Y§U"e“1a˜0B#ƒ•#9AÏv+.쩆gªW_w†Cý`Ÿ¿xš3ñÒû’ 5N¨-t¨ŦÛD‹Ê ^¹1-B\y^cèJJ{í™o`Ì`+ \ No newline at end of file diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c new file mode 100644 index 000000000..b1fb722c5 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221 new file mode 100644 index 000000000..10f24a087 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab new file mode 100644 index 000000000..9db72668c Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb new file mode 100644 index 000000000..35d253f0d --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb @@ -0,0 +1,2 @@ +x­Î=n!†aל‚ ¬5,? ‘eùi’ Ã`#‡Åbq‘Ûg£飴ô}z©ÕZ†Ô³=ŒÎ,5‡hUðä 1È~£µQŠu4É)ì¼~“SÙyñKHètô$½ó’½UlÀ縵.ß +aOM¾be¥¶Ý‹<õ<Ö_¼\+–#µz–Ê‚ëLXä3€ØuüOwb{ÆyRB¼—ëÊij9Oñóå/­â ãxl) \ No newline at end of file diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 new file mode 100644 index 000000000..df2037a2d Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310 new file mode 100644 index 000000000..05c04d288 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310 differ diff --git a/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule new file mode 100644 index 000000000..39dc53f01 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule @@ -0,0 +1 @@ +e83f6f805bd016b90acafc8702c52d778eb57310 diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/.gitattributes b/buildroot/support/testing/tests/download/git-remote/repo.git/.gitattributes new file mode 100644 index 000000000..eb50c64a2 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/.gitattributes @@ -0,0 +1 @@ +objects/*/* binary diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/HEAD b/buildroot/support/testing/tests/download/git-remote/repo.git/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/config b/buildroot/support/testing/tests/download/git-remote/repo.git/config new file mode 100644 index 000000000..07d359d07 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343 new file mode 100644 index 000000000..ef7fbd415 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0 new file mode 100644 index 000000000..3541cd14f Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055 new file mode 100644 index 000000000..cbf60fc72 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/2b/0e0d98a49c97da6a618ab36337e2058eb733a2 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/2b/0e0d98a49c97da6a618ab36337e2058eb733a2 new file mode 100644 index 000000000..39c913094 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/2b/0e0d98a49c97da6a618ab36337e2058eb733a2 @@ -0,0 +1 @@ +xEŽK!]sŠ¾€“~BbŒpã °i *ƒA6s{1³póR©Eåõ`6jWo¦f¶äÉÜ­f²Ö(uDëI²F}`‰Q*Ñ×7ÕRr}4Ê:öG‰\3…+\Bëy¡úyf8¶MNå/Ï©„üšFæ4NàÁ'ÑÁ¢[ò L3 \ No newline at end of file diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d new file mode 100644 index 000000000..2dd14580e Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08 new file mode 100644 index 000000000..c2c986572 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08 @@ -0,0 +1 @@ +x­Î;N1@Qj¯Â˜ÈߌP” Ð<¿Ob‘ãìžH)èí)®.öÖêÔÞí_æ`ÖìPØ쓬‹bïDغ` ¢‡‚œRfõƒ·©ÁùT, Rr‘ÂJÉÑ9ìŠ)XKÙ‚û¼ô¡?* ®ßa̺a¿]«~Oܵ_<žÔÏövÐ6š5ÇäcÖ‹ñƨ‡>¦'ÿSN•^¬R§zÞ˜–.²”ï׿̪1nS \ No newline at end of file diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5 new file mode 100644 index 000000000..29f2d4fd0 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/46/bae5b639e5a18e2cc4dc508f080d566baeff59 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/46/bae5b639e5a18e2cc4dc508f080d566baeff59 new file mode 100644 index 000000000..3bf8865ea --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/46/bae5b639e5a18e2cc4dc508f080d566baeff59 @@ -0,0 +1 @@ +x­Î1n!@Qל‚ ¬Å0àa£(òÒÄ'˜e`–“··¥î-·¯øú±ÕZ†F‹»ÑSÒ1›ìrðB )![±~™çƒ‡À(±1 ~¹§mh¶%X/Ž$ ãŒÑ[‹( ³Åãܺþ*‘»4ýÉ}”-¶ËwÑïý÷õǵrùÙÇV?4xC³pðz2hŒºë}z¤åÔà”:•uK2µœ§åúöÌ©ºÍFkb \ No newline at end of file diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/51/6c9c5f64ec66534d4d069c2e408d9ae4dce023 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/51/6c9c5f64ec66534d4d069c2e408d9ae4dce023 new file mode 100644 index 000000000..0bda23ab4 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/51/6c9c5f64ec66534d4d069c2e408d9ae4dce023 @@ -0,0 +1,2 @@ +x­ÎKN1EQÆ^…7БåBQ6À„¬ º\n¬à6rœ»'æˆéyÒÓ¥ÞZÒû4³dc|ZK +¾pÖœÅ\ôV“Ââ‚uшO¼OéüŠ «·‰udCä2ŠEE•Á?æR ¼Í÷>ä[%¹ËW³îÔ¯—*_ÆÚ/ž¶†õã@½¥D¬\”UJÜõ=ùŸîÄÄÍq®ÛÎyé¥,ë×ó_JÅ7Êle \ No newline at end of file diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f new file mode 100644 index 000000000..3e421bb97 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f @@ -0,0 +1 @@ +x­Î=N1†ajŸÂØÈ;³ë„ !'ÏL+xŒ)¸=+¥HÑ>Ò÷éåVkÁ?®j3,cð°¨pˆâ ÍxA&I™R`拺nûp‹óè¢$X“àœÅ‰!AQŒ™ÕEC?ãÒºý(L]š}§>ÊÆíûZìK¿á¡Þñí\©|¸ÕW;¯.¤5¢G;9tÎìºGý§;“;m|cŽå¼©Lítšòïó#±æ$bl· \ No newline at end of file diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7 new file mode 100644 index 000000000..70cf1795f Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/92/ef85be57d627f280d8ce3724452ac21c9a6452 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/92/ef85be57d627f280d8ce3724452ac21c9a6452 new file mode 100644 index 000000000..1f2474ba3 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/92/ef85be57d627f280d8ce3724452ac21c9a6452 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab new file mode 100644 index 000000000..9db72668c Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d new file mode 100644 index 000000000..31b6bcf34 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d @@ -0,0 +1 @@ +x­ÎM @aלb.Ш”bŒñnôÃ_´@‚¸ðö6qáÞ¸ý/Ï•”¨ÔÓ®ÕÀ˜(ijBEc•Œ(MG?LÜ{ä£ðFh´ Ÿí^*\Éaõ.XeW Á±~°O_<Ï ií]I'Šk£ô´×Ðñs¶é6ÑŸrŒ25•±Í9ø®ÄØÙ×á—YölÚ`C \ No newline at end of file diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f new file mode 100644 index 000000000..2cbdce1f9 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232 new file mode 100644 index 000000000..20491e3f1 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/cf/0f4f85d7a1237e377a2d25b996518a877ea001 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/cf/0f4f85d7a1237e377a2d25b996518a877ea001 new file mode 100644 index 000000000..fd2245525 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/cf/0f4f85d7a1237e377a2d25b996518a877ea001 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41 new file mode 100644 index 000000000..4d8216930 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/2695cbf976fed1f543ad7486a531c0af473482 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/2695cbf976fed1f543ad7486a531c0af473482 new file mode 100644 index 000000000..15d80c78f Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/2695cbf976fed1f543ad7486a531c0af473482 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e new file mode 100644 index 000000000..57be64857 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 new file mode 100644 index 000000000..df2037a2d Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/f6/476b879f65e956d7dedd5b08736369e9a24acc b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/f6/476b879f65e956d7dedd5b08736369e9a24acc new file mode 100644 index 000000000..ee01041e0 Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/f6/476b879f65e956d7dedd5b08736369e9a24acc differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5 new file mode 100644 index 000000000..6d0ae484c Binary files /dev/null and b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5 differ diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/master b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/master new file mode 100644 index 000000000..b6bccc1c1 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/master @@ -0,0 +1 @@ +a238b1dfcd825d47d834af3c5223417c8411d90d diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch new file mode 100644 index 000000000..45cec5467 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch @@ -0,0 +1 @@ +68c197d0879d485f4f6cee85544722b79e68e59f diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/submodule b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/submodule new file mode 100644 index 000000000..e9f4f32c3 --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/submodule @@ -0,0 +1 @@ +2fa37f6885d7eb746df75eccaddbacf3ac82799d diff --git a/buildroot/support/testing/tests/download/git-remote/repo.git/refs/tags/mytag b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/tags/mytag new file mode 100644 index 000000000..8c09448ad --- /dev/null +++ b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/tags/mytag @@ -0,0 +1 @@ +2b0e0d98a49c97da6a618ab36337e2058eb733a2 diff --git a/buildroot/support/testing/tests/download/gitremote.py b/buildroot/support/testing/tests/download/gitremote.py new file mode 100644 index 000000000..3b35456dd --- /dev/null +++ b/buildroot/support/testing/tests/download/gitremote.py @@ -0,0 +1,46 @@ +# subprocess does not kill the child daemon when a test case fails by raising +# an exception. So use pexpect instead. +import infra + +import pexpect + + +GIT_REMOTE_PORT_INITIAL = 9418 +GIT_REMOTE_PORT_LAST = GIT_REMOTE_PORT_INITIAL + 99 + + +class GitRemote(object): + def __init__(self, builddir, serveddir, logtofile): + """ + Start a local git server. + + In order to support test cases in parallel, select the port the + server will listen to in runtime. Since there is no reliable way + to allocate the port prior to starting the server (another + process in the host machine can use the port between it is + selected from a list and it is really allocated to the server) + try to start the server in a port and in the case it is already + in use, try the next one in the allowed range. + """ + self.daemon = None + self.port = None + self.logfile = infra.open_log_file(builddir, "gitremote", logtofile) + + daemon_cmd = ["git", "daemon", "--reuseaddr", "--verbose", + "--listen=localhost", "--export-all", + "--base-path={}".format(serveddir)] + for port in range(GIT_REMOTE_PORT_INITIAL, GIT_REMOTE_PORT_LAST + 1): + cmd = daemon_cmd + ["--port={port}".format(port=port)] + self.logfile.write("> starting git remote with '{}'\n".format(" ".join(cmd))) + self.daemon = pexpect.spawn(cmd[0], cmd[1:], logfile=self.logfile) + ret = self.daemon.expect(["Ready to rumble", + "Address already in use"]) + if ret == 0: + self.port = port + return + raise SystemError("Could not find a free port to run git remote") + + def stop(self): + if self.daemon is None: + return + self.daemon.terminate(force=True) diff --git a/buildroot/support/testing/tests/download/test_git.py b/buildroot/support/testing/tests/download/test_git.py new file mode 100644 index 000000000..245555729 --- /dev/null +++ b/buildroot/support/testing/tests/download/test_git.py @@ -0,0 +1,81 @@ +import os +import shutil + +from gitremote import GitRemote + +import infra + + +class GitTestBase(infra.basetest.BRConfigTest): + config = \ + """ + BR2_BACKUP_SITE="" + """ + gitremotedir = infra.filepath("tests/download/git-remote") + gitremote = None + + def setUp(self): + super(GitTestBase, self).setUp() + self.gitremote = GitRemote(self.builddir, self.gitremotedir, self.logtofile) + + def tearDown(self): + self.show_msg("Cleaning up") + if self.gitremote: + self.gitremote.stop() + if self.b and not self.keepbuilds: + self.b.delete() + + def check_hash(self, package): + # store downloaded tarball inside the output dir so the test infra + # cleans it up at the end + env = {"BR2_DL_DIR": os.path.join(self.builddir, "dl"), + "GITREMOTE_PORT_NUMBER": str(self.gitremote.port)} + self.b.build(["{}-dirclean".format(package), + "{}-source".format(package)], + env) + + def check_download(self, package): + # store downloaded tarball inside the output dir so the test infra + # cleans it up at the end + dl_dir = os.path.join(self.builddir, "dl") + # enforce we test the download + if os.path.exists(dl_dir): + shutil.rmtree(dl_dir) + env = {"BR2_DL_DIR": dl_dir, + "GITREMOTE_PORT_NUMBER": str(self.gitremote.port)} + self.b.build(["{}-dirclean".format(package), + "{}-legal-info".format(package)], + env) + + +class TestGitHash(GitTestBase): + br2_external = [infra.filepath("tests/download/br2-external/git-hash")] + + def test_run(self): + with self.assertRaises(SystemError): + self.check_hash("bad") + self.check_hash("good") + self.check_hash("nohash") + + +class TestGitRefs(GitTestBase): + br2_external = [infra.filepath("tests/download/br2-external/git-refs")] + + def test_run(self): + with self.assertRaises(SystemError): + self.check_download("git-wrong-content") + with self.assertRaises(SystemError): + self.check_download("git-wrong-sha1") + self.check_download("git-partial-sha1-branch-head") + self.check_download("git-partial-sha1-reachable-by-branch") + self.check_download("git-partial-sha1-reachable-by-tag") + self.check_download("git-partial-sha1-tag-itself") + self.check_download("git-partial-sha1-tag-points-to") + self.check_download("git-sha1-branch-head") + self.check_download("git-sha1-reachable-by-branch") + self.check_download("git-sha1-reachable-by-tag") + self.check_download("git-sha1-tag-itself") + self.check_download("git-sha1-tag-points-to") + self.check_download("git-submodule-disabled") + self.check_download("git-submodule-enabled") + self.check_download("git-tag") diff --git a/buildroot/support/testing/tests/package/copy-sample-script-to-target.sh b/buildroot/support/testing/tests/package/copy-sample-script-to-target.sh new file mode 100755 index 000000000..6448a80d6 --- /dev/null +++ b/buildroot/support/testing/tests/package/copy-sample-script-to-target.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +shift +for file in "$@"; do + cp -f "${file}" "${TARGET_DIR}/root/" +done diff --git a/buildroot/support/testing/tests/package/sample_python_argh.py b/buildroot/support/testing/tests/package/sample_python_argh.py new file mode 100644 index 000000000..48247bf60 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_argh.py @@ -0,0 +1,10 @@ +import argh + + +@argh.arg("foo", help="help for foo") +@argh.arg("--bar", help="help for bar") +def main(foo, bar=False): + print("{}, {}".format(foo, bar)) + + +argh.dispatch_command(main) diff --git a/buildroot/support/testing/tests/package/sample_python_attrs.py b/buildroot/support/testing/tests/package/sample_python_attrs.py new file mode 100644 index 000000000..f22494491 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_attrs.py @@ -0,0 +1,15 @@ +import attr + + +@attr.s +class Obj(object): + x = attr.ib() + y = attr.ib(default=1) + + +obj1 = Obj(2) +assert(obj1.x == 2) +assert(obj1.y == 1) +obj2 = Obj(3, 4) +assert(obj2.x == 3) +assert(obj2.y == 4) diff --git a/buildroot/support/testing/tests/package/sample_python_autobahn.py b/buildroot/support/testing/tests/package/sample_python_autobahn.py new file mode 100644 index 000000000..8189b6a6b --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_autobahn.py @@ -0,0 +1 @@ +import autobahn.wamp # noqa diff --git a/buildroot/support/testing/tests/package/sample_python_automat.py b/buildroot/support/testing/tests/package/sample_python_automat.py new file mode 100644 index 000000000..baf536f99 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_automat.py @@ -0,0 +1,27 @@ +from automat import MethodicalMachine + + +class Led(object): + _machine = MethodicalMachine() + + @_machine.state() + def led_on(self): + "led is on" + + @_machine.state(initial=True) + def led_off(self): + "led is off" + + @_machine.input() + def turn_on(self): + "turn the led on" + + @_machine.output() + def _light(self): + print("light") + + led_off.upon(turn_on, enter=led_on, outputs=[_light]) + + +led = Led() +led.turn_on() diff --git a/buildroot/support/testing/tests/package/sample_python_bitstring.py b/buildroot/support/testing/tests/package/sample_python_bitstring.py new file mode 100644 index 000000000..2cc10dba6 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_bitstring.py @@ -0,0 +1,6 @@ +import bitstring + +value = bitstring.BitArray("uint:12=42") +assert(value.hex == "02a") +assert(value.bin == "000000101010") +assert(value.uint == 42) diff --git a/buildroot/support/testing/tests/package/sample_python_cbor_dec.py b/buildroot/support/testing/tests/package/sample_python_cbor_dec.py new file mode 100644 index 000000000..5ca5e3aa7 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_cbor_dec.py @@ -0,0 +1,10 @@ +import cbor + +with open("/tmp/data.cbor", "rb") as f: + serialized = f.read() +data = cbor.loads(serialized) +print(data) +assert(data["name"] == "python-cbor") +assert(data["versions"] == ["1", "2"]) +assert(data["group"]["is_a_package"] is True) +assert(data["group"]["value"] == 42) diff --git a/buildroot/support/testing/tests/package/sample_python_cbor_enc.py b/buildroot/support/testing/tests/package/sample_python_cbor_enc.py new file mode 100644 index 000000000..1bde92bb9 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_cbor_enc.py @@ -0,0 +1,14 @@ +import cbor + +data = { + "name": "python-cbor", + "versions": ["1", "2"], + "group": { + "is_a_package": True, + "value": 42 + } +} +serialized = cbor.dumps(data) +print(serialized) +with open("/tmp/data.cbor", "wb") as f: + f.write(serialized) diff --git a/buildroot/support/testing/tests/package/sample_python_click.py b/buildroot/support/testing/tests/package/sample_python_click.py new file mode 100644 index 000000000..759868d08 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_click.py @@ -0,0 +1,12 @@ +import click + + +@click.command() +@click.argument("foo") +@click.option("--bar", is_flag=True, help="help for bar") +def main(foo, bar): + click.echo("{}, {}".format(foo, bar)) + + +if __name__ == '__main__': + main() diff --git a/buildroot/support/testing/tests/package/sample_python_constantly.py b/buildroot/support/testing/tests/package/sample_python_constantly.py new file mode 100644 index 000000000..570cf85b2 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_constantly.py @@ -0,0 +1,19 @@ +from constantly import ValueConstant, Values + + +class RESULT(Values): + OK = ValueConstant(0) + FAIL = ValueConstant(-1) + + @classmethod + def get(cls, rc): + if rc == 0: + return cls.OK + else: + return cls.FAIL + + +print(list(RESULT.iterconstants())) +assert(RESULT.OK < RESULT.FAIL) +assert(RESULT.OK.value > RESULT.FAIL.value) +assert(RESULT.get(-5) == RESULT.FAIL) diff --git a/buildroot/support/testing/tests/package/sample_python_crossbar.py b/buildroot/support/testing/tests/package/sample_python_crossbar.py new file mode 100644 index 000000000..3695fe92c --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_crossbar.py @@ -0,0 +1,3 @@ +import crossbar + +crossbar.run(["version"]) diff --git a/buildroot/support/testing/tests/package/sample_python_cryptography.py b/buildroot/support/testing/tests/package/sample_python_cryptography.py new file mode 100644 index 000000000..ec9883dc6 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_cryptography.py @@ -0,0 +1,3 @@ +from cryptography.fernet import Fernet +key = Fernet.generate_key() +f = Fernet(key) diff --git a/buildroot/support/testing/tests/package/sample_python_incremental.py b/buildroot/support/testing/tests/package/sample_python_incremental.py new file mode 100644 index 000000000..b6e2aa803 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_incremental.py @@ -0,0 +1,3 @@ +import incremental +v = incremental.Version("package", 1, 2, 3, release_candidate=4) +assert(str(v) == "[package, version 1.2.3rc4]") diff --git a/buildroot/support/testing/tests/package/sample_python_passlib.py b/buildroot/support/testing/tests/package/sample_python_passlib.py new file mode 100644 index 000000000..3ab348b9e --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_passlib.py @@ -0,0 +1,5 @@ +from passlib.hash import pbkdf2_sha256 + +hash = pbkdf2_sha256.hash("password") +assert(pbkdf2_sha256.verify("passWord", hash) is False) +assert(pbkdf2_sha256.verify("password", hash) is True) diff --git a/buildroot/support/testing/tests/package/sample_python_pexpect.py b/buildroot/support/testing/tests/package/sample_python_pexpect.py new file mode 100644 index 000000000..cfe395fc2 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_pexpect.py @@ -0,0 +1,8 @@ +import pexpect + +p = pexpect.spawn(["login"]) +p.expect("login:") +p.sendline("wrong") +p.expect("Password:") +p.sendline("wrong") +p.expect("Login incorrect") diff --git a/buildroot/support/testing/tests/package/sample_python_pynacl.py b/buildroot/support/testing/tests/package/sample_python_pynacl.py new file mode 100644 index 000000000..d17c50ebe --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_pynacl.py @@ -0,0 +1,3 @@ +import nacl.utils + +nonce = nacl.utils.random(16) diff --git a/buildroot/support/testing/tests/package/sample_python_pyyaml_dec.py b/buildroot/support/testing/tests/package/sample_python_pyyaml_dec.py new file mode 100644 index 000000000..9ab893119 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_pyyaml_dec.py @@ -0,0 +1,10 @@ +import yaml + +with open("/tmp/data.yml", "rb") as f: + serialized = f.read() +data = yaml.load(serialized) +print(data) +assert(data["name"] == "python-pyyaml") +assert(data["versions"] == ["1", "2"]) +assert(data["group"]["is_a_package"] is True) +assert(data["group"]["value"] == 42) diff --git a/buildroot/support/testing/tests/package/sample_python_pyyaml_enc.py b/buildroot/support/testing/tests/package/sample_python_pyyaml_enc.py new file mode 100644 index 000000000..30759949e --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_pyyaml_enc.py @@ -0,0 +1,14 @@ +import yaml + +data = { + "name": "python-pyyaml", + "versions": ["1", "2"], + "group": { + "is_a_package": True, + "value": 42 + } +} +serialized = yaml.dump(data, default_flow_style=False) +print(serialized) +with open("/tmp/data.yml", "w") as f: + f.write(serialized) diff --git a/buildroot/support/testing/tests/package/sample_python_service_identity.py b/buildroot/support/testing/tests/package/sample_python_service_identity.py new file mode 100644 index 000000000..3184b6c58 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_service_identity.py @@ -0,0 +1,2 @@ +from service_identity import VerificationError # noqa +from service_identity.pyopenssl import verify_hostname # noqa diff --git a/buildroot/support/testing/tests/package/sample_python_subprocess32.py b/buildroot/support/testing/tests/package/sample_python_subprocess32.py new file mode 100644 index 000000000..8579745cc --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_subprocess32.py @@ -0,0 +1,6 @@ +import subprocess32 + +output = subprocess32.check_output(["ls", "-l", "/dev/null"]) +print(output) +assert("/dev/null" in output) +assert("No such" not in output) diff --git a/buildroot/support/testing/tests/package/sample_python_treq.py b/buildroot/support/testing/tests/package/sample_python_treq.py new file mode 100644 index 000000000..974fdcd8e --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_treq.py @@ -0,0 +1,16 @@ +from twisted.internet import reactor +import treq + + +def done(response): + print(response.code) + reactor.stop() + + +def err(fail): + print(fail.value) + reactor.stop() + + +treq.get("https://localhost").addCallback(done).addErrback(err) +reactor.run() diff --git a/buildroot/support/testing/tests/package/sample_python_twisted.py b/buildroot/support/testing/tests/package/sample_python_twisted.py new file mode 100644 index 000000000..47d6c5deb --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_twisted.py @@ -0,0 +1,9 @@ +from twisted.internet import protocol, reactor, endpoints + + +class F(protocol.Factory): + pass + + +endpoints.serverFromString(reactor, "tcp:1234").listen(F()) +reactor.run() diff --git a/buildroot/support/testing/tests/package/sample_python_txaio_asyncio.py b/buildroot/support/testing/tests/package/sample_python_txaio_asyncio.py new file mode 100644 index 000000000..77f11ed80 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_txaio_asyncio.py @@ -0,0 +1,3 @@ +import txaio +txaio.use_asyncio() +f0 = txaio.create_future() diff --git a/buildroot/support/testing/tests/package/sample_python_txaio_twisted.py b/buildroot/support/testing/tests/package/sample_python_txaio_twisted.py new file mode 100644 index 000000000..13ea82a96 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_txaio_twisted.py @@ -0,0 +1,3 @@ +import txaio +txaio.use_twisted() +f0 = txaio.create_future() diff --git a/buildroot/support/testing/tests/package/sample_python_txtorcon.py b/buildroot/support/testing/tests/package/sample_python_txtorcon.py new file mode 100644 index 000000000..c4a2ae6f5 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_txtorcon.py @@ -0,0 +1 @@ +import txtorcon # noqa diff --git a/buildroot/support/testing/tests/package/sample_python_ubjson_dec.py b/buildroot/support/testing/tests/package/sample_python_ubjson_dec.py new file mode 100644 index 000000000..12ccdfd58 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_ubjson_dec.py @@ -0,0 +1,10 @@ +import ubjson + +with open("/tmp/data.json", "rb") as f: + serialized = f.read() +data = ubjson.loadb(serialized) +print(data) +assert(data["name"] == "python-ubjson") +assert(data["versions"] == ["1", "2"]) +assert(data["group"]["is_a_package"] is True) +assert(data["group"]["value"] == 42) diff --git a/buildroot/support/testing/tests/package/sample_python_ubjson_enc.py b/buildroot/support/testing/tests/package/sample_python_ubjson_enc.py new file mode 100644 index 000000000..9a2140ef8 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_ubjson_enc.py @@ -0,0 +1,14 @@ +import ubjson + +data = { + "name": "python-ubjson", + "versions": ["1", "2"], + "group": { + "is_a_package": True, + "value": 42 + } +} +serialized = ubjson.dumpb(data) +print(serialized) +with open("/tmp/data.json", "wb") as f: + f.write(serialized) diff --git a/buildroot/support/testing/tests/package/test_atop.py b/buildroot/support/testing/tests/package/test_atop.py new file mode 100644 index 000000000..32c5a07c3 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_atop.py @@ -0,0 +1,40 @@ +import os + +import infra.basetest + + +class TestAtop(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_SYSTEM_DHCP="eth0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + BR2_PACKAGE_ATOP=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + kernel = os.path.join(self.builddir, "images", "zImage") + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + dtb = os.path.join(self.builddir, "images", "vexpress-v2p-ca9.dtb") + self.emulator.boot(arch="armv7", kernel=kernel, options=["-initrd", cpio_file, "-M", "vexpress-a9", "-dtb", dtb]) + self.emulator.login() + + cmd = "atop -V | grep '^Version'" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + cmd = "atop -a 1 2 | grep '% *atop *$'" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) diff --git a/buildroot/support/testing/tests/package/test_docker_compose.py b/buildroot/support/testing/tests/package/test_docker_compose.py new file mode 100644 index 000000000..de53a3da1 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_docker_compose.py @@ -0,0 +1,63 @@ +import os + +import infra.basetest + + +class TestDockerCompose(infra.basetest.BRTest): + config = \ + """ + BR2_x86_64=y + BR2_x86_core2=y + BR2_TOOLCHAIN_BUILDROOT_GLIBC=y + BR2_KERNEL_HEADERS_4_19=y + BR2_SYSTEM_DHCP="eth0" + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_CGROUPFS_MOUNT=y + BR2_PACKAGE_DOCKER_CLI=y + BR2_PACKAGE_DOCKER_COMPOSE=y + BR2_PACKAGE_DOCKER_ENGINE=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="512M" + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("conf/docker-compose.yml"), + infra.filepath("conf/docker-compose-kernel.config")) + + def wait_for_dockerd(self): + # dockerd takes a while to start up + _, _ = self.emulator.run('while [ ! -e /var/run/docker.sock ]; do sleep 1; done', 120) + + def docker_test(self): + # will download container if not available, which may take some time + _, exit_code = self.emulator.run('docker run --rm busybox:latest /bin/true', 120) + self.assertEqual(exit_code, 0) + + def docker_compose_test(self): + # will download container if not available, which may take some time + _, exit_code = self.emulator.run('docker-compose up', 120) + self.assertEqual(exit_code, 0) + + def test_run(self): + kernel = os.path.join(self.builddir, "images", "bzImage") + rootfs = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="x86_64", + kernel=kernel, + kernel_cmdline=["root=/dev/vda", "console=ttyS0"], + options=["-cpu", "core2duo", + "-m", "512M", + "-device", "virtio-rng-pci", + "-drive", "file={},format=raw,if=virtio".format(rootfs), + "-net", "nic,model=virtio", + "-net", "user"]) + self.emulator.login() + self.wait_for_dockerd() + self.docker_test() + self.docker_compose_test() diff --git a/buildroot/support/testing/tests/package/test_dropbear.py b/buildroot/support/testing/tests/package/test_dropbear.py index 8f7f1fee8..bfec8701f 100644 --- a/buildroot/support/testing/tests/package/test_dropbear.py +++ b/buildroot/support/testing/tests/package/test_dropbear.py @@ -4,14 +4,16 @@ import infra.basetest class TestDropbear(infra.basetest.BRTest): + passwd = "testpwd" config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ - BR2_TARGET_GENERIC_ROOT_PASSWD="testpwd" + BR2_TARGET_GENERIC_ROOT_PASSWD="{}" BR2_SYSTEM_DHCP="eth0" BR2_PACKAGE_DROPBEAR=y + BR2_PACKAGE_SSHPASS=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - """ + """.format(passwd) def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.cpio") @@ -19,11 +21,12 @@ class TestDropbear(infra.basetest.BRTest): kernel="builtin", options=["-initrd", img, "-net", "nic", - "-net", "user,hostfwd=tcp::2222-:22"]) - self.emulator.login("testpwd") + "-net", "user"]) + self.emulator.login(self.passwd) cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:22" _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 0) - # Would be useful to try to login through SSH here, through - # localhost:2222, though it is not easy to pass the ssh - # password on the command line. + + cmd = "sshpass -p {} ssh -y localhost /bin/true".format(self.passwd) + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) diff --git a/buildroot/support/testing/tests/package/test_lua.py b/buildroot/support/testing/tests/package/test_lua.py new file mode 100644 index 000000000..77358ba13 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_lua.py @@ -0,0 +1,59 @@ +import os + +import infra.basetest + + +class TestLuaBase(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + def version_test(self, version): + cmd = "lua -v" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(version, output[0]) + + def g_version_test(self, expected): + cmd = "lua -e 'print(_G._VERSION)'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], expected) + + def module_test(self, module, script="a=1"): + cmd = "lua -l {} -e '{}'".format(module, script) + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + +class TestLua(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + """ + + def test_run(self): + self.login() + self.version_test('Lua 5.3') + self.g_version_test('Lua 5.3') + + +class TestLuajit(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + """ + + def test_run(self): + self.login() + self.version_test('LuaJIT 2') + self.g_version_test('Lua 5.1') diff --git a/buildroot/support/testing/tests/package/test_perl.py b/buildroot/support/testing/tests/package/test_perl.py new file mode 100644 index 000000000..033b7cf34 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl.py @@ -0,0 +1,66 @@ +import os + +import infra.basetest + + +class TestPerlBase(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + def module_test(self, module, script="1"): + cmd = "perl -M{} -e '{}'".format(module, script) + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + +class TestPerl(TestPerlBase): + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + """ + + def version_test(self): + cmd = "perl -v" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn("This is perl 5", output[1]) + + def core_modules_test(self): + self.module_test("Cwd") + self.module_test("Data::Dumper") + self.module_test("Devel::Peek") + self.module_test("Digest::MD5") + self.module_test("Digest::SHA") + self.module_test("Encode") + self.module_test("Fcntl") + self.module_test("File::Glob") + self.module_test("Hash::Util") + self.module_test("I18N::Langinfo") + self.module_test("IO::Handle") + self.module_test("IPC::SysV") + self.module_test("List::Util") + self.module_test("MIME::Base64") + self.module_test("POSIX") + self.module_test("Socket") + self.module_test("Storable") + self.module_test("Sys::Hostname") + self.module_test("Sys::Syslog") + self.module_test("Time::HiRes") + self.module_test("Time::Piece") + self.module_test("Unicode::Collate") + self.module_test("Unicode::Normalize") + + def test_run(self): + self.login() + self.version_test() + self.core_modules_test() diff --git a/buildroot/support/testing/tests/package/test_perl_class_load.py b/buildroot/support/testing/tests/package/test_perl_class_load.py new file mode 100644 index 000000000..fbcd904aa --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_class_load.py @@ -0,0 +1,28 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlClassLoad(TestPerlBase): + """ + package: + Class-Load + direct dependencies: + Data-OptList + Module-Implementation + Module-Runtime + Package-Stash + Try-Tiny + indirect dependencies: + Dist-CheckConflicts + Params-Util XS + Sub-Install + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_CLASS_LOAD=y + """ + + def test_run(self): + self.login() + self.module_test("Class::Load") diff --git a/buildroot/support/testing/tests/package/test_perl_dbd_mysql.py b/buildroot/support/testing/tests/package/test_perl_dbd_mysql.py new file mode 100644 index 000000000..f8fe832b4 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_dbd_mysql.py @@ -0,0 +1,21 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlDBDmysql(TestPerlBase): + """ + package: + DBD-mysql XS + direct dependencies: + DBI XS + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_DBD_MYSQL=y + """ + + def test_run(self): + self.login() + self.module_test("DBI") + self.module_test("DBD::mysql") diff --git a/buildroot/support/testing/tests/package/test_perl_encode_detect.py b/buildroot/support/testing/tests/package/test_perl_encode_detect.py new file mode 100644 index 000000000..4b33fee01 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_encode_detect.py @@ -0,0 +1,20 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlEncodeDetect(TestPerlBase): + """ + package: + Encode-Detect XS + direct dependencies: + Module-Build + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_ENCODE_DETECT=y + """ + + def test_run(self): + self.login() + self.module_test("Encode::Detect") diff --git a/buildroot/support/testing/tests/package/test_perl_gdgraph.py b/buildroot/support/testing/tests/package/test_perl_gdgraph.py new file mode 100644 index 000000000..23ddbca4a --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_gdgraph.py @@ -0,0 +1,22 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlGDGraph(TestPerlBase): + """ + package: + GDGraph + direct dependencies: + GD XS + GDTextUtil + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_GDGRAPH=y + """ + + def test_run(self): + self.login() + self.module_test("GD") + self.module_test("GD::Graph") diff --git a/buildroot/support/testing/tests/package/test_perl_io_socket_multicast.py b/buildroot/support/testing/tests/package/test_perl_io_socket_multicast.py new file mode 100644 index 000000000..48a086a6f --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_io_socket_multicast.py @@ -0,0 +1,21 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlIOSocketMulticast(TestPerlBase): + """ + package: + IO-Socket-Multicast XS + direct dependencies: + IO-Interface XS + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_IO_SOCKET_MULTICAST=y + """ + + def test_run(self): + self.login() + self.module_test("IO::Interface") + self.module_test("IO::Socket::Multicast") diff --git a/buildroot/support/testing/tests/package/test_perl_io_socket_ssl.py b/buildroot/support/testing/tests/package/test_perl_io_socket_ssl.py new file mode 100644 index 000000000..51663e837 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_io_socket_ssl.py @@ -0,0 +1,21 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlIOSocketSSL(TestPerlBase): + """ + package: + IO-Socket-SSL + direct dependencies: + Net-SSLeay XS + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_IO_SOCKET_SSL=y + """ + + def test_run(self): + self.login() + self.module_test("Net::SSLeay") + self.module_test("IO::Socket::SSL") diff --git a/buildroot/support/testing/tests/package/test_perl_libwww_perl.py b/buildroot/support/testing/tests/package/test_perl_libwww_perl.py new file mode 100644 index 000000000..af9f7c7ed --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_libwww_perl.py @@ -0,0 +1,41 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerllibwwwperl(TestPerlBase): + """ + package: + libwww-perl + direct dependencies: + Encode-Locale + File-Listing + HTML-Parser XS + HTTP-Cookies + HTTP-Daemon + HTTP-Date + HTTP-Message + HTTP-Negotiate + LWP-MediaTypes + Net-HTTP + Try-Tiny + URI + WWW-RobotRules + indirect dependencies: + HTML-Tagset + IO-HTML + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_LIBWWW_PERL=y + """ + + def test_run(self): + self.login() + self.module_test("LWP") + self.module_test("LWP::UserAgent") + self.module_test("LWP::Authen::Basic") + self.module_test("LWP::Authen::Digest") + self.module_test("HTTP::Message") + self.module_test("HTTP::Daemon") + self.module_test("WWW::RobotRules") diff --git a/buildroot/support/testing/tests/package/test_perl_mail_dkim.py b/buildroot/support/testing/tests/package/test_perl_mail_dkim.py new file mode 100644 index 000000000..7affce82b --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_mail_dkim.py @@ -0,0 +1,28 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlMailDKIM(TestPerlBase): + """ + package: + Mail-DKIM + direct dependencies: + Crypt-OpenSSL-RSA XS + MailTools + Net-DNS + Net-DNS-Resolver-Mock + YAML-LibYAML XS + indirect dependencies: + Crypt-OpenSSL-Random XS + Digest-HMAC + TimeDate + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_MAIL_DKIM=y + """ + + def test_run(self): + self.login() + self.module_test("Mail::DKIM") diff --git a/buildroot/support/testing/tests/package/test_perl_x10.py b/buildroot/support/testing/tests/package/test_perl_x10.py new file mode 100644 index 000000000..84feb74e6 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_x10.py @@ -0,0 +1,22 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlX10(TestPerlBase): + """ + package: + X10 + direct dependencies: + Astro-SunTime + Device-SerialPort XS + Time-ParseDate + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_X10=y + """ + + def test_run(self): + self.login() + self.module_test("X10") diff --git a/buildroot/support/testing/tests/package/test_perl_xml_libxml.py b/buildroot/support/testing/tests/package/test_perl_xml_libxml.py new file mode 100644 index 000000000..faace5dd0 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_perl_xml_libxml.py @@ -0,0 +1,22 @@ +from tests.package.test_perl import TestPerlBase + + +class TestPerlXMLLibXML(TestPerlBase): + """ + package: + XML-LibXML XS + direct dependencies: + XML-NamespaceSupport + XML-SAX + XML-SAX-Base + """ + + config = TestPerlBase.config + \ + """ + BR2_PACKAGE_PERL=y + BR2_PACKAGE_PERL_XML_LIBXML=y + """ + + def test_run(self): + self.login() + self.module_test("XML::LibXML") diff --git a/buildroot/support/testing/tests/package/test_prosody.py b/buildroot/support/testing/tests/package/test_prosody.py new file mode 100644 index 000000000..8ef8ff95f --- /dev/null +++ b/buildroot/support/testing/tests/package/test_prosody.py @@ -0,0 +1,48 @@ +from tests.package.test_lua import TestLuaBase + + +class TestProsody(TestLuaBase): + def lua_dependencies_test(self): + self.module_test('bit') # luabitop + self.module_test('lfs') # luafilesystem + self.module_test('lxp') # luaexpat + self.module_test('socket') # luasocket + self.module_test('ssl') # luasec + + def prosody_test(self): + # prosody was launched as service + cmd = "prosodyctl status" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn("Prosody is running", output[0]) + + +class TestProsodyLua51(TestProsody): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUA_5_1=y + BR2_PACKAGE_PROSODY=y + """ + + def test_run(self): + self.login() + self.version_test('Lua 5.1') + self.g_version_test('Lua 5.1') + self.lua_dependencies_test() + self.prosody_test() + + +class TestProsodyLuajit(TestProsody): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_PROSODY=y + """ + + def test_run(self): + self.login() + self.version_test('LuaJIT 2') + self.g_version_test('Lua 5.1') + self.lua_dependencies_test() + self.prosody_test() diff --git a/buildroot/support/testing/tests/package/test_python.py b/buildroot/support/testing/tests/package/test_python.py index 26cf49947..bcd363ad1 100644 --- a/buildroot/support/testing/tests/package/test_python.py +++ b/buildroot/support/testing/tests/package/test_python.py @@ -68,3 +68,58 @@ class TestPython3(TestPythonBase): self.math_floor_test() self.libc_time_test() self.zlib_test() + + +class TestPythonPackageBase(TestPythonBase): + """Common class to test a python package. + + Build an image containing the scripts listed in sample_scripts, start the + emulator, login to it and for each sample script in the image run the python + interpreter passing the name of the script and check the status code is 0. + + Each test case that inherits from this class must have: + __test__ = True - to let nose2 know that it is a test case + config - defconfig fragment with the packages to run the test + It also can have: + sample_scripts - list of scripts to add to the image and run on the target + timeout - timeout to the script to run when the default from the + test infra is not enough + When custom commands need be issued on the target the method + run_sample_scripts can be overridden. + """ + + __test__ = False + config_sample_scripts = \ + """ + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + "{sample_scripts}") + sample_scripts = None + timeout = -1 + + def __init__(self, names): + """Add the scripts to the target in build time.""" + super(TestPythonPackageBase, self).__init__(names) + if self.sample_scripts: + scripts = [infra.filepath(s) for s in self.sample_scripts] + self.config += self.config_sample_scripts.format(sample_scripts=" ".join(scripts)) + + def check_sample_scripts_exist(self): + """Check the scripts were really added to the image.""" + scripts = [os.path.basename(s) for s in self.sample_scripts] + cmd = "md5sum " + " ".join(scripts) + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + def run_sample_scripts(self): + """Run each script previously added to the image.""" + for script in self.sample_scripts: + cmd = self.interpreter + " " + os.path.basename(script) + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) + self.assertEqual(exit_code, 0) + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + self.run_sample_scripts() diff --git a/buildroot/support/testing/tests/package/test_python_argh.py b/buildroot/support/testing/tests/package/test_python_argh.py new file mode 100644 index 000000000..de4b4cbe7 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_argh.py @@ -0,0 +1,45 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonArgh(TestPythonPackageBase): + config = TestPythonPackageBase.config + sample_scripts = ["tests/package/sample_python_argh.py"] + + def run_sample_scripts(self): + cmd = self.interpreter + " sample_python_argh.py -h" + output, exit_code = self.emulator.run(cmd) + self.assertIn("usage:", output[0]) + self.assertEqual(exit_code, 0) + + cmd = self.interpreter + " sample_python_argh.py 123" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(output[0], "123, False") + self.assertEqual(exit_code, 0) + + cmd = self.interpreter + " sample_python_argh.py --bar 456" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(output[0], "456, True") + self.assertEqual(exit_code, 0) + + cmd = self.interpreter + " sample_python_argh.py" + output, exit_code = self.emulator.run(cmd) + self.assertIn("usage:", output[0]) + self.assertEqual(exit_code, 2) + + +class TestPythonPy2Argh(TestPythonArgh): + __test__ = True + config = TestPythonArgh.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_ARGH=y + """ + + +class TestPythonPy3Argh(TestPythonArgh): + __test__ = True + config = TestPythonArgh.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_ARGH=y + """ diff --git a/buildroot/support/testing/tests/package/test_python_attrs.py b/buildroot/support/testing/tests/package/test_python_attrs.py new file mode 100644 index 000000000..9f597034a --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_attrs.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Attrs(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_ATTRS=y + """ + sample_scripts = ["tests/package/sample_python_attrs.py"] + + +class TestPythonPy3Attrs(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_ATTRS=y + """ + sample_scripts = ["tests/package/sample_python_attrs.py"] diff --git a/buildroot/support/testing/tests/package/test_python_autobahn.py b/buildroot/support/testing/tests/package/test_python_autobahn.py index 2bc0f0ccc..af1f617d6 100644 --- a/buildroot/support/testing/tests/package/test_python_autobahn.py +++ b/buildroot/support/testing/tests/package/test_python_autobahn.py @@ -1,32 +1,21 @@ -from tests.package.test_python import TestPythonBase +from tests.package.test_python import TestPythonPackageBase -class TestPythonAutobahn(TestPythonBase): - def import_test(self): - cmd = self.interpreter + " -c 'import autobahn.wamp'" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) - - -class TestPythonPy2Autobahn(TestPythonAutobahn): - config = TestPythonBase.config + \ +class TestPythonPy2Autobahn(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON=y BR2_PACKAGE_PYTHON_AUTOBAHN=y """ - - def test_run(self): - self.login() - self.import_test() + sample_scripts = ["tests/package/sample_python_autobahn.py"] -class TestPythonPy3Autobahn(TestPythonAutobahn): - config = TestPythonBase.config + \ +class TestPythonPy3Autobahn(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_AUTOBAHN=y """ - - def test_run(self): - self.login() - self.import_test() + sample_scripts = ["tests/package/sample_python_autobahn.py"] diff --git a/buildroot/support/testing/tests/package/test_python_automat.py b/buildroot/support/testing/tests/package/test_python_automat.py new file mode 100644 index 000000000..00a7ed652 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_automat.py @@ -0,0 +1,23 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Automat(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_AUTOMAT=y + """ + sample_scripts = ["tests/package/sample_python_automat.py"] + timeout = 30 + + +class TestPythonPy3Automat(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_AUTOMAT=y + """ + sample_scripts = ["tests/package/sample_python_automat.py"] + timeout = 30 diff --git a/buildroot/support/testing/tests/package/test_python_bitstring.py b/buildroot/support/testing/tests/package/test_python_bitstring.py new file mode 100644 index 000000000..63b3fdb69 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_bitstring.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Bitstring(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_BITSTRING=y + """ + sample_scripts = ["tests/package/sample_python_bitstring.py"] + + +class TestPythonPy3Bitstring(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_BITSTRING=y + """ + sample_scripts = ["tests/package/sample_python_bitstring.py"] diff --git a/buildroot/support/testing/tests/package/test_python_cbor.py b/buildroot/support/testing/tests/package/test_python_cbor.py new file mode 100644 index 000000000..9da350376 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_cbor.py @@ -0,0 +1,23 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Cbor(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_CBOR=y + """ + sample_scripts = ["tests/package/sample_python_cbor_enc.py", + "tests/package/sample_python_cbor_dec.py"] + + +class TestPythonPy3Cbor(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CBOR=y + """ + sample_scripts = ["tests/package/sample_python_cbor_enc.py", + "tests/package/sample_python_cbor_dec.py"] diff --git a/buildroot/support/testing/tests/package/test_python_click.py b/buildroot/support/testing/tests/package/test_python_click.py new file mode 100644 index 000000000..db57d3aa9 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_click.py @@ -0,0 +1,44 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonClick(TestPythonPackageBase): + sample_scripts = ["tests/package/sample_python_click.py"] + + def run_sample_scripts(self): + cmd = self.interpreter + " sample_python_click.py --help" + output, exit_code = self.emulator.run(cmd) + self.assertIn("Usage:", output[0]) + self.assertEqual(exit_code, 0) + + cmd = self.interpreter + " sample_python_click.py 123" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(output[0], "123, False") + self.assertEqual(exit_code, 0) + + cmd = self.interpreter + " sample_python_click.py --bar 456" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(output[0], "456, True") + self.assertEqual(exit_code, 0) + + cmd = self.interpreter + " sample_python_click.py" + output, exit_code = self.emulator.run(cmd) + self.assertIn("Usage:", output[0]) + self.assertEqual(exit_code, 2) + + +class TestPythonPy2Click(TestPythonClick): + __test__ = True + config = TestPythonClick.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_CLICK=y + """ + + +class TestPythonPy3Click(TestPythonClick): + __test__ = True + config = TestPythonClick.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CLICK=y + """ diff --git a/buildroot/support/testing/tests/package/test_python_constantly.py b/buildroot/support/testing/tests/package/test_python_constantly.py new file mode 100644 index 000000000..5be01c4f8 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_constantly.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Constantly(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_CONSTANTLY=y + """ + sample_scripts = ["tests/package/sample_python_constantly.py"] + + +class TestPythonPy3Constantly(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CONSTANTLY=y + """ + sample_scripts = ["tests/package/sample_python_constantly.py"] diff --git a/buildroot/support/testing/tests/package/test_python_crossbar.py b/buildroot/support/testing/tests/package/test_python_crossbar.py new file mode 100644 index 000000000..2d7b739b5 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_crossbar.py @@ -0,0 +1,14 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Crossbar(TestPythonPackageBase): + __test__ = True + # use haveged to generate enough entropy so crossbar -> pynacl -> libsodium don't hang waiting for /dev/random + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CROSSBAR=y + BR2_PACKAGE_HAVEGED=y + """ + sample_scripts = ["tests/package/sample_python_crossbar.py"] + timeout = 60 diff --git a/buildroot/support/testing/tests/package/test_python_cryptography.py b/buildroot/support/testing/tests/package/test_python_cryptography.py index 78c3ef55b..14515fcd2 100644 --- a/buildroot/support/testing/tests/package/test_python_cryptography.py +++ b/buildroot/support/testing/tests/package/test_python_cryptography.py @@ -1,34 +1,23 @@ -from tests.package.test_python import TestPythonBase +from tests.package.test_python import TestPythonPackageBase -class TestPythonCryptography(TestPythonBase): - def fernet_test(self, timeout=-1): - cmd = self.interpreter + " -c 'from cryptography.fernet import Fernet;" - cmd += "key = Fernet.generate_key();" - cmd += "f = Fernet(key)'" - _, exit_code = self.emulator.run(cmd, timeout) - self.assertEqual(exit_code, 0) - - -class TestPythonPy2Cryptography(TestPythonCryptography): - config = TestPythonBase.config + \ +class TestPythonPy2Cryptography(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y """ - - def test_run(self): - self.login() - self.fernet_test(40) + sample_scripts = ["tests/package/sample_python_cryptography.py"] + timeout = 40 -class TestPythonPy3Cryptography(TestPythonCryptography): - config = TestPythonBase.config + \ +class TestPythonPy3Cryptography(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y """ - - def test_run(self): - self.login() - self.fernet_test(40) + sample_scripts = ["tests/package/sample_python_cryptography.py"] + timeout = 40 diff --git a/buildroot/support/testing/tests/package/test_python_incremental.py b/buildroot/support/testing/tests/package/test_python_incremental.py index acf743cdd..49800d893 100644 --- a/buildroot/support/testing/tests/package/test_python_incremental.py +++ b/buildroot/support/testing/tests/package/test_python_incremental.py @@ -1,34 +1,23 @@ -from tests.package.test_python import TestPythonBase +from tests.package.test_python import TestPythonPackageBase -class TestPythonIncremental(TestPythonBase): - def str_test(self): - cmd = self.interpreter + " -c 'import incremental;" - cmd += "v = incremental.Version(\"package\", 1, 2, 3, release_candidate=4);" - cmd += "assert(str(v) == \"[package, version 1.2.3rc4]\")'" - _, exit_code = self.emulator.run(cmd, timeout=30) - self.assertEqual(exit_code, 0) - - -class TestPythonPy2Incremental(TestPythonIncremental): - config = TestPythonBase.config + \ +class TestPythonPy2Incremental(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON=y BR2_PACKAGE_PYTHON_INCREMENTAL=y """ - - def test_run(self): - self.login() - self.str_test() + sample_scripts = ["tests/package/sample_python_incremental.py"] + timeout = 30 -class TestPythonPy3Incremental(TestPythonIncremental): - config = TestPythonBase.config + \ +class TestPythonPy3Incremental(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_INCREMENTAL=y """ - - def test_run(self): - self.login() - self.str_test() + sample_scripts = ["tests/package/sample_python_incremental.py"] + timeout = 30 diff --git a/buildroot/support/testing/tests/package/test_python_passlib.py b/buildroot/support/testing/tests/package/test_python_passlib.py new file mode 100644 index 000000000..7c85882bf --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_passlib.py @@ -0,0 +1,23 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Passlib(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_PASSLIB=y + """ + sample_scripts = ["tests/package/sample_python_passlib.py"] + timeout = 30 + + +class TestPythonPy3Passlib(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PASSLIB=y + """ + sample_scripts = ["tests/package/sample_python_passlib.py"] + timeout = 30 diff --git a/buildroot/support/testing/tests/package/test_python_pexpect.py b/buildroot/support/testing/tests/package/test_python_pexpect.py new file mode 100644 index 000000000..ba31cdbdb --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_pexpect.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Pexpect(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_PEXPECT=y + """ + sample_scripts = ["tests/package/sample_python_pexpect.py"] + + +class TestPythonPy3Pexpect(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PEXPECT=y + """ + sample_scripts = ["tests/package/sample_python_pexpect.py"] diff --git a/buildroot/support/testing/tests/package/test_python_pynacl.py b/buildroot/support/testing/tests/package/test_python_pynacl.py new file mode 100644 index 000000000..729a88755 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_pynacl.py @@ -0,0 +1,27 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Pynacl(TestPythonPackageBase): + __test__ = True + # use haveged to generate enough entropy so pynacl -> libsodium don't hang waiting for /dev/random + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_PYNACL=y + BR2_PACKAGE_HAVEGED=y + """ + sample_scripts = ["tests/package/sample_python_pynacl.py"] + timeout = 10 + + +class TestPythonPy3Pynacl(TestPythonPackageBase): + __test__ = True + # use haveged to generate enough entropy so pynacl -> libsodium don't hang waiting for /dev/random + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYNACL=y + BR2_PACKAGE_HAVEGED=y + """ + sample_scripts = ["tests/package/sample_python_pynacl.py"] + timeout = 10 diff --git a/buildroot/support/testing/tests/package/test_python_pyyaml.py b/buildroot/support/testing/tests/package/test_python_pyyaml.py new file mode 100644 index 000000000..cd45a57b8 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_pyyaml.py @@ -0,0 +1,23 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Pyyaml(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_PYYAML=y + """ + sample_scripts = ["tests/package/sample_python_pyyaml_enc.py", + "tests/package/sample_python_pyyaml_dec.py"] + + +class TestPythonPy3Pyyaml(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYYAML=y + """ + sample_scripts = ["tests/package/sample_python_pyyaml_enc.py", + "tests/package/sample_python_pyyaml_dec.py"] diff --git a/buildroot/support/testing/tests/package/test_python_service_identity.py b/buildroot/support/testing/tests/package/test_python_service_identity.py new file mode 100644 index 000000000..6aeb77de8 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_service_identity.py @@ -0,0 +1,23 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2ServiceIdentity(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y + """ + sample_scripts = ["tests/package/sample_python_service_identity.py"] + timeout = 30 + + +class TestPythonPy3ServiceIdentity(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y + """ + sample_scripts = ["tests/package/sample_python_service_identity.py"] + timeout = 30 diff --git a/buildroot/support/testing/tests/package/test_python_subprocess32.py b/buildroot/support/testing/tests/package/test_python_subprocess32.py new file mode 100644 index 000000000..d2878046d --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_subprocess32.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Subprocess32(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_SUBPROCESS32=y + """ + sample_scripts = ["tests/package/sample_python_subprocess32.py"] diff --git a/buildroot/support/testing/tests/package/test_python_treq.py b/buildroot/support/testing/tests/package/test_python_treq.py new file mode 100644 index 000000000..7108b9569 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_treq.py @@ -0,0 +1,29 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonTreq(TestPythonPackageBase): + sample_scripts = ["tests/package/sample_python_treq.py"] + + def run_sample_scripts(self): + cmd = self.interpreter + " sample_python_treq.py" + output, exit_code = self.emulator.run(cmd, timeout=20) + self.assertIn("Connection refused", output[0]) + self.assertEqual(exit_code, 0) + + +class TestPythonPy2Treq(TestPythonTreq): + __test__ = True + config = TestPythonTreq.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_TREQ=y + """ + + +class TestPythonPy3Treq(TestPythonTreq): + __test__ = True + config = TestPythonTreq.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_TREQ=y + """ diff --git a/buildroot/support/testing/tests/package/test_python_twisted.py b/buildroot/support/testing/tests/package/test_python_twisted.py index ccee07d61..a458ee45d 100644 --- a/buildroot/support/testing/tests/package/test_python_twisted.py +++ b/buildroot/support/testing/tests/package/test_python_twisted.py @@ -1,25 +1,16 @@ -from tests.package.test_python import TestPythonBase - -TEST_SCRIPT = """ -from twisted.internet import protocol, reactor, endpoints -class F(protocol.Factory): - pass -endpoints.serverFromString(reactor, "tcp:1234").listen(F()) -reactor.run() -""" +from tests.package.test_python import TestPythonPackageBase -class TestPythonTwisted(TestPythonBase): - def import_test(self): - cmd = "printf '{}' > test.py".format(TEST_SCRIPT) - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) +class TestPythonTwisted(TestPythonPackageBase): + config = TestPythonPackageBase.config + sample_scripts = ["tests/package/sample_python_twisted.py"] + def run_sample_scripts(self): cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 1) - cmd = self.interpreter + " test.py &" + cmd = self.interpreter + " sample_python_twisted.py &" # give some time to setup the server cmd += "sleep 30" _, exit_code = self.emulator.run(cmd, timeout=35) @@ -31,24 +22,18 @@ class TestPythonTwisted(TestPythonBase): class TestPythonPy2Twisted(TestPythonTwisted): - config = TestPythonBase.config + \ + __test__ = True + config = TestPythonTwisted.config + \ """ BR2_PACKAGE_PYTHON=y BR2_PACKAGE_PYTHON_TWISTED=y """ - def test_run(self): - self.login() - self.import_test() - class TestPythonPy3Twisted(TestPythonTwisted): - config = TestPythonBase.config + \ + __test__ = True + config = TestPythonTwisted.config + \ """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TWISTED=y """ - - def test_run(self): - self.login() - self.import_test() diff --git a/buildroot/support/testing/tests/package/test_python_txaio.py b/buildroot/support/testing/tests/package/test_python_txaio.py index af93e031b..7bff1bc23 100644 --- a/buildroot/support/testing/tests/package/test_python_txaio.py +++ b/buildroot/support/testing/tests/package/test_python_txaio.py @@ -1,34 +1,22 @@ -from tests.package.test_python import TestPythonBase +from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Txaio(TestPythonBase): - config = TestPythonBase.config + \ +class TestPythonPy2Txaio(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON=y BR2_PACKAGE_PYTHON_TXAIO=y BR2_PACKAGE_PYTHON_TWISTED=y """ - - def test_run(self): - self.login() - cmd = self.interpreter + " -c 'import txaio;" - cmd += "txaio.use_twisted();" - cmd += "f0 = txaio.create_future()'" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + sample_scripts = ["tests/package/sample_python_txaio_twisted.py"] -class TestPythonPy3Txaio(TestPythonBase): - config = TestPythonBase.config + \ +class TestPythonPy3Txaio(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TXAIO=y """ - - def test_run(self): - self.login() - cmd = self.interpreter + " -c 'import txaio;" - cmd += "txaio.use_asyncio();" - cmd += "f0 = txaio.create_future()'" - _, exit_code = self.emulator.run(cmd) - self.assertEqual(exit_code, 0) + sample_scripts = ["tests/package/sample_python_txaio_asyncio.py"] diff --git a/buildroot/support/testing/tests/package/test_python_txtorcon.py b/buildroot/support/testing/tests/package/test_python_txtorcon.py index 352ff6782..1ac2f6919 100644 --- a/buildroot/support/testing/tests/package/test_python_txtorcon.py +++ b/buildroot/support/testing/tests/package/test_python_txtorcon.py @@ -1,32 +1,23 @@ -from tests.package.test_python import TestPythonBase +from tests.package.test_python import TestPythonPackageBase -class TestPythonTxtorcon(TestPythonBase): - def import_test(self): - cmd = self.interpreter + " -c 'import txtorcon'" - _, exit_code = self.emulator.run(cmd, timeout=30) - self.assertEqual(exit_code, 0) - - -class TestPythonPy2Txtorcon(TestPythonTxtorcon): - config = TestPythonBase.config + \ +class TestPythonPy2Txtorcon(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON=y BR2_PACKAGE_PYTHON_TXTORCON=y """ - - def test_run(self): - self.login() - self.import_test() + sample_scripts = ["tests/package/sample_python_txtorcon.py"] + timeout = 30 -class TestPythonPy3Txtorcon(TestPythonTxtorcon): - config = TestPythonBase.config + \ +class TestPythonPy3Txtorcon(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_TXTORCON=y """ - - def test_run(self): - self.login() - self.import_test() + sample_scripts = ["tests/package/sample_python_txtorcon.py"] + timeout = 30 diff --git a/buildroot/support/testing/tests/package/test_python_ubjson.py b/buildroot/support/testing/tests/package/test_python_ubjson.py new file mode 100644 index 000000000..85c707e29 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_ubjson.py @@ -0,0 +1,23 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Ubjson(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_UBJSON=y + """ + sample_scripts = ["tests/package/sample_python_ubjson_enc.py", + "tests/package/sample_python_ubjson_dec.py"] + + +class TestPythonPy3Ubjson(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_UBJSON=y + """ + sample_scripts = ["tests/package/sample_python_ubjson_enc.py", + "tests/package/sample_python_ubjson_dec.py"] diff --git a/buildroot/support/testing/tests/package/test_rust.py b/buildroot/support/testing/tests/package/test_rust.py index 2dc814f99..9854c3692 100644 --- a/buildroot/support/testing/tests/package/test_rust.py +++ b/buildroot/support/testing/tests/package/test_rust.py @@ -57,25 +57,25 @@ class TestRustBase(infra.basetest.BRTest): class TestRustBin(TestRustBase): config = \ - """ - BR2_arm=y - BR2_cortex_a9=y - BR2_ARM_ENABLE_NEON=y - BR2_ARM_ENABLE_VFP=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - BR2_SYSTEM_DHCP="eth0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y - BR2_PACKAGE_HOST_RUSTC=y - """ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_SYSTEM_DHCP="eth0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_HOST_CARGO=y + BR2_PACKAGE_HOST_RUSTC=y + """ def test_run(self): self.build_test_prog() @@ -86,26 +86,26 @@ class TestRustBin(TestRustBase): class TestRust(TestRustBase): config = \ - """ - BR2_arm=y - BR2_cortex_a9=y - BR2_ARM_ENABLE_NEON=y - BR2_ARM_ENABLE_VFP=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - BR2_SYSTEM_DHCP="eth0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y - BR2_PACKAGE_HOST_RUSTC=y - BR2_PACKAGE_HOST_RUST=y - """ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_SYSTEM_DHCP="eth0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_HOST_CARGO=y + BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_HOST_RUST=y + """ def test_run(self): self.build_test_prog() diff --git a/buildroot/system/Config.in b/buildroot/system/Config.in index 9e34f11b6..498b56e22 100644 --- a/buildroot/system/Config.in +++ b/buildroot/system/Config.in @@ -31,10 +31,6 @@ config BR2_ROOTFS_SKELETON_CUSTOM_PATH help Path to custom target skeleton. -# dummy config so merged /usr workarounds can also be activated for -# custom rootfs skeleton -config BR2_ROOTFS_MERGED_USR - endif if BR2_ROOTFS_SKELETON_DEFAULT @@ -61,40 +57,22 @@ endif choice bool "Passwords encoding" - default BR2_TARGET_GENERIC_PASSWD_MD5 + default BR2_TARGET_GENERIC_PASSWD_SHA256 help Choose the password encoding scheme to use when Buildroot needs to encode a password (eg. the root password, below). Note: this is used at build-time, and *not* at runtime. -config BR2_TARGET_GENERIC_PASSWD_MD5 - bool "md5" - help - Use MD5 to encode passwords. - - The default. Wildly available, and pretty good. - Although pretty strong, MD5 is now an old hash function, and - suffers from some weaknesses, which makes it susceptible to - brute-force attacks. - config BR2_TARGET_GENERIC_PASSWD_SHA256 bool "sha-256" help - Use SHA256 to encode passwords. - - Very strong, but not ubiquitous, although available in glibc - for some time now. Choose only if you are sure your C library - understands SHA256 passwords. + Use SHA256 to encode passwords which is stronger than MD5. config BR2_TARGET_GENERIC_PASSWD_SHA512 bool "sha-512" help - Use SHA512 to encode passwords. - - Extremely strong, but not ubiquitous, although available in - glibc for some time now. Choose only if you are sure your C - library understands SHA512 passwords. + Use SHA512 to encode passwords which is stronger than SHA256 endchoice # Passwd encoding @@ -210,8 +188,6 @@ config BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES help Support extended attributes handling in device tables -if BR2_ROOTFS_SKELETON_DEFAULT - config BR2_ROOTFS_MERGED_USR bool "Use symlinks to /usr for /bin, /sbin and /lib" help @@ -224,6 +200,8 @@ config BR2_ROOTFS_MERGED_USR symlinks to their counterparts in /usr. In this case, /usr can not be a separate filesystem. +if BR2_ROOTFS_SKELETON_DEFAULT + config BR2_TARGET_ENABLE_ROOT_LOGIN bool "Enable root login with password" default y @@ -404,6 +382,16 @@ comment "automatic network configuration via DHCP needs ifupdown or busybox or n endif # BR2_ROOTFS_SKELETON_DEFAULT +config BR2_SYSTEM_DEFAULT_PATH + string "Set the system's default PATH" + default "/bin:/sbin:/usr/bin:/usr/sbin" + help + Sets the system's default PATH. It is being used in + /etc/profile in the skeleton-init-common package and by some + daemons. + + The default should work in most cases. + config BR2_ENABLE_LOCALE_PURGE bool "Purge unwanted locales" default y diff --git a/buildroot/system/skeleton/etc/profile b/buildroot/system/skeleton/etc/profile index 1255d23ff..db29e4492 100644 --- a/buildroot/system/skeleton/etc/profile +++ b/buildroot/system/skeleton/etc/profile @@ -1,4 +1,4 @@ -export PATH=/bin:/sbin:/usr/bin:/usr/sbin +export PATH=@PATH@ if [ "$PS1" ]; then if [ "`id -u`" -eq 0 ]; then diff --git a/buildroot/system/system.mk b/buildroot/system/system.mk index ca6bf1388..8db87cb12 100644 --- a/buildroot/system/system.mk +++ b/buildroot/system/system.mk @@ -86,3 +86,7 @@ define SYSTEM_REMOUNT_ROOT_INITTAB $(SED) '/^[^#].*-o remount,rw \/$$/s~^~#~' $(TARGET_DIR)/etc/inittab endef endif + +ifeq ($(BR_BUILDING)$(BR2_SYSTEM_DEFAULT_PATH),y"") +$(error BR2_SYSTEM_DEFAULT_PATH can't be empty) +endif diff --git a/buildroot/toolchain/Config.in b/buildroot/toolchain/Config.in index bf8ed5bf5..87d7bc30b 100644 --- a/buildroot/toolchain/Config.in +++ b/buildroot/toolchain/Config.in @@ -15,10 +15,16 @@ config BR2_TOOLCHAIN_USES_GLIBC select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_HAS_UCONTEXT select BR2_TOOLCHAIN_SUPPORTS_PIE config BR2_TOOLCHAIN_USES_UCLIBC bool + # ucontext is only available for a subset of the supported + # architectures + select BR2_TOOLCHAIN_HAS_UCONTEXT if BR2_ARM_CPU_HAS_ARM || BR2_i386 \ + || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \ + || BR2_sparc || BR2_x86_64 select BR2_TOOLCHAIN_SUPPORTS_PIE if !BR2_m68k && !BR2_microblaze && !BR2_STATIC_LIBS config BR2_TOOLCHAIN_USES_MUSL @@ -28,6 +34,7 @@ config BR2_TOOLCHAIN_USES_MUSL select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_HAS_UCONTEXT select BR2_TOOLCHAIN_SUPPORTS_PIE if !BR2_STATIC_LIBS choice @@ -93,6 +100,19 @@ config BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_sparc_v8 depends on !BR2_m68k_cf5208 +# GCC uses thunk functions to adjust the 'this' pointer when calling +# C++ member functions in classes derived with multiple inheritance. +# Generation of thunk functions requires support from the compiler +# back end. In the absence of that support target-independent code +# in the C++ front end is used to generate thunk functions, but it +# does not support vararg functions. +# or1k will support it in the gcc mainline starting with gcc-9. +config BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK + bool + default y + depends on !BR2_or1k + depends on !BR2_xtensa + # Prior to gcc 7.x, exception_ptr, nested_exception and future from # libstdc++ would only be provided on architectures that support # always lock-free atomic ints. See @@ -109,6 +129,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_TOOLCHAIN_HAS_GCC_BUG_85180 bool default y if BR2_microblaze + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85862 # An infinite loop exists in the find_base_term() logic of 6.x @@ -145,6 +166,9 @@ config BR2_TOOLCHAIN_HAS_THREADS_NPTL config BR2_TOOLCHAIN_HAS_SSP bool +config BR2_TOOLCHAIN_HAS_UCONTEXT + bool + config BR2_TOOLCHAIN_SUPPORTS_PIE bool @@ -370,10 +394,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.20" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 default "4.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 default "4.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 default "4.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in index 1e303c5ec..d992be019 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE - bool "Arm AArch64 BE 2018.08" + bool "Arm AArch64 BE 2018.11" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" depends on !BR2_STATIC_LIBS @@ -7,7 +7,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 select BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_HAS_FORTRAN help diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash index 9ab0eb519..580e10dd7 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.08/gcc-arm-8.2-2018.08-x86_64-aarch64_be-linux-gnu.tar.xz.asc -md5 789171dc11bc2e37e90ea3c6de46c719 gcc-arm-8.2-2018.08-x86_64-aarch64_be-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/gcc-arm-8.2-2018.11-x86_64-aarch64_be-linux-gnu.tar.xz.asc +md5 ab9a31ebe529b0a0cae78e610a9ffa0b gcc-arm-8.2-2018.11-x86_64-aarch64_be-linux-gnu.tar.xz # locally calculated -sha256 2cd8a1a35a892db5f0cd738a8b17bd1563f6d6e4be43a2b527b355bcfb295df8 gcc-arm-8.2-2018.08-x86_64-aarch64_be-linux-gnu.tar.xz +sha256 36df73194804ac52053edf469c7ace73fb4b243a8306dadfb7b95c4f485abde4 gcc-arm-8.2-2018.11-x86_64-aarch64_be-linux-gnu.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk index 4a4e5a01b..a41d9cadf 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2018.08 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2018.11 TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION) TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-8.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-linux-gnu.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index ba627129c..fbb5e025e 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 - bool "Arm AArch64 2018.08" + bool "Arm AArch64 2018.11" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" depends on !BR2_STATIC_LIBS @@ -7,7 +7,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 select BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_HAS_FORTRAN help diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash index d651bb018..cda90f751 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.08/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu.tar.xz.asc -md5 1c47f4edc431cf19604a9f1b09975269 gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/gcc-arm-8.2-2018.11-x86_64-aarch64-linux-gnu.tar.xz.asc +md5 319ca548ff05b0ec1008988a7e5ab619 gcc-arm-8.2-2018.11-x86_64-aarch64-linux-gnu.tar.xz # locally calculated -sha256 3e60644846ac60693e58ad71a319d64c5f7bcf95ff34411272c8d9674f85648f gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu.tar.xz +sha256 0142366da2f30feb1c366997cbdaa02286c8f1aa527c0fc177ee5ce8e77970fc gcc-arm-8.2-2018.11-x86_64-aarch64-linux-gnu.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk index 515b66cd7..0398bd129 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2018.08 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2018.11 TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION) TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-8.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-linux-gnu.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 4ec61f2d0..044973788 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -4,7 +4,7 @@ comment "Arm toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM - bool "Arm ARM 2018.08" + bool "Arm ARM 2018.11" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" @@ -14,7 +14,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 select BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_HAS_FORTRAN help diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash index f13c43a7e..cd7f52654 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.08/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf.tar.xz.asc -md5 dc7455746d90259337fb88c3e67f8855 gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/gcc-arm-8.2-2018.11-x86_64-arm-linux-gnueabihf.tar.xz.asc +md5 59ccf965837ed1c5ba59e5ad4b688b21 gcc-arm-8.2-2018.11-x86_64-arm-linux-gnueabihf.tar.xz # locally calculated -sha256 5b3f20e1327edc3073e545a5bd3d15f33e7f94181ff4e37a76e95924c1b439b9 gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf.tar.xz +sha256 3f9bc7a68f744a5edc7caebff5f3f2c3bc1ff9d8ac8b05f7680a0071461deede gcc-arm-8.2-2018.11-x86_64-arm-linux-gnueabihf.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk index 03de21a28..0c21affd7 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2018.08 +TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2018.11 TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION) TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-8.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-x86_64-arm-linux-gnueabihf.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in index 2bfa56767..be6e56a2c 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -1,19 +1,19 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - bool "Codescape IMG GNU Linux Toolchain 2016.05" + bool "Codescape IMG GNU Linux Toolchain 2018.09" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_HAS_FORTRAN help - Codescape IMG GNU Linux Toolchain 2016.05 for the MIPS - architecture, from Imagination Technologies. It uses gcc - 4.9.2, binutils 2.24.90, glibc 2.20, gdb 7.9.1 and kernel - headers 4.7. It has support for the following variants: + Codescape IMG GNU Linux Toolchain 2018.09 for the MIPS + architecture, from MIPS Tech LLC. It uses gcc 6.3.0, + binutils 2.28.51, glibc 2.20, gdb 7.9.1 and kernel headers + 4.7. It has support for the following variants: - MIPS32r6 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI Select 'MIPS (big endian)' Target Architecture Select 'mips 32r6' Target Architecture Variant diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash index 6a12cfa07..b540164a2 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash @@ -1,4 +1,4 @@ -# Codescape toolchains from Imagination Technologies -# From: http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-06/downloads.html -sha256 8d9cdf711dd402d7bf82883d425c221038fe8ce9d0c91a3f6b30939d9d55476c Codescape.GNU.Tools.Package.2016.05-06.for.MIPS.IMG.Linux.CentOS-5.x86.tar.gz -sha256 6e2784d6df962fe4db7510c8a62ce3947b73f54207b10e18b52da59d1bc487bd Codescape.GNU.Tools.Package.2016.05-06.for.MIPS.IMG.Linux.CentOS-5.x86_64.tar.gz +# Codescape toolchains from MIPS Tech LLC +# From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html +sha256 ac035f3b6a8767522977963d8e1490520d58bccca7956f4503a1eefff6492b71 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz +sha256 09280f4fcbb993607905bf9a43bf5f3db2beed85726f0675b8453e19a9ddc429 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk index 49a7027df..55424918c 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk @@ -4,14 +4,14 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION = 2016.05-06 -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SITE = http://codescape-mips-sdk.imgtec.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION) +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION = 2018.09-02 +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SITE = https://codescape.mips.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION) TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STRIP_COMPONENTS = 2 ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-5.x86.tar.gz +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz else -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-5.x86_64.tar.gz +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz endif # Special fixup for Codescape MIPS toolchains, that have bin- and diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index 5d466a58f..15d628476 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -1,20 +1,20 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - bool "Codescape MTI GNU Linux Toolchain 2016.05" + bool "Codescape MTI GNU Linux Toolchain 2018.09" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_HAS_FORTRAN help - Codescape MTI GNU Linux Toolchain 2016.05 for the MIPS - architecture, from Imagination Technologies. It uses gcc - 4.9.2, binutils 2.24.90, glibc 2.20, gdb 7.9.1 and kernel - headers 4.7. It has support for the following variants: + Codescape MTI GNU Linux Toolchain 2018.09 for the MIPS + architecture, from MIPS Tech LLC. It uses gcc 6.3.0, + binutils 2.28.51, glibc 2.20, gdb 7.9.1 and kernel headers + 4.7. It has support for the following variants: - MIPS32r2 - Big-Endian, Hard-Float, Legacy NaN, o32 ABI Select 'MIPS (big endian)' Target Architecture Select 'mips 32r2' Target Architecture Variant diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash index d31f99803..8e70af501 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash @@ -1,4 +1,4 @@ -# Codescape toolchains from Imagination Technologies -# From: http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-06/downloads.html -sha256 3a7aba259beb05f0e3054b5a61a368a5085447f47361949a938ac9cc7de4227b Codescape.GNU.Tools.Package.2016.05-06.for.MIPS.MTI.Linux.CentOS-5.x86.tar.gz -sha256 a676a8b3647c8c651fb8935a75db8f00b79d36ec55676f7c05bac12b550788f7 Codescape.GNU.Tools.Package.2016.05-06.for.MIPS.MTI.Linux.CentOS-5.x86_64.tar.gz +# Codescape toolchains from MIPS Tech LLC +# From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html +sha256 c883a404fd7ea5718e2249a530802e223381f2be52265f88e9b1ce7035c232f3 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz +sha256 d6310a970b0a8a19ad8e0a2b3ead8c38ee90d0e284a9b2511200ce447f460d2c Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk index d63a36757..9bee1ab87 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk @@ -4,14 +4,14 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION = 2016.05-06 -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SITE = http://codescape-mips-sdk.imgtec.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION) +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION = 2018.09-02 +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SITE = https://codescape.mips.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION) TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STRIP_COMPONENTS = 2 ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-5.x86.tar.gz +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz else -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-5.x86_64.tar.gz +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz endif # Special fixup for Codescape MIPS toolchains, that have bin- and diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 288fc3f3e..08a79ee4d 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -123,6 +123,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_20 + bool "4.20.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19 bool "4.19.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index 423e4c7db..5cb0ce2a3 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -1,7 +1,7 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC - bool "Synopsys ARC 2018.03 toolchain" + bool "Synopsys ARC 2018.09 toolchain" depends on BR2_arc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP @@ -12,7 +12,7 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_7 + select BR2_TOOLCHAIN_GCC_AT_LEAST_8 help Toolchain for the ARC cores, from https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash index df95897e4..20eac19ca 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash @@ -1,5 +1,5 @@ -# From https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2018.03-release -sha256 32e8500b65737b51058d84f443d7919d5b33c43f7dc5b8562e08d4e92c53a77f arc_gnu_2018.03_prebuilt_uclibc_le_arc700_linux_install.tar.gz -sha256 722e3656f60bafd632b6f2ae2c6efa6b9d3eae1bc1840f4d004aa30f5cb419ff arc_gnu_2018.03_prebuilt_uclibc_be_arc700_linux_install.tar.gz -sha256 8e736178343cea9a6cbe63a7d86fa9e81db6671f27fc8a9a7cea98cc6183bbcc arc_gnu_2018.03_prebuilt_uclibc_le_archs_linux_install.tar.gz -sha256 14024daa36f6ae7cf1e474780687e79af5aaa35d374b077f7036685d7eab3d72 arc_gnu_2018.03_prebuilt_uclibc_be_archs_linux_install.tar.gz +# From https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2018.09-release +sha256 324b422eec3b9b36ea64c9e13167a4467fc13ab230eff34f2fa785039b460c16 arc_gnu_2018.09_prebuilt_uclibc_le_arc700_linux_install.tar.gz +sha256 b0299ad9be0c300237789e5bf8e45d72bf040aab00c3718fbdb4160b75d2ed8f arc_gnu_2018.09_prebuilt_uclibc_be_arc700_linux_install.tar.gz +sha256 d1a4c039416b3da4d94ea066f861cc96ec60afec9c2bab1b2e937555b5e05238 arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install.tar.gz +sha256 a519ed3686dc8e3c5f86646988d38647aa039f4af3204d9b7e84efa26cd37221 arc_gnu_2018.09_prebuilt_uclibc_be_archs_linux_install.tar.gz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk index c60f296a8..e3ff17ff7 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2018.03 +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2018.09 TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)-release ifeq ($(BR2_arc750d)$(BR2_arc770d),y) diff --git a/buildroot/utils/check-package b/buildroot/utils/check-package index 3dbc28b0a..ce1fe98d6 100755 --- a/buildroot/utils/check-package +++ b/buildroot/utils/check-package @@ -6,6 +6,7 @@ import argparse import inspect import os import re +import six import sys import checkpackagelib.lib_config @@ -127,10 +128,19 @@ def check_file_using_lib(fname): for cf in objects: nwarnings += print_warnings(cf.before()) - for lineno, text in enumerate(open(fname, "r").readlines()): + if six.PY3: + f = open(fname, "r", errors="surrogateescape") + else: + f = open(fname, "r") + lastline = "" + for lineno, text in enumerate(f.readlines()): nlines += 1 for cf in objects: + if cf.disable.search(lastline): + continue nwarnings += print_warnings(cf.check_line(lineno + 1, text)) + lastline = text + f.close() for cf in objects: nwarnings += print_warnings(cf.after()) diff --git a/buildroot/utils/checkpackagelib/base.py b/buildroot/utils/checkpackagelib/base.py index fc09bec9a..9544a64e5 100644 --- a/buildroot/utils/checkpackagelib/base.py +++ b/buildroot/utils/checkpackagelib/base.py @@ -1,10 +1,12 @@ # See utils/checkpackagelib/readme.txt before editing this file. +import re class _CheckFunction(object): def __init__(self, filename, url_to_manual): self.filename = filename self.url_to_manual = url_to_manual + self.disable = re.compile(r"^\s*# check-package .*\b{}\b".format(self.__class__.__name__)) def before(self): pass diff --git a/buildroot/utils/checkpackagelib/lib.py b/buildroot/utils/checkpackagelib/lib.py index 91f4ad49b..6afe1aabc 100644 --- a/buildroot/utils/checkpackagelib/lib.py +++ b/buildroot/utils/checkpackagelib/lib.py @@ -1,6 +1,6 @@ # See utils/checkpackagelib/readme.txt before editing this file. -from base import _CheckFunction +from checkpackagelib.base import _CheckFunction class ConsecutiveEmptyLines(_CheckFunction): diff --git a/buildroot/utils/checkpackagelib/lib_config.py b/buildroot/utils/checkpackagelib/lib_config.py index 1d273f1c5..89d44da57 100644 --- a/buildroot/utils/checkpackagelib/lib_config.py +++ b/buildroot/utils/checkpackagelib/lib_config.py @@ -5,11 +5,11 @@ import re -from base import _CheckFunction -from lib import ConsecutiveEmptyLines # noqa: F401 -from lib import EmptyLastLine # noqa: F401 -from lib import NewlineAtEof # noqa: F401 -from lib import TrailingSpace # noqa: F401 +from checkpackagelib.base import _CheckFunction +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 def _empty_or_comment(text): diff --git a/buildroot/utils/checkpackagelib/lib_hash.py b/buildroot/utils/checkpackagelib/lib_hash.py index 6d4cc9fd6..3e381119a 100644 --- a/buildroot/utils/checkpackagelib/lib_hash.py +++ b/buildroot/utils/checkpackagelib/lib_hash.py @@ -5,11 +5,11 @@ import re -from base import _CheckFunction -from lib import ConsecutiveEmptyLines # noqa: F401 -from lib import EmptyLastLine # noqa: F401 -from lib import NewlineAtEof # noqa: F401 -from lib import TrailingSpace # noqa: F401 +from checkpackagelib.base import _CheckFunction +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 def _empty_line_or_comment(text): diff --git a/buildroot/utils/checkpackagelib/lib_mk.py b/buildroot/utils/checkpackagelib/lib_mk.py index 0e430a2f1..00efeb7fb 100644 --- a/buildroot/utils/checkpackagelib/lib_mk.py +++ b/buildroot/utils/checkpackagelib/lib_mk.py @@ -6,16 +6,20 @@ import re -from base import _CheckFunction -from lib import ConsecutiveEmptyLines # noqa: F401 -from lib import EmptyLastLine # noqa: F401 -from lib import NewlineAtEof # noqa: F401 -from lib import TrailingSpace # noqa: F401 +from checkpackagelib.base import _CheckFunction +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 + +# used in more than one check +start_conditional = ["ifdef", "ifeq", "ifndef", "ifneq"] +end_conditional = ["endif"] class Indent(_CheckFunction): COMMENT = re.compile("^\s*#") - CONDITIONAL = re.compile("^\s*(ifeq|ifneq|endif)\s") + CONDITIONAL = re.compile("^\s*({})\s".format("|".join(start_conditional + end_conditional))) ENDS_WITH_BACKSLASH = re.compile(r"^[^#].*\\$") END_DEFINE = re.compile("^\s*endef\s") MAKEFILE_TARGET = re.compile("^[^# \t]+:\s") @@ -69,6 +73,66 @@ class Indent(_CheckFunction): text] +class OverriddenVariable(_CheckFunction): + CONCATENATING = re.compile("^([A-Z0-9_]+)\s*(\+|:|)=\s*\$\(\\1\)") + END_CONDITIONAL = re.compile("^\s*({})".format("|".join(end_conditional))) + OVERRIDING_ASSIGNMENTS = [':=', "="] + START_CONDITIONAL = re.compile("^\s*({})".format("|".join(start_conditional))) + VARIABLE = re.compile("^([A-Z0-9_]+)\s*((\+|:|)=)") + USUALLY_OVERRIDDEN = re.compile("^[A-Z0-9_]+({})".format("|".join([ + "_ARCH\s*=\s*", + "_CPU\s*=\s*", + "_SITE\s*=\s*", + "_SOURCE\s*=\s*", + "_VERSION\s*=\s*"]))) + + def before(self): + self.conditional = 0 + self.unconditionally_set = [] + self.conditionally_set = [] + + def check_line(self, lineno, text): + if self.START_CONDITIONAL.search(text): + self.conditional += 1 + return + if self.END_CONDITIONAL.search(text): + self.conditional -= 1 + return + + m = self.VARIABLE.search(text) + if m is None: + return + variable, assignment = m.group(1, 2) + + if self.conditional == 0: + if variable in self.conditionally_set: + self.unconditionally_set.append(variable) + if assignment in self.OVERRIDING_ASSIGNMENTS: + return ["{}:{}: unconditional override of variable {} previously conditionally set" + .format(self.filename, lineno, variable), + text] + + if variable not in self.unconditionally_set: + self.unconditionally_set.append(variable) + return + if assignment in self.OVERRIDING_ASSIGNMENTS: + return ["{}:{}: unconditional override of variable {}" + .format(self.filename, lineno, variable), + text] + else: + if variable not in self.unconditionally_set: + self.conditionally_set.append(variable) + return + if self.CONCATENATING.search(text): + return + if self.USUALLY_OVERRIDDEN.search(text): + return + if assignment in self.OVERRIDING_ASSIGNMENTS: + return ["{}:{}: conditional override of variable {}" + .format(self.filename, lineno, variable), + text] + + class PackageHeader(_CheckFunction): def before(self): self.skip = False @@ -222,8 +286,8 @@ class UselessFlag(_CheckFunction): "_INSTALL_REDISTRIBUTE\s*=\s*YES", "_INSTALL_STAGING\s*=\s*NO", "_INSTALL_TARGET\s*=\s*YES"]))) - END_CONDITIONAL = re.compile("^\s*(endif)") - START_CONDITIONAL = re.compile("^\s*(ifeq|ifneq)") + END_CONDITIONAL = re.compile("^\s*({})".format("|".join(end_conditional))) + START_CONDITIONAL = re.compile("^\s*({})".format("|".join(start_conditional))) def before(self): self.conditional = 0 diff --git a/buildroot/utils/checkpackagelib/lib_patch.py b/buildroot/utils/checkpackagelib/lib_patch.py index 555621afa..453b782e6 100644 --- a/buildroot/utils/checkpackagelib/lib_patch.py +++ b/buildroot/utils/checkpackagelib/lib_patch.py @@ -5,8 +5,8 @@ import re -from base import _CheckFunction -from lib import NewlineAtEof # noqa: F401 +from checkpackagelib.base import _CheckFunction +from checkpackagelib.lib import NewlineAtEof # noqa: F401 class ApplyOrder(_CheckFunction): diff --git a/buildroot/utils/genrandconfig b/buildroot/utils/genrandconfig index 1d6ff990f..a2190d6d2 100755 --- a/buildroot/utils/genrandconfig +++ b/buildroot/utils/genrandconfig @@ -310,17 +310,9 @@ def fixup_config(configfile): 'BR2_PACKAGE_QT5BASE_GUI=y\n' in configlines: return False # The cs nios2 2017.02 toolchain is affected by binutils PR19405 - if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \ - 'BR2_PACKAGE_QT_GUI_MODULE=y\n' in configlines: - return False - # The cs nios2 2017.02 toolchain is affected by binutils PR19405 if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \ 'BR2_PACKAGE_FLANN=y\n' in configlines: return False - # or1k affected by binutils PR21464 - if 'BR2_or1k=y\n' in configlines and \ - 'BR2_PACKAGE_QT_GUI_MODULE=y\n' in configlines: - return False with open(configfile, "w+") as configf: configf.writelines(configlines) @@ -366,6 +358,8 @@ def gen_config(args): configlines.append("BR2_STATIC_LIBS=y\n") if randint(0, 20) == 0: configlines.append("BR2_PACKAGE_PYTHON_PY_ONLY=y\n") + if randint(0, 5) == 0: + configlines.append("BR2_OPTIMIZE_2=y\n") # Write out the configuration file if not os.path.exists(args.outputdir): diff --git a/buildroot/utils/get-developers b/buildroot/utils/get-developers index c88793885..750fc556d 100755 --- a/buildroot/utils/get-developers +++ b/buildroot/utils/get-developers @@ -24,11 +24,6 @@ def parse_args(): def __main__(): - # DEVELOPERS is one level up from here - devs_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..') - devs = getdeveloperlib.parse_developers(devs_dir) - if devs is None: - sys.exit(1) args = parse_args() # Check that only one action is given @@ -50,9 +45,17 @@ def __main__(): print("No action specified") return + # getdeveloperlib expects to be executed from the toplevel buildroot + # directory, which is one level up from this script + os.chdir(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')) + + devs = getdeveloperlib.parse_developers() + if devs is None: + sys.exit(1) + # Handle the check action if args.check: - files = getdeveloperlib.check_developers(devs, devs_dir) + files = getdeveloperlib.check_developers(devs) for f in files: print(f) diff --git a/buildroot/utils/getdeveloperlib.py b/buildroot/utils/getdeveloperlib.py index 84665520c..35c618f79 100644 --- a/buildroot/utils/getdeveloperlib.py +++ b/buildroot/utils/getdeveloperlib.py @@ -1,7 +1,9 @@ +from __future__ import print_function import os import re import glob import subprocess +import sys # # Patch parsing functions @@ -158,8 +160,6 @@ def parse_developers(basepath=None): linen = 0 if basepath is None: basepath = os.getcwd() - else: - basepath = os.path.abspath(basepath) with open(os.path.join(basepath, "DEVELOPERS"), "r") as f: files = [] name = None @@ -169,13 +169,15 @@ def parse_developers(basepath=None): continue elif line.startswith("N:"): if name is not None or len(files) != 0: - print("Syntax error in DEVELOPERS file, line %d" % linen) + print("Syntax error in DEVELOPERS file, line %d" % linen, + file=sys.stderr) name = line[2:].strip() elif line.startswith("F:"): fname = line[2:].strip() dev_files = glob.glob(os.path.join(basepath, fname)) if len(dev_files) == 0: - print("WARNING: '%s' doesn't match any file" % fname) + print("WARNING: '%s' doesn't match any file" % fname, + file=sys.stderr) files += dev_files elif line == "": if not name: @@ -184,7 +186,8 @@ def parse_developers(basepath=None): files = [] name = None else: - print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, line)) + print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, line), + file=sys.stderr) return None linen += 1 # handle last developer diff --git a/buildroot/utils/scancpan b/buildroot/utils/scancpan index 78ea08c6e..8073ad197 100755 --- a/buildroot/utils/scancpan +++ b/buildroot/utils/scancpan @@ -487,9 +487,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.026 should be aligned with the version of perl actually +# Below, 5.028 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.026; +die <<"MSG" if $] < 5.028; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -497,7 +497,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.26.0 + perlbrew install perl-5.28.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -519,6 +519,7 @@ my %dist; # name -> metacpan data my %need_target; # name -> 1 if target package is needed my %need_host; # name -> 1 if host package is needed my %need_dlopen; # name -> 1 if requires dynamic library +my %is_xs; # name -> 1 if XS module my %deps_build; # name -> list of host dependencies my %deps_runtime; # name -> list of target dependencies my %license_files; # name -> hash of license files @@ -575,6 +576,32 @@ sub find_license_files { return @license_files; } +sub want_test { + my ($distname) = @_; + return 1 if $need_dlopen{$distname} && scalar @{$deps_runtime{$distname}} > 0; +} + +sub get_dependencies { + my ($distname) = @_; + my %dep = map { $_ => 1 } @{$deps_runtime{$distname}}; + for my $direct (@{$deps_runtime{$distname}}) { + for (get_dependencies( $direct )) { + $dep{$_} = 1; + } + } + return keys %dep; +} + +sub get_indirect_dependencies { + my ($distname) = @_; + my %indirect; + my %direct = map { $_ => 1 } @{$deps_runtime{$distname}}; + for my $dep (get_dependencies( $distname )) { + $indirect{$dep} = 1 unless exists $direct{$dep}; + } + return keys %indirect; +} + sub fetch { my ($name, $need_target, $need_host, $top) = @_; $need_target{$name} = $need_target if $need_target; @@ -588,7 +615,7 @@ sub fetch { my $author = $result->{author}; my $release = $name . q{-} . $result->{version}; my $manifest = $mcpan->source( author => $author, release => $release, path => 'MANIFEST' ); - $need_dlopen{$name} = is_xs( $manifest ); + $need_dlopen{$name} = $is_xs{$name} = is_xs( $manifest ); foreach my $fname (find_license_files( $manifest )) { my $license = $mcpan->source( author => $author, release => $release, path => $fname ); $license_files{$name}->{$fname} = sha256_hex( $license ); @@ -688,6 +715,7 @@ while (my ($distname, $dist) = each %dist) { my $mkname = $dirname . q{/} . $fsname . q{.mk}; my $hashname = $dirname . q{/} . $fsname . q{.hash}; my $brname = brname( $fsname ); + my $testname = q{support/testing/tests/package/test_} . lc $brname . q{.py}; unless (-d $dirname) { mkdir $dirname; $new_pkgs = 1; @@ -779,6 +807,47 @@ while (my ($distname, $dist) = each %dist) { } close $fh; } + if (want_test( $distname ) && ($force || !-f $testname)) { + my $classname = $distname; + $classname =~ s|-||g; + my $modname = $distname; + $modname =~ s|-|::|g; + my $mark = $is_xs{$distname} ? q{ XS} : q{}; + my @indirect = (get_indirect_dependencies( $distname )); + say qq{write ${testname}} unless $quiet; + open my $fh, q{>}, $testname; + say {$fh} qq{from tests.package.test_perl import TestPerlBase}; + say {$fh} qq{}; + say {$fh} qq{}; + say {$fh} qq{class TestPerl${classname}(TestPerlBase):}; + say {$fh} qq{ """}; + say {$fh} qq{ package:}; + say {$fh} qq{ ${distname}${mark}}; + say {$fh} qq{ direct dependencies:}; + foreach my $dep (sort @{$deps_runtime{$distname}}) { + $mark = $is_xs{$dep} ? q{ XS} : q{}; + say {$fh} qq{ ${dep}${mark}}; + } + if (scalar @indirect > 0) { + say {$fh} qq{ indirect dependencies:}; + foreach my $dep (sort @indirect) { + $mark = $is_xs{$dep} ? q{ XS} : q{}; + say {$fh} qq{ ${dep}${mark}}; + } + } + say {$fh} qq{ """}; + say {$fh} qq{}; + say {$fh} qq{ config = TestPerlBase.config + \\}; + say {$fh} qq{ """}; + say {$fh} qq{ BR2_PACKAGE_PERL=y}; + say {$fh} qq{ BR2_PACKAGE_${brname}=y}; + say {$fh} qq{ """}; + say {$fh} qq{}; + say {$fh} qq{ def test_run(self):}; + say {$fh} qq{ self.login()}; + say {$fh} qq{ self.module_test("${modname}")}; + close $fh; + } } if ($new_pkgs) { @@ -812,7 +881,7 @@ utils/scancpan Try-Tiny Moo =head1 SYNOPSIS -supports/scripts/scancpan [options] [distname ...] +utils/scancpan [options] [distname ...] Options: -help @@ -901,9 +970,9 @@ This script is a part of Buildroot. This script requires the module C (version 1.131730) which was included at the beginning of this file by the tool C. -See L. +See L. -See L. +See L. These both libraries are free software and may be distributed under the same terms as perl itself. diff --git a/buildroot/utils/scanpypi b/buildroot/utils/scanpypi index 3d3e60443..55b3d1e61 100755 --- a/buildroot/utils/scanpypi +++ b/buildroot/utils/scanpypi @@ -10,9 +10,6 @@ from __future__ import print_function from __future__ import absolute_import import argparse import json -import six.moves.urllib.request -import six.moves.urllib.error -import six.moves.urllib.parse import sys import os import shutil @@ -25,6 +22,9 @@ import textwrap import tempfile import imp from functools import wraps +import six.moves.urllib.request +import six.moves.urllib.error +import six.moves.urllib.parse from six.moves import map from six.moves import zip from six.moves import input @@ -97,6 +97,7 @@ def pkg_buildroot_name(pkg_name): pkg_name -- String to rename """ name = re.sub('[^\w-]', '', pkg_name.lower()) + name = name.replace('_', '-') prefix = 'python-' pattern = re.compile('^(?!' + prefix + ')(.+?)$') name = pattern.sub(r'python-\1', name) @@ -225,6 +226,22 @@ class BuildrootPackage(): self.filename = self.used_url['filename'] self.url = self.used_url['url'] + def check_archive(self, members): + """ + Check archive content before extracting + + Keyword arguments: + members -- list of archive members + """ + # Protect against https://github.com/snyk/zip-slip-vulnerability + # Older python versions do not validate that the extracted files are + # inside the target directory. Detect and error out on evil paths + evil = [e for e in members if os.path.relpath(e).startswith(('/', '..'))] + if evil: + print('ERROR: Refusing to extract {} with suspicious members {}'.format( + self.filename, evil)) + sys.exit(1) + def extract_package(self, tmp_path): """ Extract the package contents into a directrory @@ -249,6 +266,7 @@ class BuildrootPackage(): print('Removing {pkg}...'.format(pkg=tmp_pkg)) shutil.rmtree(tmp_pkg) os.makedirs(tmp_pkg) + self.check_archive(as_zipfile.namelist()) as_zipfile.extractall(tmp_pkg) pkg_filename = self.filename.split(".zip")[0] else: @@ -264,6 +282,7 @@ class BuildrootPackage(): print('Removing {pkg}...'.format(pkg=tmp_pkg)) shutil.rmtree(tmp_pkg) os.makedirs(tmp_pkg) + self.check_archive(as_tarfile.getnames()) as_tarfile.extractall(tmp_pkg) pkg_filename = self.filename.split(".tar")[0] @@ -281,6 +300,12 @@ class BuildrootPackage(): sys.path.append(self.tmp_extract) s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) setup = imp.load_module('setup', s_file, s_path, s_desc) + if self.metadata_name in self.setup_args: + pass + elif self.metadata_name.replace('_', '-') in self.setup_args: + self.metadata_name = self.metadata_name.replace('_', '-') + elif self.metadata_name.replace('-', '_') in self.setup_args: + self.metadata_name = self.metadata_name.replace('-', '_') try: self.setup_metadata = self.setup_args[self.metadata_name] except KeyError: @@ -354,13 +379,14 @@ class BuildrootPackage(): version=self.version) lines.append(version_line) - targz = self.filename.replace( - self.version, - '$({name}_VERSION)'.format(name=self.mk_name)) - targz_line = '{name}_SOURCE = {filename}\n'.format( - name=self.mk_name, - filename=targz) - lines.append(targz_line) + if self.buildroot_name != self.real_name: + targz = self.filename.replace( + self.version, + '$({name}_VERSION)'.format(name=self.mk_name)) + targz_line = '{name}_SOURCE = {filename}\n'.format( + name=self.mk_name, + filename=targz) + lines.append(targz_line) if self.filename not in self.url: # Sometimes the filename is in the url, sometimes it's not diff --git a/buildroot/utils/test-pkg b/buildroot/utils/test-pkg index aa91ee02c..cce4679b0 100755 --- a/buildroot/utils/test-pkg +++ b/buildroot/utils/test-pkg @@ -2,12 +2,20 @@ set -e TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' +TEMP_CONF="" + +do_clean() { + if [ ! -z "${TEMP_CONF}" ]; then + rm -f "${TEMP_CONF}" + fi +} main() { local o O opts local cfg dir pkg random toolchains_dir toolchain all number mode local ret nb nb_skip nb_fail nb_legal nb_tc build_dir local -a toolchains + local pkg_br_name o='hac:d:n:p:r:t:' O='help,config-snippet:build-dir:package:,random:,toolchains-dir:' @@ -50,8 +58,15 @@ main() { ;; esac done + + trap do_clean INT TERM HUP EXIT + if [ -z "${cfg}" ]; then - printf "error: no config snippet specified\n" >&2; exit 1 + pkg_br_name="${pkg//-/_}" + pkg_br_name="BR2_PACKAGE_${pkg_br_name^^}" + TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) + echo "${pkg_br_name}=y" > ${TEMP_CONF} + cfg="${TEMP_CONF}" fi if [ ! -e "${cfg}" ]; then printf "error: %s: no such file\n" "${cfg}" >&2; exit 1 @@ -129,7 +144,7 @@ build_one() { mkdir -p "${dir}" - support/kconfig/merge_config.sh -O "${dir}" \ + CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ >> "${dir}/logfile" 2>&1 # We want all the options from the snippet to be present as-is (set @@ -152,7 +167,7 @@ build_one() { fi # shellcheck disable=SC2086 - if ! make O="${dir}" ${pkg} >> "${dir}/logfile" 2>&1; then + if ! BR_FORCE_CHECK_DEPENDENCIES=YES make O="${dir}" ${pkg} >> "${dir}/logfile" 2>&1; then return 2 fi diff --git a/scripts/enter.sh b/scripts/enter.sh index c330c0703..7e1cfdd5d 100755 --- a/scripts/enter.sh +++ b/scripts/enter.sh @@ -1,5 +1,9 @@ #!/bin/bash -modprobe overlayfs +BUILDER_UID="$(id -u)" +BUILDER_GID="$(id -g)" -docker build -t hassbuildroot . -docker run -it --rm --privileged -v "$(pwd):/build" -v "${CACHE_DIR:=$HOME/hassos-cache}:/cache" hassbuildroot bash +sudo docker build -t hassos:local . +sudo docker run -it --rm --privileged \ + -v "$(pwd):/build" -v "${CACHE_DIR:=$HOME/hassos-cache}:/cache" \ + -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \ + hassos:local bash diff --git a/scripts/entry.sh b/scripts/entry.sh index ca46d5480..ef9cbe2c1 100755 --- a/scripts/entry.sh +++ b/scripts/entry.sh @@ -1,7 +1,23 @@ #!/bin/bash set -e +USER="root" + # Run dockerd dockerd -s vfs &> /dev/null & -exec bash +# Setup local user +if [ "${BUILDER_UID:0}" -ne 0 ] && [ "${BUILDER_GID:0}" -ne 0 ]; then + groupadd -g "${BUILDER_GID}" builder + useradd -m -u "${BUILDER_UID}" -g "${BUILDER_GID}" -G docker,sudo builder + echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers + USER="builder" +fi + +if CMD="$(command -v "$1")"; then + shift + sudo -H -u ${USER} "$CMD" "$@" +else + echo "Command not found: $1" + exit 1 +fi diff --git a/scripts/ghr b/scripts/ghr deleted file mode 100755 index ac1e8073f..000000000 Binary files a/scripts/ghr and /dev/null differ