Merge pull request #54 from coolsnowwolf/master

20200520 特别版更新
xayane · May 21, 2020 · 41141f2 · 41141f2
2 parents 23e5a3b + 35d87d5
commit 41141f2
Show file tree

Hide file tree

Showing 25 changed files with 311 additions and 20 deletions.
diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusic
-PKG_VERSION:=0.25.0
+PKG_VERSION:=0.25.3
 PKG_RELEASE:=4
 
 PKG_LICENSE:=MIT
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git
-PKG_SOURCE_VERSION:=17cddd06278d0915697b3a342a182ed5e240200d
+PKG_SOURCE_VERSION:=610ff1716aa3698cd2e9391ff808a35a05719586
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz

diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=default-settings
 PKG_VERSION:=1.1
-PKG_RELEASE:=58
+PKG_RELEASE:=59
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=LICENSE
 

diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings
@@ -44,6 +44,7 @@ sed -i 's/http:/https:/g' /etc/opkg/distfeeds.conf
 sed -i 's/root::0:0:99999:7:::/root:$1$V4UetPzk$CYXluq4wUazHjmCDBCqXF.:0:0:99999:7:::/g' /etc/shadow
 
 sed -i "s/# //g" /etc/opkg/distfeeds.conf
+sed -i '/openwrt_luci/ { s/snapshots/releases\/18.06.8/g; }'  /etc/opkg/distfeeds.conf
 
 sed -i '/REDIRECT --to-ports 53/d' /etc/firewall.user
 echo "iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53" >> /etc/firewall.user
@@ -53,7 +54,7 @@ sed -i '/option disabled/d' /etc/config/wireless
 sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
 
 sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
-echo "DISTRIB_REVISION='R20.5.9'" >> /etc/openwrt_release
+echo "DISTRIB_REVISION='R20.5.20'" >> /etc/openwrt_release
 sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
 echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release
 

diff --git a/package/lean/ksmbd-tools/Makefile b/package/lean/ksmbd-tools/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ksmbd-tools
-PKG_VERSION:=3.2.1
+PKG_VERSION:=3.2.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd-tools/archive/$(PKG_VERSION)/
-PKG_HASH:=acb4d97cbb0b22ad42ed1536bdd2c28af2a3c698664c058da59a644d5e6df599
+PKG_HASH:=d5e56b38f858736849aefd55cfbffe31ae3d4f39a13689aecb3e896f3b048866
 
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/package/lean/ksmbd-tools/ksmbd/Makefile b/package/lean/ksmbd-tools/ksmbd/Makefile
@@ -0,0 +1,70 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ksmbd
+PKG_VERSION:=3.1.6
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd/archive/$(PKG_VERSION)/
+PKG_HASH:=09c1eb39d9dcc9baf6bc9c5a2b91bcea377352bfc507ebdd10a370fffa7c31b4
+
+PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+TAR_OPTIONS+= --strip-components 1
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
+define KernelPackage/fs-ksmbd
+	SUBMENU:=Filesystems
+	TITLE:=SMB kernel server support
+	URL:=https://github.com/cifsd-team/cifsd
+	FILES:=$(PKG_BUILD_DIR)/ksmbd.ko
+	DEPENDS:= \
+		+kmod-nls-base \
+		+kmod-nls-utf8 \
+		+kmod-crypto-md4 \
+		+kmod-crypto-md5 \
+		+kmod-crypto-hmac \
+		+kmod-crypto-arc4 \
+		+kmod-crypto-ecb \
+		+kmod-crypto-des \
+		+kmod-crypto-sha256 \
+		+kmod-crypto-cmac \
+		+kmod-crypto-sha512 \
+		+kmod-crypto-aead \
+		+kmod-crypto-ccm \
+		+kmod-crypto-gcm
+endef
+
+define KernelPackage/fs-ksmbd/description
+  Ksmbd is an In-kernel SMBv(1)2/3 fileserver.
+  It's an implementation of the SMB protocol in kernel space for sharing files and IPC services over network.
+endef
+
+define KernelPackage/fs-ksmbd/config
+config KSMBD_SMB_INSECURE_SERVER
+	bool "Support for insecure SMB1/CIFS and SMB2.0 protocols"
+	depends on PACKAGE_kmod-fs-ksmbd
+	help
+		This enables deprecated insecure protocols dialects: SMB1/CIFS and SMB2.0.
+	default y
+endef
+
+ifeq ($(CONFIG_KSMBD_SMB_INSECURE_SERVER),y)
+PKG_EXTRA_KCONFIG:=CONFIG_SMB_INSECURE_SERVER=y
+EXTRA_CFLAGS += -DCONFIG_SMB_INSECURE_SERVER=1
+endif
+
+define Build/Compile
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(PKG_EXTRA_KCONFIG) \
+	CONFIG_SMB_SERVER=m \
+	modules
+endef
+
+$(eval $(call KernelPackage,fs-ksmbd))
diff --git a/package/lean/ksmbd-tools/ksmbd/patches/01-keep_kmod_metadata.patch b/package/lean/ksmbd-tools/ksmbd/patches/01-keep_kmod_metadata.patch
@@ -0,0 +1,10 @@
+--- a/glob.h	2019-12-08
++++ b/glob.h	2019-12-08
+@@ -7,6 +7,8 @@
+ #ifndef __KSMBD_GLOB_H
+ #define __KSMBD_GLOB_H
+
++#undef CONFIG_MODULE_STRIPPED
++
+ #include <linux/ctype.h>
+ #include <linux/version.h>
diff --git a/package/lean/ksmbd/Makefile b/package/lean/ksmbd/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ksmbd
-PKG_VERSION:=3.1.3
+PKG_VERSION:=3.1.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd/archive/$(PKG_VERSION)/
-PKG_HASH:=c3c4531d3806117218d23e0552edfe883f978a00b7293180dd2919694102fcb9
+PKG_HASH:=09c1eb39d9dcc9baf6bc9c5a2b91bcea377352bfc507ebdd10a370fffa7c31b4
 
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
@@ -60,7 +60,7 @@ EXTRA_CFLAGS += -DCONFIG_SMB_INSECURE_SERVER=1
 endif
 
 define Build/Compile
-	$(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)" \
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" \
 	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
 	$(PKG_EXTRA_KCONFIG) \
 	CONFIG_SMB_SERVER=m \

diff --git a/package/lean/luci-app-rclone/Makefile b/package/lean/luci-app-rclone/Makefile
@@ -10,7 +10,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for Rclone
-LUCI_DEPENDS:=+rclone +rclone-webui-react
+LUCI_DEPENDS:=+rclone +rclone-webui-react +fuse-utils
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-rclone
 PKG_VERSION:=1.3.21

diff --git a/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic
@@ -3,4 +3,5 @@
 [ "$ACTION" = ifup ] || exit 0
 
 sleep 10
+ipset flush music 2>/dev/null
 /usr/share/UnblockNeteaseMusic/getmusicip.sh
diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
@@ -111,6 +111,7 @@ del_rule(){
 	$ipt_n -X CLOUD_MUSIC  2>/dev/null
 	iptables -D OUTPUT -d 223.252.199.10 -j DROP 2>/dev/null
 
+	ipset flush music 2>/dev/null
 	ipset -X music_http 2>/dev/null
 	ipset -X music_https 2>/dev/null
 

diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh
@@ -11,7 +11,6 @@ while true
 do
   icount=`busybox ps -w | grep UnblockNeteaseMusic | grep -v grep | grep -v logcheck.sh`
 	if [ -z "$icount" ]; then
-      /usr/share/UnblockNeteaseMusic/getmusicip.sh
       /etc/init.d/unblockmusic restart 
   fi
 	log_size=$(expr $(ls -l $log_file | awk '{print $5}') / 1024)

diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -902,6 +902,9 @@ tl-wdr4900-v2)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:blue:wlan2g" "phy0tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "tp-link:blue:wlan5g" "phy1tpt"
 	;;
+tl-wdr8500-v1)
+	ucidef_set_led_default "sys" "SYS" "tp-link:blue:system" "1"
+	;;
 tl-wr885n-v1)
 	ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0"
 	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"

diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -209,6 +209,7 @@ ar71xx_setup_interfaces()
 	ap132|\
 	ap136|\
 	ap152|\
+	tl-wdr8500-v1|\
 	rb-750gl|\
 	rb-751g|\
 	rb-951g-2hnd|\

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -91,6 +91,7 @@ get_status_led() {
 	tl-mr13u|\
 	tl-wdr4300|\
 	tl-wdr4900-v2|\
+	tl-wdr8500-v1|\
 	tl-wr703n|\
 	tl-wr710n|\
 	tl-wr720n-v3|\

diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -234,6 +234,10 @@ case "$FIRMWARE" in
 		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
 			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
 		;;
+	tl-wdr8500-v1)
+		ath10kcal_extract "art" 20480 12064
+		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
+		;;
 	esac
 	;;
 *)

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -302,6 +302,9 @@ tplink_board_detect() {
 	"322000"*)
 		model="TP-Link TL-MR3220"
 		;;
+	"322700"*)
+		model="TP-Link TL-WDR3227"
+		;;
 	"332000"*)
 		model="TP-Link TL-WDR3320"
 		;;
@@ -349,12 +352,12 @@ tplink_board_detect() {
 	"751000"*)
 		model="TP-Link TL-WA7510N"
 		;;
+	"85000001")
+		model="TP-Link TL-WDR8500"
+		;;
 	"934100"*)
 		model="NC-LINK SMART-300"
 		;;
-	"322700"*)
-		model="TP-Link TL-WDR3227"
-		;;
 	"c50000"*)
 		model="TP-Link Archer C5"
 		;;
@@ -1301,6 +1304,9 @@ ar71xx_board_detect() {
 	*"TL-WDR6500 v6")
 		name="tl-wdr6500-v6"
 		;;
+	*"TL-WDR8500 v1")
+		name="tl-wdr8500-v1"
+		;;
 	*"TL-WPA8630")
 		name="tl-wpa8630"
 		;;

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -465,6 +465,7 @@ platform_check_image() {
 	tl-wdr4900-v2|\
 	tl-wdr6500-v2|\
 	tl-wdr6500-v6|\
+	tl-wdr8500-v1|\
 	tl-wpa8630|\
 	tl-wr1041n-v2|\
 	tl-wr1043nd|\

diff --git a/target/linux/ar71xx/config-4.14 b/target/linux/ar71xx/config-4.14
@@ -144,6 +144,7 @@ CONFIG_ATH79=y
 # CONFIG_ATH79_MACH_LAN_TURTLE is not set
 # CONFIG_ATH79_MACH_LIMA is not set
 # CONFIG_ATH79_MACH_MC_MAC1200R is not set
+# CONFIG_ATH79_MACH_MC_MW4530R is not set
 # CONFIG_ATH79_MACH_MR12 is not set
 # CONFIG_ATH79_MACH_MR16 is not set
 # CONFIG_ATH79_MACH_MR1750 is not set
@@ -220,7 +221,8 @@ CONFIG_ATH79=y
 # CONFIG_ATH79_MACH_TL_WDR3500 is not set
 # CONFIG_ATH79_MACH_TL_WDR4300 is not set
 # CONFIG_ATH79_MACH_TL_WDR6500_V2 is not set
-CONFIG_ATH79_MACH_TL_WDR6500_V6=y
+# CONFIG_ATH79_MACH_TL_WDR6500_V6 is not set
+# CONFIG_ATH79_MACH_TL_WDR8500_V1 is not set
 # CONFIG_ATH79_MACH_TL_WPA8630 is not set
 # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
 # CONFIG_ATH79_MACH_TL_WR1043ND is not set
@@ -244,6 +246,17 @@ CONFIG_ATH79_MACH_TL_WDR6500_V6=y
 # CONFIG_ATH79_MACH_TL_WR841N_V9 is not set
 # CONFIG_ATH79_MACH_TL_WR880N_V1 is not set
 # CONFIG_ATH79_MACH_TL_WR881N_V1 is not set
+# CONFIG_ATH79_MACH_TL_WR882N_V1 is not set
+# CONFIG_ATH79_MACH_TL_WR882N_V2 is not set
+# CONFIG_ATH79_MACH_TL_WR882N_V3 is not set
+# CONFIG_ATH79_MACH_TL_WR885N_V1 is not set
+# CONFIG_ATH79_MACH_TL_WR885N_V2 is not set
+# CONFIG_ATH79_MACH_TL_WR886N_V2 is not set
+# CONFIG_ATH79_MACH_TL_WR886N_V3 is not set
+# CONFIG_ATH79_MACH_TL_WR886N_V4 is not set
+# CONFIG_ATH79_MACH_TL_WR886N_V5 is not set
+# CONFIG_ATH79_MACH_TL_WR886N_V6 is not set
+# CONFIG_ATH79_MACH_TL_WR886N_V7 is not set
 # CONFIG_ATH79_MACH_TL_WR902AC_V1 is not set
 # CONFIG_ATH79_MACH_TL_WR940N_V4 is not set
 # CONFIG_ATH79_MACH_TL_WR941ND is not set

diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9
@@ -144,7 +144,7 @@ CONFIG_ATH79=y
 # CONFIG_ATH79_MACH_LAN_TURTLE is not set
 # CONFIG_ATH79_MACH_LIMA is not set
 # CONFIG_ATH79_MACH_MC_MAC1200R is not set
-CONFIG_ATH79_MACH_MC_MW4530R=y
+# CONFIG_ATH79_MACH_MC_MW4530R is not set
 # CONFIG_ATH79_MACH_MR12 is not set
 # CONFIG_ATH79_MACH_MR16 is not set
 # CONFIG_ATH79_MACH_MR1750 is not set
@@ -221,7 +221,8 @@ CONFIG_ATH79_MACH_MC_MW4530R=y
 # CONFIG_ATH79_MACH_TL_WDR3500 is not set
 # CONFIG_ATH79_MACH_TL_WDR4300 is not set
 # CONFIG_ATH79_MACH_TL_WDR6500_V2 is not set
-CONFIG_ATH79_MACH_TL_WDR6500_V6=y
+# CONFIG_ATH79_MACH_TL_WDR6500_V6 is not set
+# CONFIG_ATH79_MACH_TL_WDR8500_V1 is not set
 # CONFIG_ATH79_MACH_TL_WPA8630 is not set
 # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
 # CONFIG_ATH79_MACH_TL_WR1043ND is not set

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -1896,6 +1896,16 @@ config ATH79_MACH_TL_WDR6500_V6
 	select ATH79_DEV_USB
 	select ATH79_DEV_WMAC
 
+config ATH79_MACH_TL_WDR8500_V1
+	bool "TP-LINK TL-WDR8500 v1 board support"
+	select SOC_QCA956X
+	select ATH79_DEV_AP9X_PCI if PCI
+	select ATH79_DEV_ETH
+	select ATH79_DEV_GPIO_BUTTONS
+	select ATH79_DEV_LEDS_GPIO
+	select ATH79_DEV_M25P80
+	select ATH79_DEV_WMAC
+
 config ATH79_MACH_TL_WR703N
 	bool "TP-LINK TL-WR703N/TL-WR710N/TL-MR10U support"
 	select SOC_AR933X

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
@@ -107,7 +107,7 @@ obj-$(CONFIG_ATH79_MACH_DLAN_HOTSPOT)		+= mach-dlan-hotspot.o
 obj-$(CONFIG_ATH79_MACH_DLAN_PRO_1200_AC)	+= mach-dlan-pro-1200-ac.o
 obj-$(CONFIG_ATH79_MACH_DLAN_PRO_500_WP)	+= mach-dlan-pro-500-wp.o
 obj-$(CONFIG_ATH79_MACH_DOMYWIFI_DW33D)		+= mach-domywifi-dw33d.o
-obj-$(CONFIG_ATH79_MACH_ARRIS_SBR_AC1750)		+= mach-sbr-ac1750.o
+obj-$(CONFIG_ATH79_MACH_ARRIS_SBR_AC1750)	+= mach-sbr-ac1750.o
 obj-$(CONFIG_ATH79_MACH_DR342)			+= mach-dr344.o
 obj-$(CONFIG_ATH79_MACH_DR344)			+= mach-dr344.o
 obj-$(CONFIG_ATH79_MACH_DR531)			+= mach-dr531.o
@@ -232,6 +232,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WDR3500)		+= mach-tl-wdr3500.o
 obj-$(CONFIG_ATH79_MACH_TL_WDR4300)		+= mach-tl-wdr4300.o
 obj-$(CONFIG_ATH79_MACH_TL_WDR6500_V2)		+= mach-tl-wdr6500-v2.o
 obj-$(CONFIG_ATH79_MACH_TL_WDR6500_V6)		+= mach-tl-wdr6500-v6.o
+obj-$(CONFIG_ATH79_MACH_TL_WDR8500_V1)		+= mach-tl-wdr8500-v1.o
 obj-$(CONFIG_ATH79_MACH_TL_WPA8630)		+= mach-tl-wpa8630.o
 obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2)		+= mach-tl-wr1041n-v2.o
 obj-$(CONFIG_ATH79_MACH_TL_WR1043ND)		+= mach-tl-wr1043nd.o