diff --git a/autoinstall/2.x/apk/autoinstall.sh b/autoinstall/2.x/apk/autoinstall.sh index 54066c5..4f43e0a 100755 --- a/autoinstall/2.x/apk/autoinstall.sh +++ b/autoinstall/2.x/apk/autoinstall.sh @@ -10,9 +10,9 @@ LUCI_APP=1 HTTPS_DNS_PROXY=1 OWRT_VERSION="25.12" -RUAB_VERSION="2.1.11-r2" -RUAB_MOD_LUA_VERSION="2.1.11-r1" -RUAB_LUCI_APP_VERSION="2.1.11-r1" +RUAB_VERSION="2.1.12-r1" +RUAB_MOD_LUA_VERSION="2.1.12-r1" +RUAB_LUCI_APP_VERSION="2.1.12-r1" BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master" PKG_DIR="/tmp" diff --git a/autoinstall/2.x/apk/uninstall.sh b/autoinstall/2.x/apk/uninstall.sh index 3037ace..1818a3e 100755 --- a/autoinstall/2.x/apk/uninstall.sh +++ b/autoinstall/2.x/apk/uninstall.sh @@ -89,6 +89,10 @@ RemoveCronTask() { fi } +UpdatePackagesList() { + $APK_CMD update +} + RemovePackages() { local _pkg for _pkg in $@ @@ -167,6 +171,7 @@ AppStop BackupCurrentConfig DisableStartup RemoveCronTask +UpdatePackagesList RemoveAppFiles exit 0 diff --git a/autoinstall/2.x/autoinstall.sh b/autoinstall/2.x/autoinstall.sh index 4e2e98a..ec00162 100755 --- a/autoinstall/2.x/autoinstall.sh +++ b/autoinstall/2.x/autoinstall.sh @@ -10,9 +10,9 @@ LUCI_APP=1 HTTPS_DNS_PROXY=1 OWRT_VERSION="24.10" -RUAB_VERSION="2.1.11-r2" -RUAB_MOD_LUA_VERSION="2.1.11-r1" -RUAB_LUCI_APP_VERSION="2.1.11-r1" +RUAB_VERSION="2.1.12-r1" +RUAB_MOD_LUA_VERSION="2.1.12-r1" +RUAB_LUCI_APP_VERSION="2.1.12-r1" BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master" PKG_DIR="/tmp" diff --git a/luci-app-ruantiblock/Makefile b/luci-app-ruantiblock/Makefile index d2602af..ab06e82 100644 --- a/luci-app-ruantiblock/Makefile +++ b/luci-app-ruantiblock/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ruantiblock -PKG_VERSION:=2.1.11 +PKG_VERSION:=2.1.12 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot LUCI_TITLE:=LuCI support for ruantiblock diff --git a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js index 2539f66..0bd81d7 100644 --- a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js +++ b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js @@ -116,7 +116,7 @@ return view.extend({ if(p_dir_arr) { p_dir_arr.forEach(e => { let fname = e.name; - if(fname.startsWith('ruab_parser')) { + if(fname.startsWith('ruab_parser.')) { this.parsers[fname] = tools.parsersDir + '/' + fname; }; }); diff --git a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/tools.js b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/tools.js index 56793f9..f4fa256 100644 --- a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/tools.js +++ b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/tools.js @@ -60,9 +60,9 @@ return baseclass.extend({ '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-ip' : [ '*zapret-info', 'ip', 'https://github.com/zapret-info/z-i' ], - 'rublacklist-fqdn' : [ '*rublacklist', 'fqdn', 'https://rublacklist.net' ], - 'rublacklist-fqdn-only': [ '*rublacklist', 'fqdn-only', 'https://rublacklist.net' ], - 'rublacklist-ip' : [ '*rublacklist', 'ip', 'https://rublacklist.net' ], + 'rublacklist-fqdn' : [ '*rublacklist', 'fqdn', 'https://blockedin.org' ], + 'rublacklist-fqdn-only': [ '*rublacklist', 'fqdn-only', 'https://blockedin.org' ], + 'rublacklist-ip' : [ '*rublacklist', 'ip', 'https://blockedin.org' ], 'antifilter-fqdn' : [ '*antifilter', 'fqdn', 'https://antifilter.download' ], 'antifilter-fqdn-only' : [ '*antifilter', 'fqdn-only', 'https://antifilter.download' ], 'antifilter-ip' : [ '*antifilter', 'ip', 'https://antifilter.download' ], diff --git a/ruantiblock-mod-lua/Makefile b/ruantiblock-mod-lua/Makefile index 5638b2b..38e3252 100644 --- a/ruantiblock-mod-lua/Makefile +++ b/ruantiblock-mod-lua/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruantiblock-mod-lua -PKG_VERSION:=2.1.11 +PKG_VERSION:=2.1.12 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot diff --git a/ruantiblock-mod-py/Makefile b/ruantiblock-mod-py/Makefile index fdf98e5..2f194dc 100644 --- a/ruantiblock-mod-py/Makefile +++ b/ruantiblock-mod-py/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruantiblock-mod-py -PKG_VERSION:=2.1.11 +PKG_VERSION:=2.1.12 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot diff --git a/ruantiblock/Makefile b/ruantiblock/Makefile index 5156d7a..f4bb23d 100644 --- a/ruantiblock/Makefile +++ b/ruantiblock/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruantiblock -PKG_VERSION:=2.1.11 -PKG_RELEASE:=2 +PKG_VERSION:=2.1.12 +PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot include $(INCLUDE_DIR)/package.mk diff --git a/ruantiblock/files/etc/ruantiblock/gr_excluded_sld b/ruantiblock/files/etc/ruantiblock/gr_excluded_sld index cbbc5fc..6b63cd3 100644 --- a/ruantiblock/files/etc/ruantiblock/gr_excluded_sld +++ b/ruantiblock/files/etc/ruantiblock/gr_excluded_sld @@ -19,3 +19,4 @@ dynsip.org mydns.jp mooo.com github.io +googleapis.com diff --git a/ruantiblock/files/usr/share/ruantiblock/blacklist_sources b/ruantiblock/files/usr/share/ruantiblock/blacklist_sources index fce6f66..ed5570b 100644 --- a/ruantiblock/files/usr/share/ruantiblock/blacklist_sources +++ b/ruantiblock/files/usr/share/ruantiblock/blacklist_sources @@ -1,8 +1,8 @@ ### Blacklist sources ## rublacklist -export RBL_ALL_URL="https://reestr.rublacklist.net/api/v3/snapshot/" -export RBL_IP_URL="https://reestr.rublacklist.net/api/v3/ips/" -export RBL_DPI_URL="https://reestr.rublacklist.net/api/v3/dpi/" +export RBL_ALL_URL="https://blockedin.org/api/v3/snapshot/" +export RBL_IP_URL="https://blockedin.org/api/v3/ips/" +export RBL_DPI_URL="https://blockedin.org/api/v3/dpi/" export RBL_ENCODING="" ## 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"