diff --git a/package/ctcgfw/open-app-filter/files/feature.cfg b/package/ctcgfw/open-app-filter/files/feature.cfg index 9589d51235..a9e39c490a 100644 --- a/package/ctcgfw/open-app-filter/files/feature.cfg +++ b/package/ctcgfw/open-app-filter/files/feature.cfg @@ -22,6 +22,8 @@ 2012 率土之滨:[tcp;;10001;;;00:00|01:00,tcp;;8001;;;00:00|01:00] 2013 一刀传世:[tcp;;8040;;;00:47|01:45] 2014 第五人格:[tcp;;4010;;;,tcp;;4010;;;,tcp;;4020;;;,tcp;;4030;;;,tcp;;4040;;;,tcp;;4050;;;,tcp;;4060;;;,tcp;;4070;;;,tcp;;4080;;;,tcp;;4090;;;] +2016 皇室战争:[udp;;9339;;;] +2017 炉石传说:[tcp;;3724;;;00:73:01:00:02:00] #class video 3001 抖音短视频:[tcp;;80;-dy-;;,tcp;;;-dy.;;] diff --git a/package/ctcgfw/baidupcs-web/Makefile b/package/lean/baidupcs-web/Makefile similarity index 77% rename from package/ctcgfw/baidupcs-web/Makefile rename to package/lean/baidupcs-web/Makefile index 1d719379a5..a0fe471825 100644 --- a/package/ctcgfw/baidupcs-web/Makefile +++ b/package/lean/baidupcs-web/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baidupcs-web -PKG_VERSION:=3.7.0 +PKG_VERSION:=3.7.1 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk @@ -18,8 +18,7 @@ define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network TITLE:=BaiduPCS-Web is a web controller for BaiduPCS-Go - URL:=https://github.com/liuzhuoling2011/baidupcs-web - DEPENDS:=@(aarch64||arm||i386||mips||mipsel||x86_64) + URL:=https://github.com/Erope/baidupcs-web endef @@ -47,7 +46,13 @@ ifeq ($(ARCH),mips) endif ifeq ($(ARCH),arm) - PKG_ARCH_BAIDUPCS-WEB:=arm +ifeq ($(BOARD),bcm53xx) + PKG_ARCH_BAIDUPCS-WEB:=armv5 +else ifeq ($(BOARD),kirkwood) + PKG_ARCH_BAIDUPCS-WEB:=armv5 +else + PKG_ARCH_BAIDUPCS-WEB:=armv7 +endif endif ifeq ($(ARCH),aarch64) @@ -55,9 +60,9 @@ ifeq ($(ARCH),aarch64) endif -PKG_SOURCE:=BaiduPCS-Go-$(PKG_VERSION)-linux-$(PKG_ARCH_BAIDUPCS-WEB).zip +PKG_SOURCE:=BaiduPCS-Go-v$(PKG_VERSION)-linux-$(PKG_ARCH_BAIDUPCS-WEB).zip -PKG_SOURCE_URL:=https://github.com/liuzhuoling2011/baidupcs-web/releases/download/$(PKG_VERSION)/ +PKG_SOURCE_URL:=https://github.com/Erope/baidupcs-web/releases/download/$(PKG_VERSION)/ UNZIP_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME)-unzip diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 78629ba06b..860506e52d 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -51,7 +51,7 @@ echo "DISTRIB_DESCRIPTION='OpenWrt 18.06 by Lean '" >> /etc/openwrt_release sed -i 's/LuCI openwrt-18.06 branch/LuCI 18.06 by Lean/g' /usr/lib/lua/luci/version.lua sed -i '/luciversion/d' /usr/lib/lua/luci/version.lua -echo 'luciversion = "Mod20.04 by CTCGFW"' >> /usr/lib/lua/luci/version.lua +echo 'luciversion = "Mod20.05 by CTCGFW"' >> /usr/lib/lua/luci/version.lua sed -i '/log-facility/d' /etc/dnsmasq.conf echo "log-facility=/dev/null" >> /etc/dnsmasq.conf diff --git a/package/lienol/ipt2socks/Makefile b/package/lienol/ipt2socks/Makefile index da92cb1b58..e132f43d7c 100644 --- a/package/lienol/ipt2socks/Makefile +++ b/package/lienol/ipt2socks/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipt2socks -PKG_VERSION:=1.0.2 -PKG_RELEASE:=5 +PKG_VERSION:=1.1.2 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/zfl9/ipt2socks.git -PKG_SOURCE_VERSION:=aebd43819d5eb63253c6df2610089188c194c3e3 +PKG_SOURCE_VERSION:=cfbc2189356aba7fcafb0bc961a95419f313d8a7 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) @@ -25,21 +25,12 @@ define Package/ipt2socks CATEGORY:=Network TITLE:=Utility for converting iptables (REDIRECT/TPROXY) to SOCKS5 URL:=https://github.com/zfl9/ipt2socks - DEPENDS:=+libuv endef define Package/ipt2socks/description Utility for converting iptables (REDIRECT/TPROXY) to SOCKS5. endef -define Package/ipt2socks/conffiles -/etc/config/ipt2socks -endef - -#MAKE_FLAGS += INCLUDES="-I$(STAGING_DIR)/usr/include" -#MAKE_FLAGS += LDFLAGS="-L$(STAGING_DIR)/usr/lib" -MAKE_FLAGS += LIBS="-l:libuv_a.a" - define Package/ipt2socks/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/ipt2socks $(1)/usr/bin diff --git a/package/lienol/ipt2socks/patches/001-fix-splice.patch b/package/lienol/ipt2socks/patches/001-fix-splice.patch new file mode 100644 index 0000000000..d39eda94ba --- /dev/null +++ b/package/lienol/ipt2socks/patches/001-fix-splice.patch @@ -0,0 +1,49 @@ +--- a/ipt2socks.c ++++ b/ipt2socks.c +@@ -28,6 +28,36 @@ + + #define IPT2SOCKS_VERSION "ipt2socks v1.1.2 " + ++#ifdef __MUSL__ ++#include ++#include ++ ++ssize_t splice(int __fdin, __off64_t *__offin, int __fdout, ++ __off64_t *__offout, size_t __len, unsigned int __flags) { ++#ifdef __NR_splice ++ return syscall(__NR_splice, __fdin, __offin, __fdout, __offout, __len, __flags); ++#else ++ (void)__fdin; ++ (void)__offin; ++ (void)__fdout; ++ (void)__offout; ++ (void)__len; ++ (void)__flags; ++ errno = ENOSYS; ++ return -1; ++#endif ++} ++ ++#undef SPLICE_F_MOVE ++#undef SPLICE_F_NONBLOCK ++#undef SPLICE_F_MORE ++ ++#define SPLICE_F_MOVE 1 ++#define SPLICE_F_NONBLOCK 2 ++#define SPLICE_F_MORE 4 ++ ++#endif /* __MUSL__ */ ++ + enum { + OPT_ENABLE_TCP = 0x01 << 0, // enable tcp proxy + OPT_ENABLE_UDP = 0x01 << 1, // enable udp proxy + +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + CC = gcc +-CFLAGS = -std=c99 -Wall -Wextra -O2 -pthread ++CFLAGS = -std=c99 -Wall -Wextra -O2 -pthread -D __MUSL__ + LIBS = -lm + SRCS = ipt2socks.c logutils.c lrucache.c netutils.c protocol.c + OBJS = $(SRCS:.c=.o) diff --git a/package/network/config/qos-scripts/Makefile b/package/network/config/qos-scripts/Makefile index abaeaeb981..7d282b2db5 100644 --- a/package/network/config/qos-scripts/Makefile +++ b/package/network/config/qos-scripts/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qos-scripts PKG_VERSION:=1.3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Felix Fietkau diff --git a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh index 3ec7f80e53..024be0c170 100755 --- a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh +++ b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh @@ -22,15 +22,20 @@ add_insmod() { [ -e /etc/config/network ] && { # only try to parse network config on openwrt - find_ifname() {( - reset_cb - include /lib/network - scan_interfaces - config_get "$1" ifname - )} + . /lib/functions/network.sh + + find_ifname() { + local ifname + if network_get_device ifname "$1"; then + echo "$ifname" + else + echo "Device for interface $1 not found." >&2 + exit 1 + fi + } } || { find_ifname() { - echo "Interface not found." + echo "Interface not found." >&2 exit 1 } } @@ -218,6 +223,7 @@ qos_parse_config() { config_get device "$1" device [ -z "$device" ] && { device="$(find_ifname $1)" + [ -z "$device" ] && exit 1 config_set "$1" device "$device" } } diff --git a/package/ntlf9t/luci-app-clash/Makefile b/package/ntlf9t/luci-app-clash/Makefile index 1afb94f41c..14c5da4b72 100644 --- a/package/ntlf9t/luci-app-clash/Makefile +++ b/package/ntlf9t/luci-app-clash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-clash -PKG_VERSION:=1.6.9c +PKG_VERSION:=1.7.0 PKG_MAINTAINER:=frainzy1477 @@ -101,6 +101,7 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/lib/lua/luci $(INSTALL_DIR) $(1)/usr/share/ $(INSTALL_DIR) $(1)/usr/share/clash + $(INSTALL_DIR) $(1)/usr/share/clash/rules $(INSTALL_DIR) $(1)/usr/share/clash/rules/g_rules $(INSTALL_DIR) $(1)/usr/share/clash/dashboard @@ -124,7 +125,6 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) ./root/usr/share/clash/*.sh $(1)/usr/share/clash/ $(INSTALL_BIN) ./root/usr/share/clash/dns.yaml $(1)/usr/share/clash/ - $(INSTALL_BIN) ./root/usr/share/clash/rules/g_rules/Steam.rules $(1)/usr/share/clash/rules/g_rules $(INSTALL_BIN) ./root//usr/share/clash/rules/rules.list $(1)/usr/share/clash/rules @@ -137,6 +137,8 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) ./root/usr/share/clash/logstatus_check $(1)/usr/share/clash/ $(INSTALL_BIN) ./root/usr/share/clash/clash.txt $(1)/usr/share/clash/ + + $(INSTALL_BIN) ./root/usr/share/clash/dashboard/index.html $(1)/usr/share/clash/dashboard/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.1560b07adc97ac0ac265.css $(1)/usr/share/clash/dashboard/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/img/ffac0fa1d89f15922b4594863b8b32e9.png $(1)/usr/share/clash/dashboard/img/ diff --git a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua index 2c2cf90f5d..85cce4b312 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua @@ -11,7 +11,10 @@ function index() return end - entry({"admin", "services", "clash"},alias("admin", "services", "clash", "overview"), _("Clash"), 5) + local page = entry({"admin", "services", "clash"},alias("admin", "services", "clash", "overview"), _("Clash"), 5) + page.dependent = true + page.acl_depends = { "luci-app-oclash" } + entry({"admin", "services", "clash", "overview"},cbi("clash/overview"),_("Overview"), 10).leaf = true entry({"admin", "services", "clash", "client"},cbi("clash/client"),_("Client"), 20).leaf = true @@ -69,7 +72,6 @@ local function uhttp_port() end end - local function download_rule() local filename = luci.http.formvalue("filename") local rule_file_dir="/usr/share/clash/rules/g_rules/" .. filename @@ -89,7 +91,7 @@ function action_update_rule() end function action_update() - luci.sys.exec("kill $(pgrep /usr/share/clash/update.sh) ; (bash /usr/share/clash/update.sh >>/usr/share/clash/clash.txt 2>&1) &") + luci.sys.exec("kill $(pgrep /usr/share/clash/update.sh) ; (bash /usr/share/clash/update.sh >/usr/share/clash/clash.txt 2>&1) &") end @@ -317,7 +319,6 @@ function action_status() web = is_web(), clash = is_running(), localip = localip(), - uhttp_port = uhttp_port(), dash_port = dash_port(), current_version = current_version(), clash_core = clash_core(), @@ -328,6 +329,7 @@ function action_status() e_mode = e_mode(), in_use = in_use(), conf_path = conf_path(), + uhttp_port = uhttp_port(), typeconf = typeconf() }) end @@ -390,11 +392,15 @@ function check_geoip_log() local fdp=tonumber(fs.readfile("/var/run/geoiplog")) or 0 local f=io.open("/tmp/geoip_update.txt", "r+") f:seek("set",fdp) - local a=f:read(2048000) or "." + local a=f:read(2048000) or "" fdp=f:seek() fs.writefile("/var/run/geoiplog",tostring(fdp)) f:close() +if fs.access("/var/run/geoip_update") then luci.http.write(a) +else + luci.http.write(a.."\0") +end end diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/actconfig.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/actconfig.lua deleted file mode 100644 index e9ebfbb58f..0000000000 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/actconfig.lua +++ /dev/null @@ -1,69 +0,0 @@ - -local NXFS = require "nixio.fs" -local SYS = require "luci.sys" -local HTTP = require "luci.http" -local DISP = require "luci.dispatcher" -local UTIL = require "luci.util" -local uci = require("luci.model.uci").cursor() -local fs = require "luci.clash" -local http = luci.http - - - - -m = Map("clash") -s = m:section(TypedSection, "clash") -m.pageaction = false -s.anonymous = true -s.addremove=false - - -local conf = "/etc/clash/config.yaml" -sev = s:option(TextValue, "conf") -sev.readonly=true -sev.rows = 20 -sev.wrap = "off" -sev.cfgvalue = function(self, section) - return NXFS.readfile(conf) or "" -end -sev.write = function(self, section, value) -end - - -o = s:option(Button,"configrm") -o.inputtitle = translate("Delete Config") -o.write = function() - os.execute("rm -rf /etc/clash/config.yaml 2>&1 &") -end - -o = s:option(Button, "Download") -o.inputtitle = translate("Download Config") -o.inputstyle = "apply" -o.write = function () - local sPath, sFile, fd, block - sPath = "/etc/clash/config.yaml" - sFile = NXFS.basename(sPath) - if fs.isdirectory(sPath) then - fd = io.popen('tar -C "%s" -cz .' % {sPath}, "r") - sFile = sFile .. ".tar.gz" - else - fd = nixio.open(sPath, "r") - end - if not fd then - return - end - HTTP.header('Content-Disposition', 'attachment; filename="%s"' % {sFile}) - HTTP.prepare_content("application/octet-stream") - while true do - block = fd:read(nixio.const.buffersize) - if (not block) or (#block ==0) then - break - else - HTTP.write(block) - end - end - fd:close() - HTTP.close() -end - -return m diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/create.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/create.lua index 43cd8c0079..8a38acaddc 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/create.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/create.lua @@ -62,6 +62,7 @@ cc = s:option(Flag, "create", translate("Enable Create")) cc.default = 1 cc.description = translate("Enable to create configuration") + o = s:option(Value, "create_tag") o.title = translate("Config Name") o.rmempty = true diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/servers-config.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/servers-config.lua index 00ea391d65..6d0600f6a5 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/servers-config.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/servers-config.lua @@ -1,10 +1,15 @@ local m, s, o local clash = "clash" +local uci = luci.model.uci.cursor() +local fs = require "nixio.fs" +local sys = require "luci.sys" local sid = arg[1] local uuid = luci.sys.exec("cat /proc/sys/kernel/random/uuid") +local server_table = {} + local encrypt_methods_ss = { "rc4-md5", @@ -81,7 +86,6 @@ if m.uci:get(clash, sid) ~= "servers" then return end - -- [[ Servers Setting ]]-- s = m:section(NamedSection, sid, "servers") s.anonymous = true @@ -101,8 +105,6 @@ o:value("http", translate("HTTP(S)")) o:value("snell", translate("Snell")) o:value("trojan", translate("trojan")) - - o.description = translate("Using incorrect encryption mothod may causes service fail to start") o = s:option(Value, "name", translate("Alias")) diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/core_check.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/core_check.htm index 4556c77ac0..0ef89e80b1 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/core_check.htm +++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/core_check.htm @@ -1,6 +1,5 @@ <%+cbi/valueheader%> <%local fs=require"nixio.fs"%> -

@@ -17,15 +16,14 @@ function apply_update(){ function poll_check(){ var lv = document.getElementById('core_download'); lv.style.display="inline" + lv.innerText = "" XHR.poll(2, '<%=url([[admin]], [[services]], [[clash]], [[check]])%>', null, - function(x, data) { - scroll(); - var lv = document.getElementById('core_download'); - if (x.responseText && lv) { - lv.innerHTML += x.responseText; - } - } -); + function(x, data) { + if(x && x.status === 200) { + if(typeof(x.responseText) === "string") { + lv.insertAdjacentText("beforeend", x.responseText); + lv.scrollTop = lv.scrollHeight; + }}}); } @@ -56,13 +54,6 @@ function hide(){ btn.value = '<%:Download%>'; } - -function scroll(){ - var textarea = document.getElementById('core_download'); - textarea.scrollTop = textarea.scrollHeight; -} - - <% if fs.access("/var/run/core_update") then %> var btn = document.getElementById('apply_update_button'); btn.disabled = true; diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/geoip.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/geoip.htm index c54f5f7f6c..bbd46646c7 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/geoip.htm +++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/geoip.htm @@ -1,6 +1,6 @@ <%+cbi/valueheader%> <%local fs=require"nixio.fs"%> - +

@@ -17,12 +17,14 @@ function apply_update(){ function poll_check(){ var lv = document.getElementById('geoip_download'); lv.style.display="inline" + lv.innerText = "" XHR.poll(2, '<%=url([[admin]], [[services]], [[clash]], [[check_geoip]])%>', null, function(x, data) { scroll(); var lv = document.getElementById('geoip_download'); if (x.responseText && lv) { lv.innerHTML += x.responseText; + lv.scrollTop = lv.scrollHeight; } } ); @@ -58,10 +60,10 @@ function hide(){ } -function scroll(){ +/*function scroll(){ var textarea = document.getElementById('geoip_download'); textarea.scrollTop = textarea.scrollHeight; -} +}*/ <% if fs.access("/var/run/geoip_update") then %> diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/list.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/list.htm index 5ed961788b..aff5a571fb 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/list.htm +++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/list.htm @@ -1,5 +1,4 @@ - <% local dsp = require "luci.dispatcher" -%> @@ -44,4 +43,5 @@ local dsp = require "luci.dispatcher" ); } //]]> - \ No newline at end of file + + diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status_log.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status_log.htm index b821e9437d..7aff7b46f8 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status_log.htm +++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status_log.htm @@ -4,7 +4,7 @@