[lilac] updated to 20240312-6

2 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07cd34261522..9237c3320ca2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
 pkgbase = sing-geoip
 	pkgdesc = GeoIP Database and Rule Set for sing-box
 	pkgver = 20240312
-	pkgrel = 3
+	pkgrel = 6
 	url = https://github.com/SagerNet/sing-geoip
 	arch = any
 	license = CC-BY-SA-4.0
 	license = GPL-3.0-or-later
 	makedepends = git
-	source = geoip.db::https://github.com/SagerNet/sing-geoip/releases/download/20240312/geoip.db
+	source = https://github.com/SagerNet/sing-geoip/releases/download/20240312/geoip.db
+	source = https://github.com/SagerNet/sing-geoip/releases/download/20240312/geoip.db.sha256sum
 	sha256sums = 77879a4239ed28a9835e7db1d7f55dd3f9540904714125cb39cc3425e61b7fd4
-
-pkgname = sing-geoip-rule-set
-	pkgdesc = sing-geoip (rule-set)
-	provides = sing-geoip
+	sha256sums = f150da7d973e20ccae298569ae261d2f34936414bdca45fad87e4e3b9ce09b71
 
 pkgname = sing-geoip-db
 	pkgdesc = sing-geoip (database)
 	provides = sing-geoip
+
+pkgname = sing-geoip-rule-set
+	pkgdesc = sing-geoip (rule-set)
+	provides = sing-geoip
diff --git a/PKGBUILD b/PKGBUILD
index 1029921f7f78..cb41fca7ed16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: everyx <lunt.luo#gmail.com>
 
 pkgbase=sing-geoip
-pkgname=(sing-geoip-rule-set sing-geoip-db)
+pkgname=(sing-geoip-db sing-geoip-rule-set)
 pkgver=20240312
-pkgrel=3
+pkgrel=6
 pkgdesc="GeoIP Database and Rule Set for sing-box"
 arch=(any)
 url="https://github.com/SagerNet/$pkgbase"
@@ -11,19 +11,16 @@ license=(CC-BY-SA-4.0 GPL-3.0-or-later)
 
 makedepends=(git)
 
-source=("geoip.db::$url/releases/download/$pkgver/geoip.db")
-sha256sums=('77879a4239ed28a9835e7db1d7f55dd3f9540904714125cb39cc3425e61b7fd4')
+source=("$url/releases/download/$pkgver/geoip.db"
+        "$url/releases/download/$pkgver/geoip.db.sha256sum")
+sha256sums=('77879a4239ed28a9835e7db1d7f55dd3f9540904714125cb39cc3425e61b7fd4'
+            'f150da7d973e20ccae298569ae261d2f34936414bdca45fad87e4e3b9ce09b71')
 
 prepare() {
-  git clone --depth 1 --branch rule-set $url
-}
+  sha256sum -c geoip.db.sha256sum
 
-package_sing-geoip-rule-set() {
-  pkgdesc="sing-geoip (rule-set)"
-  provides=($pkgbase)
-
-  install -dm755 "$pkgdir/usr/share/sing-box/$pkgname"
-  install -Dm644 $pkgbase/*.srs "$pkgdir/usr/share/sing-box/$pkgname"
+  mkdir rule-set
+  git clone --depth 1 --branch rule-set $url rule-set
 }
 
 package_sing-geoip-db() {
@@ -33,3 +30,11 @@ package_sing-geoip-db() {
   install -dm755 "$pkgdir/usr/share/sing-box"
   install -Dm644 geoip.db "$pkgdir/usr/share/sing-box"
 }
+
+package_sing-geoip-rule-set() {
+  pkgdesc="sing-geoip (rule-set)"
+  provides=($pkgbase)
+
+  install -dm755 "$pkgdir/usr/share/sing-box/$pkgname"
+  install -Dm644 rule-set/geoip-*.srs "$pkgdir/usr/share/sing-box/$pkgname"
+}