On Sun, 5 Nov 2006, Peter J. Holzer wrote:
I've prepared a first prerelease of the RPMs for 0.33 based on a
snapshot of 0.3x from this afternoon. For those who want to live
dangerous, the RPMs can be found at:
http://www.hjp.at/apt/redhat/RPMS.qpsmtpd/qpsmtpd-0.33-0.0.noarch.rpm
http://www.hjp.at/apt/redhat/RPMS.qpsmtpd/qpsmtpd-apache-0.33-0.0.noarch.rpm
http://www.hjp.at/apt/redhat/SRPMS.qpsmtpd/qpsmtpd-0.33-0.0.src.rpm
Here's a few small fixes:
--- qpsmtpd-0.3x-20061105/plugins/virus/clamav.orig 2006-11-05
22:14:51.000000000 -0500
+++ qpsmtpd-0.3x-20061105/plugins/virus/clamav 2006-11-05
22:15:05.000000000 -0500
@@ -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");
--- qpsmtpd-0.3x-20061105/plugins/spamassassin.orig 2006-11-05
22:17:40.000000000 -0500
+++ qpsmtpd-0.3x-20061105/plugins/spamassassin 2006-11-05
22:21:27.000000000 -0500
@@ -100,12 +100,8 @@
my $leave_old_headers = lc($self->{_args}->{leave_old_headers}) || 'rename';
- my $remote = 'localhost';
- my $port = 783;
- if ($self->{_args}->{spamd_socket} =~ /^([\w.-]+):(\d+)$/) {
- $remote = $1;
- $port = $2;
- }
+ my $spamd_socket = $self->{_args}->{spamd_socket} || 'localhost:783';
+ my ($remote, $port) = ($spamd_socket =~ /^([\w.-]+):(\d+)$/);
if ($port =~ /\D/) { $port = getservbyname($port, 'tcp') }
die "No port" unless $port;
my $iaddr = inet_aton($remote) or