| 1 |
The default owner is root:root anyway, so just make sure other settings do not |
| 2 |
leak outside from the places where it is actually used. This also fixes |
| 3 |
qmail_supervise_install_one() when called from outside of qmail_src_install(). |
| 4 |
|
| 5 |
Signed-off-by: Rolf Eike Beer <eike@×××××××.de> |
| 6 |
--- |
| 7 |
eclass/qmail.eclass | 32 ++++++++++++++++++-------------- |
| 8 |
1 file changed, 18 insertions(+), 14 deletions(-) |
| 9 |
|
| 10 |
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass |
| 11 |
index 6b04cbf7792..c4f0b98ab30 100644 |
| 12 |
--- a/eclass/qmail.eclass |
| 13 |
+++ b/eclass/qmail.eclass |
| 14 |
@@ -73,7 +73,7 @@ is_prime() { |
| 15 |
|
| 16 |
dospp() { |
| 17 |
insinto "${QMAIL_HOME}"/plugins/ |
| 18 |
- insopts -o root -g "${GROUP_ROOT}" -m 0755 |
| 19 |
+ insopts -m 0755 |
| 20 |
newins $1 ${2:-$(basename $1)} |
| 21 |
} |
| 22 |
|
| 23 |
@@ -86,8 +86,8 @@ dosupervise() { |
| 24 |
local runfile=${2:-${service}} logfile=${3:-${service}-log} |
| 25 |
[[ -z "${service}" ]] && die "no service given" |
| 26 |
|
| 27 |
- insopts -o root -g "${GROUP_ROOT}" -m 0755 |
| 28 |
- diropts -o root -g "${GROUP_ROOT}" -m 0755 |
| 29 |
+ insopts -m 0755 |
| 30 |
+ diropts -m 0755 |
| 31 |
|
| 32 |
dodir ${SUPERVISE_DIR}/${service}{,/log} |
| 33 |
fperms +t ${SUPERVISE_DIR}/${service}{,/log} |
| 34 |
@@ -185,6 +185,10 @@ qmail_base_install() { |
| 35 |
insopts -o qmailq -g qmail -m 4711 |
| 36 |
doins qmail-queue |
| 37 |
|
| 38 |
+ # reset to default |
| 39 |
+ insopts -o root -g root -m 644 |
| 40 |
+ diropts -o root -g root -m 755 |
| 41 |
+ |
| 42 |
declare -F qmail_base_install_hook >/dev/null && \ |
| 43 |
qmail_base_install_hook |
| 44 |
} |
| 45 |
@@ -192,12 +196,12 @@ qmail_base_install() { |
| 46 |
qmail_config_install() { |
| 47 |
einfo "Installing stock configuration files" |
| 48 |
insinto "${QMAIL_HOME}"/control |
| 49 |
- insopts -o root -g "${GROUP_ROOT}" -m 644 |
| 50 |
+ insopts -m 644 |
| 51 |
doins "${GENQMAIL_S}"/control/{conf-*,defaultdelivery} |
| 52 |
|
| 53 |
einfo "Installing configuration sanity checker and launcher" |
| 54 |
insinto "${QMAIL_HOME}"/bin |
| 55 |
- insopts -o root -g "${GROUP_ROOT}" -m 644 |
| 56 |
+ insopts -m 644 |
| 57 |
doins "${GENQMAIL_S}"/control/qmail-config-system |
| 58 |
|
| 59 |
declare -F qmail_config_install_hook >/dev/null && \ |
| 60 |
@@ -254,9 +258,9 @@ qmail_maildir_install() { |
| 61 |
done |
| 62 |
|
| 63 |
einfo "Setting up default maildirs in the account skeleton" |
| 64 |
- diropts -o root -g "${GROUP_ROOT}" -m 755 |
| 65 |
+ diropts -o root -g root -m 755 |
| 66 |
insinto /etc/skel |
| 67 |
- insopts -o root -g "${GROUP_ROOT}" -m 644 |
| 68 |
+ insopts -m 644 |
| 69 |
newins "${GENQMAIL_S}"/control/defaultdelivery .qmail.sample |
| 70 |
"${MAILDIRMAKE}" "${D}"/etc/skel/.maildir |
| 71 |
keepdir /etc/skel/.maildir/{cur,new,tmp} |
| 72 |
@@ -268,7 +272,7 @@ qmail_maildir_install() { |
| 73 |
qmail_tcprules_install() { |
| 74 |
dodir "${TCPRULES_DIR}" |
| 75 |
insinto "${TCPRULES_DIR}" |
| 76 |
- insopts -o root -g "${GROUP_ROOT}" -m 0644 |
| 77 |
+ insopts -m 0644 |
| 78 |
doins "${GENQMAIL_S}"/tcprules/Makefile.qmail |
| 79 |
doins "${GENQMAIL_S}"/tcprules/tcp.qmail-* |
| 80 |
use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd |
| 81 |
@@ -276,8 +280,10 @@ qmail_tcprules_install() { |
| 82 |
|
| 83 |
qmail_supervise_install_one() { |
| 84 |
dosupervise ${1} |
| 85 |
- diropts -o qmaill -g "${GROUP_ROOT}" -m 755 |
| 86 |
+ diropts -o qmaill -g root -m 755 |
| 87 |
keepdir /var/log/qmail/${1} |
| 88 |
+ # reset to default |
| 89 |
+ diropts -o root -g root |
| 90 |
} |
| 91 |
|
| 92 |
qmail_supervise_install() { |
| 93 |
@@ -301,7 +307,7 @@ qmail_supervise_install() { |
| 94 |
qmail_spp_install() { |
| 95 |
einfo "Installing qmail-spp configuration files" |
| 96 |
insinto "${QMAIL_HOME}"/control/ |
| 97 |
- insopts -o root -g "${GROUP_ROOT}" -m 0644 |
| 98 |
+ insopts -m 0644 |
| 99 |
doins "${GENQMAIL_S}"/spp/smtpplugins |
| 100 |
|
| 101 |
einfo "Installing qmail-spp plugins" |
| 102 |
@@ -321,16 +327,15 @@ qmail_ssl_install() { |
| 103 |
|
| 104 |
einfo "Installing SSL Certificate creation script" |
| 105 |
insinto "${QMAIL_HOME}"/control |
| 106 |
- insopts -o root -g "${GROUP_ROOT}" -m 0644 |
| 107 |
+ insopts -m 0644 |
| 108 |
doins "${GENQMAIL_S}"/ssl/servercert.cnf |
| 109 |
|
| 110 |
insinto "${QMAIL_HOME}"/bin |
| 111 |
- insopts -o root -g "${GROUP_ROOT}" -m 0755 |
| 112 |
+ insopts -m 0755 |
| 113 |
doins "${GENQMAIL_S}"/ssl/mkservercert |
| 114 |
|
| 115 |
einfo "Installing RSA key generation cronjob" |
| 116 |
insinto /etc/${CRON_FOLDER} |
| 117 |
- insopts -o root -g "${GROUP_ROOT}" -m 0755 |
| 118 |
doins "${GENQMAIL_S}"/ssl/qmail-genrsacert.sh |
| 119 |
|
| 120 |
keepdir "${QMAIL_HOME}"/control/tlshosts |
| 121 |
@@ -340,7 +345,6 @@ qmail_ssl_install() { |
| 122 |
} |
| 123 |
|
| 124 |
qmail_src_install() { |
| 125 |
- export GROUP_ROOT="$(id -gn root)" |
| 126 |
qmail_base_install |
| 127 |
qmail_config_install |
| 128 |
qmail_man_install |
| 129 |
-- |
| 130 |
2.26.2 |
Archives