update 2024-10-31 12:16:44

kenzok8 · Oct 31, 2024 · ce2d886 · ce2d886
1 parent 721638f
commit ce2d886
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh
@@ -361,7 +361,7 @@ get_dnsmasq_conf_dir() {
 	[ -n "$dnsmasq_conf_path" ] && {
 		local dnsmasq_conf_dir=$(grep '^conf-dir=' "$dnsmasq_conf_path" | cut -d'=' -f2 | head -n 1)
 		[ -n "$dnsmasq_conf_dir" ] && {
-			DNSMASQ_CONF_DIR=$dnsmasq_conf_dir
+			DNSMASQ_CONF_DIR=${dnsmasq_conf_dir%*/}
 			TMP_DNSMASQ_PATH=${DNSMASQ_CONF_DIR}/${CONFIG}
 		}
 	}

diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile
@@ -12,13 +12,13 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
 
-GEOIP_VER:=202410240052
+GEOIP_VER:=202410310053
 GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
 define Download/geoip
   URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
   URL_FILE:=geoip.dat
   FILE:=$(GEOIP_FILE)
-  HASH:=6f51317d8aba4efed9a9b253de04a8d12b46c730c6ce14d046d6e57fc06ea795
+  HASH:=2762fa0a7d1728089b7723b7796cb5ca955330a3fa2e4407fa40e480fbf9cea7
 endef
 
 GEOSITE_VER:=20241013063848