update data: all @2022.0820, add mode:lite

honwen · Aug 21, 2022 · 4df75ec · 4df75ec
1 parent 988bf75
commit 4df75ec
Show file tree

Hide file tree

Showing 31 changed files with 30,904 additions and 11,662 deletions.
diff --git a/dnsmasq-extra/.shadowrocket/ex.conf b/dnsmasq-extra/.shadowrocket/ex.conf
diff --git a/dnsmasq-extra/Makefile b/dnsmasq-extra/Makefile
@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq-extra
-PKG_VERSION:=2022-06-15
-PKG_RELEASE:=1.9.8
+PKG_VERSION:=2022-08-20
+PKG_RELEASE:=1.9.10
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
@@ -25,6 +25,9 @@ endef
 define Package/dnsmasq-extra/config
 menu "DNSMASQ-Extra Configuration"
 	depends on PACKAGE_dnsmasq-extra && ( PACKAGE_smartdns || PACKAGE_dnsproxy || PACKAGE_dcompass || PACKAGE_aiodns)
+	config DNSMASQ_EXTRA_LITE
+		bool "lite date: gfwlist/adblock."
+		default y
 	config DNSMASQ_EXTRA_FORCE_AIODNS
 		depends on PACKAGE_aiodns
 		bool "force all to aiodns."
@@ -85,6 +88,13 @@ define Package/dnsmasq-extra/install
 	$(INSTALL_DATA) ./files/data/*.txt $(1)/etc/dnsmasq-extra.d/
 	$(INSTALL_DATA) ./files/data/*.conf $(1)/etc/dnsmasq-extra.d/
 
+ifeq ($(CONFIG_DNSMASQ_EXTRA_LITE),y)
+	ln -sf gfwlist.lite.gz $(1)/etc/dnsmasq-extra.d/gfwlist.gz
+	ln -sf adblock.lite.gz $(1)/etc/dnsmasq-extra.d/adblock.gz
+else
+	rm -f $(1)/etc/dnsmasq-extra.d/*.lite.gz
+endif
+
 ifeq ($(CONFIG_DNSMASQ_EXTRA_FORCE_AIODNS),y)
 	sed 's+\(overwrite_resolve.*\)[0-9]+\1enabled+g' -i $(1)/etc/config/dnsmasq-extra
 	sed 's+\(overwrite_aiodns.*\)[0-9]+\1enabled+g' -i $(1)/etc/config/dnsmasq-extra

diff --git a/dnsmasq-extra/files/data/.gitignore b/dnsmasq-extra/files/data/.gitignore
@@ -0,0 +1,7 @@
+*.*
+!*.gz
+!*.txt
+!*.conf
+!*.md5sum
+!.gitignore
+!*.lite*