Gentoo Archives: gentoo-dev

From: Rolf Eike Beer <eike@×××××××.de>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] qmail.eclass: hide qmail-pop3 behind a use flag
Date: Sun, 27 Oct 2019 19:24:46
Message-Id: 2122180.UaZveaQmRR@daneel.sf-tec.de
1 Other solutions offer much more features and better security, so do not
2 install this by default. Keep it for the moment for those who explicitely want
3 it.
4
5 diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
6 index b6ef483aa82..5a30461704e 100644
7 --- a/eclass/qmail.eclass
8 +++ b/eclass/qmail.eclass
9 @@ -169,11 +169,13 @@ qmail_full_install() {
10 einfo "Installing all qmail software"
11 insopts -o root -g qmail -m 755
12 doins bouncesaying condredirect config-fast except preline qbiff \
13 - qmail-{pop3d,qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto} \
14 + qmail-{qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto} \
15 qreceipt qsmhook tcp-env
16 + use pop3 && doins qmail-pop3d
17
18 insopts -o root -g qmail -m 711
19 - doins qmail-{clean,getpw,local,popup,pw2u,remote,rspawn,send} splogger
20 + doins qmail-{clean,getpw,local,pw2u,remote,rspawn,send} splogger
21 + use pop3 && doins qmail-popup
22
23 insopts -o root -g qmail -m 700
24 doins qmail-{lspawn,newmrh,newu,start}
25 @@ -261,7 +263,13 @@ qmail_tcprules_install() {
26 insopts -o root -g "$GROUP_ROOT" -m 0644
27 doins "${GENQMAIL_S}"/tcprules/Makefile.qmail
28 doins "${GENQMAIL_S}"/tcprules/tcp.qmail-*
29 - use ssl || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
30 + use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
31 +}
32 +
33 +qmail_supervise_install_one() {
34 + dosupervise ${i}
35 + diropts -o qmaill -g "$GROUP_ROOT" -m 755
36 + keepdir /var/log/qmail/${i}
37 }
38
39 qmail_supervise_install() {
40 @@ -269,16 +277,13 @@ qmail_supervise_install() {
41
42 cd "${GENQMAIL_S}"/supervise
43
44 - for i in qmail-{send,smtpd,qmtpd,qmqpd,pop3d}; do
45 - dosupervise ${i}
46 - diropts -o qmaill -g "$GROUP_ROOT" -m 755
47 - keepdir /var/log/qmail/${i}
48 + for i in qmail-{send,smtpd,qmtpd,qmqpd}; do
49 + qmail_supervise_install_one ${i}
50 done
51
52 - if use ssl; then
53 - dosupervise qmail-pop3sd
54 - diropts -o qmaill -g "$GROUP_ROOT" -m 755
55 - keepdir /var/log/qmail/qmail-pop3sd
56 + if use pop3; then
57 + qmail_supervise_install_one qmail-pop3d
58 + use ssl && qmail_supervise_install_one qmail-pop3sd
59 fi
60
61 declare -F qmail_supervise_install_hook >/dev/null && \
62 @@ -375,7 +380,9 @@ qmail_rootmail_fixup() {
63
64 qmail_tcprules_fixup() {
65 mkdir -p "${TCPRULES_DIR}"
66 - for f in {smtp,qmtp,qmqp,pop3}{,.cdb}; do
67 + local POP_FILES=
68 + use pop3 && POP_FILES="pop3 pop3.cdb"
69 + for f in {smtp,qmtp,qmqp}{,.cdb} ${POP_FILES}; do
70 old="/etc/tcp.${f}"
71 new="${TCPRULES_DIR}/tcp.qmail-${f}"
72 fail=0
73 @@ -417,13 +424,15 @@ qmail_supervise_config_notice() {
74 elog "ln -s ${SUPERVISE_DIR}/qmail-send /service/qmail-send"
75 elog "ln -s ${SUPERVISE_DIR}/qmail-smtpd /service/qmail-smtpd"
76 elog
77 - elog "To start the pop3 server as well, create the following link:"
78 - elog "ln -s ${SUPERVISE_DIR}/qmail-pop3d /service/qmail-pop3d"
79 - elog
80 - if use ssl; then
81 - elog "To start the pop3s server as well, create the following link:"
82 - elog "ln -s ${SUPERVISE_DIR}/qmail-pop3sd /service/qmail-pop3sd"
83 + if use pop3; then
84 + elog "To start the pop3 server as well, create the following link:"
85 + elog "ln -s ${SUPERVISE_DIR}/qmail-pop3d /service/qmail-pop3d"
86 elog
87 + if use ssl; then
88 + elog "To start the pop3s server as well, create the following link:"
89 + elog "ln -s ${SUPERVISE_DIR}/qmail-pop3sd /service/qmail-pop3sd"
90 + elog
91 + fi
92 fi
93 elog "Additionally, the QMTP and QMQP protocols are supported, "
94 elog "and can be started as:"

Attachments

File name MIME type
signature.asc application/pgp-signature