From 741d3c6e9b6502f3dca490e35a1dcd3e064feece Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 25 Feb 2020 13:49:00 +0800 Subject: [PATCH] Merge Lean's source --- package/ctcgfw/luci-app-dockerman/Makefile | 49 ++----------------- .../luasrc/view/dockerman/cbi/xsimpleform.htm | 2 +- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../luasrc/model/cbi/shadowsocksr/client.lua | 4 ++ .../luci-app-ssr-plus/po/zh_Hans/ssr-plus.po | 12 +++++ .../root/etc/init.d/shadowsocksr | 4 +- .../share/shadowsocksr/gentrojanconfig.lua | 1 + package/lienol/trojan/Makefile | 8 +-- 8 files changed, 31 insertions(+), 51 deletions(-) diff --git a/package/ctcgfw/luci-app-dockerman/Makefile b/package/ctcgfw/luci-app-dockerman/Makefile index d947f3aa5c..d066865f44 100644 --- a/package/ctcgfw/luci-app-dockerman/Makefile +++ b/package/ctcgfw/luci-app-dockerman/Makefile @@ -3,55 +3,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-dockerman PKG_VERSION:=v0.3.0 PKG_RELEASE:=beta +PKG_TITLE:=Docker Manager interface for LuCI +PKG_DEPENDS:=+luci-lib-docker +docker-ce +e2fsprogs +fdisk PKG_MAINTAINER:=lisaac PKG_LICENSE:=AGPL-3.0 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/lisaac/luci-app-dockerman.git -PKG_SOURCE_VERSION:=$(PKG_VERSION) - -PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=Docker Manager interface for LuCI - PKGARCH:=all - DEPENDS:=+luci-lib-docker +docker-ce +e2fsprogs +fdisk -endef - -define Package/$(PKG_NAME)/description - Docker Manager interface for LuCI -endef - -define Build/Prepare - tar -xzvf $(DL_DIR)/$(PKG_SOURCE) -C $(BUILD_DIR) -endef - -define Build/Compile -endef +include $(TOPDIR)/feeds/luci/luci.mk define Package/$(PKG_NAME)/postinst #!/bin/sh -rm -fr /tmp/luci-indexcache /tmp/luci-modulecache +rm -rf /tmp/luci-indexcache /tmp/luci-modulecache endef -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/ - cp -pR $(PKG_BUILD_DIR)/root/* $(1)/ - # $(INSTALL_DIR) $(1)/www - # cp -pR $(PKG_BUILD_DIR)/htdoc/* $(1)/www - $(INSTALL_DIR) $(1)/usr/lib/lua/luci - cp -pR $(PKG_BUILD_DIR)/luasrc/* $(1)/usr/lib/lua/luci/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - $(foreach po, $(shell find $(PKG_BUILD_DIR)/po/*/*.po),\ - po2lmo $(po) $(1)/usr/lib/lua/luci/i18n/dockerman.$(shell echo $(po) | awk -F'/' '{print $$(NF-1)}').lmo;) - #po2lmo $(PKG_BUILD_DIR)/po/zh_Hans/dockerman.po $(1)/usr/lib/lua/luci/i18n/dockerman.zh-cn.lmo -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) +# call BuildPackage - OpenWrt buildroot signature diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/cbi/xsimpleform.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/cbi/xsimpleform.htm index 24975fe11b..7cfe8bf218 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/cbi/xsimpleform.htm +++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/cbi/xsimpleform.htm @@ -8,7 +8,7 @@ }, path = { resource = resource, - browser = url("admin/services/filebrowser") + browser = url("admin/filebrowser") } })) %>> diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index e6f8088cb5..4c047ebac7 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=151 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua index 4ae91e554b..2151041e12 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua @@ -49,6 +49,10 @@ o:value("1", translate("1 Thread")) o:value("2", translate("2 Threads")) o:value("4", translate("4 Threads")) o:value("8", translate("8 Threads")) +o:value("16", translate("16 Threads")) +o:value("32", translate("32 Threads")) +o:value("64", translate("64 Threads")) +o:value("128", translate("128 Threads")) o.default = "0" o.rmempty = false 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 314ec50734..bd867a2763 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 @@ -529,6 +529,18 @@ msgstr "4 线程" msgid "8 Threads" msgstr "8 线程" +msgid "16 Threads" +msgstr "16 线程" + +msgid "32 Threads" +msgstr "32 线程" + +msgid "64 Threads" +msgstr "64 线程" + +msgid "128 Threads" +msgstr "128 线程" + msgid "Proxy Ports" 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 2c7834881f..ba2ae92012 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 @@ -324,8 +324,10 @@ start_redir() { $sscmd -config /var/etc/v2-ssr-retcp.json >/dev/null 2>&1 & echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd -version | head -1) Started!" >>/tmp/ssrplus.log elif [ "$stype" == "trojan" ]; then + for i in $(seq 1 $threads); do $sscmd --config /var/etc/trojan-ssr-retcp.json >/dev/null 2>&1 & - echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd --version 2>&1 | head -1) Started!" >>/tmp/ssrplus.log + done + echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd --version 2>&1 | head -1) , $threads Threads Started!" >>/tmp/ssrplus.log fi if [ -n "$UDP_RELAY_SERVER" ]; then redir_udp=1 diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua index 967fa854ae..719e3fbbcf 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua @@ -32,6 +32,7 @@ local trojan = { tcp = { no_delay = true, keep_alive = true, + reuse_port = true, fast_open = (server.fast_open == "1") and true or false, fast_open_qlen = 20 } diff --git a/package/lienol/trojan/Makefile b/package/lienol/trojan/Makefile index cf2910fffa..71a6f792df 100644 --- a/package/lienol/trojan/Makefile +++ b/package/lienol/trojan/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trojan PKG_VERSION:=1.14.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/trojan-gfw/trojan.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=c3a17f2b37dc2397c34cd55832e4a612b9e089c1 +PKG_SOURCE_VERSION:=5074793bef10c3ce4546b2995dbbdde83cdba3dc PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 @@ -48,7 +48,7 @@ CMAKE_OPTIONS += \ -DFORCE_TCP_FASTOPEN=OFF \ -DSYSTEMD_SERVICE=OFF \ -DOPENSSL_USE_STATIC_LIBS=FALSE \ - -DBoost_DEBUG=OFF \ + -DBoost_DEBUG=ON \ -DBoost_NO_BOOST_CMAKE=ON define Package/trojan @@ -65,4 +65,4 @@ define Package/trojan/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trojan $(1)/usr/sbin/trojan endef -$(eval $(call BuildPackage,trojan)) +$(eval $(call BuildPackage,trojan)) \ No newline at end of file