From e6a2858667dfac06165691641f0e77624f8ae2ef Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 17 Aug 2020 14:42:24 +0200 Subject: [PATCH 01/11] linux-firmware: update to version 20200817 Signed-off-by: Josef Schlehofer --- package/firmware/linux-firmware/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index b50a025409..ad3363ebd9 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware -PKG_VERSION:=20200619 +PKG_VERSION:=20200817 PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=962d3ae197d226c8259f9cc7746f7ef12a9d23787cd56bd27302021ba6339722 +PKG_HASH:=76d05d5f1eff268d3b80675245fa596f557bd55ee2e16ddd54d18ffeae943887 PKG_MAINTAINER:=Felix Fietkau From 8da86f749dc24da7b16eb70dc7967e97858958a6 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 18 Aug 2020 14:23:03 +0200 Subject: [PATCH 02/11] linux-firmware: add support for Marvell SDIO 8997 Signed-off-by: Josef Schlehofer --- package/firmware/linux-firmware/Makefile | 2 +- package/firmware/linux-firmware/marvell.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index ad3363ebd9..7dbcbdd8a3 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware PKG_VERSION:=20200817 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/package/firmware/linux-firmware/marvell.mk b/package/firmware/linux-firmware/marvell.mk index 6c3f171216..78edac0ff3 100644 --- a/package/firmware/linux-firmware/marvell.mk +++ b/package/firmware/linux-firmware/marvell.mk @@ -20,12 +20,14 @@ define Package/mwifiex-pcie-firmware/install endef $(eval $(call BuildPackage,mwifiex-pcie-firmware)) -Package/mwifiex-sdio-firmware = $(call Package/firmware-default,Marvell 8887 firmware) +Package/mwifiex-sdio-firmware = $(call Package/firmware-default,Marvell 8887/8997 firmware) define Package/mwifiex-sdio-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/mrvl $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/mrvl/sd8887_uapsta.bin \ + $(PKG_BUILD_DIR)/mrvl/sdsd8997_combo_v4.bin \ $(1)/lib/firmware/mrvl/ + ln -s ../mrvl/sdsd8997_combo_v4.bin $(1)/lib/firmware/mrvl/sd8997_uapsta.bin endef $(eval $(call BuildPackage,mwifiex-sdio-firmware)) From 37ddc74b37db9db42b3b7ca724b7690b3e8d4227 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 18 Aug 2020 02:10:25 +0800 Subject: [PATCH 03/11] cmake: Disable use of package registries CMake provides a user package registry (stored in ~/.cmake/packages) and a system package registry (not available on non-Windows platforms). The "export(PACKAGE)" command may store information in the user package registry, and the "find_package()" command may search both user and system package registries for information. This sets various variables to disable the use of these package registries (both saving and retrieval of package information). This also sets deprecated variables that perform similar functions, in case external toolchains include older versions of CMake. Signed-off-by: Jeffery To --- include/cmake.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/cmake.mk b/include/cmake.mk index e2d13c8ab3..12855982f6 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -60,6 +60,12 @@ define Build/Configure/Default -DDL_LIBRARY=$(STAGING_DIR) \ -DCMAKE_PREFIX_PATH=$(STAGING_DIR) \ -DCMAKE_SKIP_RPATH=TRUE \ + -DCMAKE_EXPORT_PACKAGE_REGISTRY=FALSE \ + -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE \ + -DCMAKE_FIND_USE_PACKAGE_REGISTRY=FALSE \ + -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=TRUE \ + -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=FALSE \ + -DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=TRUE \ $(CMAKE_OPTIONS) \ $(CMAKE_SOURCE_DIR) \ ) @@ -93,6 +99,12 @@ define Host/Configure/Default -DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \ -DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_EXPORT_PACKAGE_REGISTRY=FALSE \ + -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE \ + -DCMAKE_FIND_USE_PACKAGE_REGISTRY=FALSE \ + -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=TRUE \ + -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=FALSE \ + -DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=TRUE \ $(CMAKE_HOST_OPTIONS) \ $(HOST_CMAKE_SOURCE_DIR) \ ) From 26529097c0dc59ba5eac11f6d1f093653797a840 Mon Sep 17 00:00:00 2001 From: Donald Hoskins Date: Fri, 14 Aug 2020 14:30:02 -0700 Subject: [PATCH 04/11] uClibc-ng: update package from 1.0.31 to 1.0.34 Update package from 1.0.31 to 1.0.34 Tested mips64/octeonplus/octeon3 Build against: OpenWrt SNAPSHOT r13871-546e140382 / LuCI Master git-20.186.79919-0c47989 Build Kernel: 5.4.51 Signed-off-by: Donald Hoskins --- toolchain/uClibc/common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk index a79a838be4..bb093b1dc7 100644 --- a/toolchain/uClibc/common.mk +++ b/toolchain/uClibc/common.mk @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk -PKG_VERSION:=1.0.31 +PKG_VERSION:=1.0.34 PKG_RELEASE:=1 PKG_NAME:=uClibc-ng @@ -17,7 +17,7 @@ CONFIG_DIR:=$(PATH_PREFIX)/config PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz LIBC_SO_VERSION:=$(PKG_VERSION) -PKG_HASH:=2215d7377118434d1697fd575f10d7a6be3f29e460d6b0e1ee9f6f5306288060 +PKG_HASH:=e6776229eee8d3f5a1cd29fb4286630e3cb9e97dded4e8f4a3a9bb4fa8c0d5e3 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION) From ffbff069dc2fb68f81d8aba6de1370a6fcb49dc6 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 14 Aug 2020 14:30:03 -0700 Subject: [PATCH 05/11] uClibc-ng: refresh config and remove several legacy options SUSV3_LEGACY_MACROS are completely unused since SUSV3_LEGACY is enabled HAS_OBSOLETE_BSD_SIGNAL is completely deprecated functionality. HAS_BSD_RES_CLOSE is completely deprecated functionality. HAS_FTW is deprecated SUSV4 functionality. Saves ~4.5kb. Signed-off-by: Rosen Penev --- toolchain/uClibc/config/arc | 2 -- toolchain/uClibc/config/archs | 2 -- toolchain/uClibc/config/arm | 2 -- toolchain/uClibc/config/armeb | 2 -- toolchain/uClibc/config/common | 35 +++------------------------ toolchain/uClibc/config/i386 | 13 ---------- toolchain/uClibc/config/i686 | 13 ---------- toolchain/uClibc/config/m68k | 1 - toolchain/uClibc/config/mips | 8 ------ toolchain/uClibc/config/mips64 | 8 ------ toolchain/uClibc/config/mips64.32 | 8 ------ toolchain/uClibc/config/mips64.64 | 8 ------ toolchain/uClibc/config/mips64.n32 | 8 ------ toolchain/uClibc/config/mips64el | 8 ------ toolchain/uClibc/config/mips64el.32 | 8 ------ toolchain/uClibc/config/mips64el.64 | 8 ------ toolchain/uClibc/config/mips64el.n32 | 8 ------ toolchain/uClibc/config/mipsel | 8 ------ toolchain/uClibc/config/mipsel.cobalt | 8 ------ toolchain/uClibc/config/sparc | 2 -- toolchain/uClibc/config/sparc.leon | 2 -- toolchain/uClibc/config/x86_64 | 1 - 22 files changed, 4 insertions(+), 159 deletions(-) diff --git a/toolchain/uClibc/config/arc b/toolchain/uClibc/config/arc index de1ffc4415..f92328b7ed 100644 --- a/toolchain/uClibc/config/arc +++ b/toolchain/uClibc/config/arc @@ -3,8 +3,6 @@ ARCH_LITTLE_ENDIAN=y ARCH_WANTS_LITTLE_ENDIAN=y TARGET_ARCH="arc" TARGET_arc=y -CONFIG_ARC_CPU_700=y -# CONFIG_ARC_CPU_HS is not set CONFIG_ARC_PAGE_SIZE_8K=y # CONFIG_ARC_PAGE_SIZE_16K is not set # CONFIG_ARC_PAGE_SIZE_4K is not set diff --git a/toolchain/uClibc/config/archs b/toolchain/uClibc/config/archs index 961628ed8c..f92328b7ed 100644 --- a/toolchain/uClibc/config/archs +++ b/toolchain/uClibc/config/archs @@ -3,8 +3,6 @@ ARCH_LITTLE_ENDIAN=y ARCH_WANTS_LITTLE_ENDIAN=y TARGET_ARCH="arc" TARGET_arc=y -# CONFIG_ARC_CPU_700 is not set -CONFIG_ARC_CPU_HS=y CONFIG_ARC_PAGE_SIZE_8K=y # CONFIG_ARC_PAGE_SIZE_16K is not set # CONFIG_ARC_PAGE_SIZE_4K is not set diff --git a/toolchain/uClibc/config/arm b/toolchain/uClibc/config/arm index 41a60b1c38..9544f144d1 100644 --- a/toolchain/uClibc/config/arm +++ b/toolchain/uClibc/config/arm @@ -1,9 +1,7 @@ ARCH_ANY_ENDIAN=y ARCH_LITTLE_ENDIAN=y ARCH_WANTS_LITTLE_ENDIAN=y -# COMPILE_IN_THUMB_MODE is not set TARGET_ARCH="arm" TARGET_arm=y -# USE_BX is not set CONFIG_ARM_EABI=y diff --git a/toolchain/uClibc/config/armeb b/toolchain/uClibc/config/armeb index 2e46dd67d9..e329c7e369 100644 --- a/toolchain/uClibc/config/armeb +++ b/toolchain/uClibc/config/armeb @@ -1,9 +1,7 @@ ARCH_ANY_ENDIAN=y ARCH_BIG_ENDIAN=y ARCH_WANTS_BIG_ENDIAN=y -# COMPILE_IN_THUMB_MODE is not set TARGET_ARCH="arm" TARGET_arm=y -# USE_BX is not set CONFIG_ARM_EABI=y diff --git a/toolchain/uClibc/config/common b/toolchain/uClibc/config/common index b679c0a1ec..d88d5bf473 100644 --- a/toolchain/uClibc/config/common +++ b/toolchain/uClibc/config/common @@ -7,13 +7,11 @@ ARCH_USE_MMU=y # ARCH_WANTS_BIG_ENDIAN is not set # ARCH_WANTS_LITTLE_ENDIAN is not set ASSUME_DEVPTS=y -# COMPAT_ATEXIT is not set CROSS_COMPILER_PREFIX="" DEVEL_PREFIX="/usr/" # DOASSERTS is not set # DODEBUG is not set # DODEBUG_PT is not set -# DOMULTI is not set DOPIC=y DOSTRIP=y DO_C99_MATH=y @@ -33,7 +31,6 @@ LDSO_CACHE_SUPPORT=y # LDSO_GNU_HASH_SUPPORT is not set LDSO_LD_LIBRARY_PATH=y LDSO_LDD_SUPPORT=y -# LDSO_NO_CLEANUP is not set # LDSO_PRELINK_SUPPORT is not set # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_PRELOAD_ENV_SUPPORT=y @@ -42,12 +39,9 @@ LDSO_SAFE_RUNPATH=y # LDSO_RUNPATH_OF_EXECUTABLE is not set # LDSO_SEARCH_INTERP_PATH is not set # LDSO_STANDALONE_SUPPORT is not set -# LINUXTHREADS_NEW is not set -# LINUXTHREADS_OLD is not set # UCLIBC_HAS_BACKTRACE is not set UCLIBC_HAS_THREADS_NATIVE=y # MALLOC is not set -MALLOC_GLIBC_COMPAT=y # MALLOC_SIMPLE is not set MALLOC_STANDARD=y MULTILIB_DIR="lib" @@ -63,12 +57,10 @@ TARGET_SUBARCH="" # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set -# TARGET_e1 is not set # TARGET_frv is not set # TARGET_h8300 is not set # TARGET_hppa is not set # TARGET_i386 is not set -# TARGET_i960 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set # TARGET_m68k is not set @@ -80,10 +72,7 @@ TARGET_SUBARCH="" # TARGET_or1k is not set # TARGET_powerpc is not set # TARGET_sh is not set -# TARGET_sh64 is not set # TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set # TARGET_x86_64 is not set # TARGET_xtensa is not set UCLIBC_BSD_SPECIFIC=y @@ -96,10 +85,9 @@ UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_EXTRA_CFLAGS="" UCLIBC_GRP_BUFFER_SIZE=256 UCLIBC_HAS_ADVANCED_REALTIME=y -# UCLIBC_HAS_ARC4RANDOM is not set # UCLIBC_HAS_ARGP is not set UCLIBC_HAS_BSD_ERR=y -UCLIBC_HAS_BSD_RES_CLOSE=y +# UCLIBC_HAS_BSD_RES_CLOSE is not set # UCLIBC_HAS_COMPAT_RES_STATE is not set UCLIBC_HAS_CRYPT=y UCLIBC_HAS_CRYPT_IMPL=y @@ -114,14 +102,12 @@ UCLIBC_HAS_ERRNO_MESSAGES=y # UCLIBC_HAS_FENV is not set UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FNMATCH=y -UCLIBC_HAS_FNMATCH_OLD=y # UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y # UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set # UCLIBC_HAS_FPU is not set UCLIBC_HAS_FTS=y -UCLIBC_HAS_FTW=y -# UCLIBC_HAS_FULL_RPC is not set +# UCLIBC_HAS_FTW is not set UCLIBC_HAS_GETPT=y UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y @@ -135,29 +121,22 @@ UCLIBC_HAS_HEXADECIMAL_FLOATS=y UCLIBC_HAS_IPV4=y UCLIBC_HAS_IPV6=y UCLIBC_HAS_LFS=y -UCLIBC_HAS_LIBNSL_STUB=y -UCLIBC_HAS_LIBRESOLV_STUB=y UCLIBC_HAS_LIBUTIL=y # UCLIBC_HAS_LOCALE is not set # UCLIBC_BUILD_ALL_LOCALE is not set # UCLIBC_BUILD_MINIMAL_LOCALE is not set -# UCLIBC_PREGENERATED_LOCALE_DATA is not set UCLIBC_HAS_LONG_DOUBLE_MATH=y UCLIBC_HAS_NETWORK_SUPPORT=y UCLIBC_HAS_NFTW=y -UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y +# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set UCLIBC_HAS_PRINTF_M_SPEC=y # UCLIBC_HAS_PROFILING is not set UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y UCLIBC_HAS_PTY=y UCLIBC_HAS_REALTIME=y -# UCLIBC_HAS_REENTRANT_RPC is not set UCLIBC_HAS_REGEX=y -UCLIBC_HAS_REGEX_OLD=y UCLIBC_HAS_RESOLVER_SUPPORT=y -# UCLIBC_HAS_RPC is not set -UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y # UCLIBC_HAS_SHA256_CRYPT_IMPL is not set # UCLIBC_HAS_SHA512_CRYPT_IMPL is not set UCLIBC_HAS_SHADOW=y @@ -165,7 +144,6 @@ UCLIBC_HAS_SIGNUM_MESSAGES=y UCLIBC_HAS_SOCKET=y UCLIBC_HAS_SOFT_FLOAT=y # UCLIBC_HAS_SSP is not set -# UCLIBC_HAS_SSP_COMPAT is not set UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y # UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set # UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set @@ -198,11 +176,8 @@ UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_XATTR=y # UCLIBC_HAS_XLOCALE is not set UCLIBC_HAS___PROGNAME=y -# UCLIBC_LINUX_MODULE_24 is not set -UCLIBC_LINUX_MODULE_26=y UCLIBC_LINUX_SPECIFIC=y # UCLIBC_MALLOC_DEBUGGING is not set -# UCLIBC_MJN3_ONLY is not set # UCLIBC_NTP_LEGACY is not set # USE_OLD_VFPRINTF is not set UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 @@ -211,16 +186,14 @@ UCLIBC_PWD_BUFFER_SIZE=256 # UCLIBC_STRICT_HEADERS is not set UCLIBC_SUPPORT_AI_ADDRCONFIG=y UCLIBC_SUSV3_LEGACY=y -UCLIBC_SUSV3_LEGACY_MACROS=y +# UCLIBC_SUSV3_LEGACY_MACROS is not set UCLIBC_SUSV4_LEGACY=y # UCLIBC_SV4_DEPRECATED is not set UCLIBC_TZ_FILE_PATH="/etc/TZ" # UCLIBC_FALLBACK_TO_ETC_LOCALTIME is not set UCLIBC_USE_NETLINK=y # UNIX98PTY_ONLY is not set -USE_BX=y WARNINGS="-Wall" -# UCLIBC_HAS_OBSTACK is not set # UCLIBC_SUSV2_LEGACY is not set # UCLIBC_HAS_CONTEXT_FUNCS is not set UCLIBC_HAS_GETOPT_LONG=y diff --git a/toolchain/uClibc/config/i386 b/toolchain/uClibc/config/i386 index 5ef264c271..cddb709630 100644 --- a/toolchain/uClibc/config/i386 +++ b/toolchain/uClibc/config/i386 @@ -2,20 +2,7 @@ ARCH_LITTLE_ENDIAN=y # CONFIG_386 is not set CONFIG_486=y # CONFIG_586 is not set -# CONFIG_586MMX is not set # CONFIG_686 is not set -# CONFIG_CRUSOE is not set -# CONFIG_CYRIXIII is not set -# CONFIG_ELAN is not set -# CONFIG_GENERIC_386 is not set -# CONFIG_K6 is not set -# CONFIG_K7 is not set -# CONFIG_NEHEMIAH is not set -# CONFIG_PENTIUM4 is not set -# CONFIG_PENTIUMII is not set -# CONFIG_PENTIUMIII is not set -# CONFIG_WINCHIP2 is not set -# CONFIG_WINCHIPC6 is not set TARGET_ARCH="i386" TARGET_i386=y UCLIBC_HAS_FPU=y diff --git a/toolchain/uClibc/config/i686 b/toolchain/uClibc/config/i686 index ba615f6b86..8a25f41e23 100644 --- a/toolchain/uClibc/config/i686 +++ b/toolchain/uClibc/config/i686 @@ -2,20 +2,7 @@ ARCH_LITTLE_ENDIAN=y # CONFIG_386 is not set # CONFIG_486 is not set # CONFIG_586 is not set -# CONFIG_586MMX is not set CONFIG_686=y -# CONFIG_CRUSOE is not set -# CONFIG_CYRIXIII is not set -# CONFIG_ELAN is not set -# CONFIG_GENERIC_386 is not set -# CONFIG_K6 is not set -# CONFIG_K7 is not set -# CONFIG_NEHEMIAH is not set -# CONFIG_PENTIUM4 is not set -# CONFIG_PENTIUMII is not set -# CONFIG_PENTIUMIII is not set -# CONFIG_WINCHIP2 is not set -# CONFIG_WINCHIPC6 is not set TARGET_ARCH="i386" TARGET_i386=y UCLIBC_HAS_FPU=y diff --git a/toolchain/uClibc/config/m68k b/toolchain/uClibc/config/m68k index 14ce5aef7b..0675bb9080 100644 --- a/toolchain/uClibc/config/m68k +++ b/toolchain/uClibc/config/m68k @@ -1,5 +1,4 @@ ARCH_BIG_ENDIAN=y -LINUXTHREADS_OLD=y TARGET_ARCH="m68k" TARGET_SUBARCH="" TARGET_m68k=y diff --git a/toolchain/uClibc/config/mips b/toolchain/uClibc/config/mips index 8cec22f4de..c8f71f03c9 100644 --- a/toolchain/uClibc/config/mips +++ b/toolchain/uClibc/config/mips @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_BIG_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_WANTS_BIG_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -CONFIG_MIPS_ISA_MIPS32=y -# CONFIG_MIPS_ISA_MIPS32R2 is not set -# CONFIG_MIPS_ISA_MIPS64 is not set -# CONFIG_MIPS_ISA_MIPS64R2 is not set # CONFIG_MIPS_N32_ABI is not set # CONFIG_MIPS_N64_ABI is not set CONFIG_MIPS_O32_ABI=y diff --git a/toolchain/uClibc/config/mips64 b/toolchain/uClibc/config/mips64 index 566d87a6e4..453293def3 100644 --- a/toolchain/uClibc/config/mips64 +++ b/toolchain/uClibc/config/mips64 @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_BIG_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_WANTS_BIG_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -# CONFIG_MIPS_ISA_MIPS32 is not set -# CONFIG_MIPS_ISA_MIPS32R2 is not set -CONFIG_MIPS_ISA_MIPS64=y -# CONFIG_MIPS_ISA_MIPS64R2 is not set # CONFIG_MIPS_N32_ABI is not set CONFIG_MIPS_N64_ABI=y # CONFIG_MIPS_O32_ABI is not set diff --git a/toolchain/uClibc/config/mips64.32 b/toolchain/uClibc/config/mips64.32 index b7ea8f457e..4e98968633 100644 --- a/toolchain/uClibc/config/mips64.32 +++ b/toolchain/uClibc/config/mips64.32 @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_BIG_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_WANTS_BIG_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -# CONFIG_MIPS_ISA_MIPS32 is not set -# CONFIG_MIPS_ISA_MIPS32R2 is not set -CONFIG_MIPS_ISA_MIPS64=y -# CONFIG_MIPS_ISA_MIPS64R2 is not set # CONFIG_MIPS_N32_ABI is not set # CONFIG_MIPS_N64_ABI is not set CONFIG_MIPS_O32_ABI=y diff --git a/toolchain/uClibc/config/mips64.64 b/toolchain/uClibc/config/mips64.64 index 2a0b755a73..bf4ecca704 100644 --- a/toolchain/uClibc/config/mips64.64 +++ b/toolchain/uClibc/config/mips64.64 @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_BIG_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_WANTS_BIG_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -# CONFIG_MIPS_ISA_MIPS32 is not set -# CONFIG_MIPS_ISA_MIPS32R2 is not set -CONFIG_MIPS_ISA_MIPS64=y -# CONFIG_MIPS_ISA_MIPS64R2 is not set # CONFIG_MIPS_N32_ABI is not set CONFIG_MIPS_N64_ABI=y # CONFIG_MIPS_O32_ABI is not set diff --git a/toolchain/uClibc/config/mips64.n32 b/toolchain/uClibc/config/mips64.n32 index f8def5837f..c26ecec4c2 100644 --- a/toolchain/uClibc/config/mips64.n32 +++ b/toolchain/uClibc/config/mips64.n32 @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_BIG_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_WANTS_BIG_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -# CONFIG_MIPS_ISA_MIPS32 is not set -# CONFIG_MIPS_ISA_MIPS32R2 is not set -CONFIG_MIPS_ISA_MIPS64=y -# CONFIG_MIPS_ISA_MIPS64R2 is not set CONFIG_MIPS_N32_ABI=y # CONFIG_MIPS_N64_ABI is not set # CONFIG_MIPS_O32_ABI is not set diff --git a/toolchain/uClibc/config/mips64el b/toolchain/uClibc/config/mips64el index 53580787b5..98d9bb4569 100644 --- a/toolchain/uClibc/config/mips64el +++ b/toolchain/uClibc/config/mips64el @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_LITTLE_ENDIAN=y ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -# CONFIG_MIPS_ISA_MIPS32 is not set -# CONFIG_MIPS_ISA_MIPS32R2 is not set -CONFIG_MIPS_ISA_MIPS64=y -# CONFIG_MIPS_ISA_MIPS64R2 is not set # CONFIG_MIPS_N32_ABI is not set CONFIG_MIPS_N64_ABI=y # CONFIG_MIPS_O32_ABI is not set diff --git a/toolchain/uClibc/config/mips64el.32 b/toolchain/uClibc/config/mips64el.32 index a10840bf96..03ab17c24f 100644 --- a/toolchain/uClibc/config/mips64el.32 +++ b/toolchain/uClibc/config/mips64el.32 @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_LITTLE_ENDIAN=y ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -# CONFIG_MIPS_ISA_MIPS32 is not set -# CONFIG_MIPS_ISA_MIPS32R2 is not set -CONFIG_MIPS_ISA_MIPS64=y -# CONFIG_MIPS_ISA_MIPS64R2 is not set # CONFIG_MIPS_N32_ABI is not set # CONFIG_MIPS_N64_ABI is not set CONFIG_MIPS_O32_ABI=y diff --git a/toolchain/uClibc/config/mips64el.64 b/toolchain/uClibc/config/mips64el.64 index 8b90a54a57..884640c756 100644 --- a/toolchain/uClibc/config/mips64el.64 +++ b/toolchain/uClibc/config/mips64el.64 @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_LITTLE_ENDIAN=y ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -# CONFIG_MIPS_ISA_MIPS32 is not set -# CONFIG_MIPS_ISA_MIPS32R2 is not set -CONFIG_MIPS_ISA_MIPS64=y -# CONFIG_MIPS_ISA_MIPS64R2 is not set # CONFIG_MIPS_N32_ABI is not set CONFIG_MIPS_N64_ABI=y # CONFIG_MIPS_O32_ABI is not set diff --git a/toolchain/uClibc/config/mips64el.n32 b/toolchain/uClibc/config/mips64el.n32 index 4ac4d06c0d..9a8bb3d3fb 100644 --- a/toolchain/uClibc/config/mips64el.n32 +++ b/toolchain/uClibc/config/mips64el.n32 @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_LITTLE_ENDIAN=y ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -# CONFIG_MIPS_ISA_MIPS32 is not set -# CONFIG_MIPS_ISA_MIPS32R2 is not set -CONFIG_MIPS_ISA_MIPS64=y -# CONFIG_MIPS_ISA_MIPS64R2 is not set CONFIG_MIPS_N32_ABI=y # CONFIG_MIPS_N64_ABI is not set # CONFIG_MIPS_O32_ABI is not set diff --git a/toolchain/uClibc/config/mipsel b/toolchain/uClibc/config/mipsel index d9dedbb02c..2a79c16bdb 100644 --- a/toolchain/uClibc/config/mipsel +++ b/toolchain/uClibc/config/mipsel @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_LITTLE_ENDIAN=y ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -CONFIG_MIPS_ISA_MIPS32=y -# CONFIG_MIPS_ISA_MIPS32R2 is not set -# CONFIG_MIPS_ISA_MIPS64 is not set -# CONFIG_MIPS_ISA_MIPS64R2 is not set # CONFIG_MIPS_N32_ABI is not set # CONFIG_MIPS_N64_ABI is not set CONFIG_MIPS_O32_ABI=y diff --git a/toolchain/uClibc/config/mipsel.cobalt b/toolchain/uClibc/config/mipsel.cobalt index 1d42a70f23..2a79c16bdb 100644 --- a/toolchain/uClibc/config/mipsel.cobalt +++ b/toolchain/uClibc/config/mipsel.cobalt @@ -2,14 +2,6 @@ ARCH_ANY_ENDIAN=y ARCH_CFLAGS="-mno-split-addresses" ARCH_LITTLE_ENDIAN=y ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -CONFIG_MIPS_ISA_3=y -# CONFIG_MIPS_ISA_4 is not set -# CONFIG_MIPS_ISA_MIPS32 is not set -# CONFIG_MIPS_ISA_MIPS32R2 is not set -# CONFIG_MIPS_ISA_MIPS64 is not set -# CONFIG_MIPS_ISA_MIPS64R2 is not set # CONFIG_MIPS_N32_ABI is not set # CONFIG_MIPS_N64_ABI is not set CONFIG_MIPS_O32_ABI=y diff --git a/toolchain/uClibc/config/sparc b/toolchain/uClibc/config/sparc index e1596c4100..3630b24a7e 100644 --- a/toolchain/uClibc/config/sparc +++ b/toolchain/uClibc/config/sparc @@ -1,8 +1,6 @@ ARCH_BIG_ENDIAN=y # CONFIG_SPARC_V7 is not set # CONFIG_SPARC_V8 is not set -CONFIG_SPARC_V9=y -# CONFIG_SPARC_V9B is not set TARGET_ARCH="sparc" TARGET_sparc=y UCLIBC_HAS_LONG_DOUBLE_MATH=y diff --git a/toolchain/uClibc/config/sparc.leon b/toolchain/uClibc/config/sparc.leon index eb725ac05d..3deb5148d9 100644 --- a/toolchain/uClibc/config/sparc.leon +++ b/toolchain/uClibc/config/sparc.leon @@ -1,8 +1,6 @@ ARCH_BIG_ENDIAN=y # CONFIG_SPARC_V7 is not set CONFIG_SPARC_V8=y -# CONFIG_SPARC_V9 is not set -# CONFIG_SPARC_V9B is not set TARGET_ARCH="sparc" TARGET_sparc=y UCLIBC_HAS_LONG_DOUBLE_MATH=y diff --git a/toolchain/uClibc/config/x86_64 b/toolchain/uClibc/config/x86_64 index b6dc2c2afe..a13d659ba1 100644 --- a/toolchain/uClibc/config/x86_64 +++ b/toolchain/uClibc/config/x86_64 @@ -1,5 +1,4 @@ ARCH_LITTLE_ENDIAN=y -# LINUXTHREADS_NEW is not set TARGET_ARCH="x86_64" TARGET_x86_64=y UCLIBC_BSD_SPECIFIC=y From 25aa47d86776f9867c1fde7511aa3d46f831b704 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Fri, 14 Aug 2020 21:18:57 +0200 Subject: [PATCH 06/11] ipset: update to version 7.6 Changelog: https://ipset.netfilter.org/changelog.html Signed-off-by: Josef Schlehofer --- package/network/utils/ipset/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile index 0bab21a12f..2d0c561198 100644 --- a/package/network/utils/ipset/Makefile +++ b/package/network/utils/ipset/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ipset -PKG_VERSION:=7.4 +PKG_VERSION:=7.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ipset.netfilter.org -PKG_HASH:=4a974176e57fe4b7e2984abb231c4a18af2291bdc41536ef64e4b8ec4d4a1884 +PKG_HASH:=0e7d44caa9c153d96a9b5f12644fbe35a632537a5a7f653792b72e53d9d5c2db PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 From 2a49c3eec7f9d58dd4829c3a8e8d13ad6855d144 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 1 Aug 2020 15:54:51 -0700 Subject: [PATCH 07/11] exfat: update to 5.8.7 93e2334 exfat: fix build error on linux-5.4,5.5 kernel 01a7b8c exfat: fix name_hash computation on big endian systems 8f92bc0 exfat: fix wrong size update of stream entry by typo Removed commented material that was for testing compilation. Removed patch as the error was fixed upstream. First entry above. Signed-off-by: Rosen Penev --- package/kernel/exfat/Makefile | 12 ++-------- .../kernel/exfat/patches/010-fstream.patch | 23 ------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 package/kernel/exfat/patches/010-fstream.patch diff --git a/package/kernel/exfat/Makefile b/package/kernel/exfat/Makefile index f129da9410..2cd7b99664 100644 --- a/package/kernel/exfat/Makefile +++ b/package/kernel/exfat/Makefile @@ -7,24 +7,17 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=exfat -PKG_VERSION:=5.8.4 +PKG_VERSION:=5.8.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/namjaejeon/linux-exfat-oot/tar.gz/$(PKG_VERSION)? -PKG_HASH:=47162495bdf9a7e02d6142dfcd4364d7325a4cf75a0439926cf9e8a9d959627b +PKG_HASH:=20254677bed3f456e89cc9d757c1a47abbadab4d75640eef4a995370a37be3f4 PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0-only -#PKG_BUILD_PARALLEL:=1 -#PKG_USE_MIPS16:=0 - -# exfat-oot's makefile needs this to know where to build the kernel module -#export KERNELDIR:=$(LINUX_DIR) - include $(INCLUDE_DIR)/package.mk -#include $(INCLUDE_DIR)/kernel-defaults.mk TAR_OPTIONS+= --strip-components 1 TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) @@ -49,7 +42,6 @@ define Build/Compile $(PKG_EXTRA_KCONFIG) \ CONFIG_EXFAT_FS=m \ modules -# $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) M="$(PKG_BUILD_DIR)" modules endef $(eval $(call KernelPackage,fs-exfat)) diff --git a/package/kernel/exfat/patches/010-fstream.patch b/package/kernel/exfat/patches/010-fstream.patch deleted file mode 100644 index dc1221c611..0000000000 --- a/package/kernel/exfat/patches/010-fstream.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/super.c -+++ b/super.c -@@ -292,14 +292,14 @@ static const struct fs_parameter_spec exfat_param_specs[] = { - #endif - fsparam_flag("discard", Opt_discard), - fsparam_s32("time_offset", Opt_time_offset), -- __fsparam(NULL, "utf8", Opt_utf8, fs_param_deprecated, -- NULL), -- __fsparam(NULL, "debug", Opt_debug, fs_param_deprecated, -- NULL), -+ __fsparam(NULL, "utf8", Opt_utf8, fs_param_deprecated -+ ), -+ __fsparam(NULL, "debug", Opt_debug, fs_param_deprecated -+ ), - __fsparam(fs_param_is_u32, "namecase", Opt_namecase, -- fs_param_deprecated, NULL), -+ fs_param_deprecated), - __fsparam(fs_param_is_u32, "codepage", Opt_codepage, -- fs_param_deprecated, NULL), -+ fs_param_deprecated), - {} - }; - From 7b23a9a470c6c7c3b4e7de201f53052bc785620a Mon Sep 17 00:00:00 2001 From: Magnus Kroken Date: Sat, 25 Jul 2020 14:19:28 +0200 Subject: [PATCH 08/11] mbedtls: update to 2.16.7 Mbed TLS 2.16.7 is a maintenance release of the Mbed TLS 2.16 branch, and provides bug fixes and minor enhancements. This release includes fixes for security issues and the most severe one is described in more detail in a security advisory: https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2020-07 * Fix a side channel vulnerability in modular exponentiation that could reveal an RSA private key used in a secure enclave. * Fix side channel in mbedtls_ecp_check_pub_priv() and mbedtls_pk_parse_key() / mbedtls_pk_parse_keyfile() (when loading a private key that didn't include the uncompressed public key), as well as mbedtls_ecp_mul() / mbedtls_ecp_mul_restartable() when called with a NULL f_rng argument. An attacker with access to precise enough timing and memory access information (typically an untrusted operating system attacking a secure enclave) could fully recover the ECC private key. * Fix issue in Lucky 13 counter-measure that could make it ineffective when hardware accelerators were used (using one of the MBEDTLS_SHAxxx_ALT macros). Due to Mbed TLS moving from ARMmbed to the Trusted Firmware project, some changes to the download URLs are required. For the time being, the ARMmbed/mbedtls Github repository is the canonical source for Mbed TLS. Signed-off-by: Magnus Kroken [Use https://codeload.github.com and new tar.gz file] Signed-off-by: Hauke Mehrtens --- package/libs/mbedtls/Makefile | 8 ++-- package/libs/mbedtls/patches/200-config.patch | 46 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index 8cf2fc2c72..6e2a914c18 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mbedtls -PKG_VERSION:=2.16.6 +PKG_VERSION:=2.16.7 PKG_RELEASE:=1 PKG_USE_MIPS16:=0 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz -PKG_SOURCE_URL:=https://tls.mbed.org/download/ -PKG_HASH:=80a484df42f32dbe95665cd4b18ce0dd14b6c67dfd561d36d1475802e41eb3ed +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/ARMmbed/mbedtls/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=c95b11557ee97d2bdfd48cd57cf9b648a6cddd2ca879e3c35c4e7525f2871992 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0-or-later diff --git a/package/libs/mbedtls/patches/200-config.patch b/package/libs/mbedtls/patches/200-config.patch index 298fa4aa79..70d178feb8 100644 --- a/package/libs/mbedtls/patches/200-config.patch +++ b/package/libs/mbedtls/patches/200-config.patch @@ -1,6 +1,6 @@ --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h -@@ -633,14 +633,14 @@ +@@ -658,14 +658,14 @@ * * Enable Output Feedback mode (OFB) for symmetric ciphers. */ @@ -17,7 +17,7 @@ /** * \def MBEDTLS_CIPHER_NULL_CIPHER -@@ -757,19 +757,19 @@ +@@ -782,19 +782,19 @@ * * Comment macros to disable the curve and functions for it */ @@ -46,7 +46,7 @@ /** * \def MBEDTLS_ECP_NIST_OPTIM -@@ -871,7 +871,7 @@ +@@ -918,7 +918,7 @@ * See dhm.h for more details. * */ @@ -55,7 +55,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED -@@ -891,7 +891,7 @@ +@@ -938,7 +938,7 @@ * MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA * MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA */ @@ -64,7 +64,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED -@@ -916,7 +916,7 @@ +@@ -963,7 +963,7 @@ * MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA * MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA */ @@ -73,7 +73,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED -@@ -1050,7 +1050,7 @@ +@@ -1097,7 +1097,7 @@ * MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 * MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 */ @@ -82,7 +82,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED -@@ -1074,7 +1074,7 @@ +@@ -1121,7 +1121,7 @@ * MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256 * MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384 */ @@ -91,7 +91,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED -@@ -1178,7 +1178,7 @@ +@@ -1225,7 +1225,7 @@ * This option is only useful if both MBEDTLS_SHA256_C and * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used. */ @@ -100,7 +100,7 @@ /** * \def MBEDTLS_ENTROPY_NV_SEED -@@ -1273,14 +1273,14 @@ +@@ -1320,14 +1320,14 @@ * Uncomment this macro to disable the use of CRT in RSA. * */ @@ -117,7 +117,7 @@ /** * \def MBEDTLS_SHA256_SMALLER -@@ -1434,7 +1434,7 @@ +@@ -1481,7 +1481,7 @@ * configuration of this extension). * */ @@ -126,7 +126,7 @@ /** * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO -@@ -1609,7 +1609,7 @@ +@@ -1656,7 +1656,7 @@ * * Comment this macro to disable support for SSL session tickets */ @@ -135,7 +135,7 @@ /** * \def MBEDTLS_SSL_EXPORT_KEYS -@@ -1639,7 +1639,7 @@ +@@ -1686,7 +1686,7 @@ * * Comment this macro to disable support for truncated HMAC in SSL */ @@ -144,7 +144,7 @@ /** * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT -@@ -1698,7 +1698,7 @@ +@@ -1745,7 +1745,7 @@ * * Comment this to disable run-time checking and save ROM space */ @@ -153,7 +153,7 @@ /** * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3 -@@ -2028,7 +2028,7 @@ +@@ -2075,7 +2075,7 @@ * MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256 * MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 */ @@ -162,7 +162,7 @@ /** * \def MBEDTLS_ARIA_C -@@ -2094,7 +2094,7 @@ +@@ -2141,7 +2141,7 @@ * This module enables the AES-CCM ciphersuites, if other requisites are * enabled as well. */ @@ -171,7 +171,7 @@ /** * \def MBEDTLS_CERTS_C -@@ -2106,7 +2106,7 @@ +@@ -2153,7 +2153,7 @@ * * This module is used for testing (ssl_client/server). */ @@ -180,7 +180,7 @@ /** * \def MBEDTLS_CHACHA20_C -@@ -2214,7 +2214,7 @@ +@@ -2261,7 +2261,7 @@ * \warning DES is considered a weak cipher and its use constitutes a * security risk. We recommend considering stronger ciphers instead. */ @@ -189,7 +189,7 @@ /** * \def MBEDTLS_DHM_C -@@ -2377,7 +2377,7 @@ +@@ -2424,7 +2424,7 @@ * This module adds support for the Hashed Message Authentication Code * (HMAC)-based key derivation function (HKDF). */ @@ -198,7 +198,7 @@ /** * \def MBEDTLS_HMAC_DRBG_C -@@ -2687,7 +2687,7 @@ +@@ -2734,7 +2734,7 @@ * * This module enables abstraction of common (libc) functions. */ @@ -207,7 +207,7 @@ /** * \def MBEDTLS_POLY1305_C -@@ -2708,7 +2708,7 @@ +@@ -2755,7 +2755,7 @@ * Caller: library/md.c * */ @@ -216,7 +216,7 @@ /** * \def MBEDTLS_RSA_C -@@ -2815,7 +2815,7 @@ +@@ -2862,7 +2862,7 @@ * * Requires: MBEDTLS_CIPHER_C */ @@ -225,7 +225,7 @@ /** * \def MBEDTLS_SSL_CLI_C -@@ -2915,7 +2915,7 @@ +@@ -2962,7 +2962,7 @@ * * This module provides run-time version information. */ @@ -234,7 +234,7 @@ /** * \def MBEDTLS_X509_USE_C -@@ -3025,7 +3025,7 @@ +@@ -3072,7 +3072,7 @@ * Module: library/xtea.c * Caller: */ From c9a3b5d9c1a29c1cbffd721af2fc0def84bb6913 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 24 Aug 2020 18:04:42 +0200 Subject: [PATCH 09/11] firewall: Fix PKG_MIRROR_HASH Fixes: 6c57fb7aa93d ("firewall: bump to version 2020-07-05") Signed-off-by: Hauke Mehrtens --- package/network/config/firewall/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile index 9ad9efd520..7b2c567001 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall3.git PKG_SOURCE_DATE:=2020-07-25 PKG_SOURCE_VERSION:=e9b90dfac2225927c035f6a76277b850c282dc9a -PKG_MIRROR_HASH:=9164089058b5c8d62e81806dcd2261b9f78b050fb40cd84cbd127794ad7a940e +PKG_MIRROR_HASH:=917f662d48a766f86ee61a83e13a61688d6eca3647dd4aca1973b1fa1ea64fec PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC From 5db0dfb03aea42fb35804e8cac4159c2cbb6a857 Mon Sep 17 00:00:00 2001 From: Ray <69144237+RayorRui@users.noreply.github.com> Date: Tue, 25 Aug 2020 12:28:04 +0800 Subject: [PATCH 10/11] smartdns: bump to latest git HEAD --- package/ntlf9t/smartdns/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ntlf9t/smartdns/Makefile b/package/ntlf9t/smartdns/Makefile index 8f14bd41e0..f1433ec53c 100644 --- a/package/ntlf9t/smartdns/Makefile +++ b/package/ntlf9t/smartdns/Makefile @@ -16,12 +16,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smartdns -PKG_VERSION:=8.2020.22 +PKG_VERSION:=8.2020.24 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/pymumu/smartdns.git -PKG_SOURCE_VERSION:=80cb27c795572552ea561f2334a9d12602518d3e +PKG_SOURCE_VERSION:=Release32-RC4 PKG_MAINTAINER:=Nick Peng PKG_LICENSE:=GPL-3.0-or-later From 5b2eac4349a4ab4e1d6eb739def140478dfe17c9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 24 Aug 2020 15:53:17 +0200 Subject: [PATCH 11/11] Revert "scripts/download: add sources CDN as first mirror" This reverts commit c737a9ee6a9c47b6e553ac81bf293b1161e59799. The source CDN has been discontinued in its current form and will take a while to be reestablished. Even then it makes little sense to put a CDN before other CDNs such as kernel.org, apache.org, sourceforge etc. Signed-off-by: Jo-Philipp Wich (cherry picked from commit bf96eb55c82191701030b68810e6f19adbb91eeb) --- scripts/download.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/download.pl b/scripts/download.pl index e9aa785f1c..02ef7de4da 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -272,7 +272,6 @@ foreach my $mirror (@ARGV) { } } -push @mirrors, 'https://sources.cdn.openwrt.org'; #push @mirrors, 'https://mirror1.openwrt.org'; push @mirrors, 'https://sources.openwrt.org'; push @mirrors, 'https://mirror2.openwrt.org/sources';