Gentoo Archives: gentoo-commits

From: Andrew Savchenko <bircoph@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/sobexsrv/files/
Date: Sun, 06 Sep 2020 09:57:10
Message-Id: 1599386211.a6770b0bb394ffbbb79690dc1a126cdad35c0540.bircoph@gentoo
1 commit: a6770b0bb394ffbbb79690dc1a126cdad35c0540
2 Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 6 08:55:49 2020 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 6 09:56:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6770b0b
7
8 app-mobilephone/sobexsrv: init.d fixes
9
10 - double quote ${CHROOT} variable
11 - start-stop-daemon: migrate from --chuid to --user
12
13 Package-Manager: Portage-3.0.5, Repoman-3.0.1
14 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
15
16 app-mobilephone/sobexsrv/files/init.d_sobexsrv | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19 diff --git a/app-mobilephone/sobexsrv/files/init.d_sobexsrv b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
20 index e02530314ca..fa27e19ef11 100644
21 --- a/app-mobilephone/sobexsrv/files/init.d_sobexsrv
22 +++ b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
23 @@ -1,5 +1,5 @@
24 #!/sbin/openrc-run
25 -# Copyright 1999-2017 Gentoo Foundation
26 +# Copyright 1999-2020 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 depend() {
30 @@ -17,7 +17,7 @@ check_config() {
31 return 1
32 fi
33
34 - if [ ${CHROOT} = "yes" ] ; then
35 + if [ "${CHROOT}" = "yes" ] ; then
36 if [ ! -u /usr/bin/sobexsrv ] ; then
37 eerror "The \$CHROOT option requires /usr/bin/sobexsrv to be suid root!"
38 return 1
39 @@ -47,7 +47,7 @@ start() {
40
41 OPTIONS="-I -r ${INBOX} ${OPTIONS} ${SOBEXSRV_OPT}"
42
43 - start-stop-daemon --chuid ${USER}:${GROUP} --start --quiet --exec /usr/bin/sobexsrv -- $OPTIONS
44 + start-stop-daemon --user ${USER}:${GROUP} --start --quiet --exec /usr/bin/sobexsrv -- $OPTIONS
45 eend $?
46 }