diff --git a/autoinstall/autoinstall.sh b/autoinstall/autoinstall.sh index 43b9e5d..f78b3bf 100755 --- a/autoinstall/autoinstall.sh +++ b/autoinstall/autoinstall.sh @@ -10,7 +10,7 @@ LUCI_APP=1 OWRT_VERSION="current" RUAB_VERSION="0.9.7-1" -RUAB_MOD_LUA_VERSION="0.9.7-0" +RUAB_MOD_LUA_VERSION="0.9.7-1" RUAB_LUCI_APP_VERSION="0.9.7-0" BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master" PKG_DIR="/tmp" diff --git a/ruantiblock-mod-lua/Makefile b/ruantiblock-mod-lua/Makefile index 17eb285..088c192 100644 --- a/ruantiblock-mod-lua/Makefile +++ b/ruantiblock-mod-lua/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruantiblock-mod-lua PKG_VERSION:=1.3 -PKG_RELEASE:=0 +PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot include $(INCLUDE_DIR)/package.mk diff --git a/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua b/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua index c1a1cc2..8f4343f 100755 --- a/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua +++ b/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua @@ -535,14 +535,14 @@ end local Rbl = Class(BlackListParser, { url = Config.RBL_ALL_URL, - records_separator = '%{"authority": ', + records_separator = '%{"appearDate": ', ips_separator = ", ", }) function Rbl:sink() return function(chunk) if chunk and chunk ~= "" then - for fqdn_str, ip_str in chunk:gmatch('"domains": %["?(.-)"?%].-"ips": %[([a-f0-9/.:", ]*)%].-' .. self.records_separator .. "?") do + for fqdn_str, ip_str in chunk:gmatch('"domains": %["?(.-)"?%].-"ips": %[([a-f0-9/.:", ]*)%].-') do fqdn_sink_func(self, ip_str, fqdn_str) end end diff --git a/ruantiblock-mod-py/Makefile b/ruantiblock-mod-py/Makefile index ddd1552..d88b624 100644 --- a/ruantiblock-mod-py/Makefile +++ b/ruantiblock-mod-py/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruantiblock-mod-py PKG_VERSION:=1.3 -PKG_RELEASE:=0 +PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot include $(INCLUDE_DIR)/package.mk diff --git a/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py b/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py index e3397c0..98fd95b 100755 --- a/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py +++ b/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py @@ -380,7 +380,7 @@ class RblFQDN(BlackListParser): def __init__(self): super().__init__() self.url = self.RBL_ALL_URL - self.records_separator = '{"authority": ' + self.records_separator = '{"appearDate": ' self.ips_separator = ", " def parser_func(self):