From f964ee6d965465a436f1a140500a1d21a200df0b Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Mon, 3 Jun 2024 22:05:49 +0800
Subject: [PATCH] v2ray-geodata: disable DL download cache

* Since skip hash means DL cache is not re-downloaded, causing data files to not update, downloading it during compile ensures always getting the latest data files.

Signed-off-by: sbwml <admin@cooluc.com>
---
 v2ray-geodata/Makefile | 62 +++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile
index 0cbae7d9b..8f42cec59 100644
--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@@ -1,34 +1,23 @@
-# SPDX-License-Identifier: GPL-3.0-only
 #
-# Copyright (C) 2021 ImmortalWrt.org
+# Copyright (C) 2015-2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v3.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-geodata
-PKG_RELEASE:=$(shell date "+%Y%m%d%H%M%S")-1
+PKG_VERSION:=$(shell date "+%Y%m%d%H%M%S")
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+PKG_MAINTAINER:=sbwml <admin@cooluc.com>
 
 include $(INCLUDE_DIR)/package.mk
 
-GEOIP_FILE:=geoip.dat
-define Download/geoip
-  URL:=https://github.com/Loyalsoldier/geoip/releases/latest/download/
-  URL_FILE:=geoip-only-cn-private.dat
-  FILE:=$(GEOIP_FILE)
-  HASH:=skip
-endef
-
-GEOSITE_FILE:=geosite.dat
-define Download/geosite
-  URL:=https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/
-  URL_FILE:=geosite.dat
-  FILE:=$(GEOSITE_FILE)
-  HASH:=skip
-endef
-
-define Package/v2ray-geodata/template
+define Package/v2ray-geodata/default
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=IP Addresses and Names
@@ -37,40 +26,39 @@ define Package/v2ray-geodata/template
 endef
 
 define Package/v2ray-geoip
-  $(call Package/v2ray-geodata/template)
+  $(call Package/v2ray-geodata/default)
   TITLE:=GeoIP List for V2Ray
-  VERSION:=$(PKG_RELEASE)
   LICENSE:=CC-BY-SA-4.0
 endef
 
 define Package/v2ray-geosite
-  $(call Package/v2ray-geodata/template)
+  $(call Package/v2ray-geodata/default)
   TITLE:=Geosite List for V2Ray
-  VERSION:=$(PKG_RELEASE)
-  LICENSE:=MIT
+  LICENSE:=GPL-3.0
 endef
 
-define Build/Prepare
-	$(call Build/Prepare/Default)
-ifneq ($(CONFIG_PACKAGE_v2ray-geoip),)
-	$(call Download,geoip)
-endif
-ifneq ($(CONFIG_PACKAGE_v2ray-geosite),)
-	$(call Download,geosite)
-endif
-endef
+GEOIP_URL:=https://github.com/Loyalsoldier/geoip/releases/latest/download/geoip.dat
+GEOSITE_URL:=https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
 
 define Build/Compile
+	( \
+		pushd $(PKG_BUILD_DIR) ; \
+		curl -L $(GEOIP_URL) -o geoip.dat --progress-bar ; \
+		curl -L $(GEOSITE_URL) -o geosite.dat --progress-bar ; \
+		[ "$(curl -sL $(GEOIP_URL).sha256sum | awk '{print $1}')" != "$(sha256sum geoip.dat | awk '{print $1}')" ] && exit 1 ; \
+		[ "$(curl -sL $(GEOSITE_URL).sha256sum | awk '{print $1}')" != "$(sha256sum geosite.dat | awk '{print $1}')" ] && exit 1 ; \
+		popd ; \
+	)
 endef
 
 define Package/v2ray-geoip/install
 	$(INSTALL_DIR) $(1)/usr/share/v2ray
-	$(INSTALL_DATA) $(DL_DIR)/$(GEOIP_FILE) $(1)/usr/share/v2ray/geoip.dat
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/geoip.dat $(1)/usr/share/v2ray/geoip.dat
 endef
 
 define Package/v2ray-geosite/install
 	$(INSTALL_DIR) $(1)/usr/share/v2ray
-	$(INSTALL_DATA) $(DL_DIR)/$(GEOSITE_FILE) $(1)/usr/share/v2ray/geosite.dat
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/geosite.dat $(1)/usr/share/v2ray/geosite.dat
 endef
 
 $(eval $(call BuildPackage,v2ray-geoip))