Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/files/, net-proxy/trojan/
Date: Sun, 27 Sep 2020 09:12:34
Message-Id: 1601197938.ee7dfe493ec4984750352a7184967121d02d50c8.dlan@gentoo
1 commit: ee7dfe493ec4984750352a7184967121d02d50c8
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 27 08:55:02 2020 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 27 09:12:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee7dfe49
7
8 net-proxy/trojan: run as non-privilege user due to security concern
9
10 Package-Manager: Portage-3.0.0, Repoman-2.3.23
11 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
12
13 net-proxy/trojan/files/trojan.initd | 5 ++++-
14 net-proxy/trojan/{trojan-1.16.0.ebuild => trojan-1.16.0-r1.ebuild} | 0
15 2 files changed, 4 insertions(+), 1 deletion(-)
16
17 diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd
18 index 2990245430d..c87f6576d6b 100644
19 --- a/net-proxy/trojan/files/trojan.initd
20 +++ b/net-proxy/trojan/files/trojan.initd
21 @@ -20,6 +20,7 @@ depend() {
22 start() {
23 ebegin "Starting Trojan, Log File: ${TJ_LOG}"
24 start-stop-daemon --start -b \
25 + --user nobody --group nobody \
26 -1 "${TJ_LOG}" -2 "${TJ_LOG}" \
27 -m -p "${TJ_PIDFILE}" \
28 --exec /usr/bin/trojan -- "${TJ_CONFIG}"
29 @@ -28,6 +29,8 @@ start() {
30
31 stop() {
32 ebegin "Stopping Trojan"
33 - start-stop-daemon --stop -p "${TJ_PIDFILE}"
34 + start-stop-daemon --stop \
35 + --user nobody --group nobody \
36 + -p "${TJ_PIDFILE}"
37 eend $?
38 }
39
40 diff --git a/net-proxy/trojan/trojan-1.16.0.ebuild b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
41 similarity index 100%
42 rename from net-proxy/trojan/trojan-1.16.0.ebuild
43 rename to net-proxy/trojan/trojan-1.16.0-r1.ebuild