From bae6e7fc28b8645e6f96df80a0b57ae2387cd847 Mon Sep 17 00:00:00 2001 From: hyird <31695447+hyird@users.noreply.github.com> Date: Tue, 9 Jun 2020 16:11:41 +0800 Subject: [PATCH 01/23] luci-app-frpc: add plugin "https2http" (#4754) * Update config.lua * Update frp * Update frp.po --- .../luasrc/model/cbi/frp/config.lua | 21 +++++++++++++++++++ package/lean/luci-app-frpc/po/zh-cn/frp.po | 17 ++++++++++++++- .../lean/luci-app-frpc/root/etc/init.d/frp | 16 ++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) 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 b015ff7ad..039d1ae40 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 13f7f9add..17f775a70 100644 --- a/package/lean/luci-app-frpc/po/zh-cn/frp.po +++ b/package/lean/luci-app-frpc/po/zh-cn/frp.po @@ -252,4 +252,19 @@ msgid "STCP Server Name is Service Remark Name of STCP Server" msgstr "STCP服务器别名" msgid "Please ensure the remark name is unique." -msgstr "确保备注名唯一" \ No newline at end of file +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 cde1c0ebe..53fee3ba3 100755 --- a/package/lean/luci-app-frpc/root/etc/init.d/frp +++ b/package/lean/luci-app-frpc/root/etc/init.d/frp @@ -32,6 +32,7 @@ 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 @@ -55,6 +56,12 @@ 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 @@ -99,6 +106,15 @@ conf_proxy_add() { 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 From e0c345df71ee9555f20235a6eaa35fd70b0ab3eb Mon Sep 17 00:00:00 2001 From: HiGarfield <32226909+HiGarfield@users.noreply.github.com> Date: Tue, 9 Jun 2020 16:14:26 +0800 Subject: [PATCH 02/23] ppp: syncppp: further fix grep's regex match (#4623) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /etc/config/network这个文件里的写法可以各种各样，pppoe外面可以有引号，也可以没引号。proto与pppoe之间可以有不同类型、不同数量的空格（或Tab）。用uci show，可以把输出格式统一掉，省得考虑配置文件不同写法的区别。 --- package/network/services/ppp/files/ppp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh index eea4220a3..78e8c3213 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 } From 23699790539fb8b30b29c2ef5fff8a57af73dade Mon Sep 17 00:00:00 2001 From: ElonH Date: Wed, 10 Jun 2020 13:10:29 +0800 Subject: [PATCH 03/23] RcloneNg: bump version to 0.3.0 (#4757) --- package/lean/rclone-ng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/rclone-ng/Makefile b/package/lean/rclone-ng/Makefile index 49e438485..5e1e09ca2 100644 --- a/package/lean/rclone-ng/Makefile +++ b/package/lean/rclone-ng/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-ng -PKG_VERSION:=0.2.4 +PKG_VERSION:=0.3.0 PKG_RELEASE:=1 @@ -22,7 +22,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 From 4798e5314b8b4a328f9f4b6469af135804d630b4 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 10 Jun 2020 16:01:15 +0800 Subject: [PATCH 04/23] luci-app-unblockmusic: fix update version display --- package/lean/luci-app-unblockmusic/Makefile | 2 +- .../root/usr/share/UnblockNeteaseMusic/update_core.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index b1b84517e..9de04a6ba 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:=2 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ 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 65953b935..eea7b08ca 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 From 4676dd368cb7c970c4ffcbfa01d337d3deac9448 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 10 Jun 2020 16:03:00 +0800 Subject: [PATCH 05/23] luci-app-unblockmusic: allow revert to <320Kbps mp3 --- package/lean/luci-app-unblockmusic/Makefile | 2 +- package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 9de04a6ba..9ef04f6ec 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:=2 +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 9389ab2d2..b3de31158 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 & From e707c9fb1b755cc7d7981a3f33b03978c4341369 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Wed, 10 Jun 2020 23:33:17 +0800 Subject: [PATCH 06/23] verysync: update to 1.4.1 (#4765) --- package/lean/verysync/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/package/lean/verysync/Makefile b/package/lean/verysync/Makefile index 296143fab..5a96495a4 100644 --- a/package/lean/verysync/Makefile +++ b/package/lean/verysync/Makefile @@ -19,21 +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 ($(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:=2 +PKG_VERSION:=v1.4.1 +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)/ From 468b3f56533cbc5af82ce61cd6ecf001c651d78a Mon Sep 17 00:00:00 2001 From: barton0426 Date: Thu, 11 Jun 2020 11:33:36 +0800 Subject: [PATCH 07/23] Update v2ray version to v4.24.2 (#4771) --- package/lean/v2ray/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index ec1b6726f..a54e2fbe1 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:=ad8a042a334586f9456eccdbe074d4c3b4dad9b5a39c6ee390a5e631d1c389ae PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From 8bf7ff91685d181d39d02667eca646cee0e1c41f Mon Sep 17 00:00:00 2001 From: Jun Liu Date: Thu, 11 Jun 2020 17:18:52 +0800 Subject: [PATCH 08/23] V2ray hash fix (#4773) --- package/lean/v2ray/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index a54e2fbe1..89a58cc22 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -15,7 +15,7 @@ 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:=ad8a042a334586f9456eccdbe074d4c3b4dad9b5a39c6ee390a5e631d1c389ae +PKG_HASH:=b58b4477020034b67a7649341fae65ea7bdc81851cad47ae7e4a591c0663e4c9 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From 299da0ae6c1523b0ae7836302bde98b98b31887e Mon Sep 17 00:00:00 2001 From: hyird <31695447+hyird@users.noreply.github.com> Date: Thu, 11 Jun 2020 17:19:12 +0800 Subject: [PATCH 09/23] Update Makefile (#4776) --- package/lean/verysync/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/verysync/Makefile b/package/lean/verysync/Makefile index 5a96495a4..a0d469b71 100644 --- a/package/lean/verysync/Makefile +++ b/package/lean/verysync/Makefile @@ -29,7 +29,7 @@ ifeq ($(ARCH),powerpc64) endif PKG_NAME:=verysync -PKG_VERSION:=v1.4.1 +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 From ad0a71dadc98318a266a9fd4a97aea319f3543bc Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 12 Jun 2020 12:18:15 +0800 Subject: [PATCH 10/23] luci-app-nps: monitor uci configuration changes (#4784) when uci configuration about nps has been changed, service doesn't restart itself --- package/lean/luci-app-nps/root/etc/init.d/nps | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-nps/root/etc/init.d/nps b/package/lean/luci-app-nps/root/etc/init.d/nps index 3ea722b61..877305492 100755 --- a/package/lean/luci-app-nps/root/etc/init.d/nps +++ b/package/lean/luci-app-nps/root/etc/init.d/nps @@ -62,9 +62,7 @@ start_service() { fi } -reload_service() -{ - stop - start +service_triggers() { + procd_add_reload_trigger "nps" } From e7e68c33520e5edc37d5360ee22f34fedae6513a Mon Sep 17 00:00:00 2001 From: ricksuzade-maker <58425544+ricksuzade-maker@users.noreply.github.com> Date: Fri, 12 Jun 2020 12:18:29 +0800 Subject: [PATCH 11/23] Bump wireguard to v1.0.20200611 (#4778) Bump wireguard to the newest version --- 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 ce91fbe9b..c796aa82f 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.20200520 +PKG_VERSION:=1.0.20200611 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:=16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3 +PKG_HASH:=9b0478c3b1f3a7b488916e632e2fcbb1383bb1a2ef294489858ce2ba1da3246d PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 5715e22bbbac051d1ab486a60415d6ef431262b1 Mon Sep 17 00:00:00 2001 From: swxk <61259428+swxk521@users.noreply.github.com> Date: Fri, 12 Jun 2020 12:18:51 +0800 Subject: [PATCH 12/23] Update trojan 1.16.0 (#4772) * Update Makefile * Update Makefile --- package/lean/trojan/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/trojan/Makefile b/package/lean/trojan/Makefile index 432f9246a..fc8f35e57 100644 --- a/package/lean/trojan/Makefile +++ b/package/lean/trojan/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trojan -PKG_VERSION:=1.15.1 +PKG_VERSION:=1.16.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/trojan-gfw/trojan.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=0bad2988c60200c15786baf6b9ea42d66ba2109c +PKG_SOURCE_VERSION:=8606b7110fe79f8ab02d60c897f87ffb0a9b23f0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 From cad7fb2a5a4f5e7538122ced0f02894b69ee671c Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 13 Jun 2020 00:27:53 +0800 Subject: [PATCH 13/23] luci-app-ps3netsrv: add package luci --- package/lean/luci-app-ps3netsrv/Makefile | 18 +++++++++++++ .../luasrc/controller/ps3netsrv.lua | 21 +++++++++++++++ .../luasrc/model/cbi/ps3netsrv.lua | 24 +++++++++++++++++ .../view/ps3netsrv/ps3netsrv_status.htm | 22 ++++++++++++++++ .../luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po | 26 +++++++++++++++++++ .../root/etc/uci-defaults/ps3netsrv | 11 ++++++++ 6 files changed, 122 insertions(+) create mode 100644 package/lean/luci-app-ps3netsrv/Makefile create mode 100644 package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua create mode 100644 package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua create mode 100644 package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm create mode 100644 package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po create mode 100755 package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv diff --git a/package/lean/luci-app-ps3netsrv/Makefile b/package/lean/luci-app-ps3netsrv/Makefile new file mode 100644 index 000000000..89c3dc0fd --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/Makefile @@ -0,0 +1,18 @@ +# +# Copyright (C) 2008-2014 The LuCI Team +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Luci for PS3NETSRV +LUCI_DEPENDS:=+ps3netsrv +LUCI_PKGARCH:=all +PKG_VERSION:=1 +PKG_RELEASE:=2 + +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature + diff --git a/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua new file mode 100644 index 000000000..66dc6307a --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua @@ -0,0 +1,21 @@ +module("luci.controller.ps3netsrv",package.seeall) + +function index() +if not nixio.fs.access("/etc/config/ps3netsrv")then + return +end + +entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false + +local page + +entry({"admin", "nas","ps3netsrv"},cbi("ps3netsrv"),_("PS3 NET Server"),40).dependent=true +entry({"admin", "nas","ps3netsrv","status"},call("act_status")).leaf=true +end + +function act_status() + local e={} + e.running=luci.sys.call("ps | grep ps3netsrv |grep -v grep >/dev/null") == 0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) +end diff --git a/package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua b/package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua new file mode 100644 index 000000000..94db16034 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/luasrc/model/cbi/ps3netsrv.lua @@ -0,0 +1,24 @@ +-- Copyright 2020 Lean +-- Licensed to the public under the Apache License 2.0. + +m = Map("ps3netsrv", translate("PS3 NET Server"), translate("PS3NETSRV is ISO/PKG server for Sony PlayStation 3 webMAN-MOD plugin")) + +m:section(SimpleSection).template = "ps3netsrv/ps3netsrv_status" + +s = m:section(TypedSection, "ps3netsrv") +s.addremove = false +s.anonymous = true + +enable=s:option(Flag, "enabled", translate("Enabled")) +enable.default = "0" +enable.rmempty = false + +db_path=s:option(Value, "dir", translate("Dir Path")) +db_path.default = "/root" +db_path.rmempty = false + +port=s:option(Value, "port", translate("Port")) +port.rmempty = false +port.datatype = "port" + +return m \ No newline at end of file diff --git a/package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm b/package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm new file mode 100644 index 000000000..ebd057020 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/luasrc/view/ps3netsrv/ps3netsrv_status.htm @@ -0,0 +1,22 @@ + + +
+

+ <%:Collecting data...%> +

+
\ No newline at end of file diff --git a/package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po b/package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po new file mode 100644 index 000000000..81c973488 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/po/zh-cn/ps3netsrv.po @@ -0,0 +1,26 @@ +msgid "" +msgstr "" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-06-23 20:16+0800\n" +"PO-Revision-Date: 2015-06-23 20:17+0800\n" +"Last-Translator: coolsnowwolf \n" +"Language-Team: PandoraBox Team\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 1.8.1\n" +"X-Poedit-SourceCharset: UTF-8\n" + +msgid "PS3 NET Server" +msgstr "PS3 NET 服务器" + +msgid "PS3NETSRV is ISO/PKG server for Sony PlayStation 3 webMAN-MOD plugin" +msgstr "PS3NETSRV 是一个 Sony PlayStation 3 自制系统 webMAN-MOD 插件的服务器端（用于加载蓝光/游戏ISO/PKG）" + +msgid "Dir Path" +msgstr "目录路径" + +msgid "Port" +msgstr "端口" diff --git a/package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv b/package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv new file mode 100755 index 000000000..40b8f9fa0 --- /dev/null +++ b/package/lean/luci-app-ps3netsrv/root/etc/uci-defaults/ps3netsrv @@ -0,0 +1,11 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@ps3netsrv[-1] + add ucitrack ps3netsrv + set ucitrack.@ps3netsrv[-1].init=ps3netsrv + commit ucitrack +EOF + +rm -f /tmp/luci-indexcache +exit 0 From 4db833bfbe332f333cc7a7109acea1d0484aad01 Mon Sep 17 00:00:00 2001 From: ElonH Date: Sun, 14 Jun 2020 18:25:00 +0800 Subject: [PATCH 14/23] RcloneNg: bump version to 0.3.2 (#4810) * RcloneNg: bump version to 0.3.1 Changelog [0.3.1](https://github.com/ElonH/RcloneNg/compare/v0.3.0...v0.3.1) (2020-06-13) Features * **about:** show changelog ([9d7bea5](https://github.com/ElonH/RcloneNg/commit/9d7bea5f62a04560601ef37c371bcef8f1834182)) * **breadcurmb:** edit mode, double click to edit path. double again, back to normal ([60c57b4](https://github.com/ElonH/RcloneNg/commit/60c57b4368bea4b9cd9be39524e59a32a90014ff)) * **file.detail:** enable download file ([1f578f7](https://github.com/ElonH/RcloneNg/commit/1f578f7d54ca772eec85a5eab744d7e7de91a1ce)) * **file.detail:** show spaces usage in file detail if selected is directory ([ff27df9](https://github.com/ElonH/RcloneNg/commit/ff27df91615c515b56f44fde5a7aa9de0462dd04)) * **list-view:** expend click area of checkbox to improving user experience ([988a219](https://github.com/ElonH/RcloneNg/commit/988a219dbb874e722b7f65bc6b1f8a17be3b58a1)) * **manager:** push a message to toastr before creating directory ([9e1091a](https://github.com/ElonH/RcloneNg/commit/9e1091a1f1a2e84d97416d2213b80b83dd8b43d1)) * **pages:** add star button ([5c23b9b](https://github.com/ElonH/RcloneNg/commit/5c23b9bfe3bfb0e4891f0674450ad8af39281797)) * **server-setting:** adding more description in schema ([4eee2f5](https://github.com/ElonH/RcloneNg/commit/4eee2f55d9ca2ff246114027a4041533d26b4993)) * **server-setting:** provide a powerful schema for server setting ([67223bf](https://github.com/ElonH/RcloneNg/commit/67223bf7e4a26b80893f6a16dc7afcb7216ed5bf)) Bug Fixes * check if "rc.Serve" is enabled in server options before downloading file ([6a484ca](https://github.com/ElonH/RcloneNg/commit/6a484ca3a7d2e727a17db5cb20f5ea90cee10576)) * remove debug code ([b5cb23c](https://github.com/ElonH/RcloneNg/commit/b5cb23c9db1dabbcd61217e1cda575f703c6b471)) * **breadcurmb:** set cursor as poniter in breadcurmb item ([f014edc](https://github.com/ElonH/RcloneNg/commit/f014edc11e9b7c31c81f6d23c59f76b3a0f10d16)) * **changelog.md:** copy RcloneNg CHANGELOG.md only ([ef76e1e](https://github.com/ElonH/RcloneNg/commit/ef76e1e5892cd805128101b9cc389d62d454007e)) * **list-view:** disable double click in manipulations column ([0e0d825](https://github.com/ElonH/RcloneNg/commit/0e0d825f57ecd90307d2da02b2441d541bb56042)) * **list-view:** disable double click surrounding area of checkbox ([bf03dd1](https://github.com/ElonH/RcloneNg/commit/bf03dd173ffd1ba00c4b07cd2966956e3f769bac)) * **list-view:** disable select types icon ([2ea540e](https://github.com/ElonH/RcloneNg/commit/2ea540ec15901d103a47a92c1f1742da92e03dd8)) * **manager:** show detail button when right sidebar is expended ([d69179e](https://github.com/ElonH/RcloneNg/commit/d69179e36e2d76fac6e6462a685636b1acf1f377)) * RcloneNg: bump version to 0.3.2 Changelog [0.3.2](https://github.com/ElonH/RcloneNg/compare/v0.3.1...v0.3.2) (2020-06-14) Features * **jobs-manager:** add animation on refresh button ([b7cc817](https://github.com/ElonH/RcloneNg/commit/b7cc817b2302b63415deb74617027078f862d05e)) Bug Fixes * **list-view:** table index except first page ([b9d7fcf](https://github.com/ElonH/RcloneNg/commit/b9d7fcfb1ce884c5d7625e13c9a89835f68ffab8)) --- package/lean/rclone-ng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/rclone-ng/Makefile b/package/lean/rclone-ng/Makefile index 5e1e09ca2..a5e9468ff 100644 --- a/package/lean/rclone-ng/Makefile +++ b/package/lean/rclone-ng/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-ng -PKG_VERSION:=0.3.0 +PKG_VERSION:=0.3.2 PKG_RELEASE:=1 @@ -22,7 +22,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:=b6f7254fcb82d380ad621859a216fbf510059c95ad2df0e27bcf2872892f7c6f +PKG_HASH:=441fdfa577bdda7f58f62f6e75174a4a48e44d7c1361f7123d9699d791c08b5a define Package/$(PKG_NAME) SECTION:=net From 55c5c30b485eeb635c09aa8f3fccf5d74c162925 Mon Sep 17 00:00:00 2001 From: ElonH Date: Sun, 14 Jun 2020 18:25:17 +0800 Subject: [PATCH 15/23] rclone: Bump version to 1.52.1 (#4805) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog v1.52.1 - 2020-06-10 [See commits](https://github.com/rclone/rclone/compare/v1.52.0...v1.52.1) * Bug Fixes * lib/file: Fix SetSparse on Windows 7 which fixes downloads of files > 250MB (Nick Craig-Wood) * build * Update go.mod to go1.14 to enable -mod=vendor build (Nick Craig-Wood) * Remove quicktest from Dockerfile (Nick Craig-Wood) * Build Docker images with GitHub actions (Matteo Pietro Dazzi) * Update Docker build workflows (Nick Craig-Wood) * Set user_allow_other in /etc/fuse.conf in the Docker image (Nick Craig-Wood) * Fix xgo build after go1.14 go.mod update (Nick Craig-Wood) * docs * Add link to source and modified time to footer of every page (Nick Craig-Wood) * Remove manually set dates and use git dates instead (Nick Craig-Wood) * Minor tense, punctuation, brevity and positivity changes for the home page (edwardxml) * Remove leading slash in page reference in footer when present (Nick Craig-Wood) * Note commands which need obscured input in the docs (Nick Craig-Wood) * obscure: Write more help as we are referencing it elsewhere (Nick Craig-Wood) * VFS * Fix OS vs Unix path confusion - fixes ChangeNotify on Windows (Nick Craig-Wood) * Drive * Fix missing items when listing using --fast-list / ListR (Nick Craig-Wood) * Putio * Fix panic on Object.Open (Cenk Alti) * S3 * Fix upload of single files into buckets without create permission (Nick Craig-Wood) * Fix --header-upload (Nick Craig-Wood) * Tardigrade * Fix listing bug by upgrading to v1.0.7 * Set UserAgent to rclone (Caleb Case) v1.52.0 - 2020-05-27 Special thanks to Martin Michlmayr for proof reading and correcting all the docs and Edward Barker for helping re-write the front page. [See commits](https://github.com/rclone/rclone/compare/v1.51.0...v1.52.0) * New backends * [Tardigrade](/tardigrade/) backend for use with storj.io (Caleb Case) * [Union](/union/) re-write to have multiple writable remotes (Max Sum) * [Seafile](/seafile) for Seafile server (Fred @creativeprojects) * New commands * backend: command for backend specific commands (see backends) (Nick Craig-Wood) * cachestats: Deprecate in favour of `rclone backend stats cache:` (Nick Craig-Wood) * dbhashsum: Deprecate in favour of `rclone hashsum DropboxHash` (Nick Craig-Wood) * New Features * Add `--header-download` and `--header-upload` flags for setting HTTP headers when uploading/downloading (Tim Gallant) * Add `--header` flag to add HTTP headers to every HTTP transaction (Nick Craig-Wood) * Add `--check-first` to do all checking before starting transfers (Nick Craig-Wood) * Add `--track-renames-strategy` for configurable matching criteria for `--track-renames` (Bernd Schoolmann) * Add `--cutoff-mode` hard,soft,catious (Shing Kit Chan & Franklyn Tackitt) * Filter flags (eg `--files-from -`) can read from stdin (fishbullet) * Add `--error-on-no-transfer` option (Jon Fautley) * Implement `--order-by xxx,mixed` for copying some small and some big files (Nick Craig-Wood) * Allow `--max-backlog` to be negative meaning as large as possible (Nick Craig-Wood) * Added `--no-unicode-normalization` flag to allow Unicode filenames to remain unique (Ben Zenker) * Allow `--min-age`/`--max-age` to take a date as well as a duration (Nick Craig-Wood) * Add rename statistics for file and directory renames (Nick Craig-Wood) * Add statistics output to JSON log (reddi) * Make stats be printed on non-zero exit code (Nick Craig-Wood) * When running `--password-command` allow use of stdin (Sébastien Gross) * Stop empty strings being a valid remote path (Nick Craig-Wood) * accounting: support WriterTo for less memory copying (Nick Craig-Wood) * build * Update to use go1.14 for the build (Nick Craig-Wood) * Add `-trimpath` to release build for reproduceable builds (Nick Craig-Wood) * Remove GOOS and GOARCH from Dockerfile (Brandon Philips) * config * Fsync the config file after writing to save more reliably (Nick Craig-Wood) * Add `--obscure` and `--no-obscure` flags to `config create`/`update` (Nick Craig-Wood) * Make `config show` take `remote:` as well as `remote` (Nick Craig-Wood) * copyurl: Add `--no-clobber` flag (Denis) * delete: Added `--rmdirs` flag to delete directories as well (Kush) * filter: Added `--files-from-raw` flag (Ankur Gupta) * genautocomplete: Add support for fish shell (Matan Rosenberg) * log: Add support for syslog LOCAL facilities (Patryk Jakuszew) * lsjson: Add `--hash-type` parameter and use it in lsf to speed up hashing (Nick Craig-Wood) * rc * Add `-o`/`--opt` and `-a`/`--arg` for more structured input (Nick Craig-Wood) * Implement `backend/command` for running backend specific commands remotely (Nick Craig-Wood) * Add `mount/mount` command for starting `rclone mount` via the API (Chaitanya) * rcd: Add Prometheus metrics support (Gary Kim) * serve http * Added a `--template` flag for user defined markup (calistri) * Add Last-Modified headers to files and directories (Nick Craig-Wood) * serve sftp: Add support for multiple host keys by repeating `--key` flag (Maxime Suret) * touch: Add `--localtime` flag to make `--timestamp` localtime not UTC (Nick Craig-Wood) * Bug Fixes * accounting * Restore "Max number of stats groups reached" log line (Michał Matczuk) * Correct exitcode on Transfer Limit Exceeded flag. (Anuar Serdaliyev) * Reset bytes read during copy retry (Ankur Gupta) * Fix race clearing stats (Nick Craig-Wood) * copy: Only create empty directories when they don't exist on the remote (Ishuah Kariuki) * dedupe: Stop dedupe deleting files with identical IDs (Nick Craig-Wood) * oauth * Use custom http client so that `--no-check-certificate` is honored by oauth token fetch (Mark Spieth) * Replace deprecated oauth2.NoContext (Lars Lehtonen) * operations * Fix setting the timestamp on Windows for multithread copy (Nick Craig-Wood) * Make rcat obey `--ignore-checksum` (Nick Craig-Wood) * Make `--max-transfer` more accurate (Nick Craig-Wood) * rc * Fix dropped error (Lars Lehtonen) * Fix misplaced http server config (Xiaoxing Ye) * Disable duplicate log (ElonH) * serve dlna * Cds: don't specify childCount at all when unknown (Dan Walters) * Cds: use modification time as date in dlna metadata (Dan Walters) * serve restic: Fix tests after restic project removed vendoring (Nick Craig-Wood) * sync * Fix incorrect "nothing to transfer" message using `--delete-before` (Nick Craig-Wood) * Only create empty directories when they don't exist on the remote (Ishuah Kariuki) * Mount * Add `--async-read` flag to disable asynchronous reads (Nick Craig-Wood) * Ignore `--allow-root` flag with a warning as it has been removed upstream (Nick Craig-Wood) * Warn if `--allow-non-empty` used on Windows and clarify docs (Nick Craig-Wood) * Constrain to go1.13 or above otherwise bazil.org/fuse fails to compile (Nick Craig-Wood) * Fix fail because of too long volume name (evileye) * Report 1PB free for unknown disk sizes (Nick Craig-Wood) * Map more rclone errors into file systems errors (Nick Craig-Wood) * Fix disappearing cwd problem (Nick Craig-Wood) * Use ReaddirPlus on Windows to improve directory listing performance (Nick Craig-Wood) * Send a hint as to whether the filesystem is case insensitive or not (Nick Craig-Wood) * Add rc command `mount/types` (Nick Craig-Wood) * Change maximum leaf name length to 1024 bytes (Nick Craig-Wood) * VFS * Add `--vfs-read-wait` and `--vfs-write-wait` flags to control time waiting for a sequential read/write (Nick Craig-Wood) * Change default `--vfs-read-wait` to 20ms (it was 5ms and not configurable) (Nick Craig-Wood) * Make `df` output more consistent on a rclone mount. (Yves G) * Report 1PB free for unknown disk sizes (Nick Craig-Wood) * Fix race condition caused by unlocked reading of Dir.path (Nick Craig-Wood) * Make File lock and Dir lock not overlap to avoid deadlock (Nick Craig-Wood) * Implement lock ordering between File and Dir to eliminate deadlocks (Nick Craig-Wood) * Factor the vfs cache into its own package (Nick Craig-Wood) * Pin the Fs in use in the Fs cache (Nick Craig-Wood) * Add SetSys() methods to Node to allow caching stuff on a node (Nick Craig-Wood) * Ignore file not found errors from Hash in Read.Release (Nick Craig-Wood) * Fix hang in read wait code (Nick Craig-Wood) * Local * Speed up multi thread downloads by using sparse files on Windows (Nick Craig-Wood) * Implement `--local-no-sparse` flag for disabling sparse files (Nick Craig-Wood) * Implement `rclone backend noop` for testing purposes (Nick Craig-Wood) * Fix "file not found" errors on post transfer Hash calculation (Nick Craig-Wood) * Cache * Implement `rclone backend stats` command (Nick Craig-Wood) * Fix Server Side Copy with Temp Upload (Brandon McNama) * Remove Unused Functions (Lars Lehtonen) * Disable race tests until bbolt is fixed (Nick Craig-Wood) * Move methods used for testing into test file (greatroar) * Add Pin and Unpin and canonicalised lookup (Nick Craig-Wood) * Use proper import path go.etcd.io/bbolt (Robert-André Mauchin) * Crypt * Calculate hashes for uploads from local disk (Nick Craig-Wood) * This allows crypted Jottacloud uploads without using local disk * This means crypted s3/b2 uploads will now have hashes * Added `rclone backend decode`/`encode` commands to replicate functionality of `cryptdecode` (Anagh Kumar Baranwal) * Get rid of the unused Cipher interface as it obfuscated the code (Nick Craig-Wood) * Azure Blob * Implement streaming of unknown sized files so `rcat` is now supported (Nick Craig-Wood) * Implement memory pooling to control memory use (Nick Craig-Wood) * Add `--azureblob-disable-checksum` flag (Nick Craig-Wood) * Retry `InvalidBlobOrBlock` error as it may indicate block concurrency problems (Nick Craig-Wood) * Remove unused `Object.parseTimeString()` (Lars Lehtonen) * Fix permission error on SAS URL limited to container (Nick Craig-Wood) * B2 * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Ignore directory markers at the root also (Nick Craig-Wood) * Force the case of the SHA1 to lowercase (Nick Craig-Wood) * Remove unused `largeUpload.clearUploadURL()` (Lars Lehtonen) * Box * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Implement About to read size used (Nick Craig-Wood) * Add token renew function for jwt auth (David Bramwell) * Added support for interchangeable root folder for Box backend (Sunil Patra) * Remove unnecessary iat from jws claims (David) * Drive * Follow shortcuts by default, skip with `--drive-skip-shortcuts` (Nick Craig-Wood) * Implement `rclone backend shortcut` command for creating shortcuts (Nick Craig-Wood) * Added `rclone backend` command to change `service_account_file` and `chunk_size` (Anagh Kumar Baranwal) * Fix missing files when using `--fast-list` and `--drive-shared-with-me` (Nick Craig-Wood) * Fix duplicate items when using `--drive-shared-with-me` (Nick Craig-Wood) * Extend `--drive-stop-on-upload-limit` to respond to `teamDriveFileLimitExceeded`. (harry) * Don't delete files with multiple parents to avoid data loss (Nick Craig-Wood) * Server side copy docs use default description if empty (Nick Craig-Wood) * Dropbox * Make error insufficient space to be fatal (harry) * Add info about required redirect url (Elan Ruusamäe) * Fichier * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Implement custom pacer to deal with the new rate limiting (buengese) * FTP * Fix lockup when using concurrency limit on failed connections (Nick Craig-Wood) * Fix lockup on failed upload when using concurrency limit (Nick Craig-Wood) * Fix lockup on Close failures when using concurrency limit (Nick Craig-Wood) * Work around pureftp sending spurious 150 messages (Nick Craig-Wood) * Google Cloud Storage * Add support for `--header-upload` and `--header-download` (Nick Craig-Wood) * Add `ARCHIVE` storage class to help (Adam Stroud) * Ignore directory markers at the root (Nick Craig-Wood) * Googlephotos * Make the start year configurable (Daven) * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Create feature/favorites directory (Brandon Philips) * Fix "concurrent map write" error (Nick Craig-Wood) * Don't put an image in error message (Nick Craig-Wood) * HTTP * Improved directory listing with new template from Caddy project (calisro) * Jottacloud * Implement `--jottacloud-trashed-only` (buengese) * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Use `RawURLEncoding` when decoding base64 encoded login token (buengese) * Implement cleanup (buengese) * Update docs regarding cleanup, removed remains from old auth, and added warning about special mountpoints. (albertony) * Mailru * Describe 2FA requirements (valery1707) * Onedrive * Implement `--onedrive-server-side-across-configs` (Nick Craig-Wood) * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Fix occasional 416 errors on multipart uploads (Nick Craig-Wood) * Added maximum chunk size limit warning in the docs (Harry) * Fix missing drive on config (Nick Craig-Wood) * Make error `quotaLimitReached` to be fatal (harry) * Opendrive * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Pcloud * Added support for interchangeable root folder for pCloud backend (Sunil Patra) * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Fix initial config "Auth state doesn't match" message (Nick Craig-Wood) * Premiumizeme * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Prune unused functions (Lars Lehtonen) * Putio * Add support for `--header-upload` and `--header-download` (Nick Craig-Wood) * Make downloading files use the rclone http Client (Nick Craig-Wood) * Fix parsing of remotes with leading and trailing / (Nick Craig-Wood) * Qingstor * Make `rclone cleanup` remove pending multipart uploads older than 24h (Nick Craig-Wood) * Try harder to cancel failed multipart uploads (Nick Craig-Wood) * Prune `multiUploader.list()` (Lars Lehtonen) * Lint fix (Lars Lehtonen) * S3 * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Use memory pool for buffer allocations (Maciej Zimnoch) * Add SSE-C support for AWS, Ceph, and MinIO (Jack Anderson) * Fail fast multipart upload (Michał Matczuk) * Report errors on bucket creation (mkdir) correctly (Nick Craig-Wood) * Specify that Minio supports URL encoding in listings (Nick Craig-Wood) * Added 500 as retryErrorCode (Michał Matczuk) * Use `--low-level-retries` as the number of SDK retries (Aleksandar Janković) * Fix multipart abort context (Aleksandar Jankovic) * Replace deprecated `session.New()` with `session.NewSession()` (Lars Lehtonen) * Use the provided size parameter when allocating a new memory pool (Joachim Brandon LeBlanc) * Use rclone's low level retries instead of AWS SDK to fix listing retries (Nick Craig-Wood) * Ignore directory markers at the root also (Nick Craig-Wood) * Use single memory pool (Michał Matczuk) * Do not resize buf on put to memBuf (Michał Matczuk) * Improve docs for `--s3-disable-checksum` (Nick Craig-Wood) * Don't leak memory or tokens in edge cases for multipart upload (Nick Craig-Wood) * Seafile * Implement 2FA (Fred) * SFTP * Added `--sftp-pem-key` to support inline key files (calisro) * Fix post transfer copies failing with 0 size when using `set_modtime=false` (Nick Craig-Wood) * Sharefile * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Sugarsync * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Swift * Add support for `--header-upload` and `--header-download` (Nick Craig-Wood) * Fix cosmetic issue in error message (Martin Michlmayr) * Union * Implement multiple writable remotes (Max Sum) * Fix server-side copy (Max Sum) * Implement ListR (Max Sum) * Enable ListR when upstreams contain local (Max Sum) * WebDAV * Add support for `--header-upload` and `--header-download` (Tim Gallant) * Fix `X-OC-Mtime` header for Transip compatibility (Nick Craig-Wood) * Report full and consistent usage with `about` (Yves G) * Yandex * Add support for `--header-upload` and `--header-download` (Tim Gallant) --- package/lean/rclone/Makefile | 8 ++-- ...ccess-Control-Allow-Origin-only-once.patch | 44 ------------------- 2 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch diff --git a/package/lean/rclone/Makefile b/package/lean/rclone/Makefile index 747a8f1b7..ab7e30b84 100644 --- a/package/lean/rclone/Makefile +++ b/package/lean/rclone/Makefile @@ -10,16 +10,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone -PKG_VERSION:=1.51.0 +PKG_VERSION:=1.52.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/rclone/rclone.git -PKG_SOURCE_DATE:=2020-02-01 -PKG_SOURCE_VERSION:=43daecd89b21292b112051340317927b42ccbdd3 +PKG_SOURCE_DATE:=2020-06-10 +PKG_SOURCE_VERSION:=31dc78905ea8dfb22c43724527b19e097e05c26a PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=aca159c81971a9490a6a6c323b67879dccba3860955b66787d91590f4ba8ba29 +PKG_MIRROR_HASH:=fa79f62babc2f42691c9ad83ef906e90061d4ca6adcc97150c2906605312db66 PKG_LICENSE:=GPLv3 PKG_MAINTAINER:=ElonH diff --git a/package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch b/package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch deleted file mode 100644 index 5317aa56f..000000000 --- a/package/lean/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch +++ /dev/null @@ -1,44 +0,0 @@ -## -# File: /patches/020-Notice-Access-Control-Allow-Origin-only-once.patch -# Project: rclone -# File Created: Sunday, 3rd May 2020 1:44:22 pm -# Author: ElonH[EH](elonhhuang@gmail.com) -# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) -# Copyright (C) 2020 [ElonH] -## -diff --git a/fs/rc/rcserver/rcserver.go b/fs/rc/rcserver/rcserver.go -index 4a2b5c71e..f00994e93 100644 ---- a/fs/rc/rcserver/rcserver.go -+++ b/fs/rc/rcserver/rcserver.go -@@ -14,6 +14,7 @@ import ( - "regexp" - "sort" - "strings" -+ "sync" - - "github.com/pkg/errors" - "github.com/rclone/rclone/cmd/serve/httplib" -@@ -29,6 +30,8 @@ import ( - "github.com/skratchdot/open-golang/open" - ) - -+var onlyOnce sync.Once -+ - // Start the remote control server if configured - // - // If the server wasn't configured the *Server returned may be nil -@@ -172,9 +175,11 @@ func (s *Server) handler(w http.ResponseWriter, r *http.Request) { - - allowOrigin := rcflags.Opt.AccessControlAllowOrigin - if allowOrigin != "" { -- if allowOrigin == "*" { -- fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.") -- } -+ onlyOnce.Do(func() { -+ if allowOrigin == "*" { -+ fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.") -+ } -+ }) - w.Header().Add("Access-Control-Allow-Origin", allowOrigin) - } else { - w.Header().Add("Access-Control-Allow-Origin", s.URL()) From f4e6ac28a7d10bf592e41c72aadfddb71e1ba11e Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 14 Jun 2020 18:25:50 +0800 Subject: [PATCH 16/23] verysync: add auto select latest version support (#4790) --- package/lean/verysync/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/lean/verysync/Makefile b/package/lean/verysync/Makefile index a0d469b71..35e22eca2 100644 --- a/package/lean/verysync/Makefile +++ b/package/lean/verysync/Makefile @@ -28,8 +28,16 @@ ifeq ($(ARCH),powerpc64) PKG_ARCH_VERYSYNC:=ppc64 endif +LATEST_VERSION:=$(shell curl http://www.verysync.com/shell/latest) + PKG_NAME:=verysync -PKG_VERSION:=v1.4.3 + +ifneq ($(LATEST_VERSION),) + PKG_VERSION:=$(LATEST_VERSION) +else + PKG_VERSION:=v1.4.3 +endif + PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz From 70a9891f4a5dc28d47c2a8161ec8d8f9ffa3b26b Mon Sep 17 00:00:00 2001 From: Lienol Date: Sun, 14 Jun 2020 18:26:17 +0800 Subject: [PATCH 17/23] luci-app-kodexplorer: update api new version (#4788) --- package/lean/luci-app-kodexplorer/Makefile | 6 +- .../luasrc/controller/kodexplorer.lua | 20 +- .../luasrc/model/cbi/kodexplorer/api.lua | 79 ++--- .../luasrc/view/kodexplorer/download.htm | 278 +++++++++--------- .../luasrc/view/kodexplorer/status.htm | 15 +- .../luasrc/view/kodexplorer/version.htm | 8 +- .../etc/uci-defaults/luci-app-kodexplorer | 2 +- .../rpcd/acl.d/luci-app-kodexplorer.json | 11 + 8 files changed, 198 insertions(+), 221 deletions(-) create mode 100644 package/lean/luci-app-kodexplorer/root/usr/share/rpcd/acl.d/luci-app-kodexplorer.json diff --git a/package/lean/luci-app-kodexplorer/Makefile b/package/lean/luci-app-kodexplorer/Makefile index 532719285..91245e646 100644 --- a/package/lean/luci-app-kodexplorer/Makefile +++ b/package/lean/luci-app-kodexplorer/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for KodExplorer -LUCI_DEPENDS:=+nginx +zoneinfo-asia +php7 +php7-fpm +php7-mod-curl +php7-mod-gd +php7-mod-iconv +php7-mod-json +php7-mod-mbstring +php7-mod-opcache +php7-mod-session +php7-mod-zip +LUCI_DEPENDS:=+nginx +zoneinfo-asia +php7 +php7-fpm +php7-mod-curl +php7-mod-gd +php7-mod-iconv +php7-mod-json +php7-mod-mbstring +php7-mod-opcache +php7-mod-session +php7-mod-zip +php7-mod-sqlite3 +php7-mod-pdo +php7-mod-pdo-sqlite +php7-mod-pdo-mysql LUCI_PKGARCH:=all -PKG_VERSION:=1.1 -PKG_RELEASE:=20200210 +PKG_VERSION:=13 +PKG_DATE:=20200612 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua index 08ec22fba..b8b2347c8 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua @@ -8,15 +8,11 @@ function index() if not nixio.fs.access("/etc/config/kodexplorer") then return end entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false - entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), - _("KodExplorer"), 3).dependent = true + entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), _("KodExplorer"), 3).dependent = true - entry({"admin", "nas", "kodexplorer", "check"}, call("action_check")).leaf = - true - entry({"admin", "nas", "kodexplorer", "download"}, call("action_download")).leaf = - true - entry({"admin", "nas", "kodexplorer", "status"}, call("act_status")).leaf = - true + entry({"admin", "nas", "kodexplorer", "check"}, call("action_check")).leaf = true + entry({"admin", "nas", "kodexplorer", "download"}, call("action_download")).leaf = true + entry({"admin", "nas", "kodexplorer", "status"}, call("act_status")).leaf = true end local function http_write_json(content) @@ -26,12 +22,8 @@ end function act_status() local e = {} - e.nginx_status = luci.sys.call( - "ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == - 0 - e.php_status = luci.sys.call( - "ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == - 0 + e.nginx_status = luci.sys.call("ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == 0 + e.php_status = luci.sys.call("ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == 0 http_write_json(e) end diff --git a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua index ac00a4cc6..949dd094f 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua @@ -7,26 +7,12 @@ local i18n = require "luci.i18n" module("luci.model.cbi.kodexplorer.api", package.seeall) local appname = "kodexplorer" -local api_url = - "https://api.github.com/repos/kalcaddle/KodExplorer/releases/latest" -local download_url = "https://github.com/kalcaddle/KodExplorer/archive/" +local api_url = "https://api.kodcloud.com/?app/version" local wget = "/usr/bin/wget" -local wget_args = { - "--no-check-certificate", "--quiet", "--timeout=10", "--tries=2" -} +local wget_args = { "--no-check-certificate", "--quiet", "--timeout=10", "--tries=2" } local command_timeout = 300 -function uci_get_type(type, config, default) - value = uci:get(appname, "@" .. type .. "[0]", config) or sys.exec( - "echo -n `uci -q get " .. appname .. ".@" .. type .. "[0]." .. - config .. "`") - if (value == nil or value == "") and (default and default ~= "") then - value = default - end - return value -end - local function _unpack(t, i) i = i or 1 if t[i] ~= nil then return t[i], _unpack(t, i + 1) end @@ -77,6 +63,15 @@ local function exec(cmd, args, writer, timeout) end end +function get_project_directory() + return uci:get(appname, "@global[0]", "project_directory") or "/tmp/kodcloud" +end + +function get_version() + local version = get_project_directory() .. "/config/version.php" + return sys.exec(string.format("echo -n $(cat %s 2>/dev/null | grep \"'KOD_VERSION'\" | cut -d \"'\" -f 4)", version)) +end + local function compare_versions(ver1, comp, ver2) local table = table @@ -108,42 +103,16 @@ local function get_api_json(url) -- function(chunk) output[#output + 1] = chunk end) -- local json_content = util.trim(table.concat(output)) - local json_content = luci.sys.exec("wget-ssl -q --no-check-certificate -O- " .. url) + local json_content = sys.exec(wget .. " --no-check-certificate --timeout=10 -t 1 -O- " .. url) if json_content == "" then return {} end return jsonc.parse(json_content) or {} end -function get_project_directory() - return uci_get_type("global", "project_directory", "/tmp/kodexplorer") -end - function to_check() local json = get_api_json(api_url) - if json.tag_name == nil then - return { - code = 1, - error = i18n.translate("Get remote version info failed.") - } - end - local remote_version = json.tag_name - local html_url = json.html_url - download_url = download_url .. json.tag_name .. ".tar.gz" - if not download_url then - return { - code = 1, - version = remote_version, - html_url = html_url, - error = i18n.translate( - "New version found, but failed to get new version download url.") - } - end - return { - code = 0, - version = remote_version, - url = {html = html_url, download = download_url} - } + return json end function to_download(url) @@ -151,13 +120,11 @@ function to_download(url) return {code = 1, error = i18n.translate("Download url is required.")} end - sys.call("/bin/rm -f /tmp/kodexplorer_download.*") + sys.call("/bin/rm -f /tmp/kodcloud_download.*") - local tmp_file = util.trim(util.exec( - "mktemp -u -t kodexplorer_download.XXXXXX")) + local tmp_file = util.trim(util.exec("mktemp -u -t kodcloud_download.XXXXXX")) - local result = exec(wget, {"-O", tmp_file, url, _unpack(wget_args)}, nil, - command_timeout) == 0 + local result = exec(wget, {"-O", tmp_file, url, _unpack(wget_args)}, nil, command_timeout) == 0 if not result then exec("/bin/rm", {"-f", tmp_file}) @@ -175,13 +142,11 @@ function to_extract(file) return {code = 1, error = i18n.translate("File path required.")} end - sys.call("/bin/rm -rf /tmp/kodexplorer_extract.*") - local tmp_dir = util.trim(util.exec( - "mktemp -d -t kodexplorer_extract.XXXXXX")) + sys.call("/bin/rm -rf /tmp/kodcloud_extract.*") + local tmp_dir = util.trim(util.exec("mktemp -d -t kodcloud_extract.XXXXXX")) local output = {} - exec("/bin/tar", {"-C", tmp_dir, "-zxvf", file}, - function(chunk) output[#output + 1] = chunk end) + exec("/usr/bin/unzip", {"-o", file, "-d", tmp_dir}, function(chunk) output[#output + 1] = chunk end) local files = util.split(table.concat(output)) @@ -192,14 +157,14 @@ end function to_move(file) if not file or file == "" or not fs.access(file) then - sys.call("/bin/rm -rf /tmp/kodexplorer_extract.*") + sys.call("/bin/rm -rf /tmp/kodcloud_extract.*") return {code = 1, error = i18n.translate("Client file is required.")} end local client_file = get_project_directory() sys.call("mkdir -p " .. client_file) - sys.call("cp -R " .. file .. "/KodExplorer*/* " .. client_file) - sys.call("/bin/rm -rf /tmp/kodexplorer_extract.*") + sys.call("cp -R " .. file .. "/* " .. client_file) + sys.call("/bin/rm -rf /tmp/kodcloud_extract.*") return {code = 0} end diff --git a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm index fa271d6a6..21e522836 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm +++ b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/download.htm @@ -1,161 +1,163 @@ -<% -local dsp = require "luci.dispatcher" --%> + + // Move file to target dir + doAjaxGet(UpdateUrl, { + token: tokenStr, + task: 'move', + file: json.file + }, function (json) { + removePageNotice(); + if (json.code) { + onRequestError(btn, json.error); + } else { + onUpdateSuccess(btn); + } + }) + } + }) + } + }) + } + //]]> + <%+cbi/valueheader%> <% if self:cfgvalue(section) ~= false then %> diff --git a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm index 8b0a84b12..61ab40ff6 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm +++ b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/status.htm @@ -22,10 +22,17 @@ local dsp = require "luci.dispatcher" XHR.poll(3,'<%=dsp.build_url("admin/nas/kodexplorer/status")%>', null, function(x, json) { if (x && x.status == 200) { - if (nginx_status) - nginx_status.innerHTML = json.nginx_status ? '<%:RUNNING%> ✓' : '<%:NOT RUNNING%> X'; - if (php_status) + if (nginx_status) { + nginx_status.innerHTML = json.nginx_status ? '<%:RUNNING%> ✓' : '<%:NOT RUNNING%> X'; + } + if (php_status) { php_status.innerHTML = json.php_status ? '<%:RUNNING%> ✓' : '<%:NOT RUNNING%> X'; + } } - }); + } + ); + function openwebui(){ + var url = window.location.host+":<%=luci.sys.exec("uci -q get kodexplorer.@global[0].port"):gsub("^%s*(.-)%s*$", "%1")%>"; + window.open('http://'+url,'target',''); + } //]]> \ No newline at end of file diff --git a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm index 1a9c6d61a..c51541733 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm +++ b/package/lean/luci-app-kodexplorer/luasrc/view/kodexplorer/version.htm @@ -1,16 +1,16 @@ <% -local kodexplorer_path = luci.sys.exec("echo -n `uci get kodexplorer.@global[0].project_directory`") -local kodexplorer_version = luci.sys.exec("[ -f '" .. kodexplorer_path .. "/ChangeLog.md' ] && echo -n `cat " .. kodexplorer_path .. "/ChangeLog.md | head -1 | awk '{print $2}'`") +local api = require "luci.model.cbi.kodexplorer.api" +local app_version = api.get_version() -%> -<% if kodexplorer_version ~= nil and kodexplorer_version~="" then %> +<% if app_version and app_version ~= "" then %>
- 【 <%=kodexplorer_version%> 】 + 【 <%=app_version%> 】
diff --git a/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer b/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer index 3b9196276..4ac2bb502 100755 --- a/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer +++ b/package/lean/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer @@ -8,5 +8,5 @@ uci -q batch <<-EOF >/dev/null EOF /etc/init.d/php7-fpm disable && /etc/init.d/php7-fpm stop -rm -f /tmp/luci-indexcache +rm -rf /tmp/luci-*cache exit 0 diff --git a/package/lean/luci-app-kodexplorer/root/usr/share/rpcd/acl.d/luci-app-kodexplorer.json b/package/lean/luci-app-kodexplorer/root/usr/share/rpcd/acl.d/luci-app-kodexplorer.json new file mode 100644 index 000000000..96e28b0c8 --- /dev/null +++ b/package/lean/luci-app-kodexplorer/root/usr/share/rpcd/acl.d/luci-app-kodexplorer.json @@ -0,0 +1,11 @@ +{ + "luci-app-kodexplorer": { + "description": "Grant UCI access for luci-app-kodexplorer", + "read": { + "uci": [ "kodexplorer" ] + }, + "write": { + "uci": [ "kodexplorer" ] + } + } +} From 95d52b6014681dabf03bdc17a0729f01df9ac0b4 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 16 Jun 2020 11:56:59 +0800 Subject: [PATCH 18/23] luci-app-unblockmusic: fix golang version can't unlock iOS newversion issue --- package/lean/UnblockNeteaseMusic/Makefile | 4 ++-- package/lean/UnblockNeteaseMusicGo/Makefile | 5 ++--- .../patches/01-fix-endpoint.patch | 13 +++++++++++++ package/lean/luci-app-unblockmusic/Makefile | 2 +- .../root/etc/init.d/unblockmusic | 5 +++-- 5 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index bcd8ef581..ff8e77606 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic PKG_VERSION:=0.25.3 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_LICENSE:=MIT PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=610ff1716aa3698cd2e9391ff808a35a05719586 +PKG_SOURCE_VERSION:=1193e29a2c8f72c738d2988d5cf5afbb2fee7463 PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz diff --git a/package/lean/UnblockNeteaseMusicGo/Makefile b/package/lean/UnblockNeteaseMusicGo/Makefile index 7f451f146..e86f9711f 100644 --- a/package/lean/UnblockNeteaseMusicGo/Makefile +++ b/package/lean/UnblockNeteaseMusicGo/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusicGo PKG_VERSION:=0.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git @@ -43,7 +43,7 @@ define Build/Prepare endef define Build/Configure - + patch -p1 -d $(BUILD_DIR)/$(PKG_NAME) <./patches/01-fix-endpoint.patch endef define Build/Compile @@ -59,7 +59,6 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/UnblockNeteaseMusic $(1)/usr/bin/UnblockNeteaseMusic $(INSTALL_DIR) $(1)/usr/share/UnblockNeteaseMusicGo $(CP) ./files/* $(1)/usr/share/UnblockNeteaseMusicGo/ - endef $(eval $(call GoBinPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch b/package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch new file mode 100644 index 000000000..c67f83ef2 --- /dev/null +++ b/package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch @@ -0,0 +1,13 @@ +diff --git a/processor/processor.go b/processor/processor.go +index a35f8df..a7e3015 100644 +--- a/processor/processor.go ++++ b/processor/processor.go +@@ -393,7 +393,7 @@ + //data["url"] = uri.Scheme + "://" + uri.Host + uri.EscapedPath() + //data["url"] = uri.String() + if *config.EndPoint { +- data["url"] = "http://music.163.com/unblockmusic/" + uri.String() ++ data["url"] = "https://music.163.com/unblockmusic/" + uri.String() + } else { + data["url"] = uri.String() + } diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 9ef04f6ec..9b7971cd5 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:=3 +PKG_RELEASE:=6 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 b3de31158..102040681 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -179,13 +179,14 @@ start() 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 -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 & add_cron echo "$(date -R) # UnblockNeteaseMusic Nodejs Version (http:5200, https:5201)" >>/tmp/unblockmusic.log elif [ "$APPTYPE" == "go" ]; then - UnblockNeteaseMusic -p 5200 -sp 5201 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 & + UnblockNeteaseMusic -p 5200 -sp 5202 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 >>/tmp/unblockmusic.log 2>&1 & echo "$(date -R) # UnblockNeteaseMusic Golang Version (http:5200, https:5201)" >>/tmp/unblockmusic.log + UnblockNeteaseMusic -p 5203 -sp 5201 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 & else kill -9 $(busybox ps -w | grep 'sleep 60m' | grep -v grep | awk '{print $1}') >/dev/null 2>&1 /usr/bin/UnblockNeteaseMusicCloud >/dev/null 2>&1 & From c252faf64e1905a9081f4bf00f361eff3526d47f Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 16 Jun 2020 11:58:20 +0800 Subject: [PATCH 19/23] Version bump to R20.6.18 --- 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 f9d01629f..395d211df 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:=59 +PKG_RELEASE:=60 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 a52a824f5..a6904e936 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -44,7 +44,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.20'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='R20.6.18'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release From acb822180e87ace5a971f3ff3c67b2125d69b20b Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 16 Jun 2020 12:08:11 +0800 Subject: [PATCH 20/23] luci-app-unblockmusic:change default Nodejs version value --- package/lean/luci-app-unblockmusic/Makefile | 2 +- .../luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 9b7971cd5..6340fb467 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:=6 +PKG_RELEASE:=7 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index ad0957b60..28eba6abc 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -47,20 +47,20 @@ cloudserver.rmempty = true cloudserver:depends("apptype", "cloud") flac = s:option(Flag, "flac_enabled", translate("启用无损音质")) -flac.default = 1 +flac.default = "1" flac.rmempty = false flac.description = translate("目前仅支持酷我、QQ、咪咕") flac:depends("apptype", "nodejs") force = s:option(Flag, "force_enabled", translate("强制替换为高音质歌曲")) -force.default = 1 +force.default = "1" force.rmempty = false force.description = translate("如果歌曲音质在 320Kbps 以内，则尝试强制替换为高音质版本") force:depends("apptype", "nodejs") o = s:option(Flag, "autoupdate") o.title = translate("自动检查更新主程序") -o.default = 0 +o.default = "1" o.rmempty = false o.description = translate("每天自动检测并更新到最新版本") o:depends("apptype", "nodejs") From 3a0adfef1553e47e3615cf49c8e694a7f9fcc709 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 16 Jun 2020 18:37:34 +0800 Subject: [PATCH 21/23] dnsmasq: add auto multiple service instances for dns performance boost --- package/network/services/dnsmasq/Makefile | 2 +- .../services/dnsmasq/files/dnsmasq.init | 24 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 2e841a534..839b804b7 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.80 -PKG_RELEASE:=12 +PKG_RELEASE:=13 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 59874a5c7..6c4f08c5e 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -1024,18 +1024,22 @@ dnsmasq_start() echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf done } + + threads=$(cat /proc/cpuinfo | grep 'processor' | wc -l) + + for i in $(seq 1 $threads); do + procd_open_instance $cfg$i + procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}"."$i".pid + procd_set_param file $CONFIGFILE + [ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript" + procd_set_param respawn - procd_open_instance $cfg - procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid - procd_set_param file $CONFIGFILE - [ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript" - procd_set_param respawn + procd_add_jail dnsmasq ubus log + procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE $DHCPBOGUSHOSTNAMEFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT + procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile - procd_add_jail dnsmasq ubus log - procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE $DHCPBOGUSHOSTNAMEFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT - procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile - - procd_close_instance + procd_close_instance + done } dnsmasq_stop() From d3cc42cad8c8a6e9af33060aed9e518ab08436b8 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 17 Jun 2020 11:36:13 +0800 Subject: [PATCH 22/23] ipt2socks:bump to 1.1.3 --- package/lean/ipt2socks/Makefile | 4 +- .../ipt2socks/patches/001-fix-splice.patch | 49 ------------------- 2 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/lean/ipt2socks/patches/001-fix-splice.patch diff --git a/package/lean/ipt2socks/Makefile b/package/lean/ipt2socks/Makefile index 11936cf5e..1ece760ff 100644 --- a/package/lean/ipt2socks/Makefile +++ b/package/lean/ipt2socks/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipt2socks -PKG_VERSION:=1.1.2 +PKG_VERSION:=1.1.3 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/zfl9/ipt2socks.git -PKG_SOURCE_VERSION:=cfbc2189356aba7fcafb0bc961a95419f313d8a7 +PKG_SOURCE_VERSION:=384dab4bae5ed9402e07ec1950e502c05812bc26 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) diff --git a/package/lean/ipt2socks/patches/001-fix-splice.patch b/package/lean/ipt2socks/patches/001-fix-splice.patch deleted file mode 100644 index c7af3ca47..000000000 --- a/package/lean/ipt2socks/patches/001-fix-splice.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/ipt2socks.c -+++ b/ipt2socks.c -@@ -28,6 +28,36 @@ - - #define IPT2SOCKS_VERSION "ipt2socks v1.1.2 " - -+#ifdef __MUSL__ -+#include -+#include -+ -+ssize_t splice(int __fdin, __off64_t *__offin, int __fdout, -+ __off64_t *__offout, size_t __len, unsigned int __flags) { -+#ifdef __NR_splice -+ return syscall(__NR_splice, __fdin, __offin, __fdout, __offout, __len, __flags); -+#else -+ (void)__fdin; -+ (void)__offin; -+ (void)__fdout; -+ (void)__offout; -+ (void)__len; -+ (void)__flags; -+ errno = ENOSYS; -+ return -1; -+#endif -+} -+ -+#undef SPLICE_F_MOVE -+#undef SPLICE_F_NONBLOCK -+#undef SPLICE_F_MORE -+ -+#define SPLICE_F_MOVE 1 -+#define SPLICE_F_NONBLOCK 2 -+#define SPLICE_F_MORE 4 -+ -+#endif /* __MUSL__ */ -+ - enum { - OPT_ENABLE_TCP = 0x01 << 0, // enable tcp proxy - OPT_ENABLE_UDP = 0x01 << 1, // enable udp proxy - ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - CC = gcc --CFLAGS = -std=c99 -Wall -Wextra -O2 -pthread -+CFLAGS = -std=c99 -Wall -Wextra -O2 -pthread -D __MUSL__ - LIBS = -lm - SRCS = ipt2socks.c logutils.c lrucache.c netutils.c protocol.c - OBJS = $(SRCS:.c=.o) \ No newline at end of file From ecbbfcf25e0b5ebe55768b237525fada74ea3936 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 17 Jun 2020 17:50:02 +0800 Subject: [PATCH 23/23] ar71xx: unlock GL.net uboot part --- target/linux/ar71xx/image/generic.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 469954916..f08f1e870 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -493,7 +493,7 @@ define Device/gl-ar300m DEVICE_PACKAGES := kmod-usb-core kmod-usb2 BOARDNAME := GL-AR300M IMAGE_SIZE := 16000k - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro + MTDPARTS := spi0.0:256k(u-boot),64k(u-boot-env),16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-ar300m @@ -539,7 +539,7 @@ define Device/gl-mifi BOARDNAME := GL-MIFI IMAGE_SIZE := 16000k CONSOLE := ttyATH0,115200 - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + MTDPARTS := spi0.0:256k(u-boot),64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-mifi