From 5b88caedf6f3ed13536f1073810a583bff4328c7 Mon Sep 17 00:00:00 2001 From: ricksuzade-maker <58425544+ricksuzade-maker@users.noreply.github.com> Date: Mon, 4 May 2020 18:24:01 +0800 Subject: [PATCH 01/13] Bump wireguard to 1.0.20200429 (#4536) --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index cc9c35c92e..f57cb9f8c4 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=1.0.20200413 +PKG_VERSION:=1.0.20200429 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ -PKG_HASH:=cf166348fbb67419528e73049ce001d29131aea367fa6aef9d3e223f7251e116 +PKG_HASH:=c0050a94c33c195d4129a75ab4dca05ba021c5265e40fce8b2dfda7d7055cda2 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From b80d00eede354b1a6b5e38a0954a6b31f95f2ea0 Mon Sep 17 00:00:00 2001 From: lunatickochiya <55731491+lunatickochiya@users.noreply.github.com> Date: Wed, 6 May 2020 00:13:25 +0800 Subject: [PATCH 02/13] luci-app-openvpn-server:fix start crash in AR9341 (#4540) just one uci commit in script too many commits may crash start in AR9341 routers --- .../root/etc/uci-defaults/openvpn | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn index 412fe1c8ab..f13e6c777c 100755 --- a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn +++ b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn @@ -3,9 +3,10 @@ uci set network.vpn0="interface" uci set network.vpn0.ifname="tun0" uci set network.vpn0.proto="none" -uci commit network; -/etc/init.d/network reload +uci delete firewall.vpn +uci delete firewall.vpnwan +uci delete firewall.vpnlan uci delete firewall.openvpn uci add firewall rule uci rename firewall.@rule[-1]="openvpn" @@ -15,11 +16,6 @@ uci set firewall.@rule[-1].src="wan" uci set firewall.@rule[-1].proto="tcp udp" uci set firewall.@rule[-1].dest_port="1194" -uci delete firewall.vpn -uci delete firewall.vpnwan -uci delete firewall.vpnlan -uci commit firewall - uci add firewall zone uci rename firewall.@zone[-1]="vpn" uci set firewall.@zone[-1].name="vpn" @@ -36,11 +32,7 @@ uci add firewall forwarding uci rename firewall.@forwarding[-1]="vpnlan" uci set firewall.@forwarding[-1].src="vpn" uci set firewall.@forwarding[-1].dest="lan" -uci commit firewall; -/etc/init.d/firewall restart - -/etc/init.d/openvpn enable -/etc/init.d/openvpn stop +uci commit rm -f /tmp/luci-indexcache exit 0 From b689600046597977b7e650cec8574ef2e3ba1c91 Mon Sep 17 00:00:00 2001 From: lunatickochiya <55731491+lunatickochiya@users.noreply.github.com> Date: Wed, 6 May 2020 23:34:18 +0800 Subject: [PATCH 03/13] luci-app-openvpn-server:add lan to vpn forwarding (#4553) we can control client directly by adding this forwarding also use uci -q batch commands can lead start router faster --- .../root/etc/uci-defaults/openvpn | 69 ++++++++++--------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn index f13e6c777c..0b79269ba6 100755 --- a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn +++ b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn @@ -1,38 +1,41 @@ #!/bin/sh -uci set network.vpn0="interface" -uci set network.vpn0.ifname="tun0" -uci set network.vpn0.proto="none" - -uci delete firewall.vpn -uci delete firewall.vpnwan -uci delete firewall.vpnlan -uci delete firewall.openvpn -uci add firewall rule -uci rename firewall.@rule[-1]="openvpn" -uci set firewall.@rule[-1].name="openvpn" -uci set firewall.@rule[-1].target="ACCEPT" -uci set firewall.@rule[-1].src="wan" -uci set firewall.@rule[-1].proto="tcp udp" -uci set firewall.@rule[-1].dest_port="1194" - -uci add firewall zone -uci rename firewall.@zone[-1]="vpn" -uci set firewall.@zone[-1].name="vpn" -uci set firewall.@zone[-1].input="ACCEPT" -uci set firewall.@zone[-1].forward="ACCEPT" -uci set firewall.@zone[-1].output="ACCEPT" -uci set firewall.@zone[-1].masq="1" -uci set firewall.@zone[-1].network="vpn0" -uci add firewall forwarding -uci rename firewall.@forwarding[-1]="vpnwan" -uci set firewall.@forwarding[-1].src="vpn" -uci set firewall.@forwarding[-1].dest="wan" -uci add firewall forwarding -uci rename firewall.@forwarding[-1]="vpnlan" -uci set firewall.@forwarding[-1].src="vpn" -uci set firewall.@forwarding[-1].dest="lan" -uci commit +uci -q batch <<-EOF >/dev/null + set network.vpn0="interface" + set network.vpn0.ifname="tun0" + set network.vpn0.proto="none" + commit network + + delete firewall.vpn + delete firewall.vpnwan + delete firewall.vpnlan + delete firewall.openvpn + add firewall rule + rename firewall.@rule[-1]="openvpn" + set firewall.@rule[-1].name="openvpn" + set firewall.@rule[-1].target="ACCEPT" + set firewall.@rule[-1].src="wan" + set firewall.@rule[-1].proto="tcp udp" + set firewall.@rule[-1].dest_port="1194" + add firewall zone + rename firewall.@zone[-1]="vpn" + set firewall.@zone[-1].name="vpn" + set firewall.@zone[-1].input="ACCEPT" + set firewall.@zone[-1].forward="ACCEPT" + set firewall.@zone[-1].output="ACCEPT" + set firewall.@zone[-1].masq="1" + set firewall.@zone[-1].network="vpn0" + add firewall forwarding + set firewall.@forwarding[-1].src="vpn" + set firewall.@forwarding[-1].dest="wan" + add firewall forwarding + set firewall.@forwarding[-1].src="vpn" + set firewall.@forwarding[-1].dest="lan" + add firewall forwarding + set firewall.@forwarding[-1].dest='vpn' + set firewall.@forwarding[-1].src='lan' + commit firewall +EOF rm -f /tmp/luci-indexcache exit 0 From 585ca34a6be41e427c053a5a4916a7596371fe55 Mon Sep 17 00:00:00 2001 From: ricksuzade-maker <58425544+ricksuzade-maker@users.noreply.github.com> Date: Fri, 8 May 2020 20:42:57 +0800 Subject: [PATCH 04/13] Bump wireguard to version 1.0.20200506 (#4560) --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index f57cb9f8c4..b856d82773 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=1.0.20200429 +PKG_VERSION:=1.0.20200506 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ -PKG_HASH:=c0050a94c33c195d4129a75ab4dca05ba021c5265e40fce8b2dfda7d7055cda2 +PKG_HASH:=98a99f2b825a82d57a7213e666f1ee4f7cc02bddb09bf4908b4b09447a8f121e PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 82792a1d117fe45ecbe6d0e51e9fe12891f994c4 Mon Sep 17 00:00:00 2001 From: HiGarfield <32226909+HiGarfield@users.noreply.github.com> Date: Fri, 8 May 2020 20:43:27 +0800 Subject: [PATCH 05/13] luci-app-openvpn-server: avoid repeated forwarding rules (#4558) Fix the bug that flashing firmware multiple times will cause repeated forwarding rules in firewall. --- .../root/etc/uci-defaults/openvpn | 70 +++++++++++-------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn index 0b79269ba6..115d258828 100755 --- a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn +++ b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn @@ -1,41 +1,49 @@ #!/bin/sh uci -q batch <<-EOF >/dev/null - set network.vpn0="interface" - set network.vpn0.ifname="tun0" - set network.vpn0.proto="none" - commit network + delete network.vpn0 + set network.vpn0=interface + set network.vpn0.ifname='tun0' + set network.vpn0.proto='none' - delete firewall.vpn - delete firewall.vpnwan - delete firewall.vpnlan + commit network + delete firewall.openvpn - add firewall rule - rename firewall.@rule[-1]="openvpn" - set firewall.@rule[-1].name="openvpn" - set firewall.@rule[-1].target="ACCEPT" - set firewall.@rule[-1].src="wan" - set firewall.@rule[-1].proto="tcp udp" - set firewall.@rule[-1].dest_port="1194" - add firewall zone - rename firewall.@zone[-1]="vpn" - set firewall.@zone[-1].name="vpn" - set firewall.@zone[-1].input="ACCEPT" - set firewall.@zone[-1].forward="ACCEPT" - set firewall.@zone[-1].output="ACCEPT" - set firewall.@zone[-1].masq="1" - set firewall.@zone[-1].network="vpn0" - add firewall forwarding - set firewall.@forwarding[-1].src="vpn" - set firewall.@forwarding[-1].dest="wan" - add firewall forwarding - set firewall.@forwarding[-1].src="vpn" - set firewall.@forwarding[-1].dest="lan" - add firewall forwarding - set firewall.@forwarding[-1].dest='vpn' - set firewall.@forwarding[-1].src='lan' + set firewall.openvpn=rule + set firewall.openvpn.name='openvpn' + set firewall.openvpn.target='ACCEPT' + set firewall.openvpn.src='wan' + set firewall.openvpn.proto='tcp udp' + set firewall.openvpn.dest_port='1194' + + delete firewall.vpn + set firewall.vpn=zone + set firewall.vpn.name='vpn' + set firewall.vpn.input='ACCEPT' + set firewall.vpn.forward='ACCEPT' + set firewall.vpn.output='ACCEPT' + set firewall.vpn.masq='1' + set firewall.vpn.network='vpn0' + + delete firewall.vpntowan + set firewall.vpntowan=forwarding + set firewall.vpntowan.src='vpn' + set firewall.vpntowan.dest='wan' + + delete firewall.vpntolan + set firewall.vpntolan=forwarding + set firewall.vpntolan.src='vpn' + set firewall.vpntolan.dest='lan' + + delete firewall.lantovpn + set firewall.lantovpn=forwarding + set firewall.lantovpn.src='lan' + set firewall.lantovpn.dest='vpn' + commit firewall EOF +chmod 0777 /etc/openvpn/server/checkpsw.sh + rm -f /tmp/luci-indexcache exit 0 From 2c37fa71f93d150eb67bffdc5bdac8abf5354b16 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 9 May 2020 14:36:43 +0800 Subject: [PATCH 06/13] ipq40xx: update ath10k firmware --- package/firmware/ath10k-firmware/Makefile | 9 ++-- package/firmware/linux-firmware/Makefile | 4 +- package/firmware/linux-firmware/qca_ath10k.mk | 2 +- package/firmware/linux-firmware/realtek.mk | 7 ++++ package/kernel/mac80211/ath.mk | 1 - package/kernel/mac80211/broadcom.mk | 28 ++++++------- .../files/lib/netifd/wireless/mac80211.sh | 42 +++++++++++-------- .../hostapd/files/wpa_supplicant-basic.config | 2 +- .../hostapd/files/wpa_supplicant-mini.config | 2 +- .../090-wolfssl-fix-crypto_bignum_sum.patch | 26 ++++++++++++ target/linux/ipq40xx/Makefile | 2 +- 11 files changed, 81 insertions(+), 44 deletions(-) create mode 100644 package/network/services/hostapd/patches/090-wolfssl-fix-crypto_bignum_sum.patch diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile index c427f08842..c3614c47d5 100644 --- a/package/firmware/ath10k-firmware/Makefile +++ b/package/firmware/ath10k-firmware/Makefile @@ -8,9 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ath10k-firmware -PKG_SOURCE_DATE:=2019-10-03 -PKG_SOURCE_VERSION:=d622d160e9f552ead68d9ae81b715422892dc2ef -PKG_MIRROR_HASH:=2e504e071c3f896d629c4cfffe7ff4b5f1acdb4fecd3f01e8ff8c73e87a67cc7 +PKG_SOURCE_DATE:=2020-05-06 +PKG_SOURCE_VERSION:=d58efac2ae3e1ec1b1f45e7d5ead20d1b79f9415 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git @@ -99,7 +98,7 @@ define Package/ath10k-firmware-qca4019/install $(PKG_BUILD_DIR)/QCA4019/hw1.0/board-2.bin \ $(1)/lib/firmware/ath10k/QCA4019/hw1.0/ $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/QCA4019/hw1.0/3.5.3/firmware-5.bin_10.4-3.5.3-00057 \ + $(PKG_BUILD_DIR)/QCA4019/hw1.0/3.6/firmware-5.bin_10.4-3.6-00140 \ $(1)/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin endef @@ -179,4 +178,4 @@ $(eval $(call BuildPackage,ath10k-firmware-qca988x)) #$(eval $(call BuildPackage,ath10k-firmware-qca99x0)) #$(eval $(call BuildPackage,ath10k-firmware-qca6174)) #$(eval $(call BuildPackage,ath10k-firmware-qca9984)) -#$(eval $(call BuildPackage,ath10k-firmware-qca4019)) +$(eval $(call BuildPackage,ath10k-firmware-qca4019)) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 085cce422d..01dee59171 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:=20191215 +PKG_VERSION:=20200122 PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=c2068ff4a797c0f2c3edbb9488f82a48bca8a995855ea21310a8346195c0ae56 +PKG_HASH:=a30e811b3736a72b874ac27e10662f5e5409b1cadf8aab7ba88e8f8bc8083986 PKG_MAINTAINER:=Felix Fietkau diff --git a/package/firmware/linux-firmware/qca_ath10k.mk b/package/firmware/linux-firmware/qca_ath10k.mk index 72735819fd..6019ce26ec 100644 --- a/package/firmware/linux-firmware/qca_ath10k.mk +++ b/package/firmware/linux-firmware/qca_ath10k.mk @@ -19,7 +19,7 @@ define Package/ath10k-firmware-qca4019/install $(PKG_BUILD_DIR)/ath10k/QCA4019/hw1.0/firmware-5.bin \ $(1)/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin endef -$(eval $(call BuildPackage,ath10k-firmware-qca4019)) +# $(eval $(call BuildPackage,ath10k-firmware-qca4019)) Package/ath10k-firmware-qca9887 = $(call Package/firmware-default,ath10k qca9887 firmware) define Package/ath10k-firmware-qca9887/install diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk index 87a11c0779..b0f6ff7f35 100644 --- a/package/firmware/linux-firmware/realtek.mk +++ b/package/firmware/linux-firmware/realtek.mk @@ -79,6 +79,13 @@ define Package/rtl8723bu-firmware/install endef $(eval $(call BuildPackage,rtl8723bu-firmware)) +Package/rtl8723bs-firmware = $(call Package/firmware-default,RealTek RTL8723BS firmware) +define Package/rtl8723bs-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi + $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8723bs*.bin $(1)/lib/firmware/rtlwifi +endef +$(eval $(call BuildPackage,rtl8723bs-firmware)) + Package/rtl8821ae-firmware = $(call Package/firmware-default,RealTek RTL8821AE firmware) define Package/rtl8821ae-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index 0c25d23bb2..788131b751 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -264,7 +264,6 @@ define KernelPackage/ath10k/config config ATH10K_THERMAL bool "Enable thermal sensors and throttling support" - default y depends on PACKAGE_kmod-ath10k endef diff --git a/package/kernel/mac80211/broadcom.mk b/package/kernel/mac80211/broadcom.mk index 0a6b1b6690..41320bcc12 100644 --- a/package/kernel/mac80211/broadcom.mk +++ b/package/kernel/mac80211/broadcom.mk @@ -118,14 +118,14 @@ define KernelPackage/b43/config config PACKAGE_B43_USE_SSB select PACKAGE_kmod-ssb tristate - depends on !TARGET_brcm47xx && !TARGET_brcm63xx + depends on !TARGET_bcm47xx && !TARGET_bcm63xx default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_SSB config PACKAGE_B43_USE_BCMA select PACKAGE_kmod-bcma tristate - depends on !TARGET_brcm47xx && !TARGET_bcm53xx + depends on !TARGET_bcm47xx && !TARGET_bcm53xx default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA @@ -205,8 +205,8 @@ config PACKAGE_B43_USE_BCMA config B43_FW_SQUASH_COREREVS string "Core revisions to include" depends on B43_FW_SQUASH - default "5,6,7,8,9,10,11,13,15" if TARGET_brcm47xx_legacy - default "16,28,29,30" if TARGET_brcm47xx_mips74k + default "5,6,7,8,9,10,11,13,15" if TARGET_bcm47xx_legacy + default "16,28,29,30" if TARGET_bcm47xx_mips74k default "5,6,7,8,9,10,11,13,15,16,28,29,30" help This is a comma seperated list of core revision numbers. @@ -220,8 +220,8 @@ config PACKAGE_B43_USE_BCMA config B43_FW_SQUASH_PHYTYPES string "PHY types to include" depends on B43_FW_SQUASH - default "G,N,LP" if TARGET_brcm47xx_legacy - default "N,HT" if TARGET_brcm47xx_mips74k + default "G,N,LP" if TARGET_bcm47xx_legacy + default "N,HT" if TARGET_bcm47xx_mips74k default "G,N,LP,HT" help This is a comma seperated list of PHY types: @@ -248,15 +248,15 @@ config PACKAGE_B43_USE_BCMA This allows choosing buses that b43 should support. config PACKAGE_B43_BUSES_BCMA_AND_SSB - depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx + depends on !TARGET_bcm47xx_legacy && !TARGET_bcm47xx_mips74k && !TARGET_bcm53xx bool "BCMA and SSB" config PACKAGE_B43_BUSES_BCMA - depends on !TARGET_brcm47xx_legacy + depends on !TARGET_bcm47xx_legacy bool "BCMA only" config PACKAGE_B43_BUSES_SSB - depends on !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx + depends on !TARGET_bcm47xx_mips74k && !TARGET_bcm53xx bool "SSB only" endchoice @@ -281,7 +281,7 @@ config PACKAGE_B43_USE_BCMA config PACKAGE_B43_PHY_G bool "Enable support for G-PHYs" - default n if TARGET_brcm47xx_mips74k + default n if TARGET_bcm47xx_mips74k default y help Enable support for G-PHY. This includes support for the following devices: @@ -304,7 +304,7 @@ config PACKAGE_B43_USE_BCMA config PACKAGE_B43_PHY_LP bool "Enable support for LP-PHYs" - default n if TARGET_brcm47xx_mips74k + default n if TARGET_bcm47xx_mips74k default y help Enable support for LP-PHY. This includes support for the following devices: @@ -315,7 +315,7 @@ config PACKAGE_B43_USE_BCMA config PACKAGE_B43_PHY_HT bool "Enable support for HT-PHYs" - default n if TARGET_brcm47xx_legacy + default n if TARGET_bcm47xx_legacy default y help Enable support for HT-PHY. This includes support for the following devices: @@ -347,7 +347,7 @@ define KernelPackage/b43legacy URL:=https://wireless.wiki.kernel.org/en/users/drivers/b43 KCONFIG:= \ CONFIG_HW_RANDOM=y - DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb @!TARGET_brcm47xx_mips74k +b43legacy-firmware + DEPENDS+= +kmod-mac80211 +!(TARGET_bcm47xx||TARGET_bcm63xx):kmod-ssb @!TARGET_bcm47xx_mips74k +b43legacy-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/b43legacy/b43legacy.ko AUTOLOAD:=$(call AutoProbe,b43legacy) MENU:=1 @@ -401,7 +401,7 @@ define KernelPackage/brcmsmac $(call KernelPackage/mac80211/Default) TITLE:=Broadcom IEEE802.11n PCIe SoftMAC WLAN driver URL:=https://wireless.wiki.kernel.org/en/users/drivers/brcm80211 - DEPENDS+= +kmod-mac80211 +@DRIVER_11N_SUPPORT +!TARGET_brcm47xx:kmod-bcma +kmod-lib-cordic +kmod-lib-crc8 +kmod-brcmutil +!BRCMSMAC_USE_FW_FROM_WL:brcmsmac-firmware + DEPENDS+= +kmod-mac80211 +@DRIVER_11N_SUPPORT +!TARGET_bcm47xx:kmod-bcma +kmod-lib-cordic +kmod-lib-crc8 +kmod-brcmutil +!BRCMSMAC_USE_FW_FROM_WL:brcmsmac-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcmsmac.ko AUTOLOAD:=$(call AutoProbe,brcmsmac) MENU:=1 diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index f363200910..211fcb9510 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -590,7 +590,13 @@ mac80211_setup_supplicant() { local add_sp=0 local spobj="$(ubus -S list | grep wpa_supplicant.${ifname})" - wpa_supplicant_prepare_interface "$ifname" nl80211 || return 1 + [ "$enable" = 0 ] && { + ubus call wpa_supplicant.${phy} config_del "{\"iface\":\"$ifname\"}" + ip link set dev "$ifname" down + iw dev "$ifname" del + return 0 + } + wpa_supplicant_prepare_interface "$ifname" nl80211 || { iw dev "$ifname" del return 1 @@ -607,18 +613,17 @@ mac80211_setup_supplicant() { [ "$spobj" ] && ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}" add_sp=1 fi - [ "$enable" = 0 ] && { - ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}" - ip link set dev "$ifname" down - return 0 - } [ -z "$spobj" ] && add_sp=1 + NEW_MD5_SP=$(test -e "${_config}" && md5sum ${_config}) + OLD_MD5_SP=$(uci -q -P /var/state get wireless._${phy}.md5_${ifname}) if [ "$add_sp" = "1" ]; then wpa_supplicant_run "$ifname" "$hostapd_ctrl" else - ubus call $spobj reload + [ "${NEW_MD5_SP}" == "${OLD_MD5_SP}" ] || ubus call $spobj reload fi + uci -q -P /var/state set wireless._${phy}.md5_${ifname}="${NEW_MD5_SP}" + return 0 } mac80211_setup_supplicant_noctl() { @@ -765,7 +770,6 @@ mac80211_setup_vif() { [ "$vif_enable" = 1 ] || action=down if [ "$mode" != "ap" ] || [ "$ifname" = "$ap_ifname" ]; then - logger ip link set dev "$ifname" $action ip link set dev "$ifname" "$action" || { wireless_setup_vif_failed IFUP_ERROR json_select .. @@ -923,8 +927,8 @@ drv_mac80211_setup() { [ "$rxantenna" = "all" ] && rxantenna=0xffffffff iw phy "$phy" set antenna $txantenna $rxantenna >/dev/null 2>&1 - iw phy "$phy" set antenna_gain $antenna_gain - iw phy "$phy" set distance "$distance" + iw phy "$phy" set antenna_gain $antenna_gain >/dev/null 2>&1 + iw phy "$phy" set distance "$distance" >/dev/null 2>&1 if [ -n "$txpower" ]; then iw phy "$phy" set txpower fixed "${txpower%%.*}00" @@ -954,8 +958,8 @@ drv_mac80211_setup() { OLD_MD5=$(uci -q -P /var/state get wireless._${phy}.md5) if [ "${NEWAPLIST}" != "${OLDAPLIST}" ]; then mac80211_vap_cleanup hostapd "${OLDAPLIST}" - [ -n "${NEWAPLIST}" ] && mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap || return fi + [ -n "${NEWAPLIST}" ] && mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap local add_ap=0 local primary_ap=${NEWAPLIST%% *} [ -n "$hostapd_ctrl" ] && { @@ -966,7 +970,11 @@ drv_mac80211_setup() { no_reload=$? if [ "$no_reload" != "0" ]; then mac80211_vap_cleanup hostapd "${OLDAPLIST}" - [ -n "${NEWAPLIST}" ] && mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap || return + mac80211_vap_cleanup wpa_supplicant "$(uci -q -P /var/state get wireless._${phy}.splist)" + mac80211_vap_cleanup none "$(uci -q -P /var/state get wireless._${phy}.umlist)" + sleep 2 + mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap + for_each_interface "sta adhoc mesh monitor" mac80211_prepare_vif fi } fi @@ -1031,12 +1039,10 @@ list_phy_interfaces() { drv_mac80211_teardown() { wireless_process_kill_all - json_select data - json_get_vars phy - json_select .. - - mac80211_interface_cleanup "$phy" - uci -q -P /var/state revert wireless._${phy} + for phy in `ls /sys/class/ieee80211/`; do + mac80211_interface_cleanup "$phy" + uci -q -P /var/state revert wireless._${phy} + done } add_driver mac80211 diff --git a/package/network/services/hostapd/files/wpa_supplicant-basic.config b/package/network/services/hostapd/files/wpa_supplicant-basic.config index a9da65deed..db3f7c7a11 100644 --- a/package/network/services/hostapd/files/wpa_supplicant-basic.config +++ b/package/network/services/hostapd/files/wpa_supplicant-basic.config @@ -264,7 +264,7 @@ CONFIG_BACKEND=file # configuration can still be changed, the changes are just not going to be # persistent over restarts. This option can be used to reduce code size by # about 3.5 kB. -#CONFIG_NO_CONFIG_WRITE=y +CONFIG_NO_CONFIG_WRITE=y # Remove support for configuration blobs to reduce code size by about 1.5 kB. #CONFIG_NO_CONFIG_BLOBS=y diff --git a/package/network/services/hostapd/files/wpa_supplicant-mini.config b/package/network/services/hostapd/files/wpa_supplicant-mini.config index 850d22febc..c1e0141edd 100644 --- a/package/network/services/hostapd/files/wpa_supplicant-mini.config +++ b/package/network/services/hostapd/files/wpa_supplicant-mini.config @@ -264,7 +264,7 @@ CONFIG_BACKEND=file # configuration can still be changed, the changes are just not going to be # persistent over restarts. This option can be used to reduce code size by # about 3.5 kB. -#CONFIG_NO_CONFIG_WRITE=y +CONFIG_NO_CONFIG_WRITE=y # Remove support for configuration blobs to reduce code size by about 1.5 kB. #CONFIG_NO_CONFIG_BLOBS=y diff --git a/package/network/services/hostapd/patches/090-wolfssl-fix-crypto_bignum_sum.patch b/package/network/services/hostapd/patches/090-wolfssl-fix-crypto_bignum_sum.patch new file mode 100644 index 0000000000..7cc0dec3fe --- /dev/null +++ b/package/network/services/hostapd/patches/090-wolfssl-fix-crypto_bignum_sum.patch @@ -0,0 +1,26 @@ +From 1766e608ba1114220f3b3598e77aa53b50c38a6e Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Mon, 14 Oct 2019 19:27:47 +0300 +Subject: [PATCH] wolfSSL: Fix crypto_bignum_sub() + +The initial crypto wrapper implementation for wolfSSL seems to have +included a copy-paste error in crypto_bignum_sub() implementation that +was identical to crypto_bignum_add() while mp_sub() should have been +used instead of mp_add(). + +Signed-off-by: Jouni Malinen +--- + src/crypto/crypto_wolfssl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/crypto/crypto_wolfssl.c ++++ b/src/crypto/crypto_wolfssl.c +@@ -1151,7 +1151,7 @@ int crypto_bignum_sub(const struct crypt + if (TEST_FAIL()) + return -1; + +- return mp_add((mp_int *) a, (mp_int *) b, ++ return mp_sub((mp_int *) a, (mp_int *) b, + (mp_int *) r) == MP_OKAY ? 0 : -1; + } + diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 3b6496859f..e99d40f1f6 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -9,7 +9,7 @@ CPU_SUBTYPE:=neon-vfpv4 MAINTAINER:=John Crispin # TODO: drop kmod-usb-dwc3-of-simple when migrating to 4.19 -KERNEL_PATCHVER:=4.19 +KERNEL_PATCHVER:=4.14 KERNELNAME:=zImage Image dtbs From f231323db5bb920685dc750ba15239193fa718ba Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 9 May 2020 15:03:44 +0800 Subject: [PATCH 07/13] luci-app-frps: fix disable when upgrade --- package/lean/luci-app-frps/Makefile | 2 +- .../root/etc/uci-defaults/40_luci-frps | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/package/lean/luci-app-frps/Makefile b/package/lean/luci-app-frps/Makefile index 0dd65ece63..1933daf225 100644 --- a/package/lean/luci-app-frps/Makefile +++ b/package/lean/luci-app-frps/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-frps PKG_VERSION:=0.0.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/luci-app-frps/root/etc/uci-defaults/40_luci-frps b/package/lean/luci-app-frps/root/etc/uci-defaults/40_luci-frps index b0f9d5783a..6f1b2a18b0 100644 --- a/package/lean/luci-app-frps/root/etc/uci-defaults/40_luci-frps +++ b/package/lean/luci-app-frps/root/etc/uci-defaults/40_luci-frps @@ -7,19 +7,5 @@ uci -q batch <<-EOF >/dev/null commit ucitrack EOF -frps=$(uci -q get frps.@frps[-1]) - -if [ -z "$frps" ]; then - uci -q add frps frps -fi - -if [ "x$frps" != "xmain" ]; then - uci -q batch <<-EOF >/dev/null - rename frps.@frps[-1]="main" - set frps.main.enabled="0" - commit frps - EOF -fi - rm -rf /tmp/luci-indexcache /tmp/luci-modulecache exit 0 From b7be5fd5fa8b81906d70335ca6d7d55d9f16e951 Mon Sep 17 00:00:00 2001 From: Hugo Yuan <429632952@163.com> Date: Sat, 9 May 2020 15:05:25 +0800 Subject: [PATCH 08/13] UnblockNeteaseMusic: bump to 0.25.0 (#4570) --- package/lean/UnblockNeteaseMusic/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index 5b4685dcac..f575b2c27c 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic -PKG_VERSION:=0.24.1 +PKG_VERSION:=0.25.0 PKG_RELEASE:=4 PKG_LICENSE:=MIT PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=9c9582401e999e1876c4baa204d35284a3d32bec +PKG_SOURCE_VERSION:=17cddd06278d0915697b3a342a182ed5e240200d PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz From 7c2d28fbae3c0e3ba59cb880332c49d699ddc36c Mon Sep 17 00:00:00 2001 From: manyeechen <36399844+manyeechen@users.noreply.github.com> Date: Sat, 9 May 2020 15:05:39 +0800 Subject: [PATCH 09/13] =?UTF-8?q?npc=EF=BC=9Abump=20version=20to=200.26.7?= =?UTF-8?q?=20(#4569)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add: api /client/list 添加获取服务端连接host和连接类型 #483 添加自定义客户端断开时间 #485 fix: web手机浏览输入框或者按钮被遮挡问题，感谢 @kekxv android客户端无法粘贴的问题 #479 p2p 由于上个版本的一些改动造成无法使用的问题 #515 --- package/lean/npc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/npc/Makefile b/package/lean/npc/Makefile index e311a246d4..c73f01dc4f 100644 --- a/package/lean/npc/Makefile +++ b/package/lean/npc/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=npc -PKG_VERSION:=0.26.6 +PKG_VERSION:=0.26.7 PKG_RELEASE:=2 ifeq ($(ARCH),mipsel) From 9c732c877d02d5d1f63fcf0b286012a22d65ca11 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 9 May 2020 15:05:57 +0800 Subject: [PATCH 10/13] ipq40xx: adjust switch configuration for netgear ex61x0v2 (#4550) --- target/linux/ipq40xx/base-files/etc/board.d/02_network | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index a6436ae048..bc9b834a2e 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -31,12 +31,11 @@ ipq40xx_setup_interfaces() "0t@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" ;; compex,wpj428) - ucidef_set_interface_lan "eth0 eth1" + ucidef_add_switch "switch0" \ + "0t@eth0" "4:lan" "5:lan" ;; engenius,eap1300|\ meraki,mr33|\ - netgear,ex6100v2|\ - netgear,ex6150v2|\ zyxel,wre6606) ucidef_set_interface_lan "eth0" ;; @@ -52,6 +51,11 @@ ipq40xx_setup_interfaces() ucidef_add_switch "switch0" \ "0t@eth0" "3:lan:2" "4:lan:1" "5:wan" ;; + netgear,ex6100v2|\ + netgear,ex6150v2) + ucidef_add_switch "switch0" \ + "0u@eth0" "4:lan" + ;; p2w,r619ac|\ p2w,r619ac-128m|\ zyxel,nbg6617) From de279cbd29de1efb4e369a9b1b77d1bd7a143ab6 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 9 May 2020 15:36:49 +0800 Subject: [PATCH 11/13] ramips: unlock Bootloader for Redmi AC2100 --- target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts | 1 - 1 file changed, 1 deletion(-) diff --git a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts index 7dcd10ab68..ded190e951 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts @@ -67,7 +67,6 @@ partition@0 { label = "Bootloader"; reg = <0x0 0x80000>; - read-only; }; partition@80000 { From f26c892a0bf9b5399d553764898f124e2079f8cc Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 9 May 2020 15:39:00 +0800 Subject: [PATCH 12/13] Version bump to R20.5.9 --- package/lean/default-settings/Makefile | 2 +- package/lean/default-settings/files/zzz-default-settings | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index b942eb922f..d68a1aebaf 100644 --- 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:=57 +PKG_RELEASE:=58 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 index edd794655f..c9c4910677 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -43,7 +43,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.4.8'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='R20.5.9'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release From b65f1ebf0089a2fa0d3e1ad30efc21385a013139 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 9 May 2020 16:48:42 +0800 Subject: [PATCH 13/13] mt76: bump to lastest version --- package/kernel/mt76/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 4ee79fe042..f4b37989c8 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -1,16 +1,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mt76 -PKG_RELEASE=1 +PKG_RELEASE=2 PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-03-10 -PKG_SOURCE_VERSION:=a94e43f277e22ce24237320ce92b1f185eff0b1e -PKG_MIRROR_HASH:=b922f2143e5af9fd1e4f86002fefa91f42c8959385be6cda0633cce4f85a8d42 +PKG_SOURCE_DATE:=2020-04-27 +PKG_SOURCE_VERSION:=5f3ccc7226272198c21ec934d9072a56b0953f47 +PKG_MIRROR_HASH:=6f1a7b7d7b9f4db79d72405baeafa318769eeab270fea4479756f91ac5a2494d PKG_MAINTAINER:=Felix Fietkau PKG_BUILD_PARALLEL:=1 @@ -143,6 +143,7 @@ define KernelPackage/mt7615e TITLE:=MediaTek MT7615 wireless driver DEPENDS+=@PCI_SUPPORT +kmod-mt76-core FILES:=\ + $(PKG_BUILD_DIR)/mt7615/mt7615-common.ko \ $(PKG_BUILD_DIR)/mt7615/mt7615e.ko AUTOLOAD:=$(call AutoProbe,mt7615e) endef @@ -191,6 +192,7 @@ ifdef CONFIG_PACKAGE_kmod-mt7603 PKG_MAKE_FLAGS += CONFIG_MT7603E=m endif ifdef CONFIG_PACKAGE_kmod-mt7615e + PKG_MAKE_FLAGS += CONFIG_MT7615_COMMON=m PKG_MAKE_FLAGS += CONFIG_MT7615E=m ifdef CONFIG_TARGET_mediatek_mt7622 PKG_MAKE_FLAGS += CONFIG_MT7622_WMAC=y