build: Update shadowsocks-rust to 1.12.5

4 files changed, 49 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b00cfe1a7206..e7db9b910d78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
 pkgbase = shadowsocks-rust
 	pkgdesc = A Rust port of shadowsocks https://shadowsocks.org/
-	pkgver = 1.8.23
+	pkgver = 1.12.5
 	pkgrel = 1
 	url = https://github.com/shadowsocks/shadowsocks-rust
 	arch = any
 	license = MIT
-	makedepends = cargo
+	makedepends = cargo-nightly
 	makedepends = libsodium
 	depends = openssl
-	source = shadowsocks-rust-1.8.23.tar.gz::https://github.com/shadowsocks/shadowsocks-rust/archive/v1.8.23.tar.gz
+	source = shadowsocks-rust-1.12.5.tar.gz::https://github.com/shadowsocks/shadowsocks-rust/archive/v1.12.5.tar.gz
 	source = shadowsocks-rust@.service
 	source = shadowsocks-rust-server@.service
-	md5sums = 4490d81e006f66fc263dcbbad64b724d
-	md5sums = 86165927273bb5efbfda1eb6fdf09315
-	md5sums = 9fc8b2c0cadb01ab6b38a95766877a20
+	sha512sums = 43f047f9c957c7a1a201df126041d3152fe679d751bdaeb1b71a728bc6ba92951bee0d2d478f78175f03ccc5a850c5fd627f3f31daa9ddf413e2f735e560392a
+	sha512sums = 0f714e3f085406ee011155daabe4a69514b5bd5d0587a3d7ebc5be459565d4c090b0fd6977fc8af7ba681e876b0d38859aa7e39f51a984de66cc9a623375e736
+	sha512sums = 6292de41dd0da9b70a1f060a19e4d9acdb66e67f8b41e84d31b331d012296c29c59c63cfb02763538dd46931412243be1098876bc93078b8cb92573be2a32b24
 
 pkgname = shadowsocks-rust
-
diff --git a/PKGBUILD b/PKGBUILD
index 338112309e35..99e816fef7fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,50 @@
-# Maintainer : rustemb <rustemb@systemli.org>
+# Maintainer: BigmenPixel <bigmen dot pixel at tuta dot io>
+# Contributor: rustemb <rustemb at systemli dot org>
 
 pkgname=shadowsocks-rust
-pkgver=1.8.23
+pkgver=1.12.5
 pkgrel=1
 pkgdesc='A Rust port of shadowsocks https://shadowsocks.org/'
 arch=('any')
 url='https://github.com/shadowsocks/shadowsocks-rust'
 license=('MIT')
 depends=('openssl')
-makedepends=('cargo' 'libsodium')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
-        'shadowsocks-rust@.service'
-        'shadowsocks-rust-server@.service')
+makedepends=('cargo-nightly' 'libsodium')
+source=(
+    "${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+    'shadowsocks-rust@.service'
+    'shadowsocks-rust-server@.service')
 
-md5sums=('4490d81e006f66fc263dcbbad64b724d'
-         '86165927273bb5efbfda1eb6fdf09315'
-         '9fc8b2c0cadb01ab6b38a95766877a20')
+sha512sums=('43f047f9c957c7a1a201df126041d3152fe679d751bdaeb1b71a728bc6ba92951bee0d2d478f78175f03ccc5a850c5fd627f3f31daa9ddf413e2f735e560392a'
+            '0f714e3f085406ee011155daabe4a69514b5bd5d0587a3d7ebc5be459565d4c090b0fd6977fc8af7ba681e876b0d38859aa7e39f51a984de66cc9a623375e736'
+            '6292de41dd0da9b70a1f060a19e4d9acdb66e67f8b41e84d31b331d012296c29c59c63cfb02763538dd46931412243be1098876bc93078b8cb92573be2a32b24')
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    cargo fetch --locked --target "${CARCH}-unknown-linux-gnu"
+}
 
 build() {
- 	cd "${pkgname}-${pkgver}"
-	cargo build --release
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    export CARGO_TARGET_DIR=target
+    cargo build --frozen --release --features local-redir,local-tun
 }
 
-package() {
- 	cd "${pkgname}-${pkgver}"
-	install -Dm755 "target/release/sslocal" "${pkgdir}/usr/bin/sslocal-rust"
-	install -Dm755 "target/release/ssserver" "${pkgdir}/usr/bin/ssserver-rust"
-	install -Dm755 "target/release/ssurl" "${pkgdir}/usr/bin/ssurl-rust"
-	install -Dm644 "${srcdir}/shadowsocks-rust@.service" "${pkgdir}/usr/lib/systemd/system/shadowsocks-rust@.service"
-	install -Dm644 "${srcdir}/shadowsocks-rust-server@.service" "${pkgdir}/usr/lib/systemd/system/shadowsocks-rust-server@.service"
-	install -Dm644 "examples/config_ext.json" "${pkgdir}/etc/shadowsocks/config_ext_rust.json.example"
-	install -Dm644 "examples/config.json" "${pkgdir}/etc/shadowsocks/config_rust.json.example"
+check() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    cargo test --frozen --features local-redir,local-tun
 }
 
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    install -Dm755 "target/release/sslocal" "${pkgdir}/usr/bin/sslocal-rust"
+    install -Dm755 "target/release/ssserver" "${pkgdir}/usr/bin/ssserver-rust"
+    install -Dm755 "target/release/ssurl" "${pkgdir}/usr/bin/ssurl-rust"
+    install -Dm755 "target/release/ssmanager" "${pkgdir}/usr/bin/ssmanager"
+    install -Dm755 "target/release/ssservice" "${pkgdir}/usr/bin/ssservice"
+    install -Dm644 "${srcdir}/${pkgname}@.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}@.service"
+    install -Dm644 "${srcdir}/${pkgname}-server@.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}-server@.service"
+    install -Dm644 "examples/config_ext.json" "${pkgdir}/etc/${pkgname}/config_ext_rust.json.example"
+    install -Dm644 "examples/config.json" "${pkgdir}/etc/${pkgname}/config_rust.json.example"
+    install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/shadowsocks-rust-server@.service b/shadowsocks-rust-server@.service
index 40358096dc86..643e1340f0b4 100644
--- a/shadowsocks-rust-server@.service
+++ b/shadowsocks-rust-server@.service
@@ -1,11 +1,13 @@
 [Unit]
 Description=Shadowsocks-Rust Server Service
 After=network.target
+Wants=network-online.target
 
 [Service]
 Type=simple
-User=nobody
-ExecStart=/usr/bin/ssserver-rust -c /etc/shadowsocks/%i.json --log-without-time
+DynamicUser=yes
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/ssserver-rust -c /etc/shadowsocks-rust/%i.json
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-rust@.service b/shadowsocks-rust@.service
index 3adac8b43272..8805c53f56a7 100644
--- a/shadowsocks-rust@.service
+++ b/shadowsocks-rust@.service
@@ -1,11 +1,13 @@
 [Unit]
 Description=Shadowsocks-Rust Client Service
 After=network.target
+Wants=network-online.target
 
 [Service]
 Type=simple
-User=nobody
-ExecStart=/usr/bin/sslocal-rust -c /etc/shadowsocks/%i.json --log-without-time
+DynamicUser=yes
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/sslocal-rust -c /etc/shadowsocks-rust/%i.json
 
 [Install]
 WantedBy=multi-user.target