[lilac] updated to 1.18.2-1

6 files changed, 67 insertions, 100 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06f92ee94aaa..419cc3fe9921 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,19 @@
 pkgbase = clash-meta
-	pkgdesc = Another Clash Kernel by MetaCubeX
-	pkgver = 1.18.1
+	pkgdesc = Another Clash Kernel
+	pkgver = 1.18.2
 	pkgrel = 1
-	url = https://github.com/MetaCubeX/Clash.Meta
+	url = https://github.com/MetaCubeX/mihomo
 	arch = x86_64
-	arch = aarch64
-	arch = riscv64
-	arch = loong64
-	license = GPL3
+	license = GPL-3.0-or-later
 	makedepends = go
-	depends = glibc
 	depends = clash-geoip
-	conflicts = clash-meta
+	depends = glibc
 	backup = etc/clash-meta/config.yaml
-	source = clash-meta-1.18.1.tar.gz::https://github.com/MetaCubeX/Clash.Meta/archive/refs/tags/v1.18.1.tar.gz
-	source = clash-meta.service
-	source = clash-meta@.service
-	source = clash-meta.sysusers
-	source = clash-meta.tmpfiles
-	sha256sums = ddca7b6c9131ee067b906cc91360837a0e5bdee08a89851226aaed0adc71c086
-	sha256sums = b6b7ce11489a6f6322a41ce840b3f999b1ec88914f8bd6864c220269231bf759
-	sha256sums = ec4de877464e595124a5f2752c3f4be157adc85ec5f7f8392c0331cb70fc906a
-	sha256sums = 655e8e2edcd82a6bdf2fd12430b7ab6f8e32db8dffce70e7342685a7cc65ebfb
-	sha256sums = 50737592c7bd743fe8f543924034718337477a203fa11ef4272cae496df3769c
+	source = clash-meta-1.18.2.tar.gz::https://github.com/MetaCubeX/mihomo/archive/refs/tags/v1.18.2.tar.gz
+	source = https://raw.githubusercontent.com/MetaCubeX/Meta-Docs/main/docs/example/yaml
+	source = https://raw.githubusercontent.com/MetaCubeX/mihomo/Alpha/.github/mihomo.service
+	sha256sums = 49855c53e5717932b9cb933e7f42f58155b52a42bf7db7f35f1fb1d4baa7ee00
+	sha256sums = 25a125934bf524b340ec0bfe9be258f41b3ee55b0b23555f1c83ea3a3e776c4f
+	sha256sums = 7d2f6de01adbb5dbe7e0d2a00582467faafdb08dce74dd32675cfd94dcbae014
 
 pkgname = clash-meta
diff --git a/PKGBUILD b/PKGBUILD
index 596967ad1cac..45e55b0ef95f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,69 @@
 # Maintainer: sukanka <su975853527 at gmail dot com>
 
 pkgname=clash-meta
-pkgver=1.18.1
+pkgver=1.18.2
 pkgrel=1
-pkgdesc="Another Clash Kernel by MetaCubeX"
-arch=('x86_64' 'aarch64' 'riscv64' 'loong64')
-url="https://github.com/MetaCubeX/Clash.Meta"
-license=("GPL3")
-depends=('glibc' 'clash-geoip')
-makedepends=('go')
-conflicts=(clash-meta)
+pkgdesc="Another Clash Kernel"
+arch=(x86_64)
+url="https://github.com/MetaCubeX/mihomo"
+license=(GPL-3.0-or-later)
+depends=(clash-geoip glibc)
+makedepends=(go)
 backup=('etc/clash-meta/config.yaml')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
-        "clash-meta.service"
-        "clash-meta@.service"
-        "${pkgname}.sysusers"
-        "${pkgname}.tmpfiles"
-)
-sha256sums=('ddca7b6c9131ee067b906cc91360837a0e5bdee08a89851226aaed0adc71c086'
-            'b6b7ce11489a6f6322a41ce840b3f999b1ec88914f8bd6864c220269231bf759'
-            'ec4de877464e595124a5f2752c3f4be157adc85ec5f7f8392c0331cb70fc906a'
-            '655e8e2edcd82a6bdf2fd12430b7ab6f8e32db8dffce70e7342685a7cc65ebfb'
-            '50737592c7bd743fe8f543924034718337477a203fa11ef4272cae496df3769c')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz"
+        "https://raw.githubusercontent.com/MetaCubeX/Meta-Docs/main/docs/example/yaml"
+        "https://raw.githubusercontent.com/MetaCubeX/mihomo/Alpha/.github/mihomo.service")
+        # Please remove the line once the upstream Meta branch contains mihomo.service file
+sha256sums=('49855c53e5717932b9cb933e7f42f58155b52a42bf7db7f35f1fb1d4baa7ee00'
+            '25a125934bf524b340ec0bfe9be258f41b3ee55b0b23555f1c83ea3a3e776c4f'
+            '7d2f6de01adbb5dbe7e0d2a00582467faafdb08dce74dd32675cfd94dcbae014')
 
 prepare(){
-    cd "${srcdir}"
-    mv mihomo-${pkgver} Clash.Meta-${pkgver}
-    cd Clash.Meta-${pkgver}
-    sed -i 's|^const.*|const Name = "clash"|g' constant/path.go
+    cd "$srcdir"
+    mv mihomo-$pkgver $pkgname
+    mv yaml           $pkgname/config.yaml
+    mv mihomo.service $pkgname/mihomo.service
 }
+
 build(){
-    cd "${srcdir}"/Clash.Meta-${pkgver}
+    export CGO_CPPFLAGS="${CPPFLAGS}"
+    export CGO_CFLAGS="${CFLAGS}"
+    export CGO_CXXFLAGS="${CXXFLAGS}"
+    export CGO_LDFLAGS="${LDFLAGS}"
+    export CGO_ENABLED=1
+    cd "$srcdir/$pkgname"
     BUILDTIME=$(date -u)
-    NAME=clash-meta
-    GOOS=linux CGO_ENABLED=0 go build \
-    -trimpath \
-    -buildmode=pie \
-    -mod=readonly \
-    -modcacherw \
-    -ldflags "-linkmode external -extldflags '${LDFLAGS}' \
-    -X 'github.com/metacubex/mihomo/constant.Version=${pkgver}' \
-    -X 'github.com/metacubex/mihomo/constant.BuildTime=${BUILDTIME}' \
-    " \
-    -tags with_gvisor -o ${pkgname}-${pkgver}
+    GOOS=linux go build \
+        -trimpath \
+        -buildmode=pie \
+        -mod=readonly \
+        -modcacherw \
+        -ldflags "-linkmode external -extldflags \"${LDFLAGS}\" \
+        -X \"github.com/metacubex/mihomo/constant.Version=${pkgver}\" \
+        -X \"github.com/metacubex/mihomo/constant.BuildTime=${BUILDTIME}\" \
+        " \
+        -tags with_gvisor -o $pkgname-$pkgver
+    
+    echo "u $_pkgname - \"Clash-Meta Service\" - -"        >  "$_pkgname.sysusers"
+    echo "d /etc/$_pkgname     0755 $_pkgname $_pkgname -" >  "$_pkgname.tmpfiles"
+    echo "d /var/log/$_pkgname 0700 $_pkgname $_pkgname -" >> "$_pkgname.tmpfiles"
+    sed -i -e '/Description/s/mihomo/Clash-Meta/' \
+           -e "s/mihomo/$_pkgname/g"              \
+           -e "/^Type=simple/a User=$_pkgname"    \
+           -e "/^Type=simple/a Group=$_pkgname"   mihomo.service
+}
+
+check() {
+    cd "$srcdir/$pkgname"
+    go test ./...
 }
+
 package() {
-    cd "${srcdir}"/Clash.Meta-${pkgver}
-    install -Dm755 "${pkgname}-${pkgver}" "${pkgdir}/usr/bin/clash-meta"
-    install -Dm644 "docs/config.yaml" -t "${pkgdir}/etc/clash-meta"
-    cd $srcdir
-    install -Dm644 ${pkgname}.sysusers "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-    install -Dm644 ${pkgname}.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
-    install -Dm644 "clash-meta.service"  -t "${pkgdir}/usr/lib/systemd/system"
-    install -Dm644 "clash-meta@.service" -t "${pkgdir}/usr/lib/systemd/system"
-    ln -sf /etc/clash/Country.mmdb ${pkgdir}/etc/${pkgname}/Country.mmdb
-    #geosite.dat from community repo does not work
-    # ln -sf /usr/share/v2ray/geosite.dat ${pkgdir}/etc/${pkgname}/GeoSite.dat
+    cd "$srcdir/$pkgname"
+    install -Dm755 "$pkgname-$pkgver"      "$pkgdir/usr/bin/clash-meta"
+    install -Dm644 "$_pkgname.sysusers"    "$pkgdir/usr/lib/sysusers.d/$_pkgname.conf"
+    install -Dm644 "$_pkgname.tmpfiles"    "$pkgdir/usr/lib/tmpfiles.d/$_pkgname.conf"
+    install -Dm644 config.yaml             "$pkgdir/etc/clash-meta/config.yaml"
+    install -Dm644 mihomo.service          "$pkgdir/usr/lib/systemd/system/clash-meta.service"
+    ln -s          /etc/clash/Country.mmdb "$pkgdir/etc/$_pkgname/Country.mmdb"
 }
diff --git a/clash-meta.service b/clash-meta.service
deleted file mode 100644
index 5e7b826a9f04..000000000000
--- a/clash-meta.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Clash-Meta Daemon, Another Clash Kernel.
-After=network.target NetworkManager.service systemd-networkd.service iwd.service
-
-[Service]
-Type=simple
-User=clash-meta
-Group=clash-meta
-LimitNPROC=500
-LimitNOFILE=1000000
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE
-Restart=always
-RestartSec=5
-ExecStart=/usr/bin/clash-meta -d /etc/clash-meta
-
-[Install]
-WantedBy=multi-user.target
diff --git a/clash-meta.sysusers b/clash-meta.sysusers
deleted file mode 100644
index 9bf164b17d9a..000000000000
--- a/clash-meta.sysusers
+++ /dev/null
@@ -1 +0,0 @@
-u "clash-meta" - - - -
diff --git a/clash-meta.tmpfiles b/clash-meta.tmpfiles
deleted file mode 100644
index 8648a59fde30..000000000000
--- a/clash-meta.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-d /etc/clash-meta 0755 clash-meta clash-meta -
-d /var/log/clash-meta 0700 clash-meta clash-meta -
diff --git a/clash-meta@.service b/clash-meta@.service
deleted file mode 100644
index e3bdfc85c053..000000000000
--- a/clash-meta@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Clash-Meta Daemon for %i.
-After=network.target NetworkManager.service systemd-networkd.service iwd.service
-
-[Service]
-Type=exec
-User=%i
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE
-Restart=on-abort
-ExecStart=/usr/bin/clash-meta
-
-[Install]
-WantedBy=multi-user.target