From 327a5b21d2b6baf98d92c88fa3c69a4ae09ab5da Mon Sep 17 00:00:00 2001
From: Anya Lin <hukk1996@gmail.com>
Date: Sat, 23 Nov 2024 18:00:26 +0800
Subject: [PATCH] apk: update modules*

---
 luci/luci-app-pcap-dnsproxy                |  2 +-
 packages/fantastic-packages-feeds/Makefile | 25 +++++++++++-----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/luci/luci-app-pcap-dnsproxy b/luci/luci-app-pcap-dnsproxy
index 70fddb5d4..ffa6c8ce6 160000
--- a/luci/luci-app-pcap-dnsproxy
+++ b/luci/luci-app-pcap-dnsproxy
@@ -1 +1 @@
-Subproject commit 70fddb5d4faa8be05a3f8bc85d70360dad6ef631
+Subproject commit ffa6c8ce65b8023fb2a0d5b5d945237cd7d6ce88
diff --git a/packages/fantastic-packages-feeds/Makefile b/packages/fantastic-packages-feeds/Makefile
index ee9d76cc0..be568af6a 100644
--- a/packages/fantastic-packages-feeds/Makefile
+++ b/packages/fantastic-packages-feeds/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fantastic-packages-feeds
-PKG_VERSION:=20241201
+PKG_VERSION:=2025????
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Anya Lin <hukk1996@gmail.com>
@@ -15,7 +15,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+fantastic-keyring +opkg
+  DEPENDS:=+fantastic-keyring +apk
   TITLE:=Installer for fantastic-packages feeds
   PKGARCH:=all
 endef
@@ -51,25 +51,25 @@ else
 	ARCH_PACKAGES=$$DISTRIB_ARCH
 fi
 if [ "$$VERSION_NUMBER" = "SNAPSHOT" ]; then
-	BRANCH="24.10"
+	BRANCH="25.??"
+	[ "$$REVISION" -lt ????? ] && BRANCH="24.10"
 	[ "$$REVISION" -lt 28158 ] && BRANCH="23.05"
 	[ "$$REVISION" -lt 23069 ] && BRANCH="22.03"
-	[ "$$REVISION" -lt 19302 ] && BRANCH="21.02"
 	# https://archive.openwrt.org/releases/**/version.buildinfo
+	# r?????-??????????    25.??.?-rc1
 	# r28158-d276b4c91a    24.10.0-rc1
 	# r23069-e2701e0f33    23.05.0-rc1
 	# r19302-df622768da    22.03.0-rc1
-	# r16122-c2139eef27    21.02.0-rc2
 else
 	BRANCH=$$(echo $$VERSION_NUMBER | awk -F '.' -v OFS='.' '{print $$1,$$2}')
 fi
-if ! grep -q fantastic_packages_ "$$IPKG_INSTROOT/etc/opkg/customfeeds.conf"; then
-	BASE_URL="https://fantastic-packages.github.io/packages/releases"
+BASE_URL="https://fantastic-packages.github.io/packages/releases"
+if ! grep -q "$$BASE_URL" "$$IPKG_INSTROOT/etc/apk/repositories.d/customfeeds.list"; then
 	BASE_URL="$$BASE_URL/$$BRANCH/packages/$$ARCH_PACKAGES"
-	cat <<- EOF >> "$$IPKG_INSTROOT/etc/opkg/customfeeds.conf"
-	src/gz fantastic_packages_packages $$BASE_URL/packages
-	src/gz fantastic_packages_luci     $$BASE_URL/luci
-	src/gz fantastic_packages_special  $$BASE_URL/special
+	cat <<- EOF >> "$$IPKG_INSTROOT/etc/apk/repositories.d/customfeeds.list"
+	$$BASE_URL/packages/packages.adb
+	$$BASE_URL/luci/packages.adb
+	$$BASE_URL/special/packages.adb
 	EOF
 fi
 exit 0
@@ -77,7 +77,8 @@ endef
 
 define Package/$(PKG_NAME)/prerm
 #!/bin/sh
-sed -i "/fantastic_packages_/d" "$$IPKG_INSTROOT/etc/opkg/customfeeds.conf"
+BASE_URL="https://fantastic-packages.github.io/packages/releases"
+sed -i "/$$BASE_URL/d" "$$IPKG_INSTROOT/etc/apk/repositories.d/customfeeds.list"
 exit 0
 endef