update 2022-09-26 09:05:50
This commit is contained in:
parent
008bfca74f
commit
8899d8e998
|
@ -7,13 +7,13 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=alist
|
||||
PKG_VERSION:=3.0.1
|
||||
PKG_WEB_VERSION:=3.0.1
|
||||
PKG_VERSION:=3.0.2
|
||||
PKG_WEB_VERSION:=3.0.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=1f8b0ae87044e161f1fb880bc70bb457424bb9fc0299ac09dc52d773ea6e03e5
|
||||
PKG_HASH:=a8d9af1a920f040f7c20157c90700b58cd61e568de1527b231dc0181c5d16713
|
||||
|
||||
PKG_LICENSE:=GPL-3.0
|
||||
PKG_LICENSE_FILE:=LICENSE
|
||||
|
@ -23,7 +23,7 @@ define Download/$(PKG_NAME)-web
|
|||
FILE:=$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz
|
||||
URL_FILE:=dist.tar.gz
|
||||
URL:=https://github.com/alist-org/alist-web/releases/download/$(PKG_WEB_VERSION)/
|
||||
HASH:=038a00e8479fa32370d48fba6616d73abfc090c944cc447dbf98ec39efb5f8ef
|
||||
HASH:=2cbf1a245ab477499dfd3970fb898bf2748c090045fd2e3a107a5082d385e1f8
|
||||
endef
|
||||
|
||||
PKG_CONFIG_DEPENDS:=CONFIG_ALIST_COMPRESS_UPX
|
||||
|
|
|
@ -275,6 +275,30 @@ function to_check()
|
|||
model = "ramips_mt7621/linksys_ea7500-v2"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-ramips-mt7621-linksys_ea7500-v2-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("linksys,ea8100%-v1$") then
|
||||
model = "ramips_mt7621/linksys_ea8100-v1"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-ramips-mt7621-linksys_ea8100-v1-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("linksys,ea8100%-v2$") then
|
||||
model = "ramips_mt7621/linksys_ea8100-v2"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-ramips-mt7621-linksys_ea8100-v2-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("linksys,ea7300%-v1$") then
|
||||
model = "ramips_mt7621/linksys_ea7300-v1"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-ramips-mt7621-linksys_ea7300-v1-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("linksys,ea7300%-v2$") then
|
||||
model = "ramips_mt7621/linksys_ea7300-v2"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-ramips-mt7621-linksys_ea7300-v2-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("linksys,ea6350%-v4$") then
|
||||
model = "ramips_mt7621/linksys_ea6350-v4"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-ramips-mt7621-linksys_ea6350-v4-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("linksys,e5600$") then
|
||||
model = "ramips_mt7621/linksys_e5600"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-ramips-mt7621-linksys_e5600-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("rt%-ac1200$") then
|
||||
model = "ramips_mt76x8/asus_rt-ac1200"
|
||||
check_update()
|
||||
|
@ -415,6 +439,18 @@ function to_check()
|
|||
model = "ramips_mt7620/xiaomi_miwifi-r3"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-ramips-mt7620-xiaomi_miwifi-r3-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("redmi%-router%-ax6000$") then
|
||||
model = "mediatek_filogic/xiaomi_redmi-router-ax6000"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-mediatek-filogic-xiaomi_redmi-router-ax6000-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("linksys,ea4500$") then
|
||||
model = "kirkwood_generic/linksys_ea4500"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-kirkwood-linksys_ea4500-squashfs-sysupgrade.bin"
|
||||
elseif board_name:match("linksys,e4200%-v2$") then
|
||||
model = "kirkwood_generic/linksys_e4200-v2"
|
||||
check_update()
|
||||
download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-kirkwood-linksys_e4200-v2-squashfs-sysupgrade.bin"
|
||||
else
|
||||
local needs_update = false
|
||||
return {
|
||||
|
|
|
@ -33789,6 +33789,7 @@ delempanyi.one
|
|||
deliberateeliza.com
|
||||
deliberatelyadvancing.com
|
||||
deliberatelycube.com
|
||||
delicatedownload.co.uk
|
||||
delicatepunch.com
|
||||
delicepizzabuchy.fr
|
||||
deliciousinvestor.com
|
||||
|
@ -43843,6 +43844,7 @@ frooter.xyz
|
|||
frosmo.com
|
||||
frost-electric-supply.com
|
||||
frothadditions.com
|
||||
frowerpalaced.life
|
||||
frowzyvibex.com
|
||||
frpiksdeygy.com
|
||||
frs.connatix.com
|
||||
|
@ -57574,6 +57576,7 @@ knewwholesomecharming.com
|
|||
knicks.jd.com
|
||||
knifecontributionproposition.com
|
||||
kniferasatte.info
|
||||
knightmaresolutions.net
|
||||
knightsstatuesteering.com
|
||||
knightsyllabusimprobable.com
|
||||
knigum.ru
|
||||
|
@ -68424,6 +68427,7 @@ myqip.icu
|
|||
myqservice.com.ar
|
||||
myqualifica.fun
|
||||
myquiz.fr
|
||||
myquotespro.com
|
||||
myramark.com
|
||||
myrdrcts.com
|
||||
myreferer.com
|
||||
|
@ -108175,6 +108179,7 @@ vortex.data.microsoft.com
|
|||
vortex.hulu.com
|
||||
voryebecho.xyz
|
||||
votemoodyexcavate.com
|
||||
votersenweave.digital
|
||||
votetoda.com
|
||||
voteyapgrade.com
|
||||
vothaiwi.com
|
||||
|
@ -114555,6 +114560,7 @@ www.pl15888559.effectivecpmcontent.com
|
|||
www.pl16169563.profitabletrustednetwork.com
|
||||
www.pl16545265.effectivecpmgate.com
|
||||
www.pl17207322.safestgatetocontent.com
|
||||
www.pl17326846.safestgatetocontent.com
|
||||
www.placelocal.com
|
||||
www.placingstandardanthem.com
|
||||
www.plaicecaught.com
|
||||
|
@ -114963,6 +114969,7 @@ www.security-update.qhigh.com
|
|||
www.seductiveamateurs.com
|
||||
www.seedtag.com
|
||||
www.seerpiu002.com
|
||||
www.seizedpenholdercranny.com
|
||||
www.selfpwn.org
|
||||
www.semiglorifyseek.com
|
||||
www.seminaire-business-france.fr
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-xray
|
||||
PKG_VERSION:=1.16.1
|
||||
PKG_VERSION:=1.17.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_LICENSE:=MPLv2
|
||||
|
@ -101,6 +101,7 @@ endif
|
|||
$(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d
|
||||
$(INSTALL_DATA) ./root/usr/share/rpcd/acl.d/luci-app-xray.json $(1)/usr/share/rpcd/acl.d/luci-app-xray.json
|
||||
$(INSTALL_DIR) $(1)/usr/share/xray
|
||||
$(LN) /var/run/xray.pid $(1)/usr/share/xray/xray.pid
|
||||
ifdef CONFIG_PACKAGE_XRAY_INFINITE_RETRY_ON_STARTUP
|
||||
$(INSTALL_DATA) ./root/usr/share/xray/infinite_retry $(1)/usr/share/xray/infinite_retry
|
||||
endif
|
||||
|
|
|
@ -44,6 +44,7 @@ Focus on making the most of Xray (HTTP/HTTPS/Socks/TProxy inbounds, multiple pro
|
|||
* 2022-08-08 fix: make sure forwarded IPs are always forwarded to Xray even for reserved addresses. Xray may not forward those requests so that manner may be changed later.
|
||||
* 2022-08-13 fix: apply 2022-08-08 fix to iptables as well
|
||||
* 2022-09-01 feat: specify outbound for manual transparent proxy
|
||||
* 2022-09-26 feat: show process running status
|
||||
|
||||
## Changelog 2021
|
||||
|
||||
|
|
|
@ -102,8 +102,12 @@ function check_resource_files(load_result) {
|
|||
let geosite_existence = false;
|
||||
let geosite_size = 0;
|
||||
let firewall4 = false;
|
||||
let xray_running = false;
|
||||
let optional_features = {};
|
||||
for (const f of load_result) {
|
||||
if (f.name == "xray.pid") {
|
||||
xray_running = true;
|
||||
}
|
||||
if (f.name == "geoip.dat") {
|
||||
geoip_existence = true;
|
||||
geoip_size = '%.2mB'.format(f.size);
|
||||
|
@ -126,6 +130,7 @@ function check_resource_files(load_result) {
|
|||
geosite_size: geosite_size,
|
||||
optional_features: optional_features,
|
||||
firewall4: firewall4,
|
||||
xray_running: xray_running,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -141,7 +146,9 @@ return view.extend({
|
|||
render: function (load_result) {
|
||||
const config_data = load_result[0];
|
||||
const geoip_direct_code = uci.get_first(config_data, "general", "geoip_direct_code");
|
||||
const { geoip_existence, geoip_size, geosite_existence, geosite_size, optional_features, firewall4 } = check_resource_files(load_result[1]);
|
||||
const { geoip_existence, geoip_size, geosite_existence, geosite_size, optional_features, firewall4, xray_running } = check_resource_files(load_result[1]);
|
||||
const status_text = xray_running ? _("[Xray is running]") : _("[Xray is stopped]");
|
||||
|
||||
let asset_file_status = _('WARNING: at least one of asset files (geoip.dat, geosite.dat) is not found under /usr/share/xray. Xray may not work properly. See <a href="https://github.com/yichya/luci-app-xray">here</a> for help.')
|
||||
if (geoip_existence) {
|
||||
if (geosite_existence) {
|
||||
|
@ -150,7 +157,7 @@ return view.extend({
|
|||
}
|
||||
|
||||
var m, s, o, ss;
|
||||
m = new form.Map('xray', _('Xray'), asset_file_status);
|
||||
m = new form.Map('xray', _('Xray'), status_text + " " + asset_file_status);
|
||||
|
||||
s = m.section(form.TypedSection, 'general');
|
||||
s.addremove = false;
|
||||
|
@ -160,13 +167,13 @@ return view.extend({
|
|||
|
||||
o = s.taboption('general', form.Value, 'xray_bin', _('Xray Executable Path'))
|
||||
|
||||
o = s.taboption('general', form.ListValue, 'main_server', _('Main Server'))
|
||||
o = s.taboption('general', form.ListValue, 'main_server', _('TCP Server'))
|
||||
o.datatype = "uciname"
|
||||
for (var v of uci.sections(config_data, "servers")) {
|
||||
o.value(v[".name"], v.alias || v.server + ":" + v.server_port)
|
||||
}
|
||||
|
||||
o = s.taboption('general', form.ListValue, 'tproxy_udp_server', _('TProxy UDP Server'))
|
||||
o = s.taboption('general', form.ListValue, 'tproxy_udp_server', _('UDP Server'))
|
||||
for (var v of uci.sections(config_data, "servers")) {
|
||||
o.value(v[".name"], v.alias || v.server + ":" + v.server_port)
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mosdns
|
||||
PKG_VERSION:=c0093d2
|
||||
PKG_VERSION:=a636786
|
||||
PKG_RELEASE:=$(AUTORELEASE)
|
||||
|
||||
PKG_SOURCE:=mosdns-$(PKG_VERSION).tar.gz
|
||||
|
|
|
@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
|
|||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=natflow
|
||||
PKG_VERSION:=20220928
|
||||
PKG_VERSION:=20220929
|
||||
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
|
||||
PKG_HASH:=e517ccb4c73b412ae6c5c08e0beab67c569eb561d5feccc22b22a4f4e0785cfd
|
||||
PKG_HASH:=a05de6e25910efe5caf6a6ef2794fe3b68892561443dd79c863055d73c13107c
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
|
||||
PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>
|
||||
|
|
Loading…
Reference in New Issue