diff --git a/brook/Makefile b/brook/Makefile index e86730390..141ddc6c4 100644 --- a/brook/Makefile +++ b/brook/Makefile @@ -55,6 +55,7 @@ define Package/brook/config config BROOK_COMPRESS_UPX bool "Compress executable files with UPX" + depends on @!mips64 default y endef diff --git a/hysteria/Makefile b/hysteria/Makefile index 5e8829318..a94ce90b0 100644 --- a/hysteria/Makefile +++ b/hysteria/Makefile @@ -50,6 +50,7 @@ config HYSTERIA_COMPRESS_GOPROXY config HYSTERIA_COMPRESS_UPX bool "Compress executable files with UPX" + depends on @!mips64 default y endmenu diff --git a/luci-app-easymesh/luasrc/model/cbi/easymesh.lua b/luci-app-easymesh/luasrc/model/cbi/easymesh.lua index c2d17573d..4e5593704 100755 --- a/luci-app-easymesh/luasrc/model/cbi/easymesh.lua +++ b/luci-app-easymesh/luasrc/model/cbi/easymesh.lua @@ -51,6 +51,7 @@ uci:foreach("wireless", "wifi-device", function(s) apRadio:value(s['.name']) end) +apRadio:value("all", translate("ALL")) o.default = "radio0" o.rmempty = false diff --git a/luci-app-easymesh/root/etc/init.d/easymesh b/luci-app-easymesh/root/etc/init.d/easymesh index 1a9dd5907..975ae7e5c 100755 --- a/luci-app-easymesh/root/etc/init.d/easymesh +++ b/luci-app-easymesh/root/etc/init.d/easymesh @@ -5,7 +5,6 @@ STOP=10 enable=$(uci get easymesh.config.enabled 2>/dev/null) mesh_bat0=$(uci get network.bat0 2>/dev/null) mesh_nwi_mesh0=$(uci get network.nwi_mesh0 2>/dev/null) -mesh_mesh0=$(uci get wireless.mesh0 2>/dev/null) ap_mode=$(uci get easymesh.config.ap_mode 2>/dev/null) lan=$(uci get network.lan.ifname 2>/dev/null) ipaddr=$(uci get easymesh.config.ipaddr 2>/dev/null) @@ -15,15 +14,10 @@ ap_gateway=$(uci get network.lan.gateway 2>/dev/null) ap_gateway1=$(cat /etc/easymesh | sed -n '1p' 2>/dev/null) dns1=$(cat /etc/easymesh | sed -n '2p' 2>/dev/null) dns=$(uci get easymesh.config.dns 2>/dev/null) -mesh_id=$(uci get easymesh.config.mesh_id 2>/dev/null) apRadio=$(uci get easymesh.config.apRadio 2>/dev/null) -mesh0_apRadio=$(uci get wireless.mesh0.device 2>/dev/null) encryption=$(uci get easymesh.config.encryption 2>/dev/null) key=$(uci get easymesh.config.key 2>/dev/null) kvr=$(uci get easymesh.config.kvr 2>/dev/null) -mobility_domain=$(uci get easymesh.config.mobility_domain 2>/dev/null) -rssi_val=$(uci get easymesh.config.rssi_val 2>/dev/null) -low_rssi_val=$(uci get easymesh.config.low_rssi_val 2>/dev/null) ap_mode_stop(){ if [ "$ap_gateway" = "$ap_gateway1" ]; then @@ -42,17 +36,78 @@ ap_mode_stop(){ fi } -kvr_stop(){ - for wifiiface in $(uci -X show wireless | grep wifi-iface | awk -F'[=]' '{print $1}'); do - if [ "${wifiiface}" != "wireless.mesh0" ]; then - uci delete ${wifiiface}.ieee80211k - uci delete ${wifiiface}.ieee80211v - uci delete ${wifiiface}.ieee80211r - uci commit network - fi - done - /etc/init.d/dawn stop && /etc/init.d/dawn disable +add_wifi_mesh(){ + mesh_apRadio=$(uci get wireless.mesh_${apall}.device 2>/dev/null) + mesh_mesh=$(uci get wireless.mesh_${apall} 2>/dev/null) + mesh_id=$(uci get easymesh.config.mesh_id 2>/dev/null) + if [ "$mesh_apRadio" != "wifi-iface" ]; then + uci set wireless.mesh_$apall=wifi-iface + uci set wireless.mesh_$apall.device=$apall + uci set wireless.mesh_$apall.ifname=mesh_${apall} + uci set wireless.mesh_$apall.network='nwi_mesh0' + uci set wireless.mesh_$apall.mode='mesh' + uci set wireless.mesh_$apall.mesh_fwding='0' + uci set wireless.mesh_$apall.mesh_id=$mesh_id + uci commit wireless + fi + if [ "$mesh_mesh" = "wifi-iface" ]; then + if [ "$mesh_apRadio" != "$apall" ]; then + uci set wireless.mesh_$apall.device=$apall + uci commit wireless + fi + fi + + if [ "$encryption" != 1 ]; then + uci set wireless.mesh_$apall.encryption='none' + uci commit wireless + else + uci set wireless.mesh_$apall.encryption='sae' + uci set wireless.mesh_$apall.key=$key + uci commit wireless + fi + add_kvr +} + +add_kvr(){ + mobility_domain=$(uci get easymesh.config.mobility_domain 2>/dev/null) + + for wifiiface in $(uci -X show wireless | grep wifi-iface | awk -F'[=]' '{print $1}'); do + if [ "${wifiiface}" != "wireless.mesh_${apall}" ]; then + if [ "$kvr" = 1 ]; then + uci set ${wifiiface}.ieee80211k='1' + uci set ${wifiiface}.rrm_neighbor_report='1' + uci set ${wifiiface}.rrm_beacon_report='1' + uci set ${wifiiface}.ieee80211v='1' + uci set ${wifiiface}.bss_transition='1' + uci set ${wifiiface}.ieee80211r='1' + uci set ${wifiiface}.encryption='psk-mixed' + uci set ${wifiiface}.mobility_domain=$mobility_domain + uci set ${wifiiface}.ft_over_ds='1' + uci set ${wifiiface}.ft_psk_generate_local='1' + uci commit network + fi + else + uci delete ${wifiiface}.ieee80211k + uci delete ${wifiiface}.ieee80211v + uci delete ${wifiiface}.ieee80211r + uci commit network + fi + done +} + +add_dawn(){ + rssi_val=$(uci get easymesh.config.rssi_val 2>/dev/null) + low_rssi_val=$(uci get easymesh.config.low_rssi_val 2>/dev/null) + + if [ "$kvr" = 1 ]; then + uci set dawn.@metric[0].rssi_val=$rssi_val + uci set dawn.@metric[0].low_rssi_val=$low_rssi_val + uci commit dawn + /etc/init.d/dawn enable && /etc/init.d/dawn start + else + /etc/init.d/dawn stop && /etc/init.d/dawn disable + fi } start(){ @@ -89,56 +144,13 @@ start(){ uci commit network fi - if [ "$mesh_mesh0" != "wifi-iface" ]; then - uci set wireless.mesh0=wifi-iface - uci set wireless.mesh0.device=$apRadio - uci set wireless.mesh0.ifname='mesh0' - uci set wireless.mesh0.network='nwi_mesh0' - uci set wireless.mesh0.mode='mesh' - uci set wireless.mesh0.mesh_fwding='0' - uci set wireless.mesh0.mesh_id=$mesh_id - uci commit wireless - fi - - if [ "$mesh_mesh0" = "wifi-iface" ]; then - if [ "$mesh0_apRadio" != "$apRadio" ]; then - uci set wireless.mesh0.device=$apRadio - uci commit wireless - fi - fi - - if [ "$encryption" != 1 ]; then - uci set wireless.mesh0.encryption='none' - uci commit wireless - else - uci set wireless.mesh0.encryption='sae' - uci set wireless.mesh0.key=$key - uci commit wireless - fi - - if [ "$kvr" = 1 ]; then - for wifiiface in $(uci -X show wireless | grep wifi-iface | awk -F'[=]' '{print $1}'); do - if [ "${wifiiface}" != "wireless.mesh0" ]; then - uci set ${wifiiface}.ieee80211k='1' - uci set ${wifiiface}.rrm_neighbor_report='1' - uci set ${wifiiface}.rrm_beacon_report='1' - uci set ${wifiiface}.ieee80211v='1' - uci set ${wifiiface}.bss_transition='1' - uci set ${wifiiface}.ieee80211r='1' - uci set ${wifiiface}.encryption='psk-mixed' - uci set ${wifiiface}.mobility_domain=$mobility_domain - uci set ${wifiiface}.ft_over_ds='1' - uci set ${wifiiface}.ft_psk_generate_local='1' - uci commit network - fi + if [ "$apRadio" = "all" ]; then + for apall in $(uci -X show wireless | grep wifi-device | awk -F'[.=]' '{print $2}'); do + add_wifi_mesh done - - uci set dawn.@metric[0].rssi_val=$rssi_val - uci set dawn.@metric[0].low_rssi_val=$low_rssi_val - uci commit dawn - /etc/init.d/dawn enable && /etc/init.d/dawn start else - kvr_stop + apall=$apRadio + add_wifi_mesh fi if [ "$ap_mode" == 1 ]; then @@ -186,12 +198,16 @@ stop(){ uci commit network fi - if [ "$mesh_mesh0" = "wifi-iface" ]; then - uci delete wireless.mesh0 - uci commit wireless + for apall in $(uci -X show wireless | grep wifi-device | awk -F'[.=]' '{print $2}'); do + mesh_mesh=$(uci get wireless.mesh_${apall} 2>/dev/null) + if [ "$mesh_mesh" = "wifi-iface" ]; then + uci delete wireless.mesh_$apall + uci commit wireless + fi + done - kvr_stop - fi + add_kvr + add_dawn if [ "$ap_mode" == 1 ]; then ap_mode_stop diff --git a/luci-app-jd-dailybonus/Makefile b/luci-app-jd-dailybonus/Makefile index c7dba7329..079d3b89e 100644 --- a/luci-app-jd-dailybonus/Makefile +++ b/luci-app-jd-dailybonus/Makefile @@ -4,14 +4,14 @@ PKG_NAME:=luci-app-jd-dailybonus PKG_VERSION:=1.0.6 PKG_RELEASE:=20211016 -define Package/$(PKG_NAME)/conffiles -/etc/config/jd-dailybonus -endef - LUCI_TITLE:=Luci for JD dailybonus Script LUCI_PKGARCH:=all LUCI_DEPENDS:=+node +wget +lua +libuci-lua +define Package/$(PKG_NAME)/conffiles +/etc/config/jd-dailybonus +endef + include $(TOPDIR)/feeds/luci/luci.mk -# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file +# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua b/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua index c492942e4..8cedc362d 100644 --- a/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua +++ b/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua @@ -6,4 +6,4 @@ t = log:field(DummyValue, '', '') t.rawhtml = true t.template = 'jd-dailybonus/log' -return log \ No newline at end of file +return log diff --git a/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm b/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm index 1740a8c57..bff88f260 100644 --- a/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm +++ b/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm @@ -59,4 +59,4 @@ } -<%+cbi/valuefooter%> \ No newline at end of file +<%+cbi/valuefooter%> diff --git a/luci-app-jd-dailybonus/root/etc/config/jd-dailybonus b/luci-app-jd-dailybonus/root/etc/config/jd-dailybonus index c32b2e16a..15a263163 100644 --- a/luci-app-jd-dailybonus/root/etc/config/jd-dailybonus +++ b/luci-app-jd-dailybonus/root/etc/config/jd-dailybonus @@ -11,4 +11,4 @@ config global option auto_run_time '0' option auto_run_time_m '1' option auto_run_time_h '1' - list Cookies '双击扫码添加 Cookie 数据' \ No newline at end of file + list Cookies '双击扫码添加 Cookie 数据' diff --git a/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus b/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus index 46af8dcbc..571e9c41d 100755 --- a/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus +++ b/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus @@ -28,4 +28,4 @@ stop_service() { service_triggers() { procd_add_reload_trigger "jd-dailybonus" -} \ No newline at end of file +} diff --git a/luci-app-jd-dailybonus/root/lib/upgrade/keep.d/jd-dailybonus b/luci-app-jd-dailybonus/root/lib/upgrade/keep.d/jd-dailybonus index e2b14557a..b180f45be 100644 --- a/luci-app-jd-dailybonus/root/lib/upgrade/keep.d/jd-dailybonus +++ b/luci-app-jd-dailybonus/root/lib/upgrade/keep.d/jd-dailybonus @@ -1,2 +1,2 @@ /usr/share/jd-dailybonus/CookieSet.json -/usr/share/jd-dailybonus/JD_DailyBonus.js \ No newline at end of file +/usr/share/jd-dailybonus/JD_DailyBonus.js diff --git a/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/gen_cookieset.lua b/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/gen_cookieset.lua index 8fe500116..d0cc9dded 100644 --- a/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/gen_cookieset.lua +++ b/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/gen_cookieset.lua @@ -25,4 +25,4 @@ end data.CookiesJD = json.stringify( data.CookiesJD ) -write_json('/usr/share/jd-dailybonus/CookieSet.json', data) \ No newline at end of file +write_json('/usr/share/jd-dailybonus/CookieSet.json', data) diff --git a/luci-app-jd-dailybonus/root/usr/share/rpcd/acl.d/luci-jd-dailybonus.json b/luci-app-jd-dailybonus/root/usr/share/rpcd/acl.d/luci-jd-dailybonus.json index 378d177d2..c6d98cd82 100644 --- a/luci-app-jd-dailybonus/root/usr/share/rpcd/acl.d/luci-jd-dailybonus.json +++ b/luci-app-jd-dailybonus/root/usr/share/rpcd/acl.d/luci-jd-dailybonus.json @@ -8,4 +8,4 @@ "uci": [ "jd-dailybonus" ] } } -} \ No newline at end of file +} diff --git a/naiveproxy/patches/001-Remove-concurrency-limit.patch b/naiveproxy/patches/001-Remove-concurrency-limit.patch new file mode 100644 index 000000000..cff7afdc3 --- /dev/null +++ b/naiveproxy/patches/001-Remove-concurrency-limit.patch @@ -0,0 +1,40 @@ +From f1a49736010170a70123db07ca41256ba92c0002 Mon Sep 17 00:00:00 2001 +From: klzgrad +Date: Sat, 3 Oct 2020 08:54:59 +0800 +Subject: [PATCH] Remove concurrency limit + +--- + src/net/tools/naive/naive_proxy.cc | 3 +-- + src/net/tools/naive/naive_proxy_bin.cc | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +--- a/src/net/tools/naive/naive_proxy.cc ++++ b/src/net/tools/naive/naive_proxy.cc +@@ -5,7 +5,6 @@ + + #include "net/tools/naive/naive_proxy.h" + +-#include + #include + + #include "base/bind.h" +@@ -39,7 +38,7 @@ NaiveProxy::NaiveProxy(std::unique_ptrconcurrency) || +- params->concurrency < 1 || params->concurrency > 4) { ++ params->concurrency < 1) { + std::cerr << "Invalid concurrency" << std::endl; + return false; + } diff --git a/trojan-go/Makefile b/trojan-go/Makefile index dffcc5064..4e2d30b6e 100644 --- a/trojan-go/Makefile +++ b/trojan-go/Makefile @@ -53,6 +53,7 @@ config TROJAN_GO_COMPRESS_GOPROXY config TROJAN_GO_COMPRESS_UPX bool "Compress executable files with UPX" + depends on @!mips64 default y endmenu diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile index 509a45c97..a81dc879f 100644 --- a/v2ray-core/Makefile +++ b/v2ray-core/Makefile @@ -104,6 +104,7 @@ config V2RAY_CORE_COMPRESS_GOPROXY config V2RAY_CORE_COMPRESS_UPX bool "Compress executable files with UPX" + depends on @!mips64 default y endmenu endef @@ -118,6 +119,7 @@ config V2RAY_CTL_COMPRESS_GOPROXY config V2RAY_CTL_COMPRESS_UPX bool "Compress executable files with UPX" + depends on @!mips64 default y endmenu endef diff --git a/v2ray-plugin/Makefile b/v2ray-plugin/Makefile index a3dfcad8b..2b1c89ea4 100644 --- a/v2ray-plugin/Makefile +++ b/v2ray-plugin/Makefile @@ -28,7 +28,9 @@ GO_PKG:=github.com/shadowsocks/v2ray-plugin GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS_X:=main.VERSION=v$(PKG_VERSION) -PKG_CONFIG_DEPENDS := CONFIG_$(PKG_NAME)_INCLUDE_GOPROXY +PKG_CONFIG_DEPENDS := \ + CONFIG_$(PKG_NAME)_INCLUDE_GOPROXY \ + CONFIG_$(PKG_NAME)_COMPRESS_UPX include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk @@ -38,6 +40,10 @@ config $(PKG_NAME)_INCLUDE_GOPROXY bool "Compiling with GOPROXY proxy" default n +config $(PKG_NAME)_COMPRESS_UPX + bool "Compress executable files with UPX" + depends on @!mips64 + default y endef ifeq ($(CONFIG_$(PKG_NAME)_INCLUDE_GOPROXY),y) @@ -60,7 +66,9 @@ endef define Build/Compile $(call GoPackage/Build/Compile) +ifneq ($(CONFIG_$(PKG_NAME)_COMPRESS_UPX),) $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/v2ray-plugin +endif endef define Package/$(PKG_NAME)/install diff --git a/xray-core/Makefile b/xray-core/Makefile index b5ebca594..23599eb5e 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -94,6 +94,7 @@ config XRAY_CORE_COMPRESS_GOPROXY config XRAY_CORE_COMPRESS_UPX bool "Compress executable files with UPX" + depends on @!mips64 default y endmenu endef diff --git a/xray-plugin/Makefile b/xray-plugin/Makefile index 758be0015..28a8dcaf9 100644 --- a/xray-plugin/Makefile +++ b/xray-plugin/Makefile @@ -46,6 +46,7 @@ config XRAY_PLUGIN_COMPRESS_GOPROXY config XRAY_PLUGIN_COMPRESS_UPX bool "Compress executable files with UPX" + depends on @!mips64 default y endef