Clash.Meta -> ClashRS

7 files changed, 65 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bda7e3acb65c..8a9ac7b420f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,28 @@
-pkgbase = clash-meta-bin
-	pkgdesc = Another Clash Kernel by MetaCubeX
-	pkgver = 1.16.0
-	pkgrel = 2
-	url = https://github.com/MetaCubeX/Clash.Meta
-	install = clash-meta-bin.install
-	arch = i686
+pkgbase = clash-rs-bin
+	pkgdesc = A custom protocol, rule based network proxy software
+	pkgver = 0.1.9
+	pkgrel = 1
+	url = https://github.com/Watfaq/clash-rs
+	install = clash-rs-bin.install
 	arch = x86_64
-	arch = arm
-	arch = armv6h
 	arch = armv7h
 	arch = aarch64
-	license = GPL3
+	license = Apache-2.0
 	depends = glibc
-	provides = clash-meta
-	conflicts = clash-meta
-	backup = etc/clash-meta/config.yaml
-	source = clash-meta.service
-	source = clash-meta@.service
+	provides = clash-rs
+	conflicts = clash-rs
+	backup = etc/clash-rs/config.yaml
+	source = clash-rs.service
+	source = clash-rs@.service
 	source = config.yaml
-	sha256sums = 9e8a28e22c159d7d70c258b65f47bc734543e54cb0cd3957ce19349aca145af8
-	sha256sums = 29c73ac66d6fe60bea4359ac1857e3452f26c2af792efd8dd16d558462472efb
-	sha256sums = c4af03523b8006d206440163406ee9b4de1a10bb5023fb3194490b8225a5e481
-	source_i686 = clash-meta-bin-i686-1.16.0.gz::https://github.com/MetaCubeX/Clash.Meta/releases/download/v1.16.0/Clash.Meta-linux-386-v1.16.0.gz
-	sha256sums_i686 = edc34b297e17f6a274b734f1a47f817e5ceb3cb9e966a17466c30a62e9ba0578
-	source_x86_64 = clash-meta-bin-x86_64-1.16.0.gz::https://github.com/MetaCubeX/Clash.Meta/releases/download/v1.16.0/Clash.Meta-linux-amd64-compatible-v1.16.0.gz
-	sha256sums_x86_64 = ed3bd776e2f9edb0de03430f503dfde2d0fb966b7a97904826633822733e9901
-	source_arm = clash-meta-bin-arm-1.16.0.gz::https://github.com/MetaCubeX/Clash.Meta/releases/download/v1.16.0/Clash.Meta-linux-armv5-v1.16.0.gz
-	sha256sums_arm = dd4e7871fbc1cec2199e4e4619de2bea339d1b4e55e8d2f46e84612b8bd2b370
-	source_armv6h = clash-meta-bin-armv6h-1.16.0.gz::https://github.com/MetaCubeX/Clash.Meta/releases/download/v1.16.0/Clash.Meta-linux-armv6-v1.16.0.gz
-	sha256sums_armv6h = d7e19035a662eb5dca39381c63174eb1578b9cdc056dc6fe42b432465a80f9af
-	source_armv7h = clash-meta-bin-armv7h-1.16.0.gz::https://github.com/MetaCubeX/Clash.Meta/releases/download/v1.16.0/Clash.Meta-linux-armv7-v1.16.0.gz
-	sha256sums_armv7h = 09c971bff85435fe18ec458a19945ad0560ffbe7fa4ff9affacc712adc2b3cef
-	source_aarch64 = clash-meta-bin-aarch64-1.16.0.gz::https://github.com/MetaCubeX/Clash.Meta/releases/download/v1.16.0/Clash.Meta-linux-arm64-v1.16.0.gz
-	sha256sums_aarch64 = 2976293bdcc44b428a5d902a6b493f76c197cf7f84046a7f5ee456e7103c2adf
+	sha256sums = 64c1b08fe40af101b5a113212e28aec7e91f63424bec85d50efc5b0fc9ce62ce
+	sha256sums = c1629d3f5b48053616141076ad8d21031fbca84a352b123d9e3c5bad6406f4a7
+	sha256sums = d6f1782c0a57591ef6b8c4c898fc7a883363ec45742ae41eee8b91eb68d90f05
+	source_x86_64 = clash-rs-bin-x86_64-0.1.9::https://github.com/Watfaq/clash-rs/releases/download/v0.1.9/clash-x86_64-unknown-linux-gnu
+	sha256sums_x86_64 = fa44d5ba0b7cdfafeb543f4b66acbc9aeef84a81640e38f73da243443cfca795
+	source_armv7h = clash-rs-bin-armv7h-0.1.9::https://github.com/Watfaq/clash-rs/releases/download/v0.1.9/clash-armv7-unknown-linux-gnueabihf
+	sha256sums_armv7h = c285c33d3cf1372d313ea142006b252a038248ddc4120027b1631d6fed2e6ad2
+	source_aarch64 = clash-rs-bin-aarch64-0.1.9::https://github.com/Watfaq/clash-rs/releases/download/v0.1.9/clash-aarch64-unknown-linux-gnu
+	sha256sums_aarch64 = 56343dc6a13f731a72a80674e54988ce1e6a40eba1c35acb6e9900e493597afa
 
-pkgname = clash-meta-bin
+pkgname = clash-rs-bin
diff --git a/PKGBUILD b/PKGBUILD
index d257337c33c5..b579cbdd9a9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,45 @@
-# Maintainer: pallxk <aur@pallxk.com>
+# Maintainer: detiam <dehe_tian@outlook.com>
+# Contributor: pallxk <aur@pallxk.com>
 # Contributor: adiprasetya <ignilium.inc@gmail.com>
 # Contributor: chenx_dust <chenx_dust@outlook.com>
 
-pkgname=clash-meta-bin
-pkgver=1.16.0
-pkgrel=2
-pkgdesc="Another Clash Kernel by MetaCubeX"
-arch=("i686" "x86_64" "arm" "armv6h" "armv7h" "aarch64")
-url="https://github.com/MetaCubeX/Clash.Meta"
-license=("GPL3")
+pkgname=clash-rs-bin
+pkgver=0.1.9
+pkgrel=1
+pkgdesc="A custom protocol, rule based network proxy software"
+arch=("x86_64" "armv7h" "aarch64")
+url="https://github.com/Watfaq/clash-rs"
+license=("Apache-2.0")
 groups=()
 depends=("glibc")
 makedepends=()
 checkdepends=()
 optdepends=()
-provides=("clash-meta")
-conflicts=("clash-meta")
+provides=("clash-rs")
+conflicts=("clash-rs")
 replaces=()
-backup=("etc/clash-meta/config.yaml")
+backup=("etc/clash-rs/config.yaml")
 options=()
 install=${pkgname}.install
 changelog=
-source=("clash-meta.service"
-        "clash-meta@.service"
+source=("clash-rs.service"
+        "clash-rs@.service"
         "config.yaml")
-source_i686=("${pkgname}-i686-${pkgver}.gz::${url}/releases/download/v${pkgver}/Clash.Meta-linux-386-v${pkgver}.gz")
-source_x86_64=("${pkgname}-x86_64-${pkgver}.gz::${url}/releases/download/v${pkgver}/Clash.Meta-linux-amd64-compatible-v${pkgver}.gz")
-source_arm=("${pkgname}-arm-${pkgver}.gz::${url}/releases/download/v${pkgver}/Clash.Meta-linux-armv5-v${pkgver}.gz")
-source_armv6h=("${pkgname}-armv6h-${pkgver}.gz::${url}/releases/download/v${pkgver}/Clash.Meta-linux-armv6-v${pkgver}.gz")
-source_armv7h=("${pkgname}-armv7h-${pkgver}.gz::${url}/releases/download/v${pkgver}/Clash.Meta-linux-armv7-v${pkgver}.gz")
-source_aarch64=("${pkgname}-aarch64-${pkgver}.gz::${url}/releases/download/v${pkgver}/Clash.Meta-linux-arm64-v${pkgver}.gz")
+source_x86_64=("${pkgname}-x86_64-${pkgver}::${url}/releases/download/v${pkgver}/clash-x86_64-unknown-linux-gnu")
+source_armv7h=("${pkgname}-armv7h-${pkgver}::${url}/releases/download/v${pkgver}/clash-armv7-unknown-linux-gnueabihf")
+source_aarch64=("${pkgname}-aarch64-${pkgver}::${url}/releases/download/v${pkgver}/clash-aarch64-unknown-linux-gnu")
 
-sha256sums=('9e8a28e22c159d7d70c258b65f47bc734543e54cb0cd3957ce19349aca145af8'
-            '29c73ac66d6fe60bea4359ac1857e3452f26c2af792efd8dd16d558462472efb'
-            'c4af03523b8006d206440163406ee9b4de1a10bb5023fb3194490b8225a5e481')
-sha256sums_i686=('edc34b297e17f6a274b734f1a47f817e5ceb3cb9e966a17466c30a62e9ba0578')
-sha256sums_x86_64=('ed3bd776e2f9edb0de03430f503dfde2d0fb966b7a97904826633822733e9901')
-sha256sums_arm=('dd4e7871fbc1cec2199e4e4619de2bea339d1b4e55e8d2f46e84612b8bd2b370')
-sha256sums_armv6h=('d7e19035a662eb5dca39381c63174eb1578b9cdc056dc6fe42b432465a80f9af')
-sha256sums_armv7h=('09c971bff85435fe18ec458a19945ad0560ffbe7fa4ff9affacc712adc2b3cef')
-sha256sums_aarch64=('2976293bdcc44b428a5d902a6b493f76c197cf7f84046a7f5ee456e7103c2adf')
+sha256sums=('64c1b08fe40af101b5a113212e28aec7e91f63424bec85d50efc5b0fc9ce62ce'
+            'c1629d3f5b48053616141076ad8d21031fbca84a352b123d9e3c5bad6406f4a7'
+            'd6f1782c0a57591ef6b8c4c898fc7a883363ec45742ae41eee8b91eb68d90f05')
+sha256sums_x86_64=('fa44d5ba0b7cdfafeb543f4b66acbc9aeef84a81640e38f73da243443cfca795')
+sha256sums_armv7h=('c285c33d3cf1372d313ea142006b252a038248ddc4120027b1631d6fed2e6ad2')
+sha256sums_aarch64=('56343dc6a13f731a72a80674e54988ce1e6a40eba1c35acb6e9900e493597afa')
 
 package() {
     cd "${srcdir}"
-    install -Dm755 "${pkgname}-${CARCH}-${pkgver}" "${pkgdir}/usr/bin/clash-meta"
-    install -Dm644 "config.yaml" "${pkgdir}/etc/clash-meta/config.yaml"
-    install -Dm644 "clash-meta.service" "${pkgdir}/usr/lib/systemd/system/clash-meta.service"
-    install -Dm644 "clash-meta@.service" "${pkgdir}/usr/lib/systemd/system/clash-meta@.service"
+    install -Dm755 "${pkgname}-${CARCH}-${pkgver}" "${pkgdir}/usr/bin/clash-rs"
+    install -Dm644 "config.yaml" "${pkgdir}/etc/clash-rs/config.yaml"
+    install -Dm644 "clash-rs.service" "${pkgdir}/usr/lib/systemd/system/clash-rs.service"
+    install -Dm644 "clash-rs@.service" "${pkgdir}/usr/lib/systemd/system/clash-rs@.service"
 }
diff --git a/clash-meta-bin.install b/clash-meta-bin.install
deleted file mode 100644
index 2bcdf3bff98c..000000000000
--- a/clash-meta-bin.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install(){
-    post_upgrade
-}
-post_upgrade(){
-    cat << EOF
-    This is the core of Clash Meta by MetaCubeX forked from Clash by Dreamacro.
-    You can find the manual at https://github.com/Dreamacro/clash/wiki/configuration
-    Home directory clash-meta.service at /etc/clash-meta
-    User home directory ~/.config/clash by default
-EOF
-
-}
\ No newline at end of file
diff --git a/clash-rs-bin.install b/clash-rs-bin.install
new file mode 100644
index 000000000000..dd4bdba77f4e
--- /dev/null
+++ b/clash-rs-bin.install
@@ -0,0 +1,11 @@
+post_install(){
+    post_upgrade
+}
+post_upgrade(){
+    cat << EOF
+    This is the core of ClashRS by Watfaq forked from Clash by Dreamacro.
+    You can find the manual at https://watfaq.gitbook.io/clashrs-user-manual
+    Home directory clash-rs.service at /etc/clash-rs
+EOF
+
+}
diff --git a/clash-meta.service b/clash-rs.service
index 6720d68ed22e..f785fba9b71b 100644
--- a/clash-meta.service
+++ b/clash-rs.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Clash-Meta Daemon, Another Clash Kernel.
+Description=ClashRS Daemon, Another Clash Kernel.
 After=network.target NetworkManager.service systemd-networkd.service iwd.service
 
 [Service]
@@ -7,7 +7,7 @@ Type=exec
 CapabilityBoundingSet=cap_net_admin
 AmbientCapabilities=cap_net_admin
 Restart=on-abort
-ExecStart=/usr/bin/clash-meta -d /etc/clash-meta
+ExecStart=/usr/bin/clash-rs -d /etc/clash-rs
 
 [Install]
 WantedBy=multi-user.target
diff --git a/clash-meta@.service b/clash-rs@.service
index 04a35a155ab6..e25a3704f30d 100644
--- a/clash-meta@.service
+++ b/clash-rs@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Clash-Meta Daemon, Another Clash Kernel.
+Description=ClashRS Daemon, Another Clash Kernel.
 After=network.target NetworkManager.service systemd-networkd.service iwd.service
 
 [Service]
@@ -8,7 +8,7 @@ User=%i
 CapabilityBoundingSet=cap_net_admin
 AmbientCapabilities=cap_net_admin
 Restart=on-abort
-ExecStart=/usr/bin/clash-meta
+ExecStart=/usr/bin/clash-rs
 
 [Install]
 WantedBy=multi-user.target
diff --git a/config.yaml b/config.yaml
index 4b69b9b7d5cb..632c7d4f222d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -65,7 +65,7 @@ dns:
 tun:
   enable: true
   stack: system # or gvisor
-  device: Meta
+  device: ClashRS
   dns-hijack:
     - any:53
   auto-route: true # auto set global route