From 17e95532842c4d62b30669490eb00b39cf8ff743 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 28 Feb 2021 19:26:07 +0000 Subject: [PATCH 1/4] tools: add xxd (from vim) U-Boot requires xxd to create the default environment from an external file as done in uboot-mediatek. Build xxd (only, not the rest of vim) as part of tools to make sure it is present on the buildhost. Reported-by: David Bauer Signed-off-by: Daniel Golle (cherry picked from commit c4dd2441e7875c9550820f8380b3e41ca619ef27) --- tools/Makefile | 2 +- tools/xxd/Makefile | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 tools/xxd/Makefile diff --git a/tools/Makefile b/tools/Makefile index a2665dbc9a..577ea799c5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,7 +25,7 @@ tools-y += autoconf autoconf-archive automake bc bison cmake dosfstools tools-y += e2fsprogs fakeroot findutils firmware-utils flex gengetopt tools-y += libressl libtool lzma m4 make-ext4fs missing-macros mkimage tools-y += mklibs mm-macros mtd-utils mtools padjffs2 patch-image -tools-y += patchelf pkgconf quilt squashfskit4 sstrip zip zlib zstd +tools-y += patchelf pkgconf quilt squashfskit4 sstrip xxd zip zlib zstd tools-$(BUILD_B43_TOOLS) += b43-tools tools-$(BUILD_ISL) += isl tools-$(BUILD_TOOLCHAIN) += expat gmp libelf mpc mpfr diff --git a/tools/xxd/Makefile b/tools/xxd/Makefile new file mode 100644 index 0000000000..7c225baa00 --- /dev/null +++ b/tools/xxd/Makefile @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xxd +PKG_SOURCE_NAME:=vim +PKG_VERSION:=8.2 +PKG_RELEASE:=2 +VIMVER:=82 + +PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://ftp.vim.org/pub/vim/unix +PKG_HASH:=f087f821831b4fece16a0461d574ccd55a8279f64d635510a1e10225966ced3b +PKG_CPE_ID:=cpe:/a:vim:vim + +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_NAME)$(VIMVER) +HOST_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/host-build.mk + +define Host/Configure +endef + +define Host/Compile + $(HOST_MAKE_VARS) $(MAKE) -C $(HOST_BUILD_DIR)/src/xxd +endef + +define Host/Install + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/xxd/xxd $(STAGING_DIR_HOST)/bin/ +endef + +$(eval $(call HostBuild)) From 92020d42425090d8e30554c41bed2d650263e06e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 1 Mar 2021 14:06:33 +0000 Subject: [PATCH 2/4] tools: xxd: use more convenient source tarball Don't download all of vim just to build xxd. Use a tight tarball containing only xxd sources instead. Signed-off-by: Daniel Golle (cherry picked from commit 2b94aac7a128c9d9f4343af2265b362e8b5d5013) --- tools/xxd/Makefile | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/tools/xxd/Makefile b/tools/xxd/Makefile index 7c225baa00..c3cc6863cc 100644 --- a/tools/xxd/Makefile +++ b/tools/xxd/Makefile @@ -3,31 +3,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xxd -PKG_SOURCE_NAME:=vim -PKG_VERSION:=8.2 -PKG_RELEASE:=2 -VIMVER:=82 - -PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://ftp.vim.org/pub/vim/unix -PKG_HASH:=f087f821831b4fece16a0461d574ccd55a8279f64d635510a1e10225966ced3b +PKG_VERSION:=1.10 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://grail.cba.csuohio.edu/~somos/ +PKG_HASH:=9bf05c19b9084973e3cc877696a7f9881a5c87fa5a9fa438d9962519726559f9 PKG_CPE_ID:=cpe:/a:vim:vim -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_NAME)$(VIMVER) -HOST_BUILD_PARALLEL:=1 - include $(INCLUDE_DIR)/host-build.mk -define Host/Configure -endef - -define Host/Compile - $(HOST_MAKE_VARS) $(MAKE) -C $(HOST_BUILD_DIR)/src/xxd -endef - define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ - $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/xxd/xxd $(STAGING_DIR_HOST)/bin/ + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin + $(INSTALL_BIN) $(HOST_BUILD_DIR)/xxd $(STAGING_DIR_HOST)/bin/ endef $(eval $(call HostBuild)) From 864bba55d8714a64abdf94cfb835450b8cd7789e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 15 Mar 2022 12:40:40 +0100 Subject: [PATCH 3/4] uboot-bcm4908: use "xxd" from staging_dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes: bash: xxd: command not found on hosts without xxd installed. Signed-off-by: Rafał Miłecki (cherry picked from commit 9dbca6bf6e6e088afd18fb532ed9135c21aec1cc) Fixes: 45b3f2aa0f57 ("uboot-bcm4908: add package with BCM4908 U-Boot") --- package/boot/uboot-bcm4908/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/boot/uboot-bcm4908/Makefile b/package/boot/uboot-bcm4908/Makefile index 489b4d69bf..dc862f4e32 100644 --- a/package/boot/uboot-bcm4908/Makefile +++ b/package/boot/uboot-bcm4908/Makefile @@ -32,10 +32,10 @@ define Build/Prepare $(call Build/Prepare/Default) mkdir -p $(PKG_BUILD_DIR)/include/generated/ ( cd $(PKG_BUILD_DIR)/board/broadcom/bcmbca/httpd/html/ && \ - xxd -i index.html > ../../../../../include/generated/index.h && \ - xxd -i flashing.html > ../../../../../include/generated/flashing.h && \ - xxd -i fail.html > ../../../../../include/generated/fail.h && \ - xxd -i 404.html > ../../../../../include/generated/404.h ) + $(STAGING_DIR_HOST)/bin/xxd -i index.html > ../../../../../include/generated/index.h && \ + $(STAGING_DIR_HOST)/bin/xxd -i flashing.html > ../../../../../include/generated/flashing.h && \ + $(STAGING_DIR_HOST)/bin/xxd -i fail.html > ../../../../../include/generated/fail.h && \ + $(STAGING_DIR_HOST)/bin/xxd -i 404.html > ../../../../../include/generated/404.h ) endef define Build/InstallDev From b1c353986895ef757dd69ea9fe30dd22194ee421 Mon Sep 17 00:00:00 2001 From: Martin Schiller Date: Wed, 16 Mar 2022 15:04:56 +0100 Subject: [PATCH 4/4] openssl: bump to 1.1.1n This is a bugfix release. Changelog: *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. (CVE-2022-0778) *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. Signed-off-by: Martin Schiller (cherry picked from commit e17c6ee62770005e398364ee5d955c9a8ab6f016) --- package/libs/openssl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index e8e10524ca..52a5aeec93 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_BASE:=1.1.1 -PKG_BUGFIX:=m +PKG_BUGFIX:=n PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) PKG_RELEASE:=1 PKG_USE_MIPS16:=0 @@ -26,7 +26,7 @@ PKG_SOURCE_URL:= \ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/old/$(PKG_BASE)/ -PKG_HASH:=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 +PKG_HASH:=40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a PKG_LICENSE:=OpenSSL PKG_LICENSE_FILES:=LICENSE