diff --git a/autoinstall/autoinstall.sh b/autoinstall/autoinstall.sh index df1d378..7b33c2f 100755 --- a/autoinstall/autoinstall.sh +++ b/autoinstall/autoinstall.sh @@ -9,8 +9,8 @@ LUA_MODULE=1 LUCI_APP=1 OWRT_VERSION="current" -RUAB_VERSION="0.9.1-2" -RUAB_MOD_LUA_VERSION="0.9.1-2" +RUAB_VERSION="0.9.1-3" +RUAB_MOD_LUA_VERSION="0.9.1-3" RUAB_LUCI_APP_VERSION="0.9.1-2" BASE_URL="https://github.com/gSpotx2f/packages-openwrt/raw/master" PKG_DIR="/tmp" diff --git a/ruantiblock-mod-lua/Makefile b/ruantiblock-mod-lua/Makefile index 0a866d1..ec33335 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:=0.9.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 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 2672150..9ef6b03 100755 --- a/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua +++ b/ruantiblock-mod-lua/files/usr/libexec/ruantiblock/ruab_parser.lua @@ -63,7 +63,6 @@ local Config = Class(nil, { ["ZI_ALL_URL"] = true, ["AF_IP_URL"] = true, ["AF_FQDN_URL"] = true, - ["AZ_ENCODING"] = true, ["RBL_ENCODING"] = true, ["ZI_ENCODING"] = true, ["AF_ENCODING"] = true, diff --git a/ruantiblock-mod-py/Makefile b/ruantiblock-mod-py/Makefile index 484eee0..2b49a4a 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:=0.9.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 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 240611b..a83adf0 100755 --- a/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py +++ b/ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py @@ -47,7 +47,6 @@ class Config: "ZI_ALL_URL", "AF_IP_URL", "AF_FQDN_URL", - "AZ_ENCODING", "RBL_ENCODING", "ZI_ENCODING", "AF_ENCODING", @@ -149,7 +148,7 @@ class BlackListParser(Config): self.url = "http://127.0.0.1" self.records_separator = "\n" self.fields_separator = ";" - self.ips_separator = " | " + self.ips_separator = "|" self.default_site_encoding = "utf-8" self.site_encoding = self.default_site_encoding diff --git a/ruantiblock/Makefile b/ruantiblock/Makefile index fb8d5d6..92d869a 100644 --- a/ruantiblock/Makefile +++ b/ruantiblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruantiblock PKG_VERSION:=0.9.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=gSpot include $(INCLUDE_DIR)/package.mk diff --git a/ruantiblock/files/etc/config/ruantiblock b/ruantiblock/files/etc/config/ruantiblock index 81537cd..12405ef 100644 --- a/ruantiblock/files/etc/config/ruantiblock +++ b/ruantiblock/files/etc/config/ruantiblock @@ -2,7 +2,7 @@ config main 'config' option proxy_mode '1' option proxy_local_clients '1' - option ipset_clear_sets '0' + option ipset_clear_sets '1' option if_vpn 'tun0' option tor_trans_port '9040' option onion_dns_addr '127.0.0.1#9053' @@ -11,9 +11,9 @@ config main 'config' option def_total_proxy '0' option bllist_source 'zapret-info' option bllist_mode 'ip' - option ip_limit '0' - option summarize_ip '0' - option summarize_cidr '0' + option ip_limit '30' + option summarize_ip '1' + option summarize_cidr '1' option ip_filter '0' option sd_limit '16' list opt_exclude_sld 'livejournal.com' diff --git a/ruantiblock/files/etc/ruantiblock/ruantiblock.conf b/ruantiblock/files/etc/ruantiblock/ruantiblock.conf index 765da1d..e3b0ff6 100644 --- a/ruantiblock/files/etc/ruantiblock/ruantiblock.conf +++ b/ruantiblock/files/etc/ruantiblock/ruantiblock.conf @@ -104,7 +104,6 @@ ZI_ALL_URL="https://raw.githubusercontent.com/zapret-info/z-i/master/dump.csv" #ZI_ALL_URL="https://app.assembla.com/spaces/z-i/git/source/master/dump.csv?_format=raw" AF_IP_URL="https://antifilter.download/list/allyouneed.lst" AF_FQDN_URL="https://antifilter.download/list/domains.lst" -AZ_ENCODING="" RBL_ENCODING="" ZI_ENCODING="CP1251" AF_ENCODING=""