* [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6
@ 2017-10-12 21:17 Peter Korsgaard
2017-10-12 21:17 ` [Buildroot] [PATCH 2/4] configs/qemu_aarch64_virt_defconfig: build and use ext4 rootfs Peter Korsgaard
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Peter Korsgaard @ 2017-10-12 21:17 UTC (permalink / raw)
To: buildroot
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
board/qemu/aarch64-virt/{linux-4.11.config => linux-4.13.config} | 0
configs/qemu_aarch64_virt_defconfig | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
rename board/qemu/aarch64-virt/{linux-4.11.config => linux-4.13.config} (100%)
diff --git a/board/qemu/aarch64-virt/linux-4.11.config b/board/qemu/aarch64-virt/linux-4.13.config
similarity index 100%
rename from board/qemu/aarch64-virt/linux-4.11.config
rename to board/qemu/aarch64-virt/linux-4.13.config
diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig
index 1ef4405ac4..84078ac892 100644
--- a/configs/qemu_aarch64_virt_defconfig
+++ b/configs/qemu_aarch64_virt_defconfig
@@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_ROOTFS_INITRAMFS=y
-# Linux headers same as kernel, a 4.11 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.6"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.11.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.13.config"
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/4] configs/qemu_aarch64_virt_defconfig: build and use ext4 rootfs
2017-10-12 21:17 [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6 Peter Korsgaard
@ 2017-10-12 21:17 ` Peter Korsgaard
2017-10-12 21:17 ` [Buildroot] [PATCH 3/4] libnspr: bump version to 4.17 Peter Korsgaard
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2017-10-12 21:17 UTC (permalink / raw)
To: buildroot
The "virt" machine supports disk emulation, so use a ext4 rootfs instead of
initramfs for consistency with the other qemu defconfigs.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
board/qemu/aarch64-virt/readme.txt | 2 +-
configs/qemu_aarch64_virt_defconfig | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/board/qemu/aarch64-virt/readme.txt b/board/qemu/aarch64-virt/readme.txt
index ece8a536a7..9e09d953f9 100644
--- a/board/qemu/aarch64-virt/readme.txt
+++ b/board/qemu/aarch64-virt/readme.txt
@@ -1,6 +1,6 @@
Run the emulation with:
- qemu-system-aarch64 -M virt -cpu cortex-a57 -nographic -smp 1 -kernel output/images/Image -append "console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0
+ qemu-system-aarch64 -M virt -cpu cortex-a57 -nographic -smp 1 -kernel output/images/Image -append "root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0
The login prompt will appear in the terminal that started Qemu.
diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig
index 84078ac892..c94c4ac773 100644
--- a/configs/qemu_aarch64_virt_defconfig
+++ b/configs/qemu_aarch64_virt_defconfig
@@ -6,8 +6,9 @@ BR2_SYSTEM_DHCP="eth0"
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_ROOTFS_INITRAMFS=y
# Linux headers same as kernel, a 4.13 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/4] libnspr: bump version to 4.17
2017-10-12 21:17 [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6 Peter Korsgaard
2017-10-12 21:17 ` [Buildroot] [PATCH 2/4] configs/qemu_aarch64_virt_defconfig: build and use ext4 rootfs Peter Korsgaard
@ 2017-10-12 21:17 ` Peter Korsgaard
2017-10-12 21:17 ` [Buildroot] [PATCH 4/4] libnss: security bump to version 3.33 Peter Korsgaard
2017-10-12 21:22 ` [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6 Peter Korsgaard
3 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2017-10-12 21:17 UTC (permalink / raw)
To: buildroot
libnss 3.33 needs libnspr >= 4.17.
Also add a hash for the license file while we're at it.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/libnspr/libnspr.hash | 6 ++++--
package/libnspr/libnspr.mk | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash
index 13cee6e7ef..46c091e0da 100644
--- a/package/libnspr/libnspr.hash
+++ b/package/libnspr/libnspr.hash
@@ -1,2 +1,4 @@
-# From https://ftp.mozilla.org/pub/nspr/releases/v4.15/src/SHA256SUMS
-sha256 27dde06bc3d0c88903a20d6ad807361a912cfb624ca0ab4efb10fc50b19e2d80 nspr-4.15.tar.gz
+# From https://ftp.mozilla.org/pub/nspr/releases/v4.17/src/SHA256SUMS
+sha256 590a0aea29412ae22d7728038c21ef2ab42646e48172a47d2e4bb782846d1095 nspr-4.17.tar.gz
+# Locally calculated
+sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 7659baf6d3..0c782ae309 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBNSPR_VERSION = 4.15
+LIBNSPR_VERSION = 4.17
LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src
LIBNSPR_SUBDIR = nspr
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 4/4] libnss: security bump to version 3.33
2017-10-12 21:17 [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6 Peter Korsgaard
2017-10-12 21:17 ` [Buildroot] [PATCH 2/4] configs/qemu_aarch64_virt_defconfig: build and use ext4 rootfs Peter Korsgaard
2017-10-12 21:17 ` [Buildroot] [PATCH 3/4] libnspr: bump version to 4.17 Peter Korsgaard
@ 2017-10-12 21:17 ` Peter Korsgaard
2017-10-12 21:22 ` [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6 Peter Korsgaard
3 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2017-10-12 21:17 UTC (permalink / raw)
To: buildroot
Fixes CVE-2017-7805 - Martin Thomson discovered that nss, the Mozilla
Network Security Service library, is prone to a use-after-free vulnerability
in the TLS 1.2 implementation when handshake hashes are generated. A remote
attacker can take advantage of this flaw to cause an application using the
nss library to crash, resulting in a denial of service, or potentially to
execute arbitrary code.
Also add a hash for the license file while we're at it.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/libnss/libnss.hash | 6 ++++--
package/libnss/libnss.mk | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash
index e4e24283cb..6c8ce83784 100644
--- a/package/libnss/libnss.hash
+++ b/package/libnss/libnss.hash
@@ -1,2 +1,4 @@
-# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_31_RTM/src/SHA256SUMS
-sha256 e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d nss-3.31.tar.gz
+# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_33_RTM/src/SHA256SUMS
+sha256 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 nss-3.33.tar.gz
+# Locally calculated
+sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 51559295ef..27d305cc34 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBNSS_VERSION = 3.31
+LIBNSS_VERSION = 3.33
LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src
LIBNSS_DISTDIR = dist
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6
2017-10-12 21:17 [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6 Peter Korsgaard
` (2 preceding siblings ...)
2017-10-12 21:17 ` [Buildroot] [PATCH 4/4] libnss: security bump to version 3.33 Peter Korsgaard
@ 2017-10-12 21:22 ` Peter Korsgaard
3 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2017-10-12 21:22 UTC (permalink / raw)
To: buildroot
On Thu, Oct 12, 2017 at 11:17 PM, Peter Korsgaard <peter@korsgaard.com> wrote:
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Ups, wrong branch - Please ignore this series.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-10-12 21:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-12 21:17 [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6 Peter Korsgaard
2017-10-12 21:17 ` [Buildroot] [PATCH 2/4] configs/qemu_aarch64_virt_defconfig: build and use ext4 rootfs Peter Korsgaard
2017-10-12 21:17 ` [Buildroot] [PATCH 3/4] libnspr: bump version to 4.17 Peter Korsgaard
2017-10-12 21:17 ` [Buildroot] [PATCH 4/4] libnss: security bump to version 3.33 Peter Korsgaard
2017-10-12 21:22 ` [Buildroot] [PATCH 1/4] configs/qemu_aarch64_virt_defconfig: bump kernel to 4.13.6 Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox