diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 174c46b8f0..dbade36b0a 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git -PKG_SOURCE_DATE:=2020-09-18 -PKG_SOURCE_VERSION:=47c34bd6ad49cae408b8d7c150c6f9f324aaddf5 -PKG_MIRROR_HASH:=31ee0eca69577380842588abc442526c23b2c20df13e79738843b8b417f99d17 +PKG_SOURCE_DATE:=2020-10-04 +PKG_SOURCE_VERSION:=14a3cb42047bd0c0f8d5713332b9b4516a505607 +PKG_MIRROR_HASH:=10db75dcc3f42543028ccda1a32454cf8684108a5117befa466b6775fc71948c PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=ISC diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in index 2303888f12..3d9e8284e9 100644 --- a/toolchain/binutils/Config.in +++ b/toolchain/binutils/Config.in @@ -14,9 +14,9 @@ choice bool "Binutils 2.34" select BINUTILS_VERSION_2_34 - config BINUTILS_USE_VERSION_2_35 - bool "Binutils 2.35" - select BINUTILS_VERSION_2_35 + config BINUTILS_USE_VERSION_2_35_1 + bool "Binutils 2.35.1" + select BINUTILS_VERSION_2_35_1 endchoice config EXTRA_BINUTILS_CONFIG_OPTIONS diff --git a/toolchain/binutils/Config.version b/toolchain/binutils/Config.version index 9d43675f1a..ed3018328e 100644 --- a/toolchain/binutils/Config.version +++ b/toolchain/binutils/Config.version @@ -5,11 +5,11 @@ config BINUTILS_VERSION_2_34 default y if !TOOLCHAINOPTS bool -config BINUTILS_VERSION_2_35 +config BINUTILS_VERSION_2_35_1 bool config BINUTILS_VERSION string default "2.32" if BINUTILS_VERSION_2_32 default "2.34" if BINUTILS_VERSION_2_34 - default "2.35" if BINUTILS_VERSION_2_35 + default "2.35.1" if BINUTILS_VERSION_2_35_1 diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 204ff3ffff..da86794480 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -23,8 +23,8 @@ ifeq ($(PKG_VERSION),2.34) PKG_HASH:=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 endif -ifeq ($(PKG_VERSION),2.35) - PKG_HASH:=1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85 +ifeq ($(PKG_VERSION),2.35.1) + PKG_HASH:=3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607 endif HOST_BUILD_PARALLEL:=1 diff --git a/toolchain/binutils/patches/2.35/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.35.1/300-001_ld_makefile_patch.patch similarity index 100% rename from toolchain/binutils/patches/2.35/300-001_ld_makefile_patch.patch rename to toolchain/binutils/patches/2.35.1/300-001_ld_makefile_patch.patch diff --git a/toolchain/binutils/patches/2.35/400-mips_no_dynamic_linking_sym.patch b/toolchain/binutils/patches/2.35.1/400-mips_no_dynamic_linking_sym.patch similarity index 100% rename from toolchain/binutils/patches/2.35/400-mips_no_dynamic_linking_sym.patch rename to toolchain/binutils/patches/2.35.1/400-mips_no_dynamic_linking_sym.patch diff --git a/toolchain/binutils/patches/2.35/500-Change-default-emulation-for-mips64-linux.patch b/toolchain/binutils/patches/2.35.1/500-Change-default-emulation-for-mips64-linux.patch similarity index 100% rename from toolchain/binutils/patches/2.35/500-Change-default-emulation-for-mips64-linux.patch rename to toolchain/binutils/patches/2.35.1/500-Change-default-emulation-for-mips64-linux.patch