From 9b383d1581b26fd70aa1bb0d352158b0ccd887f858def056b974c4fefbbba42e Mon Sep 17 00:00:00 2001
From: Hillwood Yang <hillwoodroc@gmail.com>
Date: Tue, 24 Oct 2023 06:53:53 +0000
Subject: [PATCH] Accepting request 1119865 from
 home:hillwood:branches:server:proxy

- Fix boo#1216372 and boo#1216373

OBS-URL: https://build.opensuse.org/request/show/1119865
OBS-URL: https://build.opensuse.org/package/show/server:proxy/shadowsocks-libev?expand=0&rev=51
---
 shadowsocks-libev-client.service  | 2 ++
 shadowsocks-libev-client@.service | 2 ++
 shadowsocks-libev-manager.service | 2 ++
 shadowsocks-libev-nat.service     | 2 ++
 shadowsocks-libev-nat@.service    | 2 ++
 shadowsocks-libev-redir.service   | 2 ++
 shadowsocks-libev-redir@.service  | 2 ++
 shadowsocks-libev-server.service  | 2 ++
 shadowsocks-libev-server@.service | 2 ++
 shadowsocks-libev-tunnel.service  | 2 ++
 shadowsocks-libev-tunnel@.service | 2 ++
 shadowsocks-libev.changes         | 5 +++++
 shadowsocks-libev.spec            | 5 +++++
 13 files changed, 32 insertions(+)

diff --git a/shadowsocks-libev-client.service b/shadowsocks-libev-client.service
index 33ad664..4e59208 100644
--- a/shadowsocks-libev-client.service
+++ b/shadowsocks-libev-client.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-client.pid
 ExecStart=/usr/bin/ss-local -c /etc/shadowsocks/shadowsocks-libev-config.json -f /var/run/shadowsocks-libev-client.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-client@.service b/shadowsocks-libev-client@.service
index 8d9e79a..a48daaf 100644
--- a/shadowsocks-libev-client@.service
+++ b/shadowsocks-libev-client@.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-client@%i.pid
 ExecStart=/usr/bin/ss-local -c /etc/shadowsocks/%i.json -f /var/run/shadowsocks-libev-client@%i.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-manager.service b/shadowsocks-libev-manager.service
index 334c229..efea3ab 100644
--- a/shadowsocks-libev-manager.service
+++ b/shadowsocks-libev-manager.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-manager.pid
 ExecStart=/usr/bin/ss-manager -c /etc/shadowsocks/shadowsocks-libev-config.json -f /var/run/shadowsocks-libev-manager.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-nat.service b/shadowsocks-libev-nat.service
index 961463d..5ccaa02 100644
--- a/shadowsocks-libev-nat.service
+++ b/shadowsocks-libev-nat.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-nat.pid
 ExecStart=/usr/bin/ss-nat -c /etc/shadowsocks/shadowsocks-libev-config.json -f /var/run/shadowsocks-libev-nat.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-nat@.service b/shadowsocks-libev-nat@.service
index 76ea729..89d6c49 100644
--- a/shadowsocks-libev-nat@.service
+++ b/shadowsocks-libev-nat@.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-nat@%i.pid
 ExecStart=/usr/bin/ss-nat -c /etc/shadowsocks/%i.json -f /var/run/shadowsocks-libev-nat@%i.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-redir.service b/shadowsocks-libev-redir.service
index 6e0e9e3..f9e88ec 100644
--- a/shadowsocks-libev-redir.service
+++ b/shadowsocks-libev-redir.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-redir.pid
 ExecStart=/usr/bin/ss-redir -c /etc/shadowsocks/shadowsocks-libev-config.json -f /var/run/shadowsocks-libev-redir.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-redir@.service b/shadowsocks-libev-redir@.service
index 5c6896a..15bbf4b 100644
--- a/shadowsocks-libev-redir@.service
+++ b/shadowsocks-libev-redir@.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-redir@%i.pid
 ExecStart=/usr/bin/ss-redir -c /etc/shadowsocks/%i.json -f /var/run/shadowsocks-libev-redir@%i.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-server.service b/shadowsocks-libev-server.service
index f08c3e0..dc6917c 100644
--- a/shadowsocks-libev-server.service
+++ b/shadowsocks-libev-server.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-server.pid
 ExecStart=/usr/bin/ss-server -c /etc/shadowsocks/shadowsocks-libev-config.json -f /var/run/shadowsocks-libev-server.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-server@.service b/shadowsocks-libev-server@.service
index e9ed491..1d38d72 100644
--- a/shadowsocks-libev-server@.service
+++ b/shadowsocks-libev-server@.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-server@%i.pid
 ExecStart=/usr/bin/ss-server -c /etc/shadowsocks/%i.json -f /var/run/shadowsocks-libev-server@%i.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-tunnel.service b/shadowsocks-libev-tunnel.service
index a3ad0bb..45bebe5 100644
--- a/shadowsocks-libev-tunnel.service
+++ b/shadowsocks-libev-tunnel.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-tunnel.pid
 ExecStart=/usr/bin/ss-tunnel -c /etc/shadowsocks/shadowsocks-libev-config.json -f /var/run/shadowsocks-libev-tunnel.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev-tunnel@.service b/shadowsocks-libev-tunnel@.service
index ff6cddd..44b46d9 100644
--- a/shadowsocks-libev-tunnel@.service
+++ b/shadowsocks-libev-tunnel@.service
@@ -21,6 +21,8 @@ Type=forking
 PIDFile=/var/run/shadowsocks-libev-tunnel@%i.pid
 ExecStart=/usr/bin/ss-tunnel -c /etc/shadowsocks/%i.json -f /var/run/shadowsocks-libev-tunnel@%i.pid -u --fast-open
 Restart=on-failure
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target
diff --git a/shadowsocks-libev.changes b/shadowsocks-libev.changes
index fcc6719..9487923 100644
--- a/shadowsocks-libev.changes
+++ b/shadowsocks-libev.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 24 06:50:28 UTC 2023 - Hillwood Yang <hillwood@opensuse.org>
+
+- Fix boo#1216372 and boo#1216373 
+
 -------------------------------------------------------------------
 Mon May  8 11:30:20 UTC 2023 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
 
diff --git a/shadowsocks-libev.spec b/shadowsocks-libev.spec
index 3995988..31778ea 100644
--- a/shadowsocks-libev.spec
+++ b/shadowsocks-libev.spec
@@ -153,6 +153,10 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcshadowsocks-libev-tunnel@
 %service_add_pre %{name}-nat@.service
 %service_add_pre %{name}-redir@.service
 %service_add_pre %{name}-tunnel@.service
+getent group shadowsocks >/dev/null || %{_sbindir}/groupadd --system shadowsocks
+getent passwd shadowsocks >/dev/null || %{_sbindir}/useradd --system -c "shadowsocks User" \
+         -d %{_localstatedir}/shadowsocks -m -g shadowsocks -s %{_sbindir}/nologin \
+         shadowsocks
 
 %post
 %service_add_post %{name}-server.service
@@ -166,6 +170,7 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcshadowsocks-libev-tunnel@
 %service_add_post %{name}-nat@.service
 %service_add_post %{name}-redir@.service
 %service_add_post %{name}-tunnel@.service
+chown shadowsocks:shadowsocks %{_sysconfdir}/shadowsocks -R
 
 %preun
 %service_del_preun %{name}-server.service