Merge Mainline

2020-09-06 14:35:11 +08:00 · 2020-09-06 14:35:11 +08:00 · 9fff61c268
commit 9fff61c268
parent 1462ae50e8 fa86fad9d4
6 changed files with 11 additions and 10 deletions
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/feeds.mk

 PKG_NAME:=base-files
-PKG_RELEASE:=204
+PKG_RELEASE:=205
 PKG_FLAGS:=nonshared

 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
--- a/package/base-files/files/lib/functions/leds.sh
+++ b/package/base-files/files/lib/functions/leds.sh
@ -10,7 +10,8 @@ get_dt_led() {
 	[ -f "$nodepath" ] && ledpath=$(cat "$nodepath")
 	[ -n "$ledpath" ] && \
 		label=$(cat "$basepath$ledpath/label" 2>/dev/null) || \
-		label=$(cat "$basepath$ledpath/chan-name" 2>/dev/null)
+		label=$(cat "$basepath$ledpath/chan-name" 2>/dev/null) || \
+		label=$(basename "$basepath$ledpath")

 	echo "$label"
 }
--- a/package/lean/default-settings/files/openwrt_banner
+++ b/package/lean/default-settings/files/openwrt_banner
@ -8,5 +8,5 @@
 [0;1;30;90m│[0m        [0;1;34;94m#[0m                                        [0;37m│[0m
 [0;1;34;94m│[0m        [0;1;34;94m"[0m                                        [0;1;34;94m│[0m
 [0;1;34;94m│───────────────[0;34m────────────────[0;37m────────────────[0;1;34;94m──│[0m
-[0;1;34;94m│[0m   [0;1;34;94mOpenWrt[0m [0;1;34;94m18.06[0m [0;1;34;94mby[0m [0;1;34;94mLean[0m [0;37m|[0m [0;1;34;94mMod [0;1;34;94m20.08[0m [0;1;34;94mBy[0m [0;1;34;94mCTCGFW[0m   [0;1;34;94m│[0m
+[0;1;34;94m│[0m   [0;1;34;94mOpenWrt[0m [0;1;34;94m18.06[0m [0;1;34;94mby[0m [0;1;34;94mLean[0m [0;37m|[0m [0;1;34;94mMod [0;1;34;94m20.09[0m [0;1;34;94mBy[0m [0;1;34;94mCTCGFW[0m   [0;1;34;94m│[0m
 [0;1;34;94m└───────[0;34m────────────────[0;37m────────────────[0;1;30;90m───────[0;1;34;94m───┘[0m
--- a/package/lean/default-settings/files/zzz-default-settings
+++ b/package/lean/default-settings/files/zzz-default-settings
@ -41,7 +41,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='| Mod20.08 by CTCGFW'" >> /etc/openwrt_release
+echo "DISTRIB_REVISION='| Mod20.09 by CTCGFW'" >> /etc/openwrt_release
 sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
 echo "DISTRIB_DESCRIPTION='OpenWrt 18.06 by Lean '" >> /etc/openwrt_release

--- a/package/network/config/firewall/Makefile
+++ b/package/network/config/firewall/Makefile
@ -13,9 +13,9 @@ PKG_RELEASE:=1

 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:=917f662d48a766f86ee61a83e13a61688d6eca3647dd4aca1973b1fa1ea64fec
+PKG_SOURCE_DATE:=2020-09-05
+PKG_SOURCE_VERSION:=8c2f9fad9ca644af911e0d4113a890c3c84aa738
+PKG_MIRROR_HASH:=424a7906ed8957de3e85046248608dec7146078946161a517f8a5af9f536bad1
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=ISC

--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@ -13,9 +13,9 @@ PKG_RELEASE:=5

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/paulusmack/ppp
-PKG_SOURCE_DATE:=2020-08-07
-PKG_SOURCE_VERSION:=045169401601639b9163e1df00f868a0a49131ce
-PKG_MIRROR_HASH:=0ceb3e649d191c1fe225be580135aa181d9d3ba3689503691c4c9469ddac64a3
+PKG_SOURCE_DATE:=2020-09-04
+PKG_SOURCE_VERSION:=fc0a76c87a123e65b4922008257f5878251f9323
+PKG_MIRROR_HASH:=c3ad8dc7922f628b4b33405e60b4add4d7c8b76ca6086a1782774c96da9eecba
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-4-Clause
 PKG_CPE_ID:=cpe:/a:samba:ppp