update 2022-06-27 20:22:34

This commit is contained in:
github-actions[bot] 2022-06-27 20:22:34 +08:00
parent f3d834a119
commit b6fce21b54
21 changed files with 302 additions and 30 deletions

15
luci-app-istorex/Makefile Executable file
View File

@ -0,0 +1,15 @@
#
# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
#
# This is free software, licensed under the Apache License, Version 2.0 .
#
include $(TOPDIR)/rules.mk
LUCI_TITLE:=IstoreX
PKG_VERSION:=0.0.1.12
LUCI_DEPENDS:=+quickstart +luci-app-store
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,26 @@
module("luci.controller.istorex", package.seeall)
local page_index = {"admin", "istorex","pages"}
function index()
if luci.sys.call("pgrep quickstart >/dev/null") == 0 then
entry({"admin", "istorex"}, call("redirect_index"))
entry({"admin", "istorex", "pages"}, call("istorex_template")).leaf = true
else
entry({"admin", "istorex"})
entry({"admin", "istorex", "pages"}, call("redirect_fallback")).leaf = true
end
end
function istorex_template()
luci.template.render("istorex/main", {
prefix=luci.dispatcher.build_url(unpack(page_index))
})
end
function redirect_index()
luci.http.redirect(luci.dispatcher.build_url(unpack(page_index)))
end
function redirect_fallback()
luci.http.redirect(luci.dispatcher.build_url("admin","status"))
end

View File

@ -0,0 +1,46 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0" /> -->
<meta name="viewport" content="width=1400, initial-scale=1.0" />
<title><%=luci.sys.hostname()%></title>
</head>
<body>
<script src="<%=resource%>/cbi.js?v=git-22.135.19704-132fbcf"></script>
<script type="text/javascript" src="<%=resource%>/promis.min.js?v=git-22.160.13453-cb18896"></script>
<script type="text/javascript" src="<%=resource%>/luci.js?v=git-22.160.13453-cb18896"></script>
<script>
(function(){
var pathe_prefix = "<%=prefix%>"
window.HostName = "<%=luci.sys.hostname()%>"
window.path_base = pathe_prefix
})();
</script>
<script type="text/javascript">
L = new LuCI(<%= luci.http.write_json({
token = token,
media = media,
resource = resource,
scriptname = luci.http.getenv("SCRIPT_NAME"),
pathinfo = luci.http.getenv("PATH_INFO"),
documentroot = luci.http.getenv("DOCUMENT_ROOT"),
requestpath = luci.dispatcher.context.requestpath,
dispatchpath = luci.dispatcher.context.path,
pollinterval = luci.config.main.pollinterval or 5,
ubuspath = luci.config.main.ubuspath or '/ubus/',
sessionid = luci.dispatcher.context.authsession,
nodespec = luci.dispatcher.context.dispatched,
apply_rollback = math.max(applyconf and applyconf.rollback or 90, 30),
apply_holdoff = math.max(applyconf and applyconf.holdoff or 4, 1),
apply_timeout = math.max(applyconf and applyconf.timeout or 5, 1),
apply_display = math.max(applyconf and applyconf.display or 1.5, 1),
rollback_token = rollback_token
}) %>);
</script>
<div id="app"></div>
<link rel="stylesheet" href="/luci-static/istorex/style.css?v=<%=math.random(1,100000)%>">
<script type="module" crossorigin src="/luci-static/istorex/index.js?v=<%=math.random(1,100000)%>"></script>
</body>
</html>

View File

@ -0,0 +1,16 @@
<html>
<head>
<meta http-equiv="refresh" content="0; url=<%=url('admin/istorex/pages')%>" />
<script type="text/javascript">
function onload() {
setTimeout(function(){
localtion.href="<%=url('admin/istorex/pages')%>";
document.body.style.display='block';
},1000);
}
</script>
</head>
<body style="display:none" onload="onload">
Landing to <a href="<%=url('admin/istorex/pages')%>">main page</a>
</body>
</html>

View File

@ -0,0 +1,4 @@
#!/bin/sh
rm -f /tmp/luci-indexcache
exit 0

View File

@ -0,0 +1,9 @@
{
"admin/istorex": {
"order": 0,
"action": {
"type": "template",
"path": "istorex/redirect"
}
}
}

View File

@ -76,7 +76,7 @@ get_host_ip() {
if [ -z "$(echo $host | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}")" ]; then
if [ "$host" == "${host#*:[0-9a-fA-F]}" ]; then
ip=$(resolveip -4 -t 3 $host | awk 'NR==1{print}')
[ -z "$ip" ] && ip=$(uclient-fetch -q -O- http://119.29.29.29/d?dn=$host | awk -F ';' '{print $1}')
[ -z "$ip" ] && ip=$(wget -q -O- http://119.29.29.29/d?dn=$host | awk -F ';' '{print $1}')
fi
fi
[ -z "$ip" ] || uci_set_by_name $1 ip $ip

View File

@ -439,7 +439,7 @@ local function processData(szType, content)
end
-- wget
local function wget(url)
local stdout = luci.sys.exec('uclient-fetch -q --user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36" --no-check-certificate -O- "' .. url .. '"')
local stdout = luci.sys.exec('wget -q --user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36" --no-check-certificate -O- "' .. url .. '"')
return trim(stdout)
end

View File

@ -101,7 +101,7 @@ end
local function update(url, file, type, file2)
local Num = 1
local refresh_cmd = "uclient-fetch --no-check-certificate -q -O /tmp/ssr-update." .. type .. " " .. url
local refresh_cmd = "wget --no-check-certificate -q -O /tmp/ssr-update." .. type .. " " .. url
local sret = luci.sys.call(refresh_cmd)
if sret == 0 then
if type == "gfw_data" then

16
luci-lib-iform/Makefile Normal file
View File

@ -0,0 +1,16 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.0
PKG_RELEASE:=20220626
PKG_MAINTAINER:=xiaobao <xiaobao@linkease.com>
LUCI_TITLE:=LuCI library for json form
LUCI_DESCRIPTION:=Json form library
LUCI_DEPENDS:= +luci-lib-jsonc
LUCI_PKGARCH:=all
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature

View File

@ -0,0 +1,83 @@
local http = require "luci.http"
local nixio = require "nixio"
local fs = require "nixio.fs"
local ltn12 = require "luci.ltn12"
local iform = {}
local const_log_end = "XU6J03M6"
function iform.log_end()
return const_log_end
end
function iform.exec_to_log(command)
local f = io.popen(command, "r")
local log = command
if f then
local output = f:read('*all')
f:close()
log = log .. "\n" .. output .. const_log_end
else
log = log .. " Failed" .. const_log_end
end
return log
end
function iform.response_log(logpath)
local logfd = io.open(logpath, "r")
if logfd == nil then
http.write("log not found" .. const_log_end)
return
end
local curr = logfd:seek()
local size = logfd:seek("end")
if size > 8*1024 then
logfd:seek("end", -8*1024)
else
logfd:seek("set", curr)
end
local write_log = function()
local buffer = logfd:read(4096)
if buffer and #buffer > 0 then
return buffer
else
logfd:close()
return nil
end
end
http.prepare_content("text/plain;charset=utf-8")
if logfd then
ltn12.pump.all(write_log, http.write)
end
end
function iform.fork_exec(command)
local pid = nixio.fork()
if pid > 0 then
return
elseif pid == 0 then
-- change to root dir
nixio.chdir("/")
-- patch stdin, out, err to /dev/null
local null = nixio.open("/dev/null", "w+")
if null then
nixio.dup(null, nixio.stderr)
nixio.dup(null, nixio.stdout)
nixio.dup(null, nixio.stdin)
if null:fileno() > 2 then
null:close()
end
end
-- replace with target command
nixio.exec("/bin/sh", "-c", command)
end
end
return iform

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
[lock-scroll=true]{overflow:hidden!important}.software-log_shade[data-v-27cc98a0],.software-log_shade *[data-v-27cc98a0]{-webkit-box-sizing:border-box;-webkit-tap-highlight-color:transparent;box-sizing:border-box;word-wrap:break-word;outline:none}.software-log_shade[data-v-27cc98a0]{width:100%;height:100%;display:flex;flex-wrap:wrap;align-items:center;justify-content:center;position:fixed;inset:0;z-index:99999}.software-log_shade .software-log_shade__bg[data-v-27cc98a0]{position:fixed;inset:0;background:rgba(68,79,83,.94) none repeat scroll 0 0!important;background-position:0 0;background-size:cover;opacity:.94}.software-log_shade .software-log_shade__pannel[data-v-27cc98a0]{width:800px;min-width:800px;border-radius:10px;z-index:100;box-shadow:3px 3px 10px #000;background:rgba(0,0,0,.9);padding:10px}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-title[data-v-27cc98a0]{text-align:center;font-size:18px;color:#9f0;padding:10px;font-weight:700}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-now i[data-v-27cc98a0]{color:#fc0;font-style:normal}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-content[data-v-27cc98a0]{padding:10px;width:100%;text-align:center;overflow:hidden;height:400px;overflow:overlay}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-content textarea[data-v-27cc98a0]{width:100%;border:0px solid #222;font-family:Lucida Console;font-size:11px;background:transparent;color:#fff;outline:none;overflow-x:hidden;resize:none;transition:.5s}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-content textarea[data-v-27cc98a0]:focus,.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-content textarea[data-v-27cc98a0]:hover{box-shadow:none;border-color:#fff0!important}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-content textarea[data-v-27cc98a0]::-webkit-scrollbar{width:5px;height:5px}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-content textarea[data-v-27cc98a0]::-webkit-scrollbar-thumb{height:30px;outline:none;border:none;border-radius:1rem;background-color:#4c595c;-webkit-border-radius:1rem}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-content textarea[data-v-27cc98a0]::-webkit-scrollbar-track-piece{background:none;-webkit-border-radius:0;border-radius:0}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-btn[data-v-27cc98a0]{width:100%;display:flex;flex-wrap:wrap;align-items:center;justify-content:center}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-btn button[data-v-27cc98a0]{visibility:visible;min-width:88px;font-weight:bolder;text-shadow:1px 1px 0px black;border-radius:8px;height:33px;font-family:Verdana,Microsoft Yahei UI,sans-serif;font-size:12px;padding:0 .7em;width:auto;min-width:122px;margin:0 10px;cursor:pointer;background:#090a0a!important;border:1px solid #fff!important;color:#fff!important;opacity:1!important}.software-log_shade .software-log_shade__pannel .software-log_shade__pannel-btn button[data-v-27cc98a0]:hover{opacity:.9!important}.cbi-section .title{font-size:1.1rem;line-height:1;display:block;width:100%;margin:0;color:#32325d;padding:1rem 1.25rem}.cbi-page-actions{display:inline-block;width:100%}#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}

View File

@ -110,6 +110,7 @@ test $version -lt 1 && {
[ -f /etc/config/wireless ] && {
SSID=${hostname}
SSID_PASSWD=""
[ "$(uci -q get wireless.radio1.band)" == "5g" ] && uci -q set wireless.radio0.band="2g"
for radio in radio0 radio1 radio2 radio3; do
wifi_setup_radio ${radio}
done

View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qBittorrent-Enhanced-Edition
PKG_VERSION:=4.3.9.10
PKG_VERSION:=4.4.3.12
PKG_RELEASE=1
PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz
@ -18,6 +18,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/qBittorrent-Enhanced-Edition-release-$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:qbittorrent:qbittorrent
PKG_BUILD_DEPENDS:=qttools
@ -26,6 +27,7 @@ PKG_INSTALL:=1
PKG_USE_MIPS16:=0
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/$(PKG_NAME)
SECTION:=net
@ -34,14 +36,14 @@ define Package/$(PKG_NAME)
DEPENDS:=+libgcc +libstdcpp \
+rblibtorrent \
+libopenssl \
+python3 \
+qt5-core \
+qt5-network \
+qt5-xml \
+qt5-sql \
+qt5-xml \
+zlib
TITLE:=bittorrent client programmed in C++ / Qt
URL:=https://www.qbittorrent.org/
PROVIDES:=qBittorrent
endef
define Package/$(PKG_NAME)/description
@ -52,25 +54,34 @@ define Package/$(PKG_NAME)/description
well as many features.
endef
CONFIGURE_ARGS += \
--disable-gui \
--enable-stacktrace=no \
--with-boost=$(STAGING_DIR)/usr
CMAKE_OPTIONS += \
-DCMAKE_BUILD_TYPE=Release \
-DQT6=OFF \
-DSTACKTRACE=OFF \
-DWEBUI=ON \
-DGUI=OFF \
-DVERBOSE_CONFIGURE=ON
MAKE_VARS += \
INSTALL_ROOT="$(PKG_INSTALL_DIR)"
# The pcre2 is compiled with support for mips16
ifdef CONFIG_USE_MIPS16
TARGET_CFLAGS += -minterlink-mips16
endif
# Support the glibc
ifdef CONFIG_USE_GLIBC
TARGET_LDFLAGS += -ldl -lrt -lpthread
endif
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
TARGET_CFLAGS += -std=c++17 -ffunction-sections -fdata-sections -flto
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed -flto
define Build/Prepare
$(call Build/Prepare/Default)
$(SED) '/<context>/{:a;N;/<\/context>/!ba;/\/gui\//d}' `ls $(PKG_BUILD_DIR)/src/lang/qbittorrent_*.ts`
endef
define Package/$(PKG_NAME)/conffiles
/etc/qBittorrent
endef
# The pentium-mmx with lto will build failed on qt6
ifeq ($(ARCH),i386)
ifneq ($(findstring pentium-mmx,$(CONFIG_CPU_TYPE)),)
TARGET_CFLAGS := $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_LDFLAGS := $(filter-out -flto,$(TARGET_LDFLAGS))
endif
endif
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/bin

View File

@ -0,0 +1,10 @@
--- a/conf.pri.in
+++ b/conf.pri.in
@@ -11,6 +11,7 @@ QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS
EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@
EXTERNAL_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS
+EXTERNAL_INCLUDES -= /usr/include
# added /usr/local/include due to Qt 5.7.0 bug on macOS
macx: EXTERNAL_INCLUDES += "/usr/local/include"
INCLUDEPATH += $$EXTERNAL_INCLUDES

View File

@ -0,0 +1,11 @@
--- a/src/base/bittorrent/session.cpp
+++ b/src/base/bittorrent/session.cpp
@@ -116,7 +116,7 @@ const QString CATEGORIES_FILE_NAME {QStr
namespace
{
const char PEER_ID[] = "qB";
- const char USER_AGENT[] = "qBittorrent Enhanced/" QBT_VERSION_2;
+ const char USER_AGENT[] = "qBittorrent/" QBT_VERSION_2;
void torrentQueuePositionUp(const lt::torrent_handle &handle)
{

View File

@ -5,14 +5,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sagernet-core
BASE_VERSION:=5.0.15
BASE_VERSION:=5.0.16
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/SagerNet/v2ray-core.git
PKG_SOURCE_DATE:=2022-06-16
PKG_SOURCE_VERSION:=13c46a76b8fcae7b2e85a769eff153789056010e
PKG_MIRROR_HASH:=555027a6982103af6b3028d8fb99be6433ffde5781fd39907f57e244d82080b4
PKG_SOURCE_DATE:=2022-06-26
PKG_SOURCE_VERSION:=b5f100d6a37a1a33d21c3f3781dc123124fba949
PKG_MIRROR_HASH:=5b123b5db03039bb5c38bb7b70bb7097ce1ddbac650cecba8422155481e59ddf
PKG_VERSION:=$(BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
PKG_LICENSE:=GPL-3.0-or-later

View File

@ -9,7 +9,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs
go 1.18
require (
+ github.com/Dreamacro/clash v1.10.6
+ github.com/Dreamacro/clash v1.11.0
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da
github.com/dgryski/go-camellia v0.0.0-20191119043421-69a8a13fb23d
github.com/dgryski/go-idea v0.0.0-20170306091226-d2fb45a411fb
@ -29,7 +29,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs
+ github.com/sirupsen/logrus v1.8.1 // indirect
github.com/xtaci/smux v1.5.16 // indirect
go4.org/intern v0.0.0-20220301175310-a089fc204883 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
--- a/go.sum
+++ b/go.sum
@@ -355,6 +355,8 @@ github.com/rogpeppe/go-internal v1.8.0/g
@ -40,7 +40,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs
+github.com/sagernet/clash v1.10.7-0.20220610080510-ac56b2a05ded/go.mod h1:qrmVDeYq4Gr8SiGuxVoA4cc4xhq7TNgnLa76AANNYRA=
github.com/sagernet/gvisor v0.0.0-20220402114650-763d12dc953e h1:Y4avBAtZ59OWvLl6zP9sF62jtMEVRPIH78IQctq9aXQ=
github.com/sagernet/gvisor v0.0.0-20220402114650-763d12dc953e/go.mod h1:tWwEcFvJavs154OdjFCw78axNrsDlz4Zh8jvPqwcpGI=
github.com/sagernet/sing v0.0.0-20220616051325-90beb46c6d22 h1:9qQB2pN/p6jI8vrCEy/KOvjuvEgoaz6QNIX7BgPhwSw=
github.com/sagernet/sing v0.0.0-20220620074945-99754098d119 h1:YBlJc+jgan/xl1qnmT4FIEsdfuuS2IwGfPICqJHg54o=
@@ -394,6 +396,8 @@ github.com/shurcooL/sanitized_anchor_nam
github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
@ -50,7 +50,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -451,6 +455,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go
@@ -453,6 +457,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go
go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM=
go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@ -58,7 +58,7 @@ go get github.com/Dreamacro/clash/transport/simple-obfs
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
@@ -566,6 +571,7 @@ golang.org/x/sys v0.0.0-20190606165138-5
@@ -569,6 +574,7 @@ golang.org/x/sys v0.0.0-20190606165138-5
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=