Update azure-pipelines-release.yml

* RaspberryPi: Update kernel 2e79fd01b4b9a7eea5acb234ad4e4cdca8449d5a

* Update rpi firmware & kernel

Documentation/configuration.md

@@ -19,7 +19,7 @@ hassos-xy.raucb
 - The `modules` folder is for modules-load configuration files.
 - The `modprobe` folder is for modules configuration files (/etc/modprobe.d)
 - The `udev` folder is for udev rules files.
-- The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio].
+- The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Home Assistant][debug-homeassistant].
 - The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
 - The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
 
@@ -57,4 +57,4 @@ FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org
 [systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
 [network.md]: network.md
 [hassos-release]: https://github.com/home-assistant/hassos/releases/
-[debug-hassio]: https://developers.home-assistant.io/docs/en/hassio_debugging.html
+[debug-homeassistant]: https://developers.home-assistant.io/docs/en/hassio_debugging.html

Documentation/getting_started_development.md

@@ -101,6 +101,6 @@ $ /usr/bin/qemu-system-x86_64 -enable-kvm -name hassos_ova -smp 2 -m 1024 -drive
 
 This should pop up qemu's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying addtional options and flags to qemu for network access, keyboard layout et al. are left as an exercise for the reader.
 
-After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *hassio>* shell prompt will yield a root shell in the host OS.
+After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *ha>* shell prompt will yield a root shell in the host OS.
 
 Happy hacking! :)

Documentation/kernel.md

@@ -3,9 +3,9 @@
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Applicance | 4.19.94 |
-| Raspberry Pi | 4.19.93 |
-| Tinker Board | 4.19.94 |
+| Open Virtual Applicance | 4.19.115 |
+| Raspberry Pi | 4.19.106 |
+| Tinker Board | 4.19.115 |
 | Odroid-C2 | 4.19.72 |
 | Odroid-XU4 | 4.19.72 |
-| Intel NUC | 4.19.94 |
+| Intel NUC | 4.19.115 |

Documentation/network.md

@@ -105,12 +105,12 @@ powersave=0
 Log into the HASSOS base system via a console:
 
 ```
-Welcome to HassOS
-Hassio login:
+Welcome to Home Assistant
+homeassistant login:
 ```
 Login as `root` (no password needed)
 
-At the `hassio >` prompt, type `login` (as instructed).
+At the `ha >` prompt, type `login` (as instructed).
 
 From here you will use the `nmcli` configuration tool.
 

azure-pipelines-release.yml

@@ -13,7 +13,7 @@ variables:
   - name: versionGHR
     value: 'v0.12.1'
   - group: github
-  - group: hassos
+  - group: rauc
 
 jobs:
 
@@ -89,5 +89,5 @@ jobs:
         hassos:azure make $(board)
     displayName: 'Build $(board)'
   - script: |
-      ./ghr -t $(githubToken) $(Build.SourceBranchName) release/
+      ./ghr -t $(githubToken) -replace $(Build.SourceBranchName) release/
     displayName: 'Upload $(board)'

buildroot-external/board/intel/nuc/kernel.config

@@ -13,17 +13,12 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
 
-CONFIG_SND_HDA=m
+CONFIG_SND_HDA=y
+CONFIG_SND_HDA_CORE=y
+CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
-
-CONFIG_BT=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_LE=y
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_SND_HDA_I915=m
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m

buildroot-external/busybox.config

@@ -320,7 +320,7 @@ CONFIG_TRUE=y
 CONFIG_TRUNCATE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
-CONFIG_UNAME_OSNAME="Hassio/OS"
+CONFIG_UNAME_OSNAME="HassOS"
 CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y

buildroot-external/configs/intel_nuc_defconfig

@@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -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/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.19.94"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.115"
 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
@@ -96,13 +96,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/odroid_c2_defconfig

@@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -90,13 +90,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/odroid_xu4_defconfig

@@ -9,8 +9,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -95,13 +95,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/ova_defconfig

@@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -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/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.94"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.115"
 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
@@ -87,13 +87,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi0_w_defconfig

@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2e79fd01b4b9a7eea5acb234ad4e4cdca8449d5a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 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_LINUX_KERNEL_LZ4=y
@@ -93,13 +93,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi2_defconfig

@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2e79fd01b4b9a7eea5acb234ad4e4cdca8449d5a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 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_LINUX_KERNEL_LZ4=y
@@ -92,13 +92,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi3_64_defconfig

@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2e79fd01b4b9a7eea5acb234ad4e4cdca8449d5a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 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_LINUX_KERNEL_LZ4=y
@@ -93,13 +93,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi3_defconfig

@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2e79fd01b4b9a7eea5acb234ad4e4cdca8449d5a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 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_LINUX_KERNEL_LZ4=y
@@ -93,13 +93,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi4_64_defconfig

@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2e79fd01b4b9a7eea5acb234ad4e4cdca8449d5a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 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_LINUX_KERNEL_LZ4=y
@@ -94,13 +94,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi4_defconfig

@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2e79fd01b4b9a7eea5acb234ad4e4cdca8449d5a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 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_LINUX_KERNEL_LZ4=y
@@ -94,13 +94,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi_defconfig

@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi $
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b4180819d3a119c56133d6a2d8301775bf6c60bb"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2e79fd01b4b9a7eea5acb234ad4e4cdca8449d5a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 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_LINUX_KERNEL_LZ4=y
@@ -92,13 +92,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/tinker_defconfig

@@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
 BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="hassio"
-BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS"
+BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
 BR2_INIT_SYSTEMD=y
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
@@ -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.94"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.115"
 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"
@@ -97,13 +97,13 @@ 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="195"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="217"
 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"
+BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="15"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
+BR2_PACKAGE_HASSOS_CLI_VERSION="25"
+BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/kernel/device-support.config

@@ -7,6 +7,137 @@ CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_TI=m
+
 CONFIG_USB_ACM=m
 CONFIG_USB_USBNET=m
 
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_SND_USB_AUDIO=m
+
+CONFIG_BT=y
+CONFIG_BT_BREDR=y
+CONFIG_BT_LE=y
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_HCIBTUSB=y
+CONFIG_BT_HCIBTUSB_BCM=m
+CONFIG_BT_HCIBTUSB_RTL=m
+
+# Multimedia core support
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_MEDIA_CONTROLLER_DVB=m
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_MEDIA_PCI_SUPPORT=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2_TPG=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+
+# Webcam devices
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+
+# Analog capture USB devices
+CONFIG_VIDEO_USBTV=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+
+# Analog/digital capture USB devices
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+CONFIG_VIDEO_CX2341X=m
+
+# Webcam/capture (analog/digital) USB devices
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m

buildroot-external/meta

@@ -1,5 +1,5 @@
 VERSION_MAJOR=3
-VERSION_BUILD=8
+VERSION_BUILD=13
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"

buildroot-external/misc/rauc-hook

@@ -41,4 +41,8 @@ if [ -e /usr/sbin/fw_setenv ]; then
     fw_setenv fdt_addr
 fi
 
+# rename CLI Hass.io
+sed -i "s/hassio:172.30.32.2/supervisor:172.30.32.2/g" /mnt/data/hassos.json
+
+
 exit 0

buildroot-external/package/bluetooth-bcm43xx/0001-btuart-reduced-baud-rate-rpi3b.patch

@@ -0,0 +1,16 @@
+Bluetooth: hci0: Frame reassembly failed (-84)
+https://github.com/raspberrypi/firmware/issues/1150
+
+Signed-off-by: Luca Giovenzana <luca@giovenzana.org>
+
+--- btuart.orig	2020-03-25 03:05:24.491176583 +0100
++++ btuart	2020-03-25 03:05:43.603107833 +0100
+@@ -19,7 +19,7 @@ if [ "$uart0" = "$serial1" ] ; then
+ 	if [ "$uart0_pins" = "16" ] ; then
+ 		$HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
+ 	else
+-		$HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
++		$HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
+ 	fi
+ else
+ 	$HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR

buildroot-external/package/bluetooth-bcm43xx/Config.in

@@ -3,4 +3,4 @@ config BR2_PACKAGE_BLUETOOTH_BCM43XX
 	depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
 	select BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
 	help
-	  Install bluetooth for bcm43xx. 
+	  Install bluetooth for bcm43xx.

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.mk

@@ -16,6 +16,8 @@ define BLUETOOTH_BCM43XX_BUILD_CMDS
 	curl -L -o $(@D)/btuart https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace/usr/bin/btuart
 	curl -L -o $(@D)/bthelper https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace/usr/bin/bthelper
 	curl -L -o $(@D)/90-pi-bluetooth.rules https://raw.githubusercontent.com/RPi-Distro/pi-bluetooth/cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace/lib/udev/rules.d/90-pi-bluetooth.rules
+
+	patch $(@D)/btuart $(@D)/0001-btuart-reduced-baud-rate-rpi3b.patch
 endef
 
 define BLUETOOTH_BCM43XX_INSTALL_TARGET_CMDS

buildroot-external/package/hassos/builder/Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && 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 \
+        docker-ce=5:19.03.5~3-0~ubuntu-bionic \
     && rm -rf /var/lib/apt/lists/*
 
 COPY hostapp.sh /usr/bin/

buildroot-external/rootfs-overlay/etc/dbus-1/system.d/pulseaudio-system.conf

@@ -0,0 +1,33 @@
+<?xml version="1.0"?><!--*-nxml-*-->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<!--
+This file is part of PulseAudio.
+
+PulseAudio 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.
+
+PulseAudio 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 PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+-->
+
+<busconfig>
+
+  <!-- System-wide PulseAudio runs as 'root' user. This fragment is
+       not necessary for user PulseAudio instances. -->
+
+  <policy user="root">
+    <allow own="org.pulseaudio.Server"/>
+    <allow send_destination="org.pulseaudio.Server"/>
+    <allow receive_sender="org.pulseaudio.Server"/>
+  </policy>
+
+</busconfig>

buildroot-external/rootfs-overlay/usr/modprobe.d/alsa-base.conf

@@ -0,0 +1,19 @@
+#############################
+# ALSA drivers load options
+# Based from LibreELEC
+#############################
+
+# Prevent abnormal drivers from grabbing index 0
+options snd-bt87x index=-2
+options cx88-alsa index=-2
+options saa7134-alsa index=-2
+options snd-atiixp-modem index=-2
+options snd-intel8x0m index=-2
+options snd-via82xx-modem index=-2
+options snd-usb-audio index=-2
+options snd-usb-usx2y index=-2
+options snd-usb-caiaq index=-2
+options snd-cmipci mpu_port=0x330 fm_port=0x388
+
+# HDA intel
+options snd-hda-intel model=auto

buildroot-external/scripts/ota.sh

@@ -41,7 +41,7 @@ function create_ota_update() {
     ) > "${rauc_folder}/manifest.raucm"
 
     # SPL
-    if [ "${BOOT_SYS}" == "spl" ]; then
+    if [[ "${BOOT_SYS}" =~ (spl|mbr) ]]; then
         cp -f "${spl}" "${rauc_folder}/spl.img"
 
         (

buildroot-patches/0001-Docker-AppArmor-support.patch

@@ -0,0 +1,53 @@
+From a874e0babaeefacd8e3d04a9c056dd6f1121307d Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Mon, 13 Jan 2020 12:27:06 +0000
+Subject: [PATCH 1/1] Docker: AppArmor support
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/docker-containerd/docker-containerd.mk | 1 +
+ package/docker-engine/docker-engine.mk         | 2 +-
+ package/runc/runc.mk                           | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
+index 69068e44f8..4dc0ef4672 100644
+--- a/package/docker-containerd/docker-containerd.mk
++++ b/package/docker-containerd/docker-containerd.mk
+@@ -17,6 +17,7 @@ DOCKER_CONTAINERD_LDFLAGS = \
+ DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
+ 
+ DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
++DOCKER_CONTAINERD_TAGS = apparmor
+ 
+ ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+ DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
+diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
+index 24022f7107..14673f3183 100644
+--- a/package/docker-engine/docker-engine.mk
++++ b/package/docker-engine/docker-engine.mk
+@@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \
+ 	-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
+ 	-X main.Version=$(DOCKER_ENGINE_VERSION)
+ 
+-DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen
++DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen apparmor
+ DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
+ 
+ ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+diff --git a/package/runc/runc.mk b/package/runc/runc.mk
+index acf61ab160..3432dd5fe0 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
+

buildroot-patches/0001-docker-containerd-bump-to-v1.2.7.patch

@@ -1,44 +0,0 @@
-From 9759621540997500a9dc0163506a8eac1e4769cc Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-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 <pvizeli@syshack.ch>
----
- package/docker-containerd/docker-containerd.hash | 2 +-
- package/docker-containerd/docker-containerd.mk   | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
-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	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 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.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
-@@ -17,6 +17,7 @@ DOCKER_CONTAINERD_LDFLAGS = \
- DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
- 
- DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
-+DOCKER_CONTAINERD_TAGS = apparmor
- 
- ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
- DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
--- 
-2.17.1
-

buildroot-patches/0002-Docker-tini-static.patch

@@ -0,0 +1,41 @@
+From 81bf3979ac5aec0dd8d4bccc690fe1bcef5de139 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Mon, 13 Jan 2020 12:30:48 +0000
+Subject: [PATCH 1/1] Docker: tini & static
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/docker-engine/docker-engine.mk | 6 ++++++
+ package/tini/tini.mk                   | 1 +
+ 2 files changed, 7 insertions(+)
+
+diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
+index 14673f3183..b0eaae9580 100644
+--- a/package/docker-engine/docker-engine.mk
++++ b/package/docker-engine/docker-engine.mk
+@@ -82,4 +82,10 @@ define DOCKER_ENGINE_USERS
+ 	- - docker -1 * - - - Docker Application Container Framework
+ endef
+ 
++define DOCKER_ENGINE_INSTALL_SYMLINKS
++	ln -fs tini $(TARGET_DIR)/usr/bin/docker-init
++endef
++
++DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS
++
+ $(eval $(golang-package))
+diff --git a/package/tini/tini.mk b/package/tini/tini.mk
+index 132bfc99dd..b6d7d80b22 100644
+--- a/package/tini/tini.mk
++++ b/package/tini/tini.mk
+@@ -12,6 +12,7 @@ TINI_LICENSE_FILES = LICENSE
+ TINI_CFLAGS = $(TARGET_CFLAGS) \
+ 	-DTINI_VERSION=\"$(TINI_VERSION)\" \
+ 	-DTINI_GIT=\"\"
++TINI_CFLAGS += -static
+ 
+ ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y)
+ TINI_CFLAGS += -DTINI_MINIMAL
+-- 
+2.17.1
+

buildroot-patches/0002-runc-add-AppArmor.patch

@@ -1,26 +0,0 @@
-From 021395083b5829c4fd00bebcdc7d38c2acd7232d Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Wed, 26 Jun 2019 10:00:31 +0000
-Subject: [PATCH 1/1] runc: add AppArmor
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- 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
-

buildroot-patches/0003-docker-engine-add-AppArmor-support.patch

@@ -1,37 +0,0 @@
-From 93c43e8572d374edbea8521f63c071a0a5cb1098 Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Thu, 3 Jan 2019 19:54:57 +0000
-Subject: [PATCH 1/1] docker-engine: add AppArmor support
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- package/docker-engine/docker-engine.mk | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
-index f19c1d9..9ecfd10 100644
---- a/package/docker-engine/docker-engine.mk
-+++ b/package/docker-engine/docker-engine.mk
-@@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \
- 	-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
- 	-X main.Version=$(DOCKER_ENGINE_VERSION)
- 
--DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen
-+DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen apparmor
- DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
- 
- ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
-@@ -77,4 +77,10 @@ define DOCKER_ENGINE_USERS
- 	- - docker -1 * - - - Docker Application Container Framework
- endef
- 
-+define DOCKER_ENGINE_INSTALL_SYMLINKS
-+	ln -fs tini $(TARGET_DIR)/usr/bin/docker-init
-+endef
-+
-+DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS
-+
- $(eval $(golang-package))
--- 
-2.17.1
-

buildroot-patches/0003-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch

@@ -38,7 +38,7 @@ index 9988dda717..3eae7e270b 100644
 @@ -1,2 +1,2 @@
  # Locally computed
 -sha256	f1d631920ed4ae15f368ba7b8b3caa4ed604f5223372cc6debbd39a101eb8d74  rpi-firmware-81cca1a9380c828299e884dba5efd0d4acb39e8d.tar.gz
-+sha256	088d094618924a90f65bb511808bbeb921e0769c878fa7baa9626954206f61a2  rpi-firmware-62a0d75b67484cb306a2a6f8fa954d9644868169.tar.gz
++sha256	06e6cd4df5f6543a962a434668883e50f33e22a1f4964ece63432c947291cf50  rpi-firmware-dd8cbec5a6d27090e5eb080e13d83c35fdd759f7.tar.gz
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index 630bc670ca..fd2970333e 100644
 --- a/package/rpi-firmware/rpi-firmware.mk
@@ -48,7 +48,7 @@ index 630bc670ca..fd2970333e 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 81cca1a9380c828299e884dba5efd0d4acb39e8d
-+RPI_FIRMWARE_VERSION = 62a0d75b67484cb306a2a6f8fa954d9644868169
++RPI_FIRMWARE_VERSION = dd8cbec5a6d27090e5eb080e13d83c35fdd759f7
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot-patches/0008-tini-make-static-for-docker.patch

@@ -1,25 +0,0 @@
-From e757b263a4f3ff67e69ae6cc6abdaa83039bf6b6 Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Tue, 27 Nov 2018 20:31:33 +0000
-Subject: [PATCH 1/1] tini: make static for docker
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- package/tini/tini.mk | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/package/tini/tini.mk b/package/tini/tini.mk
-index 132bfc9..b6d7d80 100644
---- a/package/tini/tini.mk
-+++ b/package/tini/tini.mk
-@@ -12,6 +12,7 @@ TINI_LICENSE_FILES = LICENSE
- TINI_CFLAGS = $(TARGET_CFLAGS) \
- 	-DTINI_VERSION=\"$(TINI_VERSION)\" \
- 	-DTINI_GIT=\"\"
-+TINI_CFLAGS += -static
- 
- ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y)
- TINI_CFLAGS += -DTINI_MINIMAL
--- 
-2.17.1
-

buildroot/CHANGES

@@ -1,3 +1,26 @@
+2019.02.9, released January 12th, 2020
+
+	Important / security related fixes.
+
+	pkg-python infrastructure: Ensure correct compiler and linker
+	flags are used for compiled code
+
+	utils/scanpypi: Remind users to update DEVELOPERS
+
+	Updated/fixed packages: busybox, cc-tool, cpio, cups, dante,
+	dillo, docker-cli, docker-containerd, docker-engine, easy-rsa,
+	ecryptfs-utils, efl, git, glibc, gnupg2, gst1-plugins-bad,
+	kf5-kcoreaddons, libarchive, libgit2, libkrb5, librsvg,
+	libssh, libtomcrypt, libuio, lirc-tools, lvm2,
+	matchbox-desktop, nodejs, ntp, opencv3, openpowerlink,
+	python-django, python-ecdsa, python-pyasn-modules,
+	python-pyqt5, python-subprocess32, python3, qpdf, runc, rygel,
+	samba4, sdl2, wavpack, xserver_xorg-server, zip
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#12121: PyQt5.QtSerialPort and other modules not being built
+
 2019.02.8, released December 7th, 2019
 
 	Important / security related fixes.

buildroot/Makefile

@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2019.02.8
+export BR2_VERSION := 2019.02.9
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1575746000
+BR2_VERSION_EPOCH = 1578842000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)

buildroot/docs/manual/adding-packages-generic.txt

@@ -358,9 +358,11 @@ not and can not work as people would expect it should:
 * +LIBFOO_DEPENDENCIES+ lists the dependencies (in terms of package
   name) that are required for the current target package to
   compile. These dependencies are guaranteed to be compiled and
-  installed before the configuration of the current package starts. In
-  a similar way, +HOST_LIBFOO_DEPENDENCIES+ lists the dependencies for
-  the current host package.
+  installed before the configuration of the current package starts.
+  However, modifications to configuration of these dependencies will
+  not force a rebuild of the current package. In a similar way,
+  +HOST_LIBFOO_DEPENDENCIES+ lists the dependencies for the current
+  host package.
 
 * +LIBFOO_EXTRACT_DEPENDENCIES+ lists the dependencies (in terms of
   package name) that are required for the current target package to be

buildroot/docs/manual/manual.text

@@ -161,13 +161,13 @@ List of Examples
 
 ---------------------------------------------------------------------
 
-Buildroot 2019.02.8 manual generated on 2019-12-07 19:24:23 UTC from
-git revision aaa1437b11
+Buildroot 2019.02.9 manual generated on 2020-01-12 15:28:51 UTC from
+git revision 24f25c8d23
 
 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=
-aaa1437b110f886ee24757595542f715a77d702a] file in the Buildroot
+24f25c8d23bd85d57b6e9c776f2c7716f2ddd4af] file in the Buildroot
 sources for the full text of this license.
 
 Copyright © 2004-2019 The Buildroot developers
@@ -1197,6 +1197,15 @@ can help you understand how to work with Buildroot:
     overlay, a post-build script or a post-image script are made,
     there is no need for a full rebuild: a simple make invocation
     will take the changes into account.
+  * When a package listed in FOO_DEPENDENCIES is rebuilt or removed,
+    the package foo is not automatically rebuilt. For example, if a
+    package bar is listed in FOO_DEPENDENCIES with FOO_DEPENDENCIES =
+    bar and the configuration of the bar package is changed, the
+    configuration change would not result in a rebuild of package foo
+    automatically. In this scenario, you may need to either rebuild
+    any packages in your build which reference bar in their
+    DEPENDENCIES, or perform a full rebuild to ensure any bar
+    dependent packages are up to date.
 
 Generally speaking, when you’re facing a build error and you’re
 unsure of the potential consequences of the configuration changes
@@ -4369,8 +4378,10 @@ information is (assuming the package name is libfoo) :
     name) that are required for the current target package to
     compile. These dependencies are guaranteed to be compiled and
     installed before the configuration of the current package starts.
-    In a similar way, HOST_LIBFOO_DEPENDENCIES lists the dependencies
-    for the current host package.
+    However, modifications to configuration of these dependencies
+    will not force a rebuild of the current package. In a similar
+    way, HOST_LIBFOO_DEPENDENCIES lists the dependencies for the
+    current host package.
   * LIBFOO_EXTRACT_DEPENDENCIES lists the dependencies (in terms of
     package name) that are required for the current target package to
     be extracted. These dependencies are guaranteed to be compiled

buildroot/docs/manual/rebuilding-packages.txt

@@ -65,6 +65,16 @@ can help you understand how to work with Buildroot:
    there is no need for a full rebuild: a simple +make+ invocation
    will take the changes into account.
 
+ * When a package listed in +FOO_DEPENDENCIES+ is rebuilt or removed,
+   the package +foo+ is not automatically rebuilt. For example, if a
+   package +bar+ is listed in +FOO_DEPENDENCIES+ with +FOO_DEPENDENCIES
+   = bar+ and the configuration of the +bar+ package is changed, the
+   configuration change would not result in a rebuild of package +foo+
+   automatically. In this scenario, you may need to either rebuild any
+   packages in your build which reference +bar+ in their +DEPENDENCIES+,
+   or perform a full rebuild to ensure any +bar+ dependent packages are
+   up to date.
+
 Generally speaking, when you're facing a build error and you're unsure
 of the potential consequences of the configuration changes you've
 made, do a full rebuild. If you get the same build error, then you are

buildroot/linux/Config.in

@@ -122,7 +122,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.19.88" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "4.19.94" 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

buildroot/linux/linux.hash

@@ -1,6 +1,6 @@
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 sha256 d011245629b980d4c15febf080b54804aaf215167b514a3577feddb2495f8a3e  linux-4.20.17.tar.xz
-sha256 5da5e16fe08fa506f8f74aa4f17be22b52c0f513e9a3f7e7ae22fc53597ad493  linux-4.4.206.tar.xz
-sha256 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6  linux-4.9.206.tar.xz
-sha256 0d49ec72e273f6fc7462ad56849b2285f13fd5f4185e8f932a0074fc2eca1bb3  linux-4.14.158.tar.xz
-sha256 c1923b6bd166e6dd07be860c15f59e8273aaa8692bc2a1fce1d31b826b9b3fbe  linux-4.19.88.tar.xz
+sha256 5899ff2a85e2b84607148349fd8e646f94399655caf0e4e55d1eb0567e48520e  linux-4.4.208.tar.xz
+sha256 b7ad1c9841d671d026c55a4c91c77205f8b488ca5f980f838591c68662e0525a  linux-4.9.208.tar.xz
+sha256 eb29cc9cfd54158789064b3d6e5b3eab108facec048b8d405a63e9863329b049  linux-4.14.163.tar.xz
+sha256 c62a10a75a7c4213e41287040e7c7509b7d42117d6830feb7dfe505949fa7467  linux-4.19.94.tar.xz

buildroot/package/busybox/busybox.mk

@@ -262,7 +262,9 @@ endif
 
 ifeq ($(BR2_INIT_BUSYBOX),y)
 define BUSYBOX_INSTALL_INITTAB
-	$(INSTALL) -D -m 0644 package/busybox/inittab $(TARGET_DIR)/etc/inittab
+	if test ! -e $(TARGET_DIR)/etc/inittab; then \
+		$(INSTALL) -D -m 0644 package/busybox/inittab $(TARGET_DIR)/etc/inittab; \
+	fi
 endef
 endif
 

buildroot/package/cc-tool/cc-tool.hash

@@ -1,3 +1,6 @@
 # From http://sourceforge.net/projects/cctool/files/
 sha1 f313e55f019ea5338438633f5b5e689b699343e1  cc-tool-0.26-src.tgz
 md5 26960676f3e6264e612c299fbf8ec5ea  cc-tool-0.26-src.tgz
+
+# Hash for license file
+sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING

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

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

buildroot/package/cpio/cpio.hash

@@ -1,2 +1,7 @@
+# From https://lists.gnu.org/archive/html/info-gnu/2019-11/msg00002.html
+md5 f3438e672e3fa273a7dc26339dd1eed6  cpio-2.13.tar.bz2
+sha1 4dcefc0e1bc36b11506a354768d82b15e3fe6bb8  cpio-2.13.tar.bz2
 # Locally calculated after checking pgp signature
-sha256	08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73	cpio-2.12.tar.gz
+sha256 eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d  cpio-2.13.tar.bz2
+# Locally calculated
+sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7  COPYING

buildroot/package/cpio/cpio.mk

@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-CPIO_VERSION = 2.12
+CPIO_VERSION = 2.13
+CPIO_SOURCE = cpio-$(CPIO_VERSION).tar.bz2
 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio
 CPIO_CONF_OPTS = --bindir=/bin
 CPIO_LICENSE = GPL-3.0+

buildroot/package/cups/cups.hash

@@ -1,3 +1,3 @@
 # Locally calculated:
-sha256 0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8  cups-2.2.12-source.tar.gz
+sha256 da375796e5e7ab6d31a853d0e5326486d41d10d42bbff9ec768b0cea85031b48  cups-2.2.13-source.tar.gz
 sha256 6e0e0ffbde118aae709f7ef65590de9071e8b2cd322f84fd645c6b64f3cc452c  LICENSE.txt

buildroot/package/cups/cups.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CUPS_VERSION = 2.2.12
+CUPS_VERSION = 2.2.13
 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

buildroot/package/dante/dante.mk

@@ -12,7 +12,7 @@ DANTE_LICENSE_FILES = LICENSE
 # 0002-compiler.m4-do-not-remove-g-flag.patch touches a m4 file
 DANTE_AUTORECONF = YES
 
-DANTE_CONF_OPTS += --disable-client --disable-preload --without-pam
+DANTE_CONF_OPTS += --disable-client --disable-preload
 
 ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
 DANTE_DEPENDENCIES += linux-pam

buildroot/package/dillo/0003-Fix-openssl-detection.patch

@@ -0,0 +1,29 @@
+From 96dde9dedf806256cdc6cbf5cacbd5c8d74e6288 Mon Sep 17 00:00:00 2001
+From: Jonathan Kimmitt <jrrk2@cam.ac.uk>
+Date: Thu, 9 Jan 2020 22:01:42 +0100
+Subject: [PATCH] Fix openssl detection
+
+SSL_library_init is now a define, use OPENSSL_init_ssl instead.
+
+Signed-off-by: Jonathan Kimmitt <jrrk2@cam.ac.uk>
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 66b5e9f..206fd53 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -276,7 +276,7 @@ if test "x$enable_ssl" = "xyes"; then
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
++    AC_CHECK_LIB(ssl, OPENSSL_init_ssl, ssl_ok=yes, ssl_ok=no, -lcrypto)
+     LIBS="$old_libs"
+   fi
+ 
+-- 
+2.24.1
+

buildroot/package/dillo/0004-Support-OpenSSL-1.1.0.patch

@@ -0,0 +1,33 @@
+From ff44d8b2d5211a502afdb3e612dae0e8133b5124 Mon Sep 17 00:00:00 2001
+From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
+Date: Thu, 9 Jan 2020 22:07:15 +0100
+Subject: [PATCH] Support OpenSSL 1.1.0
+
+taken-from: pkgsrc (Ryo ONODERA)
+submitted-by: Jun Ebihara <jun@soum.co.jp>
+
+Upstream: https://hg.dillo.org/dillo/rev/b171b8610400
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ dpi/https.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dpi/https.c b/dpi/https.c
+index 766b3af..025cfc4 100644
+--- a/dpi/https.c
++++ b/dpi/https.c
+@@ -476,7 +476,11 @@ static int handle_certificate_problem(SSL * ssl_connection)
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+          if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++#else
++         if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
++#endif
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
+-- 
+2.24.1
+

buildroot/package/docker-cli/docker-cli.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  cef3f9e8615cde906619f7ab021655a8b974d1b497ce0e5787b1afccbeabb08d  docker-cli-18.09.9.tar.gz
+sha256	00d06baf4793794c0fd9ecad5b7e95aed6eb942f24c8b6e2d7c7f7564b9743ad  docker-cli-19.03.5.tar.gz
 sha256	2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0  LICENSE

buildroot/package/docker-cli/docker-cli.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CLI_VERSION = 18.09.9
+DOCKER_CLI_VERSION = 19.03.5
 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION))
 DOCKER_CLI_WORKSPACE = gopath
 

buildroot/package/docker-containerd/docker-containerd.hash

@@ -1,3 +1,3 @@
 # Computed locally
-sha256	7179c709a0d187708a1eeddcbdecd7206b2c642dc4413bcdb049cd6b38d06801  docker-containerd-v1.2.7.tar.gz
-sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4	LICENSE
+sha256	6a4192fced10c390373adfa9fa9a4f12fe9f38bde580d90468a79ed6c8af75ee  docker-containerd-1.2.11.tar.gz
+sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE

buildroot/package/docker-containerd/docker-containerd.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = v1.2.7
-DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
+DOCKER_CONTAINERD_VERSION = 1.2.11
+DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
 

buildroot/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch

@@ -1,45 +0,0 @@
-From 324e7be4b252c13002bca6a9d82e7b2e43664634 Mon Sep 17 00:00:00 2001
-From: Christian Stewart <christian@paral.in>
-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 <christian@paral.in>
----
- 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
-

buildroot/package/docker-engine/docker-engine.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	fa3a9e998627418d648495d06d168c4d26ed07859c9370d5fddbfd29c26d8592  docker-engine-18.09.9.tar.gz
-sha256	2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0  LICENSE
+sha256	bc5d1ac503e44593be8003ed0ad9c75bf0da535db19837a9338429c438bd4637  docker-engine-19.03.5.tar.gz
+sha256	7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8  LICENSE

buildroot/package/docker-engine/docker-engine.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_ENGINE_VERSION = 18.09.9
+DOCKER_ENGINE_VERSION = 19.03.5
 DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION))
 
 DOCKER_ENGINE_LICENSE = Apache-2.0

buildroot/package/easy-rsa/Config.in

@@ -1,7 +1,8 @@
 config BR2_PACKAGE_EASY_RSA
 	bool "easy-rsa"
 	select BR2_PACKAGE_OPENSSL # runtime
-	select BR2_PACKAGE_OPENSSL_BIN
+	select BR2_PACKAGE_LIBOPENSSL_BIN if BR2_PACKAGE_LIBOPENSSL
+	select BR2_PACKAGE_LIBRESSL_BIN if BR2_PACKAGE_LIBRESSL
 	help
 	  Simple shell based CA utility
 

buildroot/package/ebtables/ebtables.mk

@@ -19,19 +19,15 @@ endef
 
 ifeq ($(BR2_STATIC_LIBS),y)
 define EBTABLES_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/static \
-		$(TARGET_DIR)/sbin/ebtables
+	$(INSTALL) -m 0755 -D $(@D)/static $(TARGET_DIR)/sbin/ebtables
 endef
 else
 define EBTABLES_INSTALL_TARGET_CMDS
-	for so in $(@D)/$(EBTABLES_SUBDIR)/*.so \
-		$(@D)/$(EBTABLES_SUBDIR)/extensions/*.so; \
-		do \
+	for so in $(@D)/*.so $(@D)/extensions/*.so; do \
 		$(INSTALL) -m 0755 -D $${so} \
 			$(TARGET_DIR)/lib/ebtables/`basename $${so}` || exit 1; \
 	done
-	$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/ebtables \
-		$(TARGET_DIR)/sbin/ebtables
+	$(INSTALL) -m 0755 -D $(@D)/ebtables $(TARGET_DIR)/sbin/ebtables
 	$(INSTALL) -m 0644 -D $(@D)/ethertypes $(TARGET_DIR)/etc/ethertypes
 endef
 endif

buildroot/package/ecryptfs-utils/0003-fix-parallel-build-issue.patch

@@ -0,0 +1,61 @@
+fix parallel build issue
+
+Build randomly fails since December 2017 on buildroot
+(http://autobuild.buildroot.org/?reason=ecryptfs-utils-111):
+
+make[5]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/ecryptfs-utils-111/src/utils'
+  /bin/mkdir -p '/home/buildroot/autobuild/instance-2/output-1/target/sbin'
+  /bin/bash ../../libtool   --mode=install /usr/bin/install -c mount.ecryptfs umount.ecryptfs mount.ecryptfs_private '/home/buildroot/autobuild/instance-2/output-1/target/sbin'
+libtool: install: /usr/bin/install -c mount.ecryptfs /home/buildroot/autobuild/instance-2/output-1/target/sbin/mount.ecryptfs
+/usr/bin/install: cannot create regular file '/home/buildroot/autobuild/instance-2/output-1/target/sbin/mount.ecryptfs': File exists
+Makefile:832: recipe for target 'install-rootsbinPROGRAMS' failed
+make[5]: *** [install-rootsbinPROGRAMS] Error 1
+
+As spotted by Thomas Petazzoni, build failure happens because of the
+following line in src/utils/Makefile.am:
+
+install-exec-hook:      install-rootsbinPROGRAMS
+        -rm -f "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
+        $(LN_S) "mount.ecryptfs_private" "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
+
+The install-exec-hook target should not have a dependency on
+install-rootsbinPROGRAMS.
+
+From https://www.gnu.org/software/automake/manual/html_node/Extending.html#Extending:
+
+"""
+In contrast, some rules also have a way to run another rule, called a
+hook; hooks are always executed after the main rule’s work is done. The
+hook is named after the principal target, with ‘-hook’ appended. The
+targets allowing hooks are install-data, install-exec, uninstall, dist,
+and distcheck.
+
+For instance, here is how to create a hard link to an installed program:
+
+install-exec-hook:
+        ln $(DESTDIR)$(bindir)/program$(EXEEXT) \
+           $(DESTDIR)$(bindir)/proglink$(EXEEXT)
+
+"""
+
+So, they explicitly say that these hooks are run after the main rule
+work is done, which means the dependency on install-rootsbinPROGRAMS is
+not needed. And the example they use to illustrate is *exactly* the
+situation of ecryptfs-utils: creating a link to a program that was
+installed.
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://bugs.launchpad.net/ecryptfs/+bug/1857622]
+
+diff -Nuar ecryptfs-utils-111-orig/src/utils/Makefile.in ecryptfs-utils-111/src/utils/Makefile.in
+--- ecryptfs-utils-111-orig/src/utils/Makefile.in	2019-12-26 15:14:16.656146065 +0100
++++ ecryptfs-utils-111/src/utils/Makefile.in	2019-12-26 17:36:07.108496164 +0100
+@@ -1522,7 +1522,7 @@
+ .PRECIOUS: Makefile
+ 
+ 
+-install-exec-hook:	install-rootsbinPROGRAMS
++install-exec-hook:
+ 	-rm -f "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
+ 	$(LN_S) "mount.ecryptfs_private" "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
+ 

buildroot/package/ecryptfs-utils/Config.in

@@ -30,7 +30,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
 
 	  http://ecryptfs.org
 
-comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynami library"
+comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynamic library"
 	depends on !BR2_microblaze
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	depends on BR2_USE_MMU

buildroot/package/efl/Config.in

@@ -168,7 +168,6 @@ config BR2_PACKAGE_EFL_X_XLIB
 	select BR2_PACKAGE_XLIB_LIBXCURSOR
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE
 	select BR2_PACKAGE_XLIB_LIBXINERAMA
-	select BR2_PACKAGE_XLIB_LIBXP
 	select BR2_PACKAGE_XLIB_LIBXRANDR
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXSCRNSAVER

buildroot/package/freescale-imx/freescale-imx.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
+FREESCALE_IMX_SITE = http://www.nxp.com/lgfiles/NMG/MAD/YOCTO
 
 # Helper for self-extracting binaries distributed by Freescale.
 #

buildroot/package/git/git.hash

@@ -1,4 +1,4 @@
 # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
-sha256 dfb71b053cbc38a9c5b08c2fe8b5eae210b4e3b63892426923e10cfd6ba63862  git-2.16.5.tar.xz
+sha256 cd45502a4146d8e77f40cc64b3b484247e6165633bb024d7a9385a85f68e1d52  git-2.16.6.tar.xz
 sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e  COPYING
 sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a  LGPL-2.1

buildroot/package/git/git.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GIT_VERSION = 2.16.5
+GIT_VERSION = 2.16.6
 GIT_SOURCE = git-$(GIT_VERSION).tar.xz
 GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
 GIT_LICENSE = GPL-2.0, LGPL-2.1+

buildroot/package/glibc/glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f/glibc.hash

@@ -1,5 +1,5 @@
 # Locally calculated (fetched from Github)
-sha256  8cfd8c4564b20e610b41e24cdab85d5b208453c51b06a64603e9ef3f86d6de0a  glibc-glibc-2.28-110-g57922433fa038faa6e37798b9655f85a94978d89.tar.gz
+sha256  8cb918cef45112554dd5efdbe4e3d4bb2909708a2b115a3b612b22bd7c670859  glibc-glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING

buildroot/package/glibc/glibc.mk

@@ -13,7 +13,7 @@ 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-110-g57922433fa038faa6e37798b9655f85a94978d89
+GLIBC_VERSION = glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f
 # 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.

buildroot/package/gnupg2/gnupg2.hash

@@ -1,7 +1,7 @@
-# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000439.html
-sha1 12c1cee8871c03f0315fc8f27876364b75c95b12  gnupg-2.2.17.tar.bz2
+# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q4/000443.html
+sha1 e24a1208ffe69d7436b2f27e99542a85f34d0ac0  gnupg-2.2.19.tar.bz2
 # Calculated based on the hash above and signature
-# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.17.tar.bz2.sig
+# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.19.tar.bz2.sig
 # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
-sha256 afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514  gnupg-2.2.17.tar.bz2
+sha256 242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0  gnupg-2.2.19.tar.bz2
 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357  COPYING

buildroot/package/gnupg2/gnupg2.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUPG2_VERSION = 2.2.17
+GNUPG2_VERSION = 2.2.19
 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
 GNUPG2_LICENSE = GPL-3.0+

buildroot/package/gstreamer1/gst1-plugins-bad/Config.in

@@ -567,7 +567,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	select BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING
-	select BR2_PACKAGE_WEBRTC
 	help
 	  WebRTC echo-cancellation, gain control and noise suppression
 

buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk

@@ -14,10 +14,16 @@ 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
 
+KF5_KCOREADDONS_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCOREADDONS_CXXFLAGS)"
+
+ifeq ($(BR2_microblaze),y)
+# Microblaze ld emits warnings, make warnings not to be treated as errors
+KF5_KCOREADDONS_CONF_OPTS += -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-fatal-warnings"
+endif
+
 $(eval $(cmake-package))

buildroot/package/libarchive/0008-Bugfix-and-optimize-archive_wstring_append_from_mbs.patch

@@ -0,0 +1,103 @@
+From 22b1db9d46654afc6f0c28f90af8cdc84a199f41 Mon Sep 17 00:00:00 2001
+From: Martin Matuska <martin@matuska.org>
+Date: Thu, 21 Nov 2019 03:08:40 +0100
+Subject: [PATCH] Bugfix and optimize archive_wstring_append_from_mbs()
+
+The cal to mbrtowc() or mbtowc() should read up to mbs_length
+bytes and not wcs_length. This avoids out-of-bounds reads.
+
+mbrtowc() and mbtowc() return (size_t)-1 wit errno EILSEQ when
+they encounter an invalid multibyte character and (size_t)-2 when
+they they encounter an incomplete multibyte character. As we return
+failure and all our callers error out it makes no sense to continue
+parsing mbs.
+
+As we allocate `len` wchars at the beginning and each wchar has
+at least one byte, there will never be need to grow the buffer,
+so the code can be left out. On the other hand, we are always
+allocatng more memory than we need.
+
+As long as wcs_length == mbs_length == len we can omit wcs_length.
+We keep the old code commented if we decide to save memory and
+use autoexpanding wcs_length in the future.
+
+Fixes #1276
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+[Peter: fixes CVE-2019-19221]
+---
+ libarchive/archive_string.c | 28 +++++++++++++++++-----------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
+index 979a418b..bd39c96f 100644
+--- a/libarchive/archive_string.c
++++ b/libarchive/archive_string.c
+@@ -591,7 +591,7 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest,
+ 	 * No single byte will be more than one wide character,
+ 	 * so this length estimate will always be big enough.
+ 	 */
+-	size_t wcs_length = len;
++	// size_t wcs_length = len;
+ 	size_t mbs_length = len;
+ 	const char *mbs = p;
+ 	wchar_t *wcs;
+@@ -600,7 +600,11 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest,
+ 
+ 	memset(&shift_state, 0, sizeof(shift_state));
+ #endif
+-	if (NULL == archive_wstring_ensure(dest, dest->length + wcs_length + 1))
++	/*
++	 * As we decided to have wcs_length == mbs_length == len
++	 * we can use len here instead of wcs_length
++	 */
++	if (NULL == archive_wstring_ensure(dest, dest->length + len + 1))
+ 		return (-1);
+ 	wcs = dest->s + dest->length;
+ 	/*
+@@ -609,6 +613,12 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest,
+ 	 * multi bytes.
+ 	 */
+ 	while (*mbs && mbs_length > 0) {
++		/*
++		 * The buffer we allocated is always big enough.
++		 * Keep this code path in a comment if we decide to choose
++		 * smaller wcs_length in the future
++		 */
++/*
+ 		if (wcs_length == 0) {
+ 			dest->length = wcs - dest->s;
+ 			dest->s[dest->length] = L'\0';
+@@ -618,24 +628,20 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest,
+ 				return (-1);
+ 			wcs = dest->s + dest->length;
+ 		}
++*/
+ #if HAVE_MBRTOWC
+-		r = mbrtowc(wcs, mbs, wcs_length, &shift_state);
++		r = mbrtowc(wcs, mbs, mbs_length, &shift_state);
+ #else
+-		r = mbtowc(wcs, mbs, wcs_length);
++		r = mbtowc(wcs, mbs, mbs_length);
+ #endif
+ 		if (r == (size_t)-1 || r == (size_t)-2) {
+ 			ret_val = -1;
+-			if (errno == EILSEQ) {
+-				++mbs;
+-				--mbs_length;
+-				continue;
+-			} else
+-				break;
++			break;
+ 		}
+ 		if (r == 0 || r > mbs_length)
+ 			break;
+ 		wcs++;
+-		wcs_length--;
++		// wcs_length--;
+ 		mbs += r;
+ 		mbs_length -= r;
+ 	}
+-- 
+2.20.1
+

buildroot/package/libgit2/libgit2.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	adf17310b590e6e7618f070c742b5ee028aeeed2c60099bc4190c386b5060de1  libgit2-0.27.9.tar.gz
+sha256	f6fd26378ff71bd7a4b17b576c82c774a2e9c2d6b74b24718a8fb29551e1c4a5  libgit2-0.27.10.tar.gz
 sha256	d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813  COPYING

buildroot/package/libgit2/libgit2.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGIT2_VERSION = 0.27.9
+LIBGIT2_VERSION = 0.27.10
 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION))
 LIBGIT2_LICENSE = GPL-2.0 with linking exception
 LIBGIT2_LICENSE_FILES = COPYING

buildroot/package/libkrb5/libkrb5.mk

@@ -41,7 +41,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBEDIT),y)
 LIBKRB5_CONF_OPTS += --with-libedit
-LIBKRB5_DEPENDENCIES += libedit
+LIBKRB5_DEPENDENCIES += host-pkgconf libedit
 else
 LIBKRB5_CONF_OPTS += --without-libedit
 endif

buildroot/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch

@@ -0,0 +1,35 @@
+From 322b415f92d4dcd36824eef83bd617bac6e5c8c7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 24 Dec 2019 16:38:35 +0100
+Subject: [PATCH] librsvg.pc.in: add libcroco to Requires.private
+
+libcroco is a mandatory dependency since version 2.35.0 so add it to
+Requires.Private to fix a static build failure with imagemagick
+
+This patch is not upstreamable as librsvg no longer depends on libcroco
+since version 2.47.1. It now does all CSS processing using Rust crates
+from Mozilla Servo.
+
+Fixes:
+ - http://autobuild.buildroot.org/results/42f4b4881569779162d3efe4628b934f965913b9
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ librsvg.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/librsvg.pc.in b/librsvg.pc.in
+index a451de05..4b09984a 100644
+--- a/librsvg.pc.in
++++ b/librsvg.pc.in
+@@ -10,6 +10,6 @@ Name: librsvg
+ Description: library that renders svg files
+ Version: @VERSION@
+ Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo
+-Requires.private:
++Requires.private: libcroco-0.6
+ Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
+ Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
+-- 
+2.24.0
+

buildroot/package/libssh/0001-buffer-Fix-size-comparison-with-count.patch

@@ -1,48 +0,0 @@
-From 2aa8c46a853acd4198af16e417ebffd5b0e2c9f4 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 1 Oct 2018 20:58:47 +0200
-Subject: [PATCH] buffer: Fix size comparison with count
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-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
-

buildroot/package/libssh/0002-buffer-Use-size_t-for-argc-argument-in-ssh_buffer_-u.patch

@@ -1,152 +0,0 @@
-From 270d6aa2bb01f3430d07cce5f97b48b741e3df9c Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-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 <asn@cryptomilk.org>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-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
-

buildroot/package/libssh/0003-more-strict-overflow-fixes.patch

@@ -1,122 +0,0 @@
-From 7656b1be8dc5425d5af03ffa6af711599fc07e80 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-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 <baruch@tkos.co.il>
----
-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
-

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.7.tar.xz.asc
+# https://www.libssh.org/files/0.9/libssh-0.9.3.tar.xz.asc
 # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
-sha256 43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592  libssh-0.8.7.tar.xz
+sha256 2c8b5f894dced58b3d629f16f3afa6562c20b4bdc894639163cf657833688f0c  libssh-0.9.3.tar.xz
 sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a  COPYING

buildroot/package/libssh/libssh.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSSH_VERSION_MAJOR = 0.8
-LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).7
+LIBSSH_VERSION_MAJOR = 0.9
+LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).3
 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
 LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
 LIBSSH_LICENSE = LGPL-2.1

buildroot/package/libtomcrypt/0001-fix-CVE-2019-17362.patch

@@ -0,0 +1,29 @@
+From 25c26a3b7a9ad8192ccc923e15cf62bf0108ef94 Mon Sep 17 00:00:00 2001
+From: werew <werew@ret2libc.com>
+Date: Thu, 3 Oct 2019 19:57:10 +0200
+Subject: [PATCH] Fixes #507
+
+Fix a vulnerability in der_decode_utf8_string as specified here:
+https://github.com/libtom/libtomcrypt/issues/507
+
+[for import into Buildroot]
+Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
+
+
+---
+ src/pk/asn1/der/utf8/der_decode_utf8_string.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pk/asn1/der/utf8/der_decode_utf8_string.c b/src/pk/asn1/der/utf8/der_decode_utf8_string.c
+index 94555b99f..d3ed82bea 100644
+--- a/src/pk/asn1/der/utf8/der_decode_utf8_string.c
++++ b/src/pk/asn1/der/utf8/der_decode_utf8_string.c
+@@ -65,7 +65,7 @@ int der_decode_utf8_string(const unsigned char *in,  unsigned long inlen,
+       /* count number of bytes */
+       for (z = 0; (tmp & 0x80) && (z <= 4); z++, tmp = (tmp << 1) & 0xFF);
+ 
+-      if (z > 4 || (x + (z - 1) > inlen)) {
++      if (z == 1 || z > 4 || (x + (z - 1) > inlen)) {
+          return CRYPT_INVALID_PACKET;
+       }
+ 

buildroot/package/libuio/libuio.mk

@@ -10,7 +10,7 @@ LIBUIO_SITE = $(call github,Linutronix,libuio,$(LIBUIO_VERSION))
 LIBUIO_LICENSE = LGPL-2.1 (library), GPL-2.0 (programs)
 LIBUIO_LICENSE_FILES = COPYING
 LIBUIO_CONF_OPTS = --with-glib=no --without-werror
-LIBUIO_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+LIBUIO_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-pkgconf
 LIBUIO_LIBS = $(TARGET_NLS_LIBS)
 LIBUIO_INSTALL_STAGING = YES
 

buildroot/package/linux-headers/Config.in.host

@@ -287,10 +287,10 @@ endchoice
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "4.4.206"	if BR2_KERNEL_HEADERS_4_4
-	default "4.9.206"	if BR2_KERNEL_HEADERS_4_9
-	default "4.14.158"	if BR2_KERNEL_HEADERS_4_14
-	default "4.19.88"	if BR2_KERNEL_HEADERS_4_19
+	default "4.4.208"	if BR2_KERNEL_HEADERS_4_4
+	default "4.9.208"	if BR2_KERNEL_HEADERS_4_9
+	default "4.14.163"	if BR2_KERNEL_HEADERS_4_14
+	default "4.19.94"	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

buildroot/package/lirc-tools/lirc-tools.mk

@@ -47,7 +47,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LIRC_TOOLS_DEPENDENCIES += python3 host-python3-setuptools
-LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV="$(PKG_PYTHON_SETUPTOOLS_ENV)"
+LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)'
 endif
 
 define LIRC_TOOLS_INSTALL_INIT_SYSV

buildroot/package/lvm2/lvm2.mk

@@ -31,6 +31,10 @@ LVM2_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
 # package/readline is GPL-3.0+, so not license compatible
 LVM2_CONF_OPTS += --disable-readline
 
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+LVM2_CONF_OPTS += --enable-udev_rules
+endif
+
 ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
 LVM2_CONF_OPTS += --enable-selinux
 LVM2_DEPENDENCIES += libselinux

buildroot/package/mali-t76x/Config.in

@@ -11,7 +11,7 @@ config BR2_PACKAGE_MALI_T76X
 	  Midgard T76X GPU. This package requires a kernel with the
 	  ARM Mali Midgard GPU Kernel Drivers enabled.
 
-	  Source: http://malideveloper.arm.com/resources/drivers/
+	  http://malideveloper.arm.com/resources/drivers/
 
 if BR2_PACKAGE_MALI_T76X
 

buildroot/package/matchbox-desktop/matchbox-desktop.mk

@@ -11,7 +11,6 @@ MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matc
 MATCHBOX_DESKTOP_LICENSE = GPL-2.0+
 MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib
-MATCHBOX_DESKTOP_CONF_OPTS = --enable-expat
 
 # The bundled configure script does not properly replace LIBADD_DL, so
 # we force an autoreconf even if we don't have any patches touching

buildroot/package/nodejs/nodejs.hash

@@ -1,5 +1,5 @@
-# From https://nodejs.org/dist/v8.16.1/SHASUMS256.txt
-sha256 d8c190acdf2d967faf49c22df883d31a8d4e249d67852dae3c2d8a0f756b0512  node-v8.16.1.tar.xz
+# From https://nodejs.org/dist/v8.17.0/SHASUMS256.txt
+sha256 5b0d96db482b273f0324c299ead86ecfbc5d033516e5fc37c92cfccb933ef6ff  node-v8.17.0.tar.xz
 
 # Hash for license file
 sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5  LICENSE

buildroot/package/nodejs/nodejs.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NODEJS_VERSION = 8.16.1
+NODEJS_VERSION = 8.17.0
 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 \