Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: [gentoo-dev] [PATCH 3/9] qmail.eclass: Use UID 0 instead of root
Date: Sun, 27 Mar 2022 07:29:00
Message-Id: 20220327072735.9719-4-ulm@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/9] eclass: Use UID 0 instead of root and other fixes by "Ulrich Müller"
1 Bug: https://bugs.gentoo.org/595908
2 Signed-off-by: Ulrich Müller <ulm@g.o>
3 ---
4 eclass/qmail.eclass | 12 ++++++------
5 1 file changed, 6 insertions(+), 6 deletions(-)
6
7 diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
8 index 33157b7e7871..471f2fe7ce5e 100644
9 --- a/eclass/qmail.eclass
10 +++ b/eclass/qmail.eclass
11 @@ -1,4 +1,4 @@
12 -# Copyright 1999-2021 Gentoo Authors
13 +# Copyright 1999-2022 Gentoo Authors
14 # Distributed under the terms of the GNU General Public License v2
15
16 # @ECLASS: qmail.eclass
17 @@ -133,7 +133,7 @@ qmail_base_install() {
18 # subshell to not leak the install options
19 (
20 einfo "Setting up basic directory hierarchy"
21 - diropts -o root -g qmail
22 + diropts -o 0 -g qmail
23 dodir "${QMAIL_HOME}"/bin
24 keepdir "${QMAIL_HOME}"/{control,users}
25 diropts -o alias -g qmail
26 @@ -145,7 +145,7 @@ qmail_base_install() {
27 einfo "Installing all qmail software"
28 exeinto "${QMAIL_HOME}"/bin
29
30 - exeopts -o root -g qmail
31 + exeopts -o 0 -g qmail
32 doexe bouncesaying condredirect config-fast datemail except forward maildir2mbox \
33 maildirmake mailsubj predate preline qbiff \
34 qmail-{inject,qmqpc,qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto,showctl} \
35 @@ -158,11 +158,11 @@ qmail_base_install() {
36
37 use pop3 && doexe qmail-pop3d
38
39 - exeopts -o root -g qmail -m 711
40 + exeopts -o 0 -g qmail -m 711
41 doexe qmail-{clean,getpw,local,pw2u,remote,rspawn,send} splogger
42 use pop3 && doexe qmail-popup
43
44 - exeopts -o root -g qmail -m 700
45 + exeopts -o 0 -g qmail -m 700
46 doexe qmail-{lspawn,newmrh,newu,start}
47
48 exeopts -o qmailq -g qmail -m 4711
49 @@ -262,7 +262,7 @@ qmail_supervise_install_one() {
50 dosupervise ${1}
51 # subshell to not leak the install options
52 (
53 - diropts -o qmaill -g root
54 + diropts -o qmaill -g 0
55 keepdir /var/log/qmail/${1}
56 )
57 }
58 --
59 2.35.1