[gentoo-commits] gentoo-x86 commit in mail-mta/qpsmtpd/files: qpsmtpd-0.43-peer_hooks.patch qpsmtpd.confd qpsmtpd-0.40-clamd_conf.patch qpsmtpd-0.40-peer_hooks.patch qpsmtpd.initd qpsmtpd.envd qpsmtpd-0.40-badrcptto_allowrelay.patch qpsmtpd-0.40-badhelo_disconnect.patch qpsmtpd.xinetd

[Markus Ullmann (jokey)]

jokey       08/09/28 19:36:17

  Added:                qpsmtpd-0.43-peer_hooks.patch qpsmtpd.confd
                        qpsmtpd-0.40-clamd_conf.patch
                        qpsmtpd-0.40-peer_hooks.patch qpsmtpd.initd
                        qpsmtpd.envd
                        qpsmtpd-0.40-badrcptto_allowrelay.patch
                        qpsmtpd-0.40-badhelo_disconnect.patch
                        qpsmtpd.xinetd
  Log:
  Initial import, also fixes bug #167930. Thanks to various people contributing on bugzie and on irc
  (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

Revision  Changes    Path
1.1                  mail-mta/qpsmtpd/files/qpsmtpd-0.43-peer_hooks.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.43-peer_hooks.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.43-peer_hooks.patch?rev=1.1&content-type=text/plain

Index: qpsmtpd-0.43-peer_hooks.patch
===================================================================
--- qpsmtpd-0.40/lib/Qpsmtpd/SMTP.pm.peer_hooks	2007-06-14 11:57:27.000000000 -0600
+++ qpsmtpd-0.40/lib/Qpsmtpd/SMTP.pm	2007-06-14 13:44:52.000000000 -0600
@@ -95,6 +95,11 @@
     my $self = shift;
     # this should maybe be called something else than "connect", see
     # lib/Qpsmtpd/TcpServer.pm for more confusion.
+    my ($rc, $msg) = $self->run_hooks("set_hooks");
+    if ($rc == DENY) {
+      $self->respond(550, ($msg || 'Connection from you denied, bye bye.'));
+      return $rc;
+    }
     $self->run_hooks("connect");
     return DONE;
 }
@@ -278,7 +283,9 @@
 
     # if we don't have a plugin implementing this auth mechanism, 504
     if( exists $auth_mechanisms{uc($mechanism)} ) {
-      return $self->{_auth} = Qpsmtpd::Auth::SASL( $self, $mechanism, @stuff );
+      $self->{_auth} = Qpsmtpd::Auth::SASL( $self, $mechanism, @stuff );
+      $self->run_hooks("valid_auth") if $self->{_auth} == OK;
+      return $self->{_auth};
     } else {
       $self->respond( 504, "Unimplemented authentification mechanism: $mechanism" );
       return DENY;
--- qpsmtpd-0.40/lib/Qpsmtpd//Plugin.pm.peer_hooks	2008-03-25 02:02:37.000000000 +0000
+++ qpsmtpd-0.40/lib/Qpsmtpd//Plugin.pm	2008-03-25 02:04:00.000000000 +0000
@@ -6,7 +6,7 @@
 our @hooks = qw(
     logging config pre-connection connect ehlo_parse ehlo
     helo_parse helo auth_parse auth auth-plain auth-login auth-cram-md5
-    rcpt_parse rcpt_pre rcpt mail_parse mail mail_pre 
+    valid_auth set_hooks rcpt_parse rcpt_pre rcpt mail_parse mail mail_pre 
     data data_post queue_pre queue queue_post vrfy noop
     quit reset_transaction disconnect post-connection
     unrecognized_command deny ok received_line help



1.1                  mail-mta/qpsmtpd/files/qpsmtpd.confd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd.confd?rev=1.1&content-type=text/plain

Index: qpsmtpd.confd
===================================================================
# Config file for /etc/init.d/qpsmtpd
#

QPSMTPD_CONFIG="/etc/qpsmtpd"
QPSMTPD_NICELEVEL="0"

# Select QPSMTPD server type
#  - async
#    Not all plugins work without problems with the async mode.
#  - forkserver (default)
#  - prefork
#    Does not work 100%. Use at your own risk.
QPSMTPD_SERVER_TYPE="forkserver"

# QPSMTPD options. This can be different depending on
# what QPSMTPD server you run.
#
# Typical forkserver
QPSMTPD_OPTIONS="-l 0.0.0.0 -p 25 -u smtpd"
#
# Typical prefork
# QPSMTPD_OPTIONS="--interface 0.0.0.0 --port 25 --user smtpd"
#
# Typical async
# QPSMTPD_OPTIONS="-l 0.0.0.0 -p 25 -u smtpd"



1.1                  mail-mta/qpsmtpd/files/qpsmtpd-0.40-clamd_conf.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.40-clamd_conf.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.40-clamd_conf.patch?rev=1.1&content-type=text/plain

Index: qpsmtpd-0.40-clamd_conf.patch
===================================================================
diff -Nur -x '*.orig' -x '*.rej' qpsmtpd-0.40/plugins/virus/clamav mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamav
--- qpsmtpd-0.40/plugins/virus/clamav	2007-06-14 11:57:23.000000000 -0600
+++ mezzanine_patched_qpsmtpd-0.40/plugins/virus/clamav	2007-06-15 13:37:26.000000000 -0600
@@ -148,7 +148,7 @@
   $self->{_max_size} ||= 512 * 1024;
   $self->{_spool_dir} ||= $self->spool_dir();
   $self->{_back_compat} ||= ''; # make sure something is set
-  $self->{_clamd_conf} ||= '/etc/clamd/conf'; # make sure something is set
+  $self->{_clamd_conf} ||= '/etc/clamd.conf'; # make sure something is set
 
   unless ($self->{_spool_dir}) {
         $self->log(LOGERROR, "No spool dir configuration found");



1.1                  mail-mta/qpsmtpd/files/qpsmtpd-0.40-peer_hooks.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.40-peer_hooks.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.40-peer_hooks.patch?rev=1.1&content-type=text/plain

Index: qpsmtpd-0.40-peer_hooks.patch
===================================================================
--- qpsmtpd-0.40/lib/Qpsmtpd/SMTP.pm.peer_hooks	2007-06-14 11:57:27.000000000 -0600
+++ qpsmtpd-0.40/lib/Qpsmtpd/SMTP.pm	2007-06-14 13:44:52.000000000 -0600
@@ -95,6 +95,11 @@
     my $self = shift;
     # this should maybe be called something else than "connect", see
     # lib/Qpsmtpd/TcpServer.pm for more confusion.
+    my ($rc, $msg) = $self->run_hooks("set_hooks");
+    if ($rc == DENY) {
+      $self->respond(550, ($msg || 'Connection from you denied, bye bye.'));
+      return $rc;
+    }
     $self->run_hooks("connect");
     return DONE;
 }
@@ -278,7 +283,9 @@
 
     # if we don't have a plugin implementing this auth mechanism, 504
     if( exists $auth_mechanisms{uc($mechanism)} ) {
-      return $self->{_auth} = Qpsmtpd::Auth::SASL( $self, $mechanism, @stuff );
+      $self->{_auth} = Qpsmtpd::Auth::SASL( $self, $mechanism, @stuff );
+      $self->run_hooks("valid_auth") if $self->{_auth} == OK;
+      return $self->{_auth};
     } else {
       $self->respond( 504, "Unimplemented authentification mechanism: $mechanism" );
       return DENY;
--- qpsmtpd-0.40/lib/Qpsmtpd/Plugin.pm.peer_hooks	2007-06-14 11:57:27.000000000 -0600
+++ qpsmtpd-0.40/lib/Qpsmtpd/Plugin.pm	2007-06-14 13:43:53.000000000 -0600
@@ -6,7 +6,7 @@
 our @hooks = qw(
     logging config pre-connection connect ehlo_parse ehlo
     helo_parse helo auth_parse auth auth-plain auth-login auth-cram-md5
-    rcpt_parse rcpt_pre rcpt mail_parse mail mail_pre 
+    valid_auth set_hooks rcpt_parse rcpt_pre rcpt mail_parse mail mail_pre 
     data data_post queue_pre queue queue_post
     quit reset_transaction disconnect post-connection
     unrecognized_command deny ok received_line



1.1                  mail-mta/qpsmtpd/files/qpsmtpd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd.initd?rev=1.1&content-type=text/plain

Index: qpsmtpd.initd
===================================================================
#!/sbin/runscript

depend() {
	use logger dns ypbind amavisd mysql postgresql antivirus postfix_greylist net saslauthd
	provide mta
}

checkconfig() {
	if ! [ -d "${QPSMTPD_CONFIG:-/etc/qpsmtpd}" ]; then
		eerror "Configuration directory ${QPSMTPD_CONFIG:-/etc/qpsmtpd} does not exist."
		return 1
	fi
	return 0
}

start() {
	checkconfig || return 1
	ebegin "Starting qpsmtpd [${QPSMTPD_SERVER_TYPE}] server"
	HOME="/var/spool/qpsmtpd"
	local QPSMTPD_SERVER_BIN=""
	local myopts=""
	export QPSMTPD_CONFIG=${QPSMTPD_CONFIG}
	for foo in PERL_UNICODE LANG LC_TIME LC_ALL BASH_ENV ENV CDPATH IFS
	do
		unset ${foo}
	done
	case "${QPSMTPD_SERVER_TYPE}" in
		prefork)
			QPSMTPD_SERVER_BIN="/usr/bin/qpsmtpd-prefork"
			QPSMTPD_OPTIONS="$(echo "${QPSMTPD_OPTIONS}" | sed "s:\-\-pid\-file[\t ]\{1,99\}[^ ]*::gI")"
			# Option --pid-file is mentioned in the help of the prefork server
			# but does not work when specified.
			# QPSMTPD_OPTIONS="${QPSMTPD_OPTIONS} --pid-file /var/run/qpsmtpd.pid"
			myopts="${myopts} --make-pidfile --pidfile /var/run/qpsmtpd.pid"
			;;
		async)
			QPSMTPD_SERVER_BIN="/usr/sbin/qpsmtpd-async"
			myopts="${myopts} --background --make-pidfile --pidfile /var/run/qpsmtpd.pid"
			;;
		forkserver|*)
			QPSMTPD_SERVER_BIN="/usr/bin/qpsmtpd-forkserver"
			QPSMTPD_OPTIONS="$(echo "${QPSMTPD_OPTIONS}" | sed "s:\-\-pid\-file[\t ]\{1,99\}[^ ]*::gI")"
			QPSMTPD_OPTIONS="$(echo "${QPSMTPD_OPTIONS}" | sed "s:[\t ]\{0,99\}\-d[\t ]\{1,99\}|[\t ]\{1,99\}\-d[\t ]\{0,99\}::gI")"
			QPSMTPD_OPTIONS="$(echo "${QPSMTPD_OPTIONS}" | sed "s:[\t ]\{0,99\}\-\detach[\t ]\{1,99\}|[\t ]\{1,99\}\-\-detach[\t ]\{0,99\}::gI")"
			QPSMTPD_OPTIONS="${QPSMTPD_OPTIONS} --pid-file /var/run/qpsmtpd.pid --detach"
			myopts="${myopts} --pidfile /dev/null"
			;;
	esac
	start-stop-daemon --start --nicelevel ${QPSMTPD_NICELEVEL:-0} \
		--quiet ${myopts} \
		--exec ${QPSMTPD_SERVER_BIN} \
		-- ${QPSMTPD_OPTIONS}
	eend $?
}

stop() {
	ebegin "Stopping qpsmtpd [${QPSMTPD_SERVER_TYPE}] server"
	start-stop-daemon --stop --quiet --pidfile /var/run/qpsmtpd.pid
	eend $?
}



1.1                  mail-mta/qpsmtpd/files/qpsmtpd.envd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd.envd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd.envd?rev=1.1&content-type=text/plain

Index: qpsmtpd.envd
===================================================================
QPSMTPD_CONFIG="/etc/qpsmtpd"
CONFIG_PROTECT="/usr/share/qpsmtpd/plugins"



1.1                  mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch?rev=1.1&content-type=text/plain

Index: qpsmtpd-0.40-badrcptto_allowrelay.patch
===================================================================
--- qpsmtpd-0.40/plugins/check_badrcptto.badrcptto_allowrelay	2007-06-14 11:57:24.000000000 -0600
+++ qpsmtpd-0.40/plugins/check_badrcptto	2007-06-14 13:26:42.000000000 -0600
@@ -3,6 +3,7 @@
 
 sub hook_rcpt {
   my ($self, $transaction, $recipient, %param) = @_;
+  return (DECLINED) if $self->qp->connection->relay_client;
   my @badrcptto = $self->qp->config("badrcptto") or return (DECLINED);
   return (DECLINED) unless $recipient->host && $recipient->user;
   my $host = lc $recipient->host;



1.1                  mail-mta/qpsmtpd/files/qpsmtpd-0.40-badhelo_disconnect.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badhelo_disconnect.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badhelo_disconnect.patch?rev=1.1&content-type=text/plain

Index: qpsmtpd-0.40-badhelo_disconnect.patch
===================================================================
--- qpsmtpd-0.40/plugins/check_spamhelo.badhelo_disconnect	2007-06-14 11:57:24.000000000 -0600
+++ qpsmtpd-0.40/plugins/check_spamhelo	2007-06-14 13:21:45.000000000 -0600
@@ -23,7 +23,7 @@
   for my $bad ($self->qp->config('badhelo')) {
     if ($host eq lc $bad) {
       $self->log(LOGDEBUG, "Denying HELO from host claiming to be $bad");
-      return (DENY, "Sorry, I don't believe that you are $host.");
+      return (DENY_DISCONNECT, "Sorry, I don't believe that you are $host.");
     }
   }
   return DECLINED;



1.1                  mail-mta/qpsmtpd/files/qpsmtpd.xinetd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd.xinetd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/qpsmtpd/files/qpsmtpd.xinetd?rev=1.1&content-type=text/plain

Index: qpsmtpd.xinetd
===================================================================
# default: off
# description: The telnet server serves telnet sessions; it uses \
#	unencrypted username/password pairs for authentication.

service smtp
{
    flags           = REUSE
    socket_type     = stream
    wait            = no
    user            = smtpd
    group           = smtpd
    groups          = yes
    log_on_failure += USERID HOST
    disable         = yes
    rlimit_as       = 128M
    instances       = 40
    per_source      = 10
    cps             = 50 10
    server          = /usr/bin/qpsmtpd
}