update 2024-06-05 10:29:09

natflow/Makefile

@@ -97,8 +97,8 @@ define Package/natflow-auth/install
 	$(INSTALL_DATA) ./files/natflow.config $(1)/etc/config/natflow
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DATA) ./files/20-natflow-zone.hotplug $(1)/etc/hotplug.d/iface/20-natflow-zone
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) ./files/urllogger.sh $(1)/sbin/urllogger
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/urllogger-ctl.sh $(1)/usr/sbin/urllogger-ctl
 endef
 
 $(eval $(call KernelPackage,natflow))

natflow/files/urllogger-ctl.sh

@@ -22,7 +22,7 @@ urllogger_read()
 	NOW=$(date +%s)
 	cat /dev/urllogger_queue | sed 's/,/ /' | while read time data; do
 		T=$((NOW+time-UP))
-		T=$(date +%Y%m%d%H%M%S -d @$T)
+		T=$(date "+%Y-%m-%d %H:%M:%S" -d @$T)
 		echo $T,$data
 	done
 }

v2ray-geodata/Makefile

@@ -12,22 +12,22 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
 
-GEOIP_VER:=202405300042
+GEOIP_VER:=202406042148
 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:=ee22e254e7cb9a2e45d8851a70022662c15c739604c379029ae8f6a19a3ccc4f
+  HASH:=19d53a38cfaaac6e5a2be6d0b2710ebf094979d33380cdcb5fd5d073f07a2248
 endef
 
-GEOSITE_VER:=20240604041304
+GEOSITE_VER:=20240604215500
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
   URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
   URL_FILE:=dlc.dat
   FILE:=$(GEOSITE_FILE)
-  HASH:=a5a74b71bec259ab28458c584eedaa0f259df7f9ac73473514ada470b8ac1407
+  HASH:=146800cbe3ec546a8ca3ed75524ad34bb3bf9d77d6f707b361eef67e4cf45d07
 endef
 
 GEOSITE_IRAN_VER:=202406030028