summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hanselmann <hansmi@gentoo.org>2005-07-13 10:57:26 +0000
committerMichael Hanselmann <hansmi@gentoo.org>2005-07-13 10:57:26 +0000
commitb352620c6869041e967e80bb321653bbacd4d8e5 (patch)
tree1d448b32ee1d1507bad8f0d503a294664cb591d0 /mail-mta
parenterr, just woke up (diff)
downloadgentoo-2-b352620c6869041e967e80bb321653bbacd4d8e5.tar.gz
gentoo-2-b352620c6869041e967e80bb321653bbacd4d8e5.tar.bz2
gentoo-2-b352620c6869041e967e80bb321653bbacd4d8e5.zip
Added a patch to log invalid envelope senders.
(Portage version: 2.0.51.19)
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/qmail/ChangeLog6
-rw-r--r--mail-mta/qmail/files/1.03-r16/invalid-envelope-sender-log.patch13
-rw-r--r--mail-mta/qmail/qmail-1.03-r16.ebuild7
3 files changed, 23 insertions, 3 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 68c5b7d70a8a..f9da1ab24049 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.48 2005/06/19 19:31:36 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.49 2005/07/13 10:57:26 hansmi Exp $
+
+ 13 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
+ +files/1.03-r16/invalid-envelope-sender-log.patch, qmail-1.03-r16.ebuild:
+ Added a patch to log invalid envelope senders.
19 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r16.ebuild:
Fixed an error in the installation of the config system.
diff --git a/mail-mta/qmail/files/1.03-r16/invalid-envelope-sender-log.patch b/mail-mta/qmail/files/1.03-r16/invalid-envelope-sender-log.patch
new file mode 100644
index 000000000000..e4657baf60e4
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/invalid-envelope-sender-log.patch
@@ -0,0 +1,13 @@
+--- qmail-smtpd.c.orig 2005-07-13 12:42:16.998697299 +0200
++++ qmail-smtpd.c 2005-07-13 12:42:35.393412418 +0200
+@@ -621,7 +621,9 @@
+ }
+
+ switch(mfcheck()) {
+- case DNS_HARD: err_hmf(); return;
++ case DNS_HARD:
++ strerr_warn4("qmail-smtpd: invalid envelope sender: <",addr.s,"> at ",remoteip,0);
++ err_hmf(); return;
+ case DNS_SOFT: err_smf(); return;
+ case DNS_MEM: die_nomem();
+ }
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 74c37d5e3de6..61dc9cd9ea6c 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.23 2005/06/19 19:31:36 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.24 2005/07/13 10:57:26 hansmi Exp $
inherit toolchain-funcs eutils fixheadtails flag-o-matic
@@ -203,7 +203,6 @@ src_unpack() {
# add mail from DNS check
EPATCH_SINGLE_MSG="check envelope sender's domain for validity" \
- #EPATCH_OPTS="${EPATCH_OPTS} -F 3" \
epatch ${DISTDIR}/qmail-1.03-r16-mfcheck.diff
# log relay attempts
@@ -244,6 +243,10 @@ src_unpack() {
# See bug 94257
epatch ${FILESDIR}/${PVR}/qmail-1.03-env-servercert.patch
+ # Log invalid envelope senders (MAIL FROM:)
+ EPATCH_SINGLE_MSG="Log invalid envelope senders" \
+ epatch ${FILESDIR}/${PVR}/invalid-envelope-sender-log.patch
+
# See bug #90631
if use logmail; then
EPATCH_SINGLE_MSG='Enabling logging of all mails via ~alias/.qmail-log' \