Gentoo Archives: gentoo-commits

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