summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hanselmann <hansmi@gentoo.org>2005-08-14 11:01:44 +0000
committerMichael Hanselmann <hansmi@gentoo.org>2005-08-14 11:01:44 +0000
commita699723e92d5bea4f7e6055047ddbbb35474f274 (patch)
tree38d5a42f498b4510bff71c9b49ded04cb80d77a8 /mail-mta
parentStable on ppc, hppa and x86. (diff)
downloadgentoo-2-a699723e92d5bea4f7e6055047ddbbb35474f274.tar.gz
gentoo-2-a699723e92d5bea4f7e6055047ddbbb35474f274.tar.bz2
gentoo-2-a699723e92d5bea4f7e6055047ddbbb35474f274.zip
Fixed dependencies for USE=noauthcram, see bug 83415.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/qmail/ChangeLog6
-rw-r--r--mail-mta/qmail/files/conf-smtpd-r165
-rw-r--r--mail-mta/qmail/qmail-1.03-r16.ebuild8
3 files changed, 14 insertions, 5 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index a4b488464cdd..d9b808872b9e 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-mta/qmail
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.58 2005/08/12 20:42:39 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.59 2005/08/14 11:01:44 hansmi Exp $
+
+ 14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> files/conf-smtpd-r16,
+ qmail-1.03-r16.ebuild:
+ Fixed dependencies for USE=noauthcram, see bug 83415.
12 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
files/1.03-r16/qmail-remote-auth-log-fix.patch:
diff --git a/mail-mta/qmail/files/conf-smtpd-r16 b/mail-mta/qmail/files/conf-smtpd-r16
index 12817730d180..5a4eba5211f3 100644
--- a/mail-mta/qmail/files/conf-smtpd-r16
+++ b/mail-mta/qmail/files/conf-smtpd-r16
@@ -1,5 +1,5 @@
# Configuration file for qmail-smtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-smtpd-r16,v 1.1 2005/06/19 06:52:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-smtpd-r16,v 1.2 2005/08/14 11:01:44 hansmi Exp $
# Stuff to run before tcpserver
#QMAIL_TCPSERVER_PRE=""
@@ -34,6 +34,9 @@ TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
# This next block is for SMTP-AUTH
+# WARNING: If you've installed qmail with USE=noauthcram, and you want to use
+# the following programs, you proably need to install them.
+
# Example using cmd5checkpw
# See the manpage for cmd5checkpw for details on the passwords
#QMAIL_SMTP_CHECKPASSWORD="/bin/cmd5checkpw"
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 4d494dde7af8..ab3e2cc0852e 100644
--- a/mail-mta/qmail/qmail-1.03-r16.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r16.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.34 2005/08/11 19:39:26 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.35 2005/08/14 11:01:44 hansmi Exp $
inherit toolchain-funcs eutils fixheadtails flag-o-matic
@@ -53,8 +53,10 @@ RDEPEND="!virtual/mta
app-shells/bash
>=sys-apps/ucspi-tcp-0.88
>=sys-process/daemontools-0.76-r1
- >=net-mail/checkpassword-0.90
- >=net-mail/cmd5checkpw-0.30
+ !noauthcram? (
+ || ( >=net-mail/checkpassword-0.90 >=net-mail/checkpassword-pam-0.99 )
+ >=net-mail/cmd5checkpw-0.30
+ )
>=net-mail/dot-forward-0.71
>=net-mail/queue-fix-1.4-r1
selinux? ( sec-policy/selinux-qmail )