[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    [gentoo-dev] qmail.eclass: hide qmail-pop3 behind a use flag
From:       Rolf Eike Beer <eike () sf-mail ! de>
Date:       2019-10-27 19:24:31
Message-ID: 2122180.UaZveaQmRR () daneel ! sf-tec ! de
[Download RAW message or body]


Other solutions offer much more features and better security, so do not 
install this by default. Keep it for the moment for those who explicitely want 
it.

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index b6ef483aa82..5a30461704e 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -169,11 +169,13 @@ qmail_full_install() {
 	einfo "Installing all qmail software"
 	insopts -o root -g qmail -m 755
 	doins bouncesaying condredirect config-fast except preline qbiff \
-		qmail-{pop3d,qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto} \
+		qmail-{qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto} \
 		qreceipt qsmhook tcp-env
+	use pop3 && doins qmail-pop3d
 
 	insopts -o root -g qmail -m 711
-	doins qmail-{clean,getpw,local,popup,pw2u,remote,rspawn,send} splogger
+	doins qmail-{clean,getpw,local,pw2u,remote,rspawn,send} splogger
+	use pop3 && doins qmail-popup
 
 	insopts -o root -g qmail -m 700
 	doins qmail-{lspawn,newmrh,newu,start}
@@ -261,7 +263,13 @@ qmail_tcprules_install() {
 	insopts -o root -g "$GROUP_ROOT" -m 0644
 	doins "${GENQMAIL_S}"/tcprules/Makefile.qmail
 	doins "${GENQMAIL_S}"/tcprules/tcp.qmail-*
-	use ssl || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
+	use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
+}
+
+qmail_supervise_install_one() {
+	dosupervise ${i}
+	diropts -o qmaill -g "$GROUP_ROOT" -m 755
+	keepdir /var/log/qmail/${i}
 }
 
 qmail_supervise_install() {
@@ -269,16 +277,13 @@ qmail_supervise_install() {
 
 	cd "${GENQMAIL_S}"/supervise
 
-	for i in qmail-{send,smtpd,qmtpd,qmqpd,pop3d}; do
-		dosupervise ${i}
-		diropts -o qmaill -g "$GROUP_ROOT" -m 755
-		keepdir /var/log/qmail/${i}
+	for i in qmail-{send,smtpd,qmtpd,qmqpd}; do
+		qmail_supervise_install_one ${i}
 	done
 
-	if use ssl; then
-		dosupervise qmail-pop3sd
-		diropts -o qmaill -g "$GROUP_ROOT" -m 755
-		keepdir /var/log/qmail/qmail-pop3sd
+	if use pop3; then
+		qmail_supervise_install_one qmail-pop3d
+		use ssl && qmail_supervise_install_one qmail-pop3sd
 	fi
 
 	declare -F qmail_supervise_install_hook >/dev/null && \
@@ -375,7 +380,9 @@ qmail_rootmail_fixup() {
 
 qmail_tcprules_fixup() {
 	mkdir -p "${TCPRULES_DIR}"
-	for f in {smtp,qmtp,qmqp,pop3}{,.cdb}; do
+	local POP_FILES=
+	use pop3 && POP_FILES="pop3 pop3.cdb"
+	for f in {smtp,qmtp,qmqp}{,.cdb} ${POP_FILES}; do
 		old="/etc/tcp.${f}"
 		new="${TCPRULES_DIR}/tcp.qmail-${f}"
 		fail=0
@@ -417,13 +424,15 @@ 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
-	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"
+	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:"

["signature.asc" (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]