Merge Lean's source

2020-06-04 18:18:07 +08:00 · 2020-06-04 18:18:07 +08:00 · b3f16d2cc2
commit b3f16d2cc2
parent b0e552747e 340f1bffaa
10 changed files with 549 additions and 5 deletions
--- a/package/ctcgfw/openwrt-v2ray-plugin/Makefile
+++ b/package/ctcgfw/openwrt-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
--- a/package/lean/luci-app-frpc/luasrc/i18n/frp.zh-cn.lmo
+++ b/package/lean/luci-app-frpc/luasrc/i18n/frp.zh-cn.lmo
--- a/package/lean/luci-app-frpc/po/zh-cn/frp.po
+++ 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>"
--- a/package/lean/ps3netsrv/Makefile
+++ 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))
--- a/package/lean/ps3netsrv/files/ps3netsrv.config
+++ 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'
--- a/package/lean/ps3netsrv/files/ps3netsrv.init
+++ 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"
+}
--- a/package/lean/ps3netsrv/patches/001-include.common.h.patch
+++ 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)
+ {
--- a/package/lean/ps3netsrv/patches/002-include.compat.h.patch
+++ 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>
--- a/package/lean/ps3netsrv/patches/003-makefile.patch
+++ 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)
--- 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.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:=c4c6d290859d1701fa6198bc7d2f657671ddfb4652356efdc454f48429736f66
+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