From 6f60d4f3b26acd839b7624c1e104ab1108ebd20c Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 5 Mar 2020 18:54:36 +0800 Subject: [PATCH] Merge Lean's source --- .../Makefile | 4 +- package/lean/default-settings/Makefile | 2 +- package/lean/luci-app-n2n_v2/Makefile | 2 +- .../luasrc/controller/n2n_v2.lua | 8 +++ .../luasrc/model/cbi/n2n_v2.lua | 2 + .../luasrc/view/n2n_v2/status.htm | 20 ++++++ .../lean/luci-app-n2n_v2/po/zh_Hans/n2n_v2.po | 6 ++ package/lean/luci-app-ssr-plus/Makefile | 6 +- .../model/cbi/shadowsocksr/advanced.lua | 2 +- .../model/cbi/shadowsocksr/client-config.lua | 20 +++++- .../luasrc/model/cbi/shadowsocksr/servers.lua | 2 +- .../luci-app-ssr-plus/po/zh_Hans/ssr-plus.po | 9 ++- .../root/etc/init.d/shadowsocksr | 41 ++++++----- .../usr/share/shadowsocksr/genred2config.sh | 72 +++++++++++++++++++ .../luasrc/model/cbi/vlmcsd.lua | 2 +- .../lean/luci-app-vlmcsd/po/zh_Hans/vlmcsd.po | 2 + package/lean/n2n_v2/Makefile | 2 +- package/lean/n2n_v2/files/n2n_v2.init | 2 +- package/lean/r8152/Makefile | 6 +- package/lean/redsocks2/Makefile | 52 ++++++++++++++ package/lean/vlmcsd/files/vlmcsd.ini | 17 +++-- 21 files changed, 239 insertions(+), 40 deletions(-) create mode 100644 package/lean/luci-app-n2n_v2/luasrc/view/n2n_v2/status.htm create mode 100755 package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genred2config.sh create mode 100644 package/lean/redsocks2/Makefile diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile index 6a05da685d..aacf71a01c 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockneteasemusic-mini PKG_VERSION:=1.2 PKG_RELEASE:=7 -LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(-Go) -LUCI_DEPENDS:=+busybox +dnsmasq-full +ipset +iptables +wget +LUCI_TITLE:=LuCI support for UnblockNeteaseMusic (Mini) +LUCI_DEPENDS:=+dnsmasq-full +ipset +iptables +wget LUCI_PKGARCH:=all PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index c207da5284..59f7ac31a1 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:=53 +PKG_RELEASE:=52 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/luci-app-n2n_v2/Makefile b/package/lean/luci-app-n2n_v2/Makefile index 55eecd40d1..a92981d3be 100644 --- a/package/lean/luci-app-n2n_v2/Makefile +++ b/package/lean/luci-app-n2n_v2/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=n2n_v2 VPN Configuration module LUCI_DEPENDS:=+n2n_v2 LUCI_PKGARCH:=all PKG_VERSION:=1.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua b/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua index a1d599886e..b761feec5d 100644 --- a/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua +++ b/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua @@ -11,8 +11,16 @@ function index() end entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false + entry({"admin", "vpn", "n2n_v2", "status"}, call("n2n_status")).leaf = true local page page = entry({"admin", "vpn", "n2n_v2"}, cbi("n2n_v2"), _("N2N v2 VPN"), 45) page.dependent = true end + +function n2n_status() + local status = {} + status.running = luci.sys.call("pgrep edge >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(status) +end diff --git a/package/lean/luci-app-n2n_v2/luasrc/model/cbi/n2n_v2.lua b/package/lean/luci-app-n2n_v2/luasrc/model/cbi/n2n_v2.lua index 338e066e21..83e09a4876 100644 --- a/package/lean/luci-app-n2n_v2/luasrc/model/cbi/n2n_v2.lua +++ b/package/lean/luci-app-n2n_v2/luasrc/model/cbi/n2n_v2.lua @@ -8,6 +8,8 @@ local fs = require "nixio.fs" m = Map("n2n_v2", translate("N2N v2 VPN"), translatef("n2n is a layer-two peer-to-peer virtual private network (VPN) which allows users to exploit features typical of P2P applications at network instead of application level.")) +m:section(SimpleSection).template = "n2n_v2/status" + s = m:section(TypedSection, "edge", translate("N2N Edge Settings")) s.anonymous = true s.addremove = true diff --git a/package/lean/luci-app-n2n_v2/luasrc/view/n2n_v2/status.htm b/package/lean/luci-app-n2n_v2/luasrc/view/n2n_v2/status.htm new file mode 100644 index 0000000000..b6e57da76d --- /dev/null +++ b/package/lean/luci-app-n2n_v2/luasrc/view/n2n_v2/status.htm @@ -0,0 +1,20 @@ + +
+

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

+
\ No newline at end of file diff --git a/package/lean/luci-app-n2n_v2/po/zh_Hans/n2n_v2.po b/package/lean/luci-app-n2n_v2/po/zh_Hans/n2n_v2.po index b1c78e61b5..bb66c25b34 100644 --- a/package/lean/luci-app-n2n_v2/po/zh_Hans/n2n_v2.po +++ b/package/lean/luci-app-n2n_v2/po/zh_Hans/n2n_v2.po @@ -52,3 +52,9 @@ msgstr "Supernode节点端口" msgid "Encryption key" msgstr "加密密钥" + +msgid "N2N v2 VPN is running." +msgstr "N2N v2 VPN 运行中" + +msgid "N2N v2 VPN is not running." +msgstr "N2N v2 VPN 未运行" diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index bbd3d2d4d7..85a977f083 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus -PKG_VERSION:=161 -PKG_RELEASE:=1 +PKG_VERSION:=162 +PKG_RELEASE:=5 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -44,7 +44,7 @@ define Package/$(PKG_NAME) SUBMENU:=3. Applications TITLE:=SS/SSR/V2Ray/Trojan LuCI interface PKGARCH:=all - DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +pdnsd-alt +wget +lua +ipt2socks +microsocks +dns2socks \ + DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +pdnsd-alt +wget +lua +redsocks2 +microsocks +dns2socks \ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \ +PACKAGE_$(PKG_NAME)_INCLUDE_Simple_obfs:simple-obfs \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \ diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua index 5540f1d3ed..3222f4b097 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua @@ -40,7 +40,7 @@ o.rmempty = false o = s:option(Value, "adblock_url", translate("adblock_url")) o.default = "https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf" o:depends("adblock", "1") -o.description = translate("Support AdGuardHome and DNSMAQ format list") +o.description = translate("Support AdGuardHome and DNSMASQ format list") -- [[ SOCKS Proxy ]]-- if nixio.fs.access("/usr/bin/microsocks") then diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index ed1ddc64dc..f42822f580 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -131,20 +131,38 @@ end if nixio.fs.access("/usr/sbin/trojan") then o:value("trojan", translate("Trojan")) end -if nixio.fs.access("/usr/bin/ipt2socks") then +if nixio.fs.access("/usr/sbin/redsocks2") then o:value("socks5", translate("Socks5")) +o:value("tun", translate("Network Tunnel")) end o.description = translate("Using incorrect encryption mothod may causes service fail to start") o = s:option(Value, "alias", translate("Alias(optional)")) +o = s:option(ListValue, "iface", translate("Network interface to use")) +for _, e in ipairs(sys.net.devices()) do + if e ~= "lo" then o:value(e) end +end +o:depends("type", "tun") +o.description = translate("Redirect traffic to this network interface") + o = s:option(Value, "server", translate("Server Address")) o.datatype = "host" o.rmempty = false +o:depends("type", "ssr") +o:depends("type", "ss") +o:depends("type", "v2ray") +o:depends("type", "trojan") +o:depends("type", "socks5") o = s:option(Value, "server_port", translate("Server Port")) o.datatype = "port" o.rmempty = false +o:depends("type", "ssr") +o:depends("type", "ss") +o:depends("type", "v2ray") +o:depends("type", "trojan") +o:depends("type", "socks5") o = s:option(Flag, "auth_enable", translate("Enable Authentication")) o.rmempty = false diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua index c21c50baba..6136e63942 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua @@ -100,7 +100,7 @@ end o = s:option(DummyValue, "server_port", translate("Server Port")) function o.cfgvalue(...) - return Value.cfgvalue(...) or "?" + return Value.cfgvalue(...) or "N/A" end o = s:option(DummyValue, "switch_enable", translate("Auto Switch")) diff --git a/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po index 526e081d7e..400c79240e 100644 --- a/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po +++ b/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po @@ -401,7 +401,7 @@ msgid "GFW List" msgstr "GFW列表" msgid "ShadowSocksR Plus+ Settings" -msgstr "ShadowSocksR Plus+ 设置（支持SS/SSR/V2RAY/TROJAN/SOCKS5）" +msgstr "ShadowSocksR Plus+ 设置（支持SS/SSR/V2RAY/TROJAN/SOCKS5/TUN）" msgid "Main Server" msgstr "主服务器" @@ -496,8 +496,8 @@ msgstr "广告屏蔽设置" msgid "Server failsafe auto swith and custom update settings" msgstr "服务器节点故障自动切换/广告屏蔽/国内IP段数据库更新设置" -msgid "Support AdGuardHome and DNSMAQ format list" -msgstr "同时支持 AdGuard Home 和 DNSMAQ 格式的过滤列表" +msgid "Support AdGuardHome and DNSMASQ format list" +msgstr "同时支持 AdGuard Home 和 DNSMASQ 格式的过滤列表" msgid "Enable Custom Chnroute" msgstr "自定义国内IP段数据库更新" @@ -633,3 +633,6 @@ msgstr "启用 用户名/密码 认证" msgid "SOCKS5 Proxy Server" msgstr "SOCKS5 代理服务端" + +msgid "Redirect traffic to this network interface" +msgstr "分流到这个网络接口" diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 2743719aa8..aa0af310d5 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -287,7 +287,9 @@ start_redir() { elif [ "$stype" == "trojan" ]; then sscmd="/usr/sbin/trojan" elif [ "$stype" == "socks5" ]; then - sscmd="/usr/bin/ipt2socks" + sscmd="/usr/sbin/redsocks2" + elif [ "$stype" == "tun" ]; then + sscmd="/usr/sbin/redsocks2" fi local utype=$(uci_get_by_name $UDP_RELAY_SERVER type) if [ "$utype" == "ss" ]; then @@ -300,7 +302,9 @@ start_redir() { elif [ "$utype" == "trojan" ]; then ucmd="/usr/sbin/trojan" elif [ "$stype" == "socks5" ]; then - ucmd="/usr/bin/ipt2socks" + ucmd="/usr/sbin/redsocks2" + elif [ "$stype" == "tun" ]; then + ucmd="/usr/sbin/redsocks2" fi if [ "$(uci_get_by_type global threads 0)" == "0" ]; then threads=$(cat /proc/cpuinfo | grep 'processor' | wc -l) @@ -324,15 +328,18 @@ start_redir() { done echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd --version 2>&1 | head -1) , $threads Threads Started!" >>/tmp/ssrplus.log elif [ "$stype" == "socks5" ]; then + /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-retcp.conf" socks5 tcp $(uci_get_by_name $GLOBAL_SERVER local_port) $(uci_get_by_name $GLOBAL_SERVER server) $(uci_get_by_name $GLOBAL_SERVER server_port) \ + $(uci_get_by_name $GLOBAL_SERVER auth_enable 0) $(uci_get_by_name $GLOBAL_SERVER username) $(uci_get_by_name $GLOBAL_SERVER password) for i in $(seq 1 $threads); do - if [ "$(uci_get_by_name $GLOBAL_SERVER auth_enable 0)" == "0" ]; then - $sscmd -T -4 -b 0.0.0.0 -s $(uci_get_by_name $GLOBAL_SERVER server) -p $(uci_get_by_name $GLOBAL_SERVER server_port) -l $(uci_get_by_name $GLOBAL_SERVER local_port) -R ssr-retcp >/dev/null 2>&1 & - else - $sscmd -T -4 -b 0.0.0.0 -s $(uci_get_by_name $GLOBAL_SERVER server) -p $(uci_get_by_name $GLOBAL_SERVER server_port) -a $(uci_get_by_name $GLOBAL_SERVER username) \ - -k $(uci_get_by_name $GLOBAL_SERVER password) -l $(uci_get_by_name $GLOBAL_SERVER local_port) -R ssr-retcp >/dev/null 2>&1 & - fi + $sscmd -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1 done - echo "$(date "+%Y-%m-%d %H:%M:%S") Socks5 REDIRECT/TPROXY, $threads Threads Started!" >>/tmp/ssrplus.log + echo "$(date "+%Y-%m-%d %H:%M:%S") Socks5 REDIRECT/TPROXY $threads Threads Started!" >>/tmp/ssrplus.log + elif [ "$stype" == "tun" ]; then + /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-retcp.conf" vpn $(uci_get_by_name $GLOBAL_SERVER iface "br-lan") $(uci_get_by_name $GLOBAL_SERVER local_port) + for i in $(seq 1 $threads); do + $sscmd -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1 + done + echo "$(date "+%Y-%m-%d %H:%M:%S") Network Tunnel REDIRECT $threads Threads Started!" >>/tmp/ssrplus.log fi if [ -n "$UDP_RELAY_SERVER" ]; then redir_udp=1 @@ -353,14 +360,15 @@ start_redir() { lua /usr/share/shadowsocksr/gentrojanconfig.lua $GLOBAL_SERVER client 10801 >/var/etc/trojan-ssr-reudp.json sed -i 's/\\//g' /var/etc/trojan-ssr-reudp.json $ucmd --config /var/etc/trojan-ssr-reudp.json >/dev/null 2>&1 & - ipt2socks -U -4 -b 0.0.0.0 -s 127.0.0.1 -p 10801 -l $(uci_get_by_name $UDP_RELAY_SERVER local_port) >/dev/null 2>&1 & + /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-reudp.conf" socks5 udp $(uci_get_by_name $UDP_RELAY_SERVER local_port) 127.0.0.1 10801 0 + /usr/sbin/redsocks2 -c /var/etc/redsocks-ssr-reudp.conf >/dev/null 2>&1 elif [ "$utype" == "socks5" ]; then - if [ "$(uci_get_by_name $GLOBAL_SERVER auth_enable 0)" == "0" ]; then - $ucmd -4 -b 0.0.0.0 -s $(uci_get_by_name $UDP_RELAY_SERVER server) -p $(uci_get_by_name $UDP_RELAY_SERVER server_port) -l $(uci_get_by_name $UDP_RELAY_SERVER local_port) -U ssr-reudp >/dev/null 2>&1 & - else - $ucmd -4 -b 0.0.0.0 -s $(uci_get_by_name $UDP_RELAY_SERVER server) -p $(uci_get_by_name $UDP_RELAY_SERVER server_port) -a $(uci_get_by_name $GLOBAL_SERVER username) \ - -k $(uci_get_by_name $GLOBAL_SERVER password) -l $(uci_get_by_name $UDP_RELAY_SERVER local_port) -U ssr-reudp >/dev/null 2>&1 & - fi + /usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-reudp.conf" socks5 udp $(uci_get_by_name $UDP_RELAY_SERVER local_port) $(uci_get_by_name $UDP_RELAY_SERVER server) $(uci_get_by_name $UDP_RELAY_SERVER server_port) \ + $(uci_get_by_name $UDP_RELAY_SERVER auth_enable 0) $(uci_get_by_name $UDP_RELAY_SERVER username) $(uci_get_by_name $UDP_RELAY_SERVER password) + $ucmd -c /var/etc/redsocks-ssr-reudp.conf >/dev/null 2>&1 + elif [ "$stype" == "tun" ]; then + redir_udp=0 + echo "$(date "+%Y-%m-%d %H:%M:%S") Network Tunnel UDP TPROXY Relay not supported!" >>/tmp/ssrplus.log fi fi #deal with dns @@ -553,6 +561,7 @@ stop() { killall -q -9 pdnsd killall -q -9 dns2socks killall -q -9 microsocks + killall -q -9 redsocks2 if [ -f "/tmp/dnsmasq.d/dnsmasq-ssr.conf" ]; then rm -f /tmp/dnsmasq.d/dnsmasq-ssr.conf /etc/init.d/dnsmasq restart >/dev/null 2>&1 diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genred2config.sh b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genred2config.sh new file mode 100755 index 0000000000..a36f48f897 --- /dev/null +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genred2config.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +cat <<-EOF >$1 +base { + log_debug = off; + log_info = off; + log = stderr; + daemon = on; + redirector = iptables; + reuseport = on; +} +EOF + +if [ "$2" == "socks5" ]; then + if [ "$3" == "tcp" ]; then + if [ "$7" == "0" ]; then + cat <<-EOF >>$1 +redsocks { + bind = "0.0.0.0:$4"; + relay = "$5:$6"; + type = socks5; + autoproxy = 0; + timeout = 10; +} +EOF + else + cat <<-EOF >>$1 +redsocks { + bind = "0.0.0.0:$4"; + relay = "$5:$6"; + type = socks5; + autoproxy = 0; + timeout = 10; + login = "$8"; + password = "$9"; +} +EOF + fi + else + if [ "$7" == "0" ]; then + cat <<-EOF >>$1 +redudp { + bind = "0.0.0.0:$4"; + relay = "$5:$6"; + type = socks5; + udp_timeout = 10; +} +EOF + else + cat <<-EOF >>$1 +redudp { + bind = "0.0.0.0:$4"; + relay = "$5:$6"; + type = socks5; + udp_timeout = 10; + login = "$8"; + password = "$9"; +} +EOF + fi + fi +else + cat <<-EOF >>$1 +redsocks { + bind = "0.0.0.0:$4"; + type = direct; + interface = $3; + autoproxy = 0; + timeout = 10; +} +EOF +fi diff --git a/package/lean/luci-app-vlmcsd/luasrc/model/cbi/vlmcsd.lua b/package/lean/luci-app-vlmcsd/luasrc/model/cbi/vlmcsd.lua index 98c3e16fb1..1cb06b7cea 100644 --- a/package/lean/luci-app-vlmcsd/luasrc/model/cbi/vlmcsd.lua +++ b/package/lean/luci-app-vlmcsd/luasrc/model/cbi/vlmcsd.lua @@ -2,7 +2,7 @@ m = Map("vlmcsd") m.title = translate("vlmcsd config") -m.description = translate("A KMS Serever Emulator to active your Windows or Office") +m.description = translate("A KMS Server Emulator to active your Windows or Office") m:section(SimpleSection).template = "vlmcsd/vlmcsd_status" diff --git a/package/lean/luci-app-vlmcsd/po/zh_Hans/vlmcsd.po b/package/lean/luci-app-vlmcsd/po/zh_Hans/vlmcsd.po index bb884a3513..1f68abcb85 100644 --- a/package/lean/luci-app-vlmcsd/po/zh_Hans/vlmcsd.po +++ b/package/lean/luci-app-vlmcsd/po/zh_Hans/vlmcsd.po @@ -18,6 +18,8 @@ msgstr "基本设置" msgid "Config File" msgstr "配置文件" +msgid "A KMS Serever Emulator to active your Windows or Office" +msgstr "KMS服务器可用于激活Windows或Office" msgid "Vlmcsd is running." msgstr "KMS 服务器运行中" diff --git a/package/lean/n2n_v2/Makefile b/package/lean/n2n_v2/Makefile index 01f0415c59..a0e45ada31 100644 --- a/package/lean/n2n_v2/Makefile +++ b/package/lean/n2n_v2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=n2n_v2 PKG_VERSION:=2.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_REV=25563f31d9aba5f61b3e2fb42941b66dad1f531f PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REV).tar.bz2 diff --git a/package/lean/n2n_v2/files/n2n_v2.init b/package/lean/n2n_v2/files/n2n_v2.init index f4d2b47176..65103d2a82 100755 --- a/package/lean/n2n_v2/files/n2n_v2.init +++ b/package/lean/n2n_v2/files/n2n_v2.init @@ -60,5 +60,5 @@ start() { stop() { config_load 'n2n_v2' killall -9 edge - killall -9 supernode + ps | grep supernode | grep -v grep 2>&1 >/dev/null && killall -9 supernode } diff --git a/package/lean/r8152/Makefile b/package/lean/r8152/Makefile index 09aa00d791..4451037cb6 100755 --- a/package/lean/r8152/Makefile +++ b/package/lean/r8152/Makefile @@ -4,10 +4,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=usb-net-rtl8152 PKG_VERSION:=2.12.0 -PKG_RELEASE:=1 - -#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -#PKG_CAT:=bzcat +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -15,6 +12,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/usb-net-rtl8152 TITLE:=Driver for Realtek r8152 chipsets + DEPENDS:=@USB_SUPPORT +kmod-usb-core SUBMENU:=Network Devices VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) FILES:= $(PKG_BUILD_DIR)/r8152.ko diff --git a/package/lean/redsocks2/Makefile b/package/lean/redsocks2/Makefile new file mode 100644 index 0000000000..ed9899b08a --- /dev/null +++ b/package/lean/redsocks2/Makefile @@ -0,0 +1,52 @@ +# +# Copyright (C) 2014 OpenWrt-dist +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + + +PKG_NAME:=redsocks2 +PKG_VERSION:=0.67 +PKG_RELEASE:=3 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/semigodking/redsocks.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=2b8fe69e4faba9b256808bc664d4c9daedd76f70 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_MAINTAINER:=semigodking +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/redsocks2 + SECTION:=net + CATEGORY:=Network + TITLE:=Redirect any TCP connection to a SOCKS or HTTPS proxy server + URL:=https://github.com/semigodking/redsocks + DEPENDS:=+libevent2 +libopenssl +endef + +define Package/redsocks2/description +This is a modified version of original redsocks. \ +The name is changed to be REDSOCKS2 since this release to distinguish with original redsocks. \ +This variant is useful for anti-GFW (Great Fire Wall). +endef + +define Package/redsocks2/conffiles +/etc/config/redsocks2 +endef + +define Build/Compile + $(call Build/Compile/Default,DISABLE_SHADOWSOCKS=true) +endef + +define Package/redsocks2/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/redsocks2 $(1)/usr/sbin +endef + +$(eval $(call BuildPackage,redsocks2)) diff --git a/package/lean/vlmcsd/files/vlmcsd.ini b/package/lean/vlmcsd/files/vlmcsd.ini index c69d079d1b..2f85e12b57 100755 --- a/package/lean/vlmcsd/files/vlmcsd.ini +++ b/package/lean/vlmcsd/files/vlmcsd.ini @@ -1,11 +1,20 @@ #ePID/HwId设置为Windows显式 -;55c92734-d682-4d71-983e-d6ec3f16059f = 06401-00206-271-392041-03-1033-9600.0000-3622014 / 01 02 03 04 05 06 07 08 +;Windows = 06401-00206-471-111111-03-1033-17763.0000-2822018 / 01 02 03 04 05 06 07 08 #ePID设置为Office2010（包含Visio和Project）显式 -;59a52881-a989-479d-af46-f275c6370663 = 06401-00096-199-496023-03-1033-9600.0000-3622014 +;Office2010 = 06401-00096-199-222222-03-1033-17763.0000-2822018 -#ePID设置为Office2013（包含Visio和Project）显式 -;0ff1ce15-a989-479d-af46-f275c6370663 = 06401-00206-234-409313-03-1033-9600.0000-3622014 +#ePID/HwId设置为Office2013（包含Visio和Project）显式 +;Office2013 = 06401-00206-234-333333-03-1033-17763.0000-2822018 / 01 02 03 04 05 06 07 08 + +#ePID/HwId设置为Office2016（包含Visio和Project）显式 +;Office2016 = 06401-00206-437-444444-03-1033-17763.0000-2822018 / 01 02 03 04 05 06 07 08 + +#ePID/HwId设置为Office2019（包含Visio和Project）显式 +;Office2019 = 06401-00206-666-666666-03-1033-17763.0000-2822018 / 01 02 03 04 05 06 07 08 + +#ePID/HwId设置为Windows中国政府版 (Enterprise G/GN) 显式 +;WinChinaGov = 06401-03858-000-555555-03-1033-17763.0000-2822018 / 01 02 03 04 05 06 07 08 #使用自定义TCP端口 ;Port = 1688