i11th/ruantiblock_openwrt
1
0
Fork 0
mirror of https://github.com/gSpotx2f/ruantiblock_openwrt.git synced 2026-05-13 22:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ruablacklist URLs, fixed uninstall.sh (APK).

Browse Source
This commit is contained in:
gSpot
2026-02-16 18:21:55 +03:00
parent 53bc8167fa
commit 52cc2e314d
11 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoinstall/2.x/apk/autoinstall.sh
+3 -3
View File
@@ -10,9 +10,9 @@ LUCI_APP=1
HTTPS_DNS_PROXY=1 HTTPS_DNS_PROXY=1
OWRT_VERSION="25.12" OWRT_VERSION="25.12"
RUAB_VERSION="2.1.11-r2" RUAB_VERSION="2.1.12-r1"
RUAB_MOD_LUA_VERSION="2.1.11-r1" RUAB_MOD_LUA_VERSION="2.1.12-r1"
RUAB_LUCI_APP_VERSION="2.1.11-r1" RUAB_LUCI_APP_VERSION="2.1.12-r1"
BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master" BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master"
PKG_DIR="/tmp" PKG_DIR="/tmp"
autoinstall/2.x/apk/uninstall.sh
+5
View File
@@ -89,6 +89,10 @@ RemoveCronTask() {
fi fi
} }
UpdatePackagesList() {
$APK_CMD update
}
RemovePackages() { RemovePackages() {
local _pkg local _pkg
for _pkg in $@ for _pkg in $@
@@ -167,6 +171,7 @@ AppStop
BackupCurrentConfig BackupCurrentConfig
DisableStartup DisableStartup
RemoveCronTask RemoveCronTask
UpdatePackagesList
RemoveAppFiles RemoveAppFiles
exit 0 exit 0
autoinstall/2.x/autoinstall.sh
+3 -3
View File
@@ -10,9 +10,9 @@ LUCI_APP=1
HTTPS_DNS_PROXY=1 HTTPS_DNS_PROXY=1
OWRT_VERSION="24.10" OWRT_VERSION="24.10"
RUAB_VERSION="2.1.11-r2" RUAB_VERSION="2.1.12-r1"
RUAB_MOD_LUA_VERSION="2.1.11-r1" RUAB_MOD_LUA_VERSION="2.1.12-r1"
RUAB_LUCI_APP_VERSION="2.1.11-r1" RUAB_LUCI_APP_VERSION="2.1.12-r1"
BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master" BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master"
PKG_DIR="/tmp" PKG_DIR="/tmp"
luci-app-ruantiblock/Makefile
+1 -1
View File
@@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ruantiblock PKG_NAME:=luci-app-ruantiblock
PKG_VERSION:=2.1.11 PKG_VERSION:=2.1.12
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt> PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
LUCI_TITLE:=LuCI support for ruantiblock LUCI_TITLE:=LuCI support for ruantiblock
luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js
+1 -1
View File
@@ -116,7 +116,7 @@ return view.extend({
if(p_dir_arr) { if(p_dir_arr) {
p_dir_arr.forEach(e => { p_dir_arr.forEach(e => {
let fname = e.name; let fname = e.name;
if(fname.startsWith('ruab_parser')) { if(fname.startsWith('ruab_parser.')) {
this.parsers[fname] = tools.parsersDir + '/' + fname; this.parsers[fname] = tools.parsersDir + '/' + fname;
}; };
}); });
luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/tools.js
+3 -3
View File
@@ -60,9 +60,9 @@ return baseclass.extend({
'zapret-info-fqdn' : [ '*zapret-info', 'fqdn', 'https://github.com/zapret-info/z-i' ], 'zapret-info-fqdn' : [ '*zapret-info', 'fqdn', 'https://github.com/zapret-info/z-i' ],
'zapret-info-fqdn-only': [ '*zapret-info', 'fqdn-only', 'https://github.com/zapret-info/z-i' ], 'zapret-info-fqdn-only': [ '*zapret-info', 'fqdn-only', 'https://github.com/zapret-info/z-i' ],
'zapret-info-ip' : [ '*zapret-info', 'ip', 'https://github.com/zapret-info/z-i' ], 'zapret-info-ip' : [ '*zapret-info', 'ip', 'https://github.com/zapret-info/z-i' ],
'rublacklist-fqdn' : [ '*rublacklist', 'fqdn', 'https://rublacklist.net' ], 'rublacklist-fqdn' : [ '*rublacklist', 'fqdn', 'https://blockedin.org' ],
'rublacklist-fqdn-only': [ '*rublacklist', 'fqdn-only', 'https://rublacklist.net' ], 'rublacklist-fqdn-only': [ '*rublacklist', 'fqdn-only', 'https://blockedin.org' ],
'rublacklist-ip' : [ '*rublacklist', 'ip', 'https://rublacklist.net' ], 'rublacklist-ip' : [ '*rublacklist', 'ip', 'https://blockedin.org' ],
'antifilter-fqdn' : [ '*antifilter', 'fqdn', 'https://antifilter.download' ], 'antifilter-fqdn' : [ '*antifilter', 'fqdn', 'https://antifilter.download' ],
'antifilter-fqdn-only' : [ '*antifilter', 'fqdn-only', 'https://antifilter.download' ], 'antifilter-fqdn-only' : [ '*antifilter', 'fqdn-only', 'https://antifilter.download' ],
'antifilter-ip' : [ '*antifilter', 'ip', 'https://antifilter.download' ], 'antifilter-ip' : [ '*antifilter', 'ip', 'https://antifilter.download' ],
ruantiblock-mod-lua/Makefile
+1 -1
View File
@@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock-mod-lua PKG_NAME:=ruantiblock-mod-lua
PKG_VERSION:=2.1.11 PKG_VERSION:=2.1.12
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt> PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
ruantiblock-mod-py/Makefile
+1 -1
View File
@@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock-mod-py PKG_NAME:=ruantiblock-mod-py
PKG_VERSION:=2.1.11 PKG_VERSION:=2.1.12
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt> PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
ruantiblock/Makefile
+2 -2
View File
@@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock PKG_NAME:=ruantiblock
PKG_VERSION:=2.1.11 PKG_VERSION:=2.1.12
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt> PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
ruantiblock/files/etc/ruantiblock/gr_excluded_sld
+1
View File
@@ -19,3 +19,4 @@ dynsip.org
mydns.jp mydns.jp
mooo.com mooo.com
github.io github.io
googleapis.com
ruantiblock/files/usr/share/ruantiblock/blacklist_sources
+3 -3
View File
@@ -1,8 +1,8 @@
### Blacklist sources ### Blacklist sources
## rublacklist ## rublacklist
export RBL_ALL_URL="https://reestr.rublacklist.net/api/v3/snapshot/" export RBL_ALL_URL="https://blockedin.org/api/v3/snapshot/"
export RBL_IP_URL="https://reestr.rublacklist.net/api/v3/ips/" export RBL_IP_URL="https://blockedin.org/api/v3/ips/"
export RBL_DPI_URL="https://reestr.rublacklist.net/api/v3/dpi/" export RBL_DPI_URL="https://blockedin.org/api/v3/dpi/"
export RBL_ENCODING="" export RBL_ENCODING=""
## zapret-info ## zapret-info
export ZI_ALL_URL="https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-00.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-01.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-02.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-03.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-04.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-05.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-06.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-07.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-08.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-09.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-10.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-11.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-12.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-13.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-14.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-15.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-16.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-17.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-18.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-19.csv" export ZI_ALL_URL="https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-00.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-01.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-02.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-03.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-04.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-05.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-06.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-07.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-08.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-09.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-10.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-11.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-12.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-13.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-14.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-15.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-16.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-17.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-18.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-19.csv"