feat: v1.3.5-1

8 files changed, 135 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..62bbe54cafaf
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,30 @@
+pkgbase = clash-user
+	pkgdesc = A rule-based tunnel in Go
+	pkgver = 1.3.5
+	pkgrel = 1
+	url = https://github.com/Dreamacro/clash
+	arch = x86_64
+	license = GPL3
+	makedepends = go
+	depends = clash-geoip
+	depends = glibc
+	provides = clash=1.3.5
+	conflicts = clash
+	backup = etc/clash/config.yaml
+	source = clash-1.3.5.tar.gz::https://github.com/Dreamacro/clash/archive/v1.3.5.tar.gz
+	source = clash-user-1.3.5.patch
+	source = config.yaml
+	source = clash.sysusers
+	source = clash.tmpfiles
+	source = clash.service
+	source = clash@.service
+	sha256sums = 89f39540a698fab82728c80e903d7750894789621595ca11a4777afdfc3e265d
+	sha256sums = 511abd285aedc6dda651b1bf3d7fd84f51060fa313a12beb3ce68d916c2fc173
+	sha256sums = 62ed4460cd2ed4b400193ad04b0cccb76d7558f87c377a0033041841a73f7945
+	sha256sums = 149c6448a5630af1065ea230707331ac12663128568d6cf0e9d5480e94d1d104
+	sha256sums = 006bea79c75de78dcd4f3991bb9c4e6f706443131aeeccf8db076f8738f24ccd
+	sha256sums = 090e1598e9e9736c951b1e2488df7e573c4d29d2fd0e0da8cfc0edd998f8c8fb
+	sha256sums = d22cc741edf783c6fc83bb62f67b5381a0421d2ea49959469c1b8da48488a827
+
+pkgname = clash-user
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..93b8b39f4f57
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,62 @@
+# Maintainer: Dct Mei <dctxmei@gmail.com>
+
+pkgname=clash-user
+_pkgname=clash
+pkgver=1.3.5
+pkgrel=1
+pkgdesc="A rule-based tunnel in Go"
+arch=('x86_64')
+url="https://github.com/Dreamacro/clash"
+license=('GPL3')
+depends=('clash-geoip' 'glibc')
+makedepends=('go')
+provides=("clash=${pkgver}")
+conflicts=('clash')
+backup=("etc/clash/config.yaml")
+source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+        "clash-user-1.3.5.patch"
+        "config.yaml"
+        "clash.sysusers"
+        "clash.tmpfiles"
+        "clash.service"
+        "clash@.service")
+sha256sums=('89f39540a698fab82728c80e903d7750894789621595ca11a4777afdfc3e265d'
+            '511abd285aedc6dda651b1bf3d7fd84f51060fa313a12beb3ce68d916c2fc173'
+            '62ed4460cd2ed4b400193ad04b0cccb76d7558f87c377a0033041841a73f7945'
+            '149c6448a5630af1065ea230707331ac12663128568d6cf0e9d5480e94d1d104'
+            '006bea79c75de78dcd4f3991bb9c4e6f706443131aeeccf8db076f8738f24ccd'
+            '090e1598e9e9736c951b1e2488df7e573c4d29d2fd0e0da8cfc0edd998f8c8fb'
+            'd22cc741edf783c6fc83bb62f67b5381a0421d2ea49959469c1b8da48488a827')
+
+prepare() {
+    cd "${srcdir}"/"${_pkgname}-${pkgver}"/
+    patch -p1 -i ../clash-user-1.3.5.patch
+    sed "s/unknown version/${pkgver}/" -i constant/version.go
+    sed "s/unknown time/$(LANG=C date -u)/" -i constant/version.go
+}
+
+build() {
+    export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+    export CGO_CPPFLAGS="${CPPFLAGS}"
+    export CGO_CXXFLAGS="${CXXFLAGS}"
+    export CGO_CFLAGS="${CFLAGS}"
+    export CGO_LDFLAGS="${LDFLAGS}"
+    cd "${_pkgname}-${pkgver}/"
+    go build -ldflags="-linkmode=external"
+}
+
+check() {
+    cd "${_pkgname}-${pkgver}/"
+    go test github.com/Dreamacro/clash/...
+}
+
+package() {
+    cd "${_pkgname}-${pkgver}/"
+    install -Dm 755 clash -t "${pkgdir}"/usr/bin/
+    install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/clash/
+    install -Dm 644 "${srcdir}"/config.yaml -t "${pkgdir}"/etc/clash/
+    install -Dm 644 "${srcdir}"/clash.sysusers "${pkgdir}"/usr/lib/sysusers.d/clash.conf
+    install -Dm 644 "${srcdir}"/clash.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/clash.conf
+    install -Dm 644 "${srcdir}"/clash.service -t "${pkgdir}"/usr/lib/systemd/system/
+    install -Dm 644 "${srcdir}"/clash@.service -t "${pkgdir}"/usr/lib/systemd/system/
+}
diff --git a/clash-user-1.3.5.patch b/clash-user-1.3.5.patch
new file mode 100644
index 000000000000..e2d0848f6e5a
--- /dev/null
+++ b/clash-user-1.3.5.patch
@@ -0,0 +1,16 @@
+diff --git a/constant/adapters.go b/constant/adapters.go
+index 4ba891d..85c8c10 100644
+--- a/constant/adapters.go
++++ b/constant/adapters.go
+@@ -108,9 +108,9 @@ func (at AdapterType) String() string {
+ 	case Socks5:
+ 		return "Socks5"
+ 	case Http:
+-		return "Http"
++		return "HTTP"
+ 	case Vmess:
+-		return "Vmess"
++		return "VMess"
+ 	case Trojan:
+ 		return "Trojan"
+ 
diff --git a/clash.service b/clash.service
new file mode 100644
index 000000000000..bc37fe8d7aae
--- /dev/null
+++ b/clash.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Clash Service
+After=network.target nss-lookup.target
+
+[Service]
+User=clash
+ExecStart=/usr/bin/clash -d /etc/clash/
+Restart=on-abort
+StandardOutput=file:/var/log/clash/clash.log
+
+[Install]
+WantedBy=multi-user.target
diff --git a/clash.sysusers b/clash.sysusers
new file mode 100644
index 000000000000..09d5d8232ff5
--- /dev/null
+++ b/clash.sysusers
@@ -0,0 +1 @@
+u clash - "Clash Service" - -
diff --git a/clash.tmpfiles b/clash.tmpfiles
new file mode 100644
index 000000000000..60ff89785d2b
--- /dev/null
+++ b/clash.tmpfiles
@@ -0,0 +1 @@
+d /var/log/clash 0700 clash clash - -
diff --git a/clash@.service b/clash@.service
new file mode 100644
index 000000000000..dd7b11b11ce0
--- /dev/null
+++ b/clash@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Clash Service
+After=network.target nss-lookup.target
+
+[Service]
+User=clash
+ExecStart=/usr/bin/clash -d /etc/clash/ -f /etc/clash/%i.yaml
+Restart=on-abort
+StandardOutput=file:/var/log/clash/%i.log
+
+[Install]
+WantedBy=multi-user.target
diff --git a/config.yaml b/config.yaml
new file mode 100644
index 000000000000..5ac1cc5c1364
--- /dev/null
+++ b/config.yaml
@@ -0,0 +1 @@
+port: 7890