Merge Mainline

package/kernel/cryptodev-linux/Makefile

@@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=cryptodev-linux
-PKG_VERSION:=1.10
-PKG_RELEASE:=2
+PKG_VERSION:=1.11
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=833ab7c5c88d2b700a7c702a151254c089a3058886a63cc7d12630e364b8ea83
+PKG_HASH:=d71fd8dafc40147586f5bc6acca8fce5088d9c576d1142fe5aeb7b0813186a11
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 

package/kernel/cryptodev-linux/patches/010-Fix-module-loading-with-Linux-v5.0-rc5.patch

@@ -1,50 +0,0 @@
-From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001
-From: "Derald D. Woods" <woods.technical@gmail.com>
-Date: Sun, 10 Feb 2019 13:22:19 -0600
-Subject: [PATCH] Fix module loading with Linux v5.0-rc5
-
-This commit fixes this module load error:
-[...]
-[   29.112091] cryptodev: loading out-of-tree module taints kernel.
-[   29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2)
-[   29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2)
-modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter
-[...]
-
-Upstream Linux support for unused GIVCIPHER, and others, was dropped here:
-
-c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators)
-
-Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
----
- cryptlib.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/cryptlib.c b/cryptlib.c
-index 6e66698..4a87037 100644
---- a/cryptlib.c
-+++ b/cryptlib.c
-@@ -38,7 +38,9 @@
- #include "cryptodev_int.h"
- #include "cipherapi.h"
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
- extern const struct crypto_type crypto_givcipher_type;
-+#endif
- 
- static void cryptodev_complete(struct crypto_async_request *req, int err)
- {
-@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name,
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
- 		tfm = crypto_skcipher_tfm(out->async.s);
--		if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) ||
--		    (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) {
-+		if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
-+		    || (tfm->__crt_alg->cra_type == &crypto_givcipher_type)
-+#endif
-+							) {
- 			struct ablkcipher_alg *alg;
- 
- 			alg = &tfm->__crt_alg->cra_ablkcipher;

package/lean/autocore/files/arm/index.htm

@@ -175,7 +175,7 @@
 		});
 	}
 
-	XHR.poll(1, '<%=REQUEST_URI%>', { status: 1 },
+	XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 },
 		function(x, info)
 		{
 			if (!(npoll++ % 5))

package/lean/default-settings/files/zzz-default-settings

@@ -47,7 +47,7 @@ echo "DISTRIB_DESCRIPTION='OpenWrt 18.06 by Lean '" >> /etc/openwrt_release
 
 sed -i 's/LuCI openwrt-18.06 branch/LuCI 18.06 by Lean/g' /usr/lib/lua/luci/version.lua
 sed -i '/luciversion/d' /usr/lib/lua/luci/version.lua
-echo 'luciversion = "Mod20.08 by CTCGFW"' >> /usr/lib/lua/luci/version.lua
+echo 'luciversion = "Mod20.10 by CTCGFW"' >> /usr/lib/lua/luci/version.lua
 
 sed -i '/log-facility/d' /etc/dnsmasq.conf
 echo "log-facility=/dev/null" >> /etc/dnsmasq.conf

package/lean/dns2socks/Makefile

@@ -6,11 +6,12 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/kongfl888/dns2socks.git
-PKG_SOURCE_VERSION:=HEAD
+PKG_SOURCE_VERSION:=1723dfaf96fcd5d9a392e9122a08b92a1248f88b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 PKG_LICENSE:=GPL-3.0
 PKG_MAINTAINER:=kongfl888 <kongfl888@outlook.com>
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1

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 <nbd@nbd.name>
 PKG_LICENSE:=ISC
 

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

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

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