From 297a116933a3e51e305fa5a3943a663b78b26455 Mon Sep 17 00:00:00 2001
From: R3pl4c3r <30682790+R3pl4c3r@users.noreply.github.com>
Date: Sun, 31 May 2020 10:43:37 +0800
Subject: [PATCH 1/8] luci-app-docker: rename dockerman (#4704)

---
 .../Makefile                                        |   0
 .../luasrc/controller/docker.lua                    |   0
 .../luasrc/model/cbi/docker.lua                     |   0
 .../luasrc/view/docker/docker_status.htm            |   0
 .../po/zh-cn/docker.po                              |   0
 .../root/etc/config/dockerd                         |   0
 .../root/etc/docker-init                            |   0
 .../root/etc/docker-web                             |   0
 .../root/etc/init.d/dockerd                         |   0
 .../root/etc/uci-defaults/docker                    |   0
 .../root/www/DockerReadme.pdf                       | Bin
 11 files changed, 0 insertions(+), 0 deletions(-)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/Makefile (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/luasrc/controller/docker.lua (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/luasrc/model/cbi/docker.lua (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/luasrc/view/docker/docker_status.htm (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/po/zh-cn/docker.po (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/root/etc/config/dockerd (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/root/etc/docker-init (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/root/etc/docker-web (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/root/etc/init.d/dockerd (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/root/etc/uci-defaults/docker (100%)
 rename package/lean/{luci-app-dockerman => luci-app-docker}/root/www/DockerReadme.pdf (100%)

diff --git a/package/lean/luci-app-dockerman/Makefile b/package/lean/luci-app-docker/Makefile
similarity index 100%
rename from package/lean/luci-app-dockerman/Makefile
rename to package/lean/luci-app-docker/Makefile
diff --git a/package/lean/luci-app-dockerman/luasrc/controller/docker.lua b/package/lean/luci-app-docker/luasrc/controller/docker.lua
similarity index 100%
rename from package/lean/luci-app-dockerman/luasrc/controller/docker.lua
rename to package/lean/luci-app-docker/luasrc/controller/docker.lua
diff --git a/package/lean/luci-app-dockerman/luasrc/model/cbi/docker.lua b/package/lean/luci-app-docker/luasrc/model/cbi/docker.lua
similarity index 100%
rename from package/lean/luci-app-dockerman/luasrc/model/cbi/docker.lua
rename to package/lean/luci-app-docker/luasrc/model/cbi/docker.lua
diff --git a/package/lean/luci-app-dockerman/luasrc/view/docker/docker_status.htm b/package/lean/luci-app-docker/luasrc/view/docker/docker_status.htm
similarity index 100%
rename from package/lean/luci-app-dockerman/luasrc/view/docker/docker_status.htm
rename to package/lean/luci-app-docker/luasrc/view/docker/docker_status.htm
diff --git a/package/lean/luci-app-dockerman/po/zh-cn/docker.po b/package/lean/luci-app-docker/po/zh-cn/docker.po
similarity index 100%
rename from package/lean/luci-app-dockerman/po/zh-cn/docker.po
rename to package/lean/luci-app-docker/po/zh-cn/docker.po
diff --git a/package/lean/luci-app-dockerman/root/etc/config/dockerd b/package/lean/luci-app-docker/root/etc/config/dockerd
similarity index 100%
rename from package/lean/luci-app-dockerman/root/etc/config/dockerd
rename to package/lean/luci-app-docker/root/etc/config/dockerd
diff --git a/package/lean/luci-app-dockerman/root/etc/docker-init b/package/lean/luci-app-docker/root/etc/docker-init
similarity index 100%
rename from package/lean/luci-app-dockerman/root/etc/docker-init
rename to package/lean/luci-app-docker/root/etc/docker-init
diff --git a/package/lean/luci-app-dockerman/root/etc/docker-web b/package/lean/luci-app-docker/root/etc/docker-web
similarity index 100%
rename from package/lean/luci-app-dockerman/root/etc/docker-web
rename to package/lean/luci-app-docker/root/etc/docker-web
diff --git a/package/lean/luci-app-dockerman/root/etc/init.d/dockerd b/package/lean/luci-app-docker/root/etc/init.d/dockerd
similarity index 100%
rename from package/lean/luci-app-dockerman/root/etc/init.d/dockerd
rename to package/lean/luci-app-docker/root/etc/init.d/dockerd
diff --git a/package/lean/luci-app-dockerman/root/etc/uci-defaults/docker b/package/lean/luci-app-docker/root/etc/uci-defaults/docker
similarity index 100%
rename from package/lean/luci-app-dockerman/root/etc/uci-defaults/docker
rename to package/lean/luci-app-docker/root/etc/uci-defaults/docker
diff --git a/package/lean/luci-app-dockerman/root/www/DockerReadme.pdf b/package/lean/luci-app-docker/root/www/DockerReadme.pdf
similarity index 100%
rename from package/lean/luci-app-dockerman/root/www/DockerReadme.pdf
rename to package/lean/luci-app-docker/root/www/DockerReadme.pdf

From ef2ebeeec4f91abd7457968c0767ab561e21f38f Mon Sep 17 00:00:00 2001
From: Kuma <xiongshimin1997@126.com>
Date: Sun, 31 May 2020 10:45:33 +0800
Subject: [PATCH 2/8] Update UnblockNeteaseMusicGo server.crt (#4697)

---
 .../UnblockNeteaseMusicGo/files/server.crt    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/package/lean/UnblockNeteaseMusicGo/files/server.crt b/package/lean/UnblockNeteaseMusicGo/files/server.crt
index b58111aee7..b9025514d2 100644
--- a/package/lean/UnblockNeteaseMusicGo/files/server.crt
+++ b/package/lean/UnblockNeteaseMusicGo/files/server.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIJAKTlW9B59i1HMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
+MIIDkjCCAnqgAwIBAgIJAK/bIUIlE36LMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
 BAYTAkNOMSQwIgYDVQQDDBtVbmJsb2NrTmV0ZWFzZU11c2ljIFJvb3QgQ0ExHTAb
-BgNVBAoMFEdpdEh1Yi5jb20gQG5vbmRhbmVlMB4XDTE5MDUxODE2MDYxOFoXDTIw
-MDUxNzE2MDYxOFowezELMAkGA1UEBhMCQ04xETAPBgNVBAcMCEhhbmd6aG91MSww
+BgNVBAoMFEdpdEh1Yi5jb20gQG5vbmRhbmVlMB4XDTIwMDUxNjE3MTIxM1oXDTIx
+MDUxNjE3MTIxM1owezELMAkGA1UEBhMCQ04xETAPBgNVBAcMCEhhbmd6aG91MSww
 KgYDVQQKDCNOZXRFYXNlIChIYW5nemhvdSkgTmV0d29yayBDby4sIEx0ZDERMA8G
 A1UECwwISVQgRGVwdC4xGDAWBgNVBAMMDyoubXVzaWMuMTYzLmNvbTCCASIwDQYJ
 KoZIhvcNAQEBBQADggEPADCCAQoCggEBALobECypwEoe8VqM/FJvBRR3p2T+ZWdi
@@ -10,12 +10,13 @@ MSPrwfiRJr5p7OMtWBlLveCBV85+R3feidYbQTXlvVTdToY+GN6mFE1x6zG2dvLD
 s4UuRnipmvGcFYhIRTX8J4AJiN8VMtW0TNXscRMudpz/FAVtsRrggRaThYg4f/rI
 oAPMqKMsS4JoYhxs9ED6E6/tpj3XmSg1ekaXhgacYSYHeyxizZwoOFVCLH3TG5sF
 sD6CYNnukYol8bR+VRpvHftIYss5Yz+DyyhYEAMJm1CfQo+xoGR3D0ozbT3hUnzm
-fEoOhmSp3sALrFVE4iJSuajoh2/3xhmcyi3xZdWyq4F8hpb+URyaoW0CAwEAAaMt
-MCswKQYDVR0RBCIwIIINbXVzaWMuMTYzLmNvbYIPKi5tdXNpYy4xNjMuY29tMA0G
-CSqGSIb3DQEBCwUAA4IBAQB32SVz5jHUYv3ZG7SNF/LFJ904/LI8QlTe9R+Abb9z
-bpXmQeo4pvNNOk3LgcTyuSIPQSHEFn32hk/MedB6Q2cKaGVKQq7Usne1jsV0JirG
-wMx3PTcKPnX+XexRY8s6v6cNKSx5YlMQNFeH7p8MgKqdM/UX/dNCxT04X/ClmP1K
-/rKqonXn4i3wmWprl7Q7Z1wqt0ygQRkNJKqdYKTu4oQcPON8/dRcseYdJzSoK2/G
-H6cOJwKrRLzuUqQlphe6wyUsyTIbIJiFu1a1Gml6zB4lhLZhL89H2lYwdS8wWlc+
-M+wYi+XTM/ylNHEIoKsOe2nscnwi/hTfHJOPPchHbEuM
+fEoOhmSp3sALrFVE4iJSuajoh2/3xhmcyi3xZdWyq4F8hpb+URyaoW0CAwEAAaNC
+MEAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwKQYDVR0RBCIwIIINbXVzaWMuMTYzLmNv
+bYIPKi5tdXNpYy4xNjMuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQB+zW0o1169aGQI
+7GA/8BQ769svpkpdy/lfvkokapFjzoxLTBQhjMo9rqzmGOwr9ksePwQqSDXn685W
+mKnEl0CzhBrKnL5x3gHus8bg591xpW+01xAFXSyLITOfMJqMEdY7ylymkm0XZ3aN
+vm+yFdP1fr/bZNw6Wrprg3i7eGhj7TdBXRA96usVgBcnCkC1SzEZfnDZsKl9o8Xx
+TSOpvzIMSaD7++Bp7BdzA5oCCydv2c++zV/sgCPIr26Jq8UQac+qQP5SMlYyGbAl
+vIQRRZyfQ4fPonYDnEPHWFCMyBkQIN39LMhDRsUgn8bT0rnP91xkNAd9S4VWbNDA
+5TMiQy3F
 -----END CERTIFICATE-----

From 939405f2cc944975d099c9a556bec2889d13ac02 Mon Sep 17 00:00:00 2001
From: Max Zhao <mdcw1103@gmail.com>
Date: Mon, 1 Jun 2020 10:48:20 +0800
Subject: [PATCH 3/8] v2ray: update v2ray-core to 4.23.2 (#4705)

---
 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 abed0879a1..2250262e3e 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.1
+PKG_VERSION:=4.23.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/v2ray/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=474b3aeed069d9867f7603a0544abcc0f31386cef9254423577ab752fc8d4dcc
+PKG_HASH:=c4c6d290859d1701fa6198bc7d2f657671ddfb4652356efdc454f48429736f66
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

From d42b563e2faf531e327781ba11f172f643caa7e6 Mon Sep 17 00:00:00 2001
From: Max Zhao <mdcw1103@gmail.com>
Date: Mon, 1 Jun 2020 22:01:44 +0800
Subject: [PATCH 4/8] v2ray-plugin: update to 1.3.1 (#4709)

---
 package/lean/v2ray-plugin/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/lean/v2ray-plugin/Makefile b/package/lean/v2ray-plugin/Makefile
index 5506183e17..8111b4e335 100644
--- a/package/lean/v2ray-plugin/Makefile
+++ b/package/lean/v2ray-plugin/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-plugin
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.3.1
 PKG_RELEASE:=2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/shadowsocks/v2ray-plugin/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=dfb86cd8d9be86e665c4b86b68cd7037e4310de001656eef01ec9aeea71edd10
+PKG_HASH:=86d37a8ecef82457b4750a1af9e8d093b25ae0d32ea7dcc2ad5c0068fe2d3d74
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

From e2bbcd5ac216c9ed1b468a7c7cc74f06cc2a91a7 Mon Sep 17 00:00:00 2001
From: Zeezorn <31385055+Zeezorn@users.noreply.github.com>
Date: Wed, 3 Jun 2020 12:10:15 +0800
Subject: [PATCH 5/8] update v2ray-core to 4.23.3 (#4716)

Fix
Issued an emergency fix for VMess weakness described in https://github.com/v2ray/v2ray-core/issues/2523
This fix can significantly hindrance attack based on the weakness described. Only servers need to be updated to apply this emergency fix, it not expected for well-behaved clients to be influenced. A more permanent solution is underway.
---
 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 2250262e3e..dedcbf9d09 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.2
+PKG_VERSION:=4.23.3
 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/v2ray/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=c4c6d290859d1701fa6198bc7d2f657671ddfb4652356efdc454f48429736f66
+PKG_HASH:=39558c5a9300158a4adf76d099b210790f7ef9705ce2909c6bdc2fccc70d5c69
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

From ee958e2bd374a38be4048e82867d3d9641a10468 Mon Sep 17 00:00:00 2001
From: Aaron-lv <58249729+Aaron-lv@users.noreply.github.com>
Date: Thu, 4 Jun 2020 15:48:17 +0800
Subject: [PATCH 6/8] Update v2ray-core to 4.23.4 (#4725)

---
 package/lean/v2ray/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile
index dedcbf9d09..ec1b6726fc 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.3
+PKG_VERSION:=4.23.4
 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/v2ray/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=39558c5a9300158a4adf76d099b210790f7ef9705ce2909c6bdc2fccc70d5c69
+PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=726dd98d674bd73150158b1d4c8bc0d59dbb672ba10096ac61548d6278213c78
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

From 4b97e2a8262deb8c783c7f5751019e4029d34e83 Mon Sep 17 00:00:00 2001
From: hyird <31695447+hyird@users.noreply.github.com>
Date: Thu, 4 Jun 2020 15:48:42 +0800
Subject: [PATCH 7/8] luci-app-frpc:fix translate (#4726)

Co-authored-by: hyird <1326606797@qq.com>
---
 .../luci-app-frpc/luasrc/i18n/frp.zh-cn.lmo   | Bin 5032 -> 0 bytes
 package/lean/luci-app-frpc/po/zh-cn/frp.po    | 255 ++++++++++++++++++
 2 files changed, 255 insertions(+)
 delete mode 100644 package/lean/luci-app-frpc/luasrc/i18n/frp.zh-cn.lmo
 create mode 100644 package/lean/luci-app-frpc/po/zh-cn/frp.po

diff --git a/package/lean/luci-app-frpc/luasrc/i18n/frp.zh-cn.lmo b/package/lean/luci-app-frpc/luasrc/i18n/frp.zh-cn.lmo
deleted file mode 100644
index 9e48c9b3fad24425271ac5c91888635be699583a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5032
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

diff --git a/package/lean/luci-app-frpc/po/zh-cn/frp.po b/package/lean/luci-app-frpc/po/zh-cn/frp.po
new file mode 100644
index 0000000000..13f7f9adde
--- /dev/null
+++ b/package/lean/luci-app-frpc/po/zh-cn/frp.po
@@ -0,0 +1,255 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+
+msgid "Frp Setting"
+msgstr "Frp 内网穿透"
+
+msgid "Frp Status"
+msgstr "Frp状态"
+
+msgid "The Frp service is not running."
+msgstr "Frp服务未运行"
+
+msgid "The Frp service is running."
+msgstr "Frp服务正在运行"
+
+msgid "Frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet."
+msgstr "Frp 是一个可用于内网穿透的高性能的反向代理应用。"
+
+msgid "Global Setting"
+msgstr "全局设置"
+
+msgid "Basic Settings"
+msgstr "基本设置"
+
+msgid "Other Settings"
+msgstr "其他设置"
+
+msgid "Client Log"
+msgstr "日志"
+
+msgid "Enabled"
+msgstr "启用"
+
+msgid "Server"
+msgstr "服务器"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Token"
+msgstr "令牌"
+
+msgid "Time duration between server of frpc and frps mustn't exceed 15 minutes."
+msgstr "frpc服务器与frps之间的时间间隔不得超过15分钟"
+
+msgid "Vhost HTTP Port"
+msgstr "HTTP穿透服务端口"
+
+msgid "Vhost HTTPS Port"
+msgstr "HTTPS穿透服务端口"
+
+msgid "Exit program when first login failed"
+msgstr "初始登录失败即退出程序"
+
+msgid "TCP Stream Multiplexing"
+msgstr "TCP端口复用"
+
+msgid "decide if exit program when first login failed, otherwise continuous relogin to frps."
+msgstr "第一次登录失败就退出程序，否则将持续尝试登陆 Frp 服务器。"
+
+msgid "Default is Ture. This feature in frps.ini and frpc.ini must be same."
+msgstr "该功能默认启用，该配置项在服务端和客户端必须保持一致。"
+
+msgid "Protocol Type"
+msgstr "协议类型"
+
+msgid "Frp support kcp protocol since v0.12.0"
+msgstr "从 v0.12.0 版本开始，底层通信协议支持选择 kcp 协议加速。"
+
+msgid "TCP Protocol"
+msgstr "TCP协议"
+
+msgid "KCP Protocol"
+msgstr "KCP协议"
+
+msgid "Connect frps by HTTP PROXY"
+msgstr "通过代理连接 frps"
+
+msgid "frpc can connect frps using HTTP PROXY"
+msgstr "frpc 支持通过 HTTP PROXY 和 frps 进行通信"
+
+msgid "HTTP PROXY"
+msgstr "HTTP代理"
+
+msgid "Enable Connection Pool"
+msgstr "启用连接池功能"
+
+msgid "This feature is fit for a large number of short connections."
+msgstr "适合有大量短连接请求时开启"
+
+msgid "Connection Pool"
+msgstr "指定预创建连接的数量"
+
+msgid "Connections will be established in advance."
+msgstr "frpc 会预先和服务端建立起指定数量的连接。"
+
+msgid "Service registration interval"
+msgstr "服务注册间隔"
+
+msgid "0 means disable this feature, unit: min"
+msgstr "0表示禁用定时注册功能，单位：分钟"
+
+msgid "Log Level"
+msgstr "日志记录等级"
+
+msgid "Trace"
+msgstr "追踪"
+
+msgid "Debug"
+msgstr "调试"
+
+msgid "Info"
+msgstr "信息"
+
+msgid "Warning"
+msgstr "警告"
+
+msgid "Error"
+msgstr "错误"
+
+msgid "Log Keepd Max Days"
+msgstr "日志记录天数"
+
+msgid "Services List"
+msgstr "服务列表"
+
+msgid "Service Remark Name"
+msgstr "服务备注名"
+
+msgid "Domain/Subdomain"
+msgstr "域名/子域名"
+
+msgid "Remote Port"
+msgstr "远程主机端口"
+
+msgid "Local Host Address"
+msgstr "内网主机地址"
+
+msgid "Local Host Port"
+msgstr "内网主机端口"
+
+msgid "Use Encryption"
+msgstr "开启数据加密"
+
+msgid "Use Compression"
+msgstr "使用压缩"
+
+msgid "Enable State"
+msgstr "开启状态"
+
+msgid "Frp Domain Config"
+msgstr "Frp域名配置"
+
+msgid "Config Frp Protocol"
+msgstr "配置 Frp 协议参数"
+
+msgid "Disable"
+msgstr "关闭"
+
+msgid "Frp Protocol Type"
+msgstr "Frp 协议类型"
+
+msgid "Domain Type"
+msgstr "域名类型"
+
+msgid "Custom Domains"
+msgstr "自定义域名"
+
+msgid "SubDomain"
+msgstr "子域名"
+
+msgid "Both the above two Domain types"
+msgstr "同时使用2种域名"
+
+msgid "If SubDomain is used, Custom Domains couldn't be subdomain or wildcard domain of the maindomain(subdomain_host)."
+msgstr "如果服务端配置了主域名(subdomain_host)，则自定义域名不能是属于主域名(subdomain_host) 的子域名或者泛域名。"
+
+msgid "subdomain_host must be configured in server: frps in advance."
+msgstr "使用子域名时，必须预先在服务端配置主域名(subdomain_host)参数。"
+
+msgid "STCP Role"
+msgstr "SFTP服务类型"
+
+msgid "Use Plugin"
+msgstr "使用插件"
+
+msgid "If plugin is defined, local_ip and local_port is useless, plugin will handle connections got from frps."
+msgstr "使用插件使用插件模式时，本地 IP 地址和端口无需配置，插件将会处理来自服务端的链接请求。"
+
+msgid "STCP Screct Key"
+msgstr "SFTP密钥"
+
+msgid "STCP Server Name"
+msgstr "SFTP服务名称"
+
+msgid "Enable URL routing"
+msgstr "启用 URL 路由"
+
+msgid "Frp support forward http requests to different backward web services by url routing."
+msgstr "Frp支持通过url路由将http请求转发到不同的反向web服务。"
+
+msgid "Choose Plugin"
+msgstr "选择插件"
+
+msgid "Proxy Authentication"
+msgstr "代理认证"
+
+msgid "Other PCs could access the Internet through frpc's network by using http_proxy plugin."
+msgstr "http proxy 插件，可以使其他机器通过 frpc 的网络访问互联网；开启身份验证之后需要用户名、密码才能连接到 HTTP 代理。"
+
+msgid "HTTP Proxy UserName"
+msgstr "HTTP 代理用户名"
+
+msgid "HTTP Proxy Password"
+msgstr "HTTP 代理密码"
+
+msgid "Plugin Unix Sock Path"
+msgstr "Unix Sock 插件路径"
+
+msgid "Password protecting your web service"
+msgstr "密码保护您的web服务"
+
+msgid "HTTP UserName"
+msgstr "HTTP 用户名"
+
+msgid "HTTP PassWord"
+msgstr "HTTP 密码"
+
+msgid "Rewriting the Host Header"
+msgstr "修改 Host Header"
+
+msgid "Frp can rewrite http requests with a modified Host header."
+msgstr "Frp可以用修改后的主机头重写http请求。"
+
+msgid "Proxy-Protocol Version"
+msgstr "Proxy-Protocol 版本"
+
+msgid "Encrypted the communication between frpc and frps, will effectively prevent the traffic intercepted."
+msgstr "将 frpc 与 frps 之间的通信内容加密传输，将会有效防止流量被拦截。"
+
+msgid "The contents will be compressed to speed up the traffic forwarding speed, but this will consume some additional cpu resources."
+msgstr "对传输内容进行压缩，加快流量转发速度，但是会额外消耗一些 cpu 资源。"
+
+msgid "Http username and password are safety certification for http protocol."
+msgstr "Http用户名和密码是Http协议的安全认证。"
+
+msgid "Proxy Protocol to send user's real IP to local services."
+msgstr "将用户的真实IP发送到本地服务的代理协议。"
+
+msgid "STCP Server Name is Service Remark Name of STCP Server"
+msgstr "STCP服务器别名"
+
+msgid "<font color=\"red\">Please ensure the remark name is unique.</font>"
+msgstr "<font color=\"red\">确保备注名唯一</font>"
\ No newline at end of file

From 340f1bffaa5ef9700490beb257b6132ae516c4e2 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Thu, 4 Jun 2020 16:38:42 +0800
Subject: [PATCH 8/8] ps3netsrv: add ps3netsrv allows you to stream games and
 ISOs over the network to your CFW PlayStation(R) 3 system

---
 package/lean/ps3netsrv/Makefile               |  55 +++++++++
 package/lean/ps3netsrv/files/ps3netsrv.config |   5 +
 package/lean/ps3netsrv/files/ps3netsrv.init   |  83 +++++++++++++
 .../patches/001-include.common.h.patch        |  20 +++
 .../patches/002-include.compat.h.patch        |  12 ++
 .../lean/ps3netsrv/patches/003-makefile.patch | 114 ++++++++++++++++++
 6 files changed, 289 insertions(+)
 create mode 100644 package/lean/ps3netsrv/Makefile
 create mode 100644 package/lean/ps3netsrv/files/ps3netsrv.config
 create mode 100644 package/lean/ps3netsrv/files/ps3netsrv.init
 create mode 100644 package/lean/ps3netsrv/patches/001-include.common.h.patch
 create mode 100644 package/lean/ps3netsrv/patches/002-include.compat.h.patch
 create mode 100644 package/lean/ps3netsrv/patches/003-makefile.patch

diff --git a/package/lean/ps3netsrv/Makefile b/package/lean/ps3netsrv/Makefile
new file mode 100644
index 0000000000..ab81de49a5
--- /dev/null
+++ b/package/lean/ps3netsrv/Makefile
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2012-2017 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v3.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ps3netsrv
+PKG_VERSION:=20190630
+PKG_GIT_COMMIT:=3107bba17870657c5bb3f7830657838d766a296c
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_GIT_COMMIT).tar.gz
+PKG_SOURCE_URL:=https://github.com/jhonathanc/ps3netsrv/releases/download/$(PKG_VERSION)
+PKG_HASH:=b1df52bab6496d3008019ff76660436c4b24d05c84fc71f293719dbd608f1511
+PKG_INSTALL:=1
+
+PKG_MAINTAINER:=JCorrea
+PKG_LICENSE:=GPLv3
+PKG_LICENSE_FILES:=COPYING
+PKG_BUILD_DEPENDS:=mbedtls
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ps3netsrv
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=File Transfer
+  TITLE:=PS3 Game Server
+  URL:=https://github.com/jhonathanc/ps3netsrv-openwrt/
+  DEPENDS:=+libpthread +libstdcpp
+endef
+
+define Package/ps3netsrv/description
+ps3netsrv allows you to stream games and ISOs over the network to your CFW PlayStation(R) 3 system.
+This may be useful if you have a modified PS3, and your router has storage options.
+endef
+
+define Build/Install
+	# Do nothing
+endef
+
+define Package/ps3netsrv/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ps3netsrv $(1)/usr/bin
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/ps3netsrv.init $(1)/etc/init.d/ps3netsrv
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/ps3netsrv.config $(1)/etc/config/ps3netsrv
+endef
+
+$(eval $(call BuildPackage,ps3netsrv))
diff --git a/package/lean/ps3netsrv/files/ps3netsrv.config b/package/lean/ps3netsrv/files/ps3netsrv.config
new file mode 100644
index 0000000000..d03ae2b094
--- /dev/null
+++ b/package/lean/ps3netsrv/files/ps3netsrv.config
@@ -0,0 +1,5 @@
+config ps3netsrv 'main'
+	option enabled '0'
+	option user 'root'
+	option dir '/root'
+	option port '38008'
diff --git a/package/lean/ps3netsrv/files/ps3netsrv.init b/package/lean/ps3netsrv/files/ps3netsrv.init
new file mode 100644
index 0000000000..8565dbb74a
--- /dev/null
+++ b/package/lean/ps3netsrv/files/ps3netsrv.init
@@ -0,0 +1,83 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+NAME=ps3netsrv
+PROG=/usr/bin/ps3netsrv
+
+_info() {
+	logger -p daemon.info -t "$NAME" "$*"
+}
+
+_err() {
+	logger -p daemon.err -t "$NAME" "$*"
+}
+
+_change_owner() {
+	local u="$1"; shift
+
+	local d
+	for d in "$@"; do
+		if [ -f "$d" ]; then
+			chown "$u" "$d" 2>/dev/null || return 1
+		elif [ -d "$d" ]; then
+			chown -R "$u" "$d" 2>/dev/null || return 1
+		fi
+	done
+
+	return 0
+}
+
+ps3netsrv_validate() {
+	uci_validate_section "$NAME" ps3netsrv "$1" \
+		'enabled:bool:0' \
+		'dir:string:/root' \
+		'user:string' \
+		'port:range(1024,65535)'
+}
+
+ps3netsrv_start() {
+	local section="$1"
+	ps3netsrv_validate "$section" || { _err "Validation failed."; return 1; }
+
+	[ "$enabled" = "1" ] || { _info "Instance \"${section}\" disabled."; return 1; }
+	[ -n "$dir" ] || { _err "Please set PS3 Game dir."; return 1; }
+	[ -n "$port" ] || { _err "Please set bind port."; return 1; }
+	[ -d "$dir" ] || { _err "Please create PS3 Game dir first."; return 1; }
+
+	if [ -n "$user" ]; then
+		if ( user_exists "$user" && _change_owner "$user" "$log" ); then
+				_info "ps3netsrv will run as user '${user}'."
+				if [ "$user" != "root" ]; then
+					_info "Please make sure user '${user}' has read access to directory: ${dir}"
+				fi
+		else
+			_info "Set run user to '${user}' failed, default user will be used."
+			user=
+		fi
+	fi
+
+	procd_open_instance "${NAME}.${section}"
+	procd_set_param command "$PROG" "$dir" "$port"
+
+	procd_set_param respawn
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+
+	[ -n "$user" ] && \
+		procd_set_param user "$user"
+
+	procd_add_jail "${NAME}.${section}" log
+	procd_add_jail_mount "$dir"
+	procd_close_instance
+}
+
+service_triggers() {
+	procd_add_reload_trigger "$NAME"
+}
+
+start_service() {
+	config_load "$NAME"
+	config_foreach ps3netsrv_start "ps3netsrv"
+}
diff --git a/package/lean/ps3netsrv/patches/001-include.common.h.patch b/package/lean/ps3netsrv/patches/001-include.common.h.patch
new file mode 100644
index 0000000000..17fa47f6ec
--- /dev/null
+++ b/package/lean/ps3netsrv/patches/001-include.common.h.patch
@@ -0,0 +1,20 @@
+diff -Naur a/include/common.h b/include/common.h
+--- a/include/common.h	2019-08-03 10:48:42.000000000 -0700
++++ b/include/common.h	2020-03-01 19:26:14.000000000 -0800
+@@ -2,6 +2,7 @@
+ #define __COMMON_H__
+ 
+ #include <stdint.h>
++#include <endian.h>
+ 
+ #ifdef DEBUG
+ #include <stdio.h>
+@@ -10,7 +11,7 @@
+ #define DPRINTF(...)
+ #endif
+ 
+-#ifdef __BIG_ENDIAN__
++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+ 
+ static inline uint16_t BE16(uint16_t x)
+ {
diff --git a/package/lean/ps3netsrv/patches/002-include.compat.h.patch b/package/lean/ps3netsrv/patches/002-include.compat.h.patch
new file mode 100644
index 0000000000..517a116428
--- /dev/null
+++ b/package/lean/ps3netsrv/patches/002-include.compat.h.patch
@@ -0,0 +1,12 @@
+diff -Naur a/include/compat.h b/include/compat.h
+--- a/include/compat.h	2019-08-03 10:48:42.000000000 -0700
++++ b/include/compat.h	2020-03-01 19:26:14.000000000 -0800
+@@ -57,7 +57,7 @@ typedef int socklen_t;
+ 
+ #else
+ 
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
diff --git a/package/lean/ps3netsrv/patches/003-makefile.patch b/package/lean/ps3netsrv/patches/003-makefile.patch
new file mode 100644
index 0000000000..c9e0c90640
--- /dev/null
+++ b/package/lean/ps3netsrv/patches/003-makefile.patch
@@ -0,0 +1,114 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2019-08-03 10:48:42.000000000 -0700
++++ b/Makefile	2020-03-01 19:26:14.000000000 -0800
+@@ -1,21 +1,17 @@
+-OS = windows
++OS = linux
+ BUILD_TYPE = release_static
+ 
+ OUTPUT := ps3netsrv
+ OBJS = src/main.o src/compat.o src/File.o src/VIsoFile.o
+ 
+-CFLAGS = -Wall -I./include -I./polarssl-1.3.2/include -std=gnu99 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DPOLARSSL
+-CPPFLAGS += -Wall -I./include -I./polarssl-1.3.2/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DPOLARSSL
+-
+-#CFLAGS += -DNOSSL
+-#CPPFLAGS +=-DNOSSL
+-
+-LDFLAGS = -L. -L./polarssl-1.3.2/library
+-LIBS = -lstdc++ -lpolarssl
++CFLAGS = -Wall -I./include -std=gnu99 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CPPFLAGS = -Wall -I./include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
++LDFLAGS = -L.
++LIBS = -lstdc++
+ 
+ ifeq ($(OS), linux)
+-LIBS += -lpthread
++LIBS += -lpthread -lgcc_eh
+ endif
+ 
+ ifeq ($(OS), windows)
+@@ -37,28 +33,82 @@ endif
+ ifeq ($(BUILD_TYPE), debug)
+ CFLAGS += -O0 -g3 -DDEBUG
+ CPPFLAGS += -O0 -g3 -DDEBUG
++LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
++endif
++
++ifeq ($(BUILD_TYPE), debug_nossl)
++CFLAGS += -O0 -g3 -DDEBUG -DNOSSL
++CPPFLAGS += -O0 -g3 -DDEBUG -DNOSSL
++endif
++
++ifeq ($(BUILD_TYPE), debug_polar)
++CFLAGS += -O0 -g3 -DDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
++CPPFLAGS += -O0 -g3 -DDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
++LDFLAGS += -L./polarssl-1.3.2/library
++LIBS += -lpolarssl
+ endif
+ 
+ ifeq ($(BUILD_TYPE), debug_static)
+ CFLAGS += -O0 -static -g3 -DDEBUG
+ CPPFLAGS += -O0 -static -g3 -DDEBUG
++LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
++endif
++
++ifeq ($(BUILD_TYPE), debug_static_nossl)
++CFLAGS += -O0 -static -g3 -DDEBUG -DNOSSL
++CPPFLAGS += -O0 -static -g3 -DDEBUG -DNOSSL
++endif
++
++ifeq ($(BUILD_TYPE), debug_static_polar)
++CFLAGS += -O0 -static -g3 -DDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
++CPPFLAGS += -O0 -static -g3 -DDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
++LDFLAGS += -L./polarssl-1.3.2/library
++LIBS += -lpolarssl
+ endif
+ 
+ ifeq ($(BUILD_TYPE), release)
+ CFLAGS += -O3 -s -DNDEBUG
+ CPPFLAGS += -O3 -s -DNDEBUG
++LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
++endif
++
++ifeq ($(BUILD_TYPE), release_nossl)
++CFLAGS += -O3 -s -DNDEBUG -DNOSSL
++CPPFLAGS += -O3 -s -DNDEBUG -DNOSSL
++endif
++
++ifeq ($(BUILD_TYPE), release_polar)
++CFLAGS += -O3 -s -DNDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
++CPPFLAGS += -O3 -s -DNDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
++LDFLAGS += -L./polarssl-1.3.2/library
++LIBS += -lpolarssl
+ endif
+ 
+ ifeq ($(BUILD_TYPE), release_static)
+ CFLAGS += -static -O3 -s -DNDEBUG
+ CPPFLAGS += -static -O3 -s -DNDEBUG
++LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
++endif
++
++ifeq ($(BUILD_TYPE), release_static_nossl)
++CFLAGS += -static -O3 -s -DNDEBUG -DNOSSL
++CPPFLAGS += -static -O3 -s -DNDEBUG -DNOSSL
++endif
++
++ifeq ($(BUILD_TYPE), release_static_polar)
++CFLAGS += -static -O3 -s -DNDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
++CPPFLAGS += -static -O3 -s -DNDEBUG -I./polarssl-1.3.2/include -DPOLARSSL
++LDFLAGS += -L./polarssl-1.3.2/library
++LIBS += -lpolarssl
+ endif
+ 
+ all: $(OUTPUT)
+ 	rm -r -f src/*.o
++	rm -r -f polarssl-1.3.2/library/*.o
+ 
+ clean:
+ 	rm -r -f $(OUTPUT) src/*.o
++	rm -r -f polarssl-1.3.2/library/*.o
+ 
+ $(OUTPUT): $(OBJS)
+ 	$(LINK.c) $(LDFLAGS) -o $@ $^ $(LIBS)