diff --git a/package/ctcgfw/rclone-ng/Makefile b/package/ctcgfw/rclone-ng/Makefile index 49e4384856..2ddc65622d 100644 --- a/package/ctcgfw/rclone-ng/Makefile +++ b/package/ctcgfw/rclone-ng/Makefile @@ -10,10 +10,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-ng -PKG_VERSION:=0.2.4 +PKG_VERSION:=0.3.0 PKG_RELEASE:=1 - PKG_LICENSE:=GPLv3 PKG_MAINTAINER:=ElonH @@ -22,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=3090a713253b17bfbb4d6a69b4b55b81d69e1768cf56d3abca8631e4a35f270b +PKG_HASH:=b6f7254fcb82d380ad621859a216fbf510059c95ad2df0e27bcf2872892f7c6f define Package/$(PKG_NAME) SECTION:=net diff --git a/package/lean/default-settings/i18n/default.zh-cn.po b/package/lean/default-settings/i18n/default.zh-cn.po index 91f4a764ef..13c905cd64 100644 --- a/package/lean/default-settings/i18n/default.zh-cn.po +++ b/package/lean/default-settings/i18n/default.zh-cn.po @@ -5,19 +5,19 @@ msgid "Architecture" msgstr "架构" msgid "CPU Temperature" -msgstr "CPU温度" +msgstr "CPU 温度" msgid "CPU Info" -msgstr "CPU信息" +msgstr "CPU 信息" msgid "CPU Model" msgstr "处理器型号" msgid "CPU frequency" -msgstr "CPU频率" +msgstr "CPU 频率" msgid "RAM frequency" -msgstr "RAM频率" +msgstr "RAM 频率" msgid "Flash Size" msgstr "闪存大小" @@ -44,7 +44,7 @@ msgid "ZRam Size" msgstr "ZRam 大小" msgid "Size of the ZRam device in megabytes" -msgstr "划分给ZRam 分区的内存大小（MB），推荐留空由系统自动管理" +msgstr "划分给 ZRam 分区的内存大小（MB），推荐留空由系统自动管理" msgid "Number of parallel threads used for compression" msgstr "用于压缩内存数据的CPU并发线程数" @@ -59,15 +59,15 @@ msgid "Log" msgstr "日志" msgid "Force 40MHz mode" -msgstr "强制40MHz频宽" +msgstr "强制 40MHz 频宽" msgid "" "Always use 40MHz channels even if the secondary channel overlaps. Using this " "option does not comply with IEEE 802.11n-2009!" -msgstr "强制启用40MHz频宽并忽略辅助信道重叠。此选项可能不兼容某些无线硬件导致无法启用!" +msgstr "强制启用 40MHz 频宽并忽略辅助信道重叠。此选项可能不兼容某些无线硬件导致无法启用!" msgid "Disassociate On Low Acknowledgement" msgstr "弱信号剔除" msgid "Allow AP mode to disconnect STAs based on low ACK condition" -msgstr "允许AP模式基于低ACK条件判断剔除弱信号的客户端" +msgstr "允许 AP 模式基于低 ACK 条件判断剔除弱信号的客户端" diff --git a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua index b015ff7ad4..039d1ae40c 100644 --- a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua +++ b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua @@ -105,6 +105,27 @@ e:depends("type","http") e = t:taboption("other",Value, "host_header_rewrite", translate("Host Header"), translate("The Host header will be rewritten to match the hostname portion of the forwarding address.")) e.default = "dev.yourdomain.com" e:depends("enable_host_header_rewrite",1) +e=t:taboption("other",Flag,"enable_https_plugin",translate("Use Plugin")) +e.default="0" +e:depends("type","https") +e=t:taboption("other",ListValue,"https_plugin",translate("Choose Plugin"),translate("If plugin is defined, local_ip and local_port is useless, plugin will handle connections got from frps.")) +e:value("https2http",translate("https2http")) +e:depends("enable_https_plugin",1) +e=t:taboption("other",Value,"plugin_local_addr",translate("Plugin_Local_Addr")) +e.default="127.0.0.1:80" +e:depends("https_plugin","https2http") +e=t:taboption("other",Value,"plugin_crt_path",translate("plugin_crt_path")) +e.default="./server.crt" +e:depends("https_plugin","https2http") +e=t:taboption("other",Value,"plugin_key_path",translate("plugin_key_path")) +e.default="./server.key" +e:depends("https_plugin","https2http") +e=t:taboption("other",Value,"plugin_host_header_rewrite",translate("plugin_host_header_rewrite")) +e.default="127.0.0.1" +e:depends("https_plugin","https2http") +e=t:taboption("other",Value,"plugin_header_X_From_Where",translate("plugin_header_X-From-Where")) +e.default="frp" +e:depends("https_plugin","https2http") e = t:taboption("base",ListValue, "proxy_protocol_version", translate("Proxy-Protocol Version"), translate("Proxy Protocol to send user's real IP to local services.")) e.default = "disable" e:value("disable",translate("Disable")) diff --git a/package/lean/luci-app-frpc/po/zh-cn/frp.po b/package/lean/luci-app-frpc/po/zh-cn/frp.po index 7bbedc80f3..17f775a70a 100644 --- a/package/lean/luci-app-frpc/po/zh-cn/frp.po +++ b/package/lean/luci-app-frpc/po/zh-cn/frp.po @@ -253,3 +253,18 @@ msgstr "STCP服务器别名" msgid "Please ensure the remark name is unique." msgstr "确保备注名唯一" + +msgid "Plugin_Local_Addr" +msgstr "插件本地地址（格式 IP:Port）" + +msgid "plugin_crt_path" +msgstr "插件证书路径" + +msgid "plugin_key_path" +msgstr "插件私钥路径" + +msgid "plugin_host_header_rewrite" +msgstr "插件 Host Header 重写" + +msgid "plugin_header_X-From-Where" +msgstr "插件X-From-Where请求头" diff --git a/package/lean/luci-app-frpc/root/etc/init.d/frp b/package/lean/luci-app-frpc/root/etc/init.d/frp index cde1c0ebea..7423ec3b92 100755 --- a/package/lean/luci-app-frpc/root/etc/init.d/frp +++ b/package/lean/luci-app-frpc/root/etc/init.d/frp @@ -32,10 +32,11 @@ conf_proxy_add() { local enable type domain_type custom_domains remote_port local_ip local_port enable_http_auth enable_host_header_rewrite host_header_rewrite local subdomain proxy_protocol_version use_encryption use_compression http_user http_pwd remark locations local enable_plugin plugin plugin_http_user plugin_http_passwd plugin_unix_path stcp_role stcp_secretkey stcp_servername - + local enable_https_plugin https_plugin plugin_local_addr plugin_crt_path plugin_key_path plugin_host_header_rewrite plugin_header_X_From_Where + config_get_bool enable "$cfg" enable 1 [ "$enable" -gt 0 ] || return 1 - + config_get type "$cfg" type config_get custom_domains "$cfg" custom_domains config_get subdomain "$cfg" subdomain @@ -55,10 +56,16 @@ conf_proxy_add() { config_get stcp_secretkey "$cfg" stcp_secretkey config_get stcp_servername "$cfg" stcp_servername config_get proxy_protocol_version "$cfg" proxy_protocol_version + config_get https_plugin "$cfg" https_plugin + config_get plugin_local_addr "$cfg" plugin_local_addr + config_get plugin_crt_path "$cfg" plugin_crt_path + config_get plugin_key_path "$cfg" plugin_key_path + config_get plugin_host_header_rewrite "$cfg" plugin_host_header_rewrite + config_get plugin_header_X_From_Where "$cfg" plugin_header_X_From_Where [ -n "$remark" ] && [ -n "$type" ] || return 1 - + echo "" >>$tmpconf echo "[$remark]" >>$tmpconf echo "type=$type" >>$tmpconf @@ -79,7 +86,7 @@ conf_proxy_add() { echo "plugin_http_passwd=$plugin_http_passwd" >>$tmpconf } [ -n "$plugin_unix_path" ] && echo "plugin_unix_path=$plugin_unix_path" >>$tmpconf - + [ -n "$stcp_role" ] && { if [ "$stcp_role" == "visitor" ]; then echo "role=$stcp_role" >>$tmpconf @@ -92,13 +99,22 @@ conf_proxy_add() { fi [ -n "$stcp_secretkey" ] && echo "sk=$stcp_secretkey" >>$tmpconf || return 1 } - + [ -n "$proxy_protocol_version" ] && { if [ "$proxy_protocol_version" != "disable" ]; then echo "proxy_protocol_version=$proxy_protocol_version" >>$tmpconf fi } + [ -n "$https_plugin" ] && echo "plugin=$https_plugin" >>$tmpconf + [ -n "$plugin_local_addr" ] && echo "plugin_local_addr=$plugin_local_addr" >>$tmpconf + [ -n "$plugin_crt_path" -a -n "$plugin_key_path" ] && { + echo "plugin_crt_path=$plugin_crt_path" >>$tmpconf + echo "plugin_key_path=$plugin_key_path" >>$tmpconf + } + [ -n "$plugin_host_header_rewrite" ] && echo "plugin_host_header_rewrite=$plugin_host_header_rewrite" >>$tmpconf + [ -n "$plugin_header_X_From_Where" ] && echo "plugin_header_X_From_Where=$plugin_header_X_From_Where" >>$tmpconf + frp_write_bool use_encryption $cfg 1 frp_write_bool use_compression $cfg 1 @@ -121,15 +137,15 @@ frp_write_bool() { frp_add_cru(){ time=$1 if [ ! -f "/etc/crontabs/root" ] || [ -z "$(cat /etc/crontabs/root | grep frp)" ]; then - sed -i '/frp/d' /etc/crontabs/root >/dev/null 2>&1 - echo "*/$time * * * * /etc/init.d/frp restart" >> /etc/crontabs/root + sed -i '/frp/d' /etc/crontabs/root >/dev/null 2>&1 + echo "*/$time * * * * /etc/init.d/frp restart" >> /etc/crontabs/root fi } frp_del_cru(){ if [ ! -f "/etc/crontabs/root" ] || [ -n "$(cat /etc/crontabs/root | grep frp)" ]; then - sed -i '/frp/d' /etc/crontabs/root >/dev/null 2>&1 + sed -i '/frp/d' /etc/crontabs/root >/dev/null 2>&1 fi } @@ -155,7 +171,7 @@ boot() { start() { config_load "frp" - local enabled server_addr server_port time privilege_token tcp_mux enable_cpool + local enabled server_addr server_port time privilege_token tcp_mux enable_cpool local pool_count log_level log_max_days login_fail_exit http_proxy protocol config_get_bool enabled common enabled 1 @@ -175,10 +191,10 @@ start() { mkdir -p /var/etc/frp [ ! -f "$LOGFILE" ] && touch $LOGFILE - + [ ! -f "/usr/bin/frpc" ] && download_binary [ ! -f "/usr/bin/frpc" ] && logger -t Frp 'Download frpc failed, please retry.' && exit 0 - + local tmpconf="/var/etc/frp/frpc.conf" echo "[common]" >$tmpconf diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 3de6562bff..7b99aac30e 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.5 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index 9389ab2d26..b3de31158c 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -176,6 +176,8 @@ start() fi if [ $FORCE -eq 1 ]; then sed -i '/item.code != 200/ { s/item.code != 200 || item.freeTrialInfo/item.br < 320000/g; }' /usr/share/UnblockNeteaseMusic/src/hook.js + else + sed -i '/item.br < 320000/ { s/item.br < 320000/item.code != 200 || item.freeTrialInfo/g; }' /usr/share/UnblockNeteaseMusic/src/hook.js fi node /usr/share/UnblockNeteaseMusic/app.js -e http://music.163.com -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 & node /usr/share/UnblockNeteaseMusic/app.js -e https://music.163.com -p 5203:5201 $musictype >>/tmp/unblockmusic.log 2>&1 & diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh index 65953b9353..eea7b08ca8 100755 --- a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh +++ b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh @@ -49,7 +49,7 @@ function update_core(){ exit 1 else echo -e "${latest_ver}" > /usr/share/UnblockNeteaseMusic/local_ver - cat /usr/share/UnblockNeteaseMusic/package-lock.json | grep version |awk -F ':' '{print $2}' | cut -c3-8 > /usr/share/UnblockNeteaseMusic/core_ver + cat /usr/share/UnblockNeteaseMusic/package.json | grep version |awk -F ':' '{print $2}' | cut -c3-8 > /usr/share/UnblockNeteaseMusic/core_ver fi echo -e "Succeeded in updating core." >/tmp/unblockmusic_update.log diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index b330e93e79..2e684ec482 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray -PKG_VERSION:=4.23.4 +PKG_VERSION:=4.24.2 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION) PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=726dd98d674bd73150158b1d4c8bc0d59dbb672ba10096ac61548d6278213c78 +PKG_HASH:=b58b4477020034b67a7649341fae65ea7bdc81851cad47ae7e4a591c0663e4c9 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh index eea4220a34..78e8c32136 100755 --- a/package/network/services/ppp/files/ppp.sh +++ b/package/network/services/ppp/files/ppp.sh @@ -233,8 +233,8 @@ proto_pppoe_setup() { #By 蝈蝈：并发拨号同步的前期准备 syncppp_option="" - [ "$(uci get syncdial.config.enabled)" == "1" ] && { - ppp_if_cnt=$(cat /etc/config/network | grep -E -c "proto\s+?'pppoe'") + [ "$(uci get syncdial.config.enabled)" -eq "1" ] && { + ppp_if_cnt=$(uci show network | grep -c "\.proto=\'pppoe\'$") syncppp_option="syncppp $ppp_if_cnt" shellsync $ppp_if_cnt 10 } diff --git a/package/zxlhhyccc/verysync/Makefile b/package/zxlhhyccc/verysync/Makefile index 12eee3ce0e..a0d469b714 100644 --- a/package/zxlhhyccc/verysync/Makefile +++ b/package/zxlhhyccc/verysync/Makefile @@ -19,24 +19,18 @@ ifeq ($(ARCH),i386) PKG_ARCH_VERYSYNC:=386 endif ifeq ($(ARCH),arm) - PKG_ARCH_VERYSYNC:=arm7 -endif -ifeq ($(BOARD),bcm53xx) - PKG_ARCH_VERYSYNC:=arm6 -endif -ifeq ($(BOARD),kirkwood) - PKG_ARCH_VERYSYNC:=arm -endif -ifeq ($(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))),) PKG_ARCH_VERYSYNC:=arm endif ifeq ($(ARCH),aarch64) PKG_ARCH_VERYSYNC:=arm64 endif +ifeq ($(ARCH),powerpc64) + PKG_ARCH_VERYSYNC:=ppc64 +endif PKG_NAME:=verysync -PKG_VERSION:=v1.3.1 -PKG_RELEASE:=4 +PKG_VERSION:=v1.4.3 +PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://releases-cdn.verysync.com/releases/$(PKG_VERSION)/ @@ -48,7 +42,7 @@ define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network TITLE:=A efficient data transmission tool - DEPENDS:=@(aarch64||arm||i386||mips||mipsel||x86_64) + DEPENDS:= URL:=http://www.verysync.com endef