fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Lean's source

Browse Source
This commit is contained in:
CN_SZTL 2020-02-14 17:56:22 +08:00
parent cf3beed725
commit 6b58762284
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
14 changed files with 213 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/kernel/antfs/Makefile → package/lean/antfs/Makefile
View File

@ -2,13 +2,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=antfs
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_URL:=https://github.com/klukonin/antfs.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2020-02-10
PKG_SOURCE_VERSION:=b41ba529f6b64b429527e09a06ce0326d5456c05
PKG_MIRROR_HASH:=dae039c0fe5bf1a2c8c1cca4211d607a4d6f56fc41b38444e2234b40d710d9db
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=LICENSE

4
package/lean/luci-app-ssr-plus/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus
PKG_RELEASE:=140
PKG_RELEASE:=142
PKG_VERSION:=1
define Package/$(PKG_NAME)/config
@ -35,7 +35,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Socks
bool "Include Socks Sever"
default y if x86_64
default y
endef
LUCI_TITLE:=SS/SSR/V2Ray/Trojan LuCI interface

8
package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
View File

@ -477,10 +477,10 @@ start_local() {
local local_server=$(uci_get_by_type socks5_proxy socks 0)
[ "$local_server" = 0 ] && return 0
mkdir -p /var/run /var/etc
echo '0.0.0.0 any' > /var/etc/srelay.conf
/usr/bin/srelay -q -c /etc/srelay.conf \
-i:$(uci_get_by_type socks5_proxy local_port 1080) \
-p /var/run/ssr-local.pid >/dev/null 2>&1
/usr/bin/srelay -q -c /var/etc/srelay.conf \
-i:$(uci_get_by_type socks5_proxy local_port 1080) >/dev/null 2>&1
local_enable=1
}
@ -559,6 +559,8 @@ stop() {
fi
killall -q -9 ssr-monitor
killall -q -9 ss-redir
killall -q -9 obfs-local
killall -q -9 v2ray-plugin
killall -q -9 ssr-redir
killall -q -9 v2ray
killall -q -9 trojan

1
package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules
View File

@ -188,6 +188,7 @@ tp_rule() {
ip route add local 0.0.0.0/0 dev lo table 100
local ipt="iptables -t mangle"
$ipt -N SS_SPEC_TPROXY
$ipt -A SS_SPEC_TPROXY -p udp --dport 443 -j DROP
$ipt -A SS_SPEC_TPROXY -p udp --dport 53 -j RETURN
$ipt -A SS_SPEC_TPROXY -p udp -d 0.0.0.0/8 -j RETURN
$ipt -A SS_SPEC_TPROXY -p udp -d 10.0.0.0/8 -j RETURN

22
package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
View File

@ -193,12 +193,21 @@ local function processData(szType, content)
if host[2]:find("/\\?") then
local query = split(host[2], "/\\?")
result.server_port = query[1]
-- local params = {}
-- for _, v in pairs(split(query[2], '&')) do
-- local t = split(v, '=')
-- params[t[1]] = t[2]
-- end
-- 这里似乎没什么用 我看数据结构没有写插件的支持 先抛弃
local params = {}
for _, v in pairs(split(query[2], '&')) do
local t = split(v, '=')
params[t[1]] = t[2]
end
if params.lugin then
local plugin_info = UrlDecode(params.lugin)
local idx_pn = plugin_info:find(";")
if idx_pn then
result.plugin = plugin_info:sub(1, idx_pn - 1)
result.plugin_opts = plugin_info:sub(idx_pn + 1, #plugin_info)
else
result.plugin = plugin_info
end
end
else
result.server_port = host[2]
end
@ -365,3 +374,4 @@ if subscribe_url and #subscribe_url > 0 then
end
end)
end

6
package/lean/luci-app-xlnetacc/Makefile
View File

@ -11,10 +11,6 @@ LUCI_DEPENDS:=+jshn +wget +openssl-util
LUCI_PKGARCH:=all
LUCI_DESCRIPTION=LuCI Support for XLNetAcc.
define Package/$(PKG_NAME)/conffiles
/etc/config/xlnetacc
endef
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature
$(eval $(call BuildPackage,$(PKG_NAME)))

142
package/lean/luci-app-xlnetacc/files/luci/i18n/xlnetacc.zh-cn.po
View File

@ -1,142 +0,0 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"Last-Translator: ElonH <elonhhuang@gmail.com>\n"
"Language-Team: none\n"
"Language: zh-Hans\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
"X-Generator: Poedit 2.0.6\n"
#: luasrc/view/xlnetacc/status.htm:4 luasrc/view/xlnetacc/status.htm:5
#: luasrc/view/xlnetacc/status.htm:6 luasrc/view/xlnetacc/logview.htm:25
msgid "Collecting data..."
msgstr "获取数据中..."
#: luasrc/view/xlnetacc/status.htm:5
msgid "DownLink Upgrade Status"
msgstr "下行提速状态"
#: luasrc/model/cbi/xlnetacc.lua:14
msgid "Enable DownLink Upgrade"
msgstr "开启下行提速"
#: luasrc/model/cbi/xlnetacc.lua:18
msgid "Enable Logging"
msgstr "启用日志记录"
#: luasrc/model/cbi/xlnetacc.lua:16
msgid "Enable UpLink Upgrade"
msgstr "开启上行提速"
#: luasrc/model/cbi/xlnetacc.lua:21
msgid "Enable verbose logging"
msgstr "启用详细日志"
#: luasrc/model/cbi/xlnetacc.lua:11
msgid "Enabled"
msgstr "启用"
#: luasrc/view/xlnetacc/logview.htm:44
msgid "Error get log data."
msgstr "获取日志数据失败。"
#: luasrc/model/cbi/xlnetacc.lua:7
msgid "General Settings"
msgstr "基本设置"
#: luasrc/view/xlnetacc/logview.htm:25
msgid "Loading..."
msgstr "正在加载..."
#: luasrc/controller/xlnetacc.lua:15
msgid "Log"
msgstr "日志"
#: luasrc/view/xlnetacc/logview.htm:22
msgid "Log Data"
msgstr "日志数据"
#: luasrc/view/xlnetacc/status.htm:16
msgid "NOT RUNNING"
msgstr "未运行"
#: luasrc/view/xlnetacc/logview.htm:39 luasrc/view/xlnetacc/logview.htm:41
msgid "No log data."
msgstr "无日志数据。"
#: luasrc/view/xlnetacc/status.htm:17 luasrc/view/xlnetacc/status.htm:18
msgid "No upgrade information"
msgstr "暂无提速信息"
#: luasrc/view/xlnetacc/status.htm:16
msgid "RUNNING"
msgstr "运行中"
#: luasrc/view/xlnetacc/logview.htm:26
msgid "Refresh every 5 seconds."
msgstr "每 5 秒刷新。"
#: luasrc/view/xlnetacc/status.htm:2
msgid "Running Status"
msgstr "运行状态"
#: luasrc/controller/xlnetacc.lua:12 luasrc/model/cbi/xlnetacc.lua:4
msgid "Settings"
msgstr "设置"
#: luasrc/view/xlnetacc/status.htm:6
msgid "UpLink Upgrade Status"
msgstr "上行提速状态"
#: luasrc/model/cbi/xlnetacc.lua:24
msgid "Upgrade interface"
msgstr "指定提速接口"
#: luasrc/controller/xlnetacc.lua:9 luasrc/view/xlnetacc/logview.htm:22
#: luasrc/model/cbi/xlnetacc.lua:4
msgid "XLNetAcc"
msgstr "迅雷快鸟"
#: luasrc/view/xlnetacc/status.htm:4
msgid "XLNetAcc Running Status"
msgstr "快鸟运行状态"
#: luasrc/model/cbi/xlnetacc.lua:31
msgid "XLNetAcc account"
msgstr "迅雷快鸟帐号"
#: luasrc/model/cbi/xlnetacc.lua:4
msgid ""
"XLNetAcc is a Thunder joint broadband operators launched a commitment to "
"help users solve the low broadband, slow Internet access, poor Internet "
"experience of professional-grade broadband upgrade software."
msgstr ""
"迅雷快鸟是迅雷联合宽带运营商推出的一款致力于帮助用户解决宽带低、网速慢、上网"
"体验差的专业级宽带加速软件。"
#: luasrc/model/cbi/xlnetacc.lua:33
msgid "XLNetAcc password"
msgstr "迅雷快鸟密码"
#: luasrc/view/xlnetacc/logview.htm:40
msgid "log file:"
msgstr "日志文件："
#: luasrc/view/xlnetacc/logview.htm:38
msgid "syslog:"
msgstr "系统日志："
#~ msgid ""
#~ "Does not store the plaintext password, automatically emptied after start."
#~ msgstr "不存储明文密码，启动后自动清空。"
#~ msgid "Encrypted password"
#~ msgstr "加密后的密码"
#~ msgid ""
#~ "Auto-generate in accordance with the plaintext password, do not modify it!"
#~ msgstr "根据明文密码自动生成，请勿修改！"

102
package/lean/luci-app-xlnetacc/po/zh_Hans/xlnetacc.po Normal file
View File

@ -0,0 +1,102 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"Last-Translator: ElonH <elonhhuang@gmail.com>\n"
"Language-Team: none\n"
"Language: zh-Hans\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
"X-Generator: Poedit 2.0.6\n"
msgid "XLNetAcc"
msgstr "迅雷快鸟"
msgid "XLNetAcc is a Thunder joint broadband operators launched a commitment to help users solve the low broadband, slow Internet access, poor Internet experience of professional-grade broadband upgrade software."
msgstr "迅雷快鸟是迅雷联合宽带运营商推出的一款致力于帮助用户解决宽带低、网速慢、上网体验差的专业级宽带加速软件。"
msgid "Settings"
msgstr "设置"
msgid "Log"
msgstr "日志"
msgid "Running Status"
msgstr "运行状态"
msgid "XLNetAcc Running Status"
msgstr "快鸟运行状态"
msgid "DownLink Upgrade Status"
msgstr "下行提速状态"
msgid "UpLink Upgrade Status"
msgstr "上行提速状态"
msgid "RUNNING"
msgstr "运行中"
msgid "NOT RUNNING"
msgstr "未运行"
msgid "No upgrade information"
msgstr "暂无提速信息"
msgid "General Settings"
msgstr "基本设置"
msgid "Enabled"
msgstr "启用"
msgid "Enable DownLink Upgrade"
msgstr "开启下行提速"
msgid "Enable UpLink Upgrade"
msgstr "开启上行提速"
msgid "Enable Logging"
msgstr "启用日志记录"
msgid "Enable verbose logging"
msgstr "启用详细日志"
msgid "Upgrade interface"
msgstr "指定提速接口"
msgid "XLNetAcc account"
msgstr "迅雷快鸟帐号"
msgid "XLNetAcc password"
msgstr "迅雷快鸟密码"
msgid "Does not store the plaintext password, automatically emptied after start."
msgstr "不存储明文密码，启动后自动清空。"
msgid "Encrypted password"
msgstr "加密后的密码"
msgid "Auto-generate in accordance with the plaintext password, do not modify it!"
msgstr "根据明文密码自动生成，请勿修改！"
msgid "Log Data"
msgstr "日志数据"
msgid "Loading..."
msgstr "正在加载..."
msgid "Refresh every 5 seconds."
msgstr "每 5 秒刷新。"
msgid "syslog:"
msgstr "系统日志："
msgid "log file:"
msgstr "日志文件："
msgid "No log data."
msgstr "无日志数据。"
msgid "Error get log data."
msgstr "获取日志数据失败。"

4
package/lean/shadowsocksr-libev/Makefile
View File

@ -5,10 +5,10 @@ PKG_VERSION:=2.5.6
PKG_RELEASE:=5
PKG_SOURCE_PROTO:=git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/shadowsocksrr/shadowsocksr-libev
PKG_SOURCE_VERSION:=d63ff863800a5645aca4309d5dd5962bd1e95543
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=LICENSE
@ -25,6 +25,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/shadowsocksr-libev
SECTION:=net
CATEGORY:=Network
SUBMENU:=Web Servers/Proxies
TITLE:=Lightweight Secured Socks5 Proxy
URL:=https://github.com/shadowsocksrr/shadowsocksr-libev
DEPENDS:=+libopenssl +libpthread +libpcre +zlib
@ -42,6 +43,7 @@ define Package/shadowsocksr-libev/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ss-local $(1)/usr/bin/ssr-local
$(LN) ssr-local $(1)/usr/bin/ssr-tunnel
$(INSTALL_BIN) $(PKG_BUILD_DIR)/server/ss-check $(1)/usr/bin/ssr-check
$(INSTALL_BIN) $(PKG_BUILD_DIR)/server/ss-server $(1)/usr/bin/ssr-server
endef
define Package/shadowsocksr-libev-alt/install

45
package/lean/srelay/Makefile Normal file
View File

@ -0,0 +1,45 @@
#
# Copyright (C) 2006-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=srelay
PKG_VERSION:=0.4.8p3
PKG_RELEASE:=8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/socks-relay
PKG_MD5SUM:=8121ff3d1b741de95dd6eacc5ad5811c
include $(INCLUDE_DIR)/package.mk
define Package/srelay
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libpthread
SUBMENU:=Web Servers/Proxies
TITLE:=A socks 4/5 proxy server
URL:=http://www.c-wind.com/srelay/
endef
define Package/srelay/conffiles
/etc/srelay.conf
endef
CONFIGURE_ARGS += \
--enable-thread \
--with-libwrap=no \
CONFIGURE_VARS += \
CPPFLAGS="-DLINUX $$$$CPPFLAGS" \
define Package/srelay/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
endef
$(eval $(call BuildPackage,srelay))

2
package/lean/srelay/files/srelay.conf Normal file
View File

@ -0,0 +1,2 @@
# allow local subnet to access socks proxy
0.0.0.0 any

14
package/lean/srelay/files/srelay.init Normal file
View File

@ -0,0 +1,14 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2006-2011 OpenWrt.org
START=50
SERVICE_USE_PID=1
start() {
service_start /usr/bin/srelay -c /etc/srelay.conf -r -s
}
stop() {
service_stop /usr/bin/srelay
}

19
package/lean/srelay/patches/001-compile.patch Normal file
View File

@ -0,0 +1,19 @@
--- a/configure
+++ b/configure
@@ -3999,11 +3999,11 @@
LDFLAGS="$LDFLAGS -lpthread"
fi
if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
+# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+#as_fn_error $? "cannot run test program while cross compiling
+#See \`config.log' for more details" "$LINENO" 5; }
+#else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

4
package/lienol/trojan/Makefile
View File

@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=trojan
PKG_VERSION:=1.14.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/trojan-gfw/trojan.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=7cfe059c664e06bc7663620024578d85d9e6008c
PKG_SOURCE_VERSION:=c3a17f2b37dc2397c34cd55832e4a612b9e089c1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1