commit: ec4f22b89cd70ef40d3c765afa67533bf7728e28 Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> AuthorDate: Sat Dec 31 21:28:07 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 31 22:40:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4f22b8
Revert "qmail.eclass: remove remnants of USE=pop3" This reverts commit 3a2f8ddaec09ebc439453016bb669627bf8a6d6d. Bug: https://bugs.gentoo.org/889216 Bug: https://bugs.gentoo.org/889218 Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/qmail.eclass | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass index 12f7fa8375b0..67069087376d 100644 --- a/eclass/qmail.eclass +++ b/eclass/qmail.eclass @@ -156,8 +156,11 @@ qmail_base_install() { [[ -x ${i} ]] && doexe ${i} done + use pop3 && doexe qmail-pop3d + exeopts -o 0 -g qmail -m 711 doexe qmail-{clean,getpw,local,pw2u,remote,rspawn,send} splogger + use pop3 && doexe qmail-popup exeopts -o 0 -g qmail -m 700 doexe qmail-{lspawn,newmrh,newu,start} @@ -237,7 +240,7 @@ qmail_tcprules_install() { insinto "${TCPRULES_DIR}" doins "${GENQMAIL_S}"/tcprules/Makefile.qmail doins "${GENQMAIL_S}"/tcprules/tcp.qmail-* - rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd + use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd } qmail_supervise_install_one() { @@ -257,6 +260,11 @@ qmail_supervise_install() { for i in qmail-{send,smtpd,qmtpd,qmqpd}; do qmail_supervise_install_one ${i} done + + if use pop3; then + qmail_supervise_install_one qmail-pop3d + use ssl && qmail_supervise_install_one qmail-pop3sd + fi } qmail_spp_install() { @@ -359,6 +367,16 @@ qmail_supervise_config_notice() { elog "ln -s ${SUPERVISE_DIR}/qmail-send /service/qmail-send" elog "ln -s ${SUPERVISE_DIR}/qmail-smtpd /service/qmail-smtpd" elog + if use pop3; then + elog "To start the pop3 server as well, create the following link:" + elog "ln -s ${SUPERVISE_DIR}/qmail-pop3d /service/qmail-pop3d" + elog + if use ssl; then + elog "To start the pop3s server as well, create the following link:" + elog "ln -s ${SUPERVISE_DIR}/qmail-pop3sd /service/qmail-pop3sd" + elog + fi + fi elog "Additionally, the QMTP and QMQP protocols are supported, " elog "and can be started as:" elog "ln -s ${SUPERVISE_DIR}/qmail-qmtpd /service/qmail-qmtpd"
