mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
mail-mta/qpsmtpd: drop 0.84-r2
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,2 +1 @@
|
||||
DIST qpsmtpd-0.84.tar.gz 178260 BLAKE2B 6a92d6a70f3abb84fb3a59ac68c61ecc36067f72bd6c86986bc9069f220d86352bce3ca674f19430fc1f1e724e98b7112df19e7f0c19a504b4204578f10fadf3 SHA512 a12491c123d21b4e3965105bbe88ad7e7e61551a3ff4e96eee78c83dcb2afae62239fa24d710092a7ccf60097699901c42d70df8183de6454bef4fb26843358d
|
||||
DIST qpsmtpd-0.95.tar.gz 367400 BLAKE2B bd77d8f203f1adf5ad6671fcd958bd97c5321317b51ceb9b9320cd2bc2fb82687b0d367618ad74905b3c4d44f0e83291d6330abbf4f8d01cd1d29ba7588f2df5 SHA512 4265606ecde68eda92091e2c3c27645baa131db4197f3d135932dc2ad8d76c1fb6c25ce267ab421cab3a4a9902aa682e4be87a1228e41b226705a64e440ffe87
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- 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,44 +0,0 @@
|
||||
Accept messages with no body.
|
||||
|
||||
If a message has no body, there is nothing in the RFC spec that says it
|
||||
needs to have a trailing \n for a blank line after the headers.
|
||||
|
||||
Thumderbird 10 generates some emails like this, which will always cause
|
||||
plugin errors when $transaction->header is accessed otherwise, as there
|
||||
is almost no checking that $transaction->header is defined before usage.
|
||||
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
Thanks-To: Jack Bates <ms419@freezone.co.uk>
|
||||
|
||||
--- qpsmtpd-0.83.orig/lib/Qpsmtpd/SMTP.pm 2009-04-03 06:24:21.000000000 +0000
|
||||
+++ qpsmtpd-0.83/lib/Qpsmtpd/SMTP.pm 2012-02-25 05:52:14.000000000 +0000
|
||||
@@ -632,7 +632,7 @@
|
||||
|
||||
my $timeout = $self->config('timeout');
|
||||
while (defined($_ = $self->getline($timeout))) {
|
||||
- $complete++, last if $_ eq ".\r\n";
|
||||
+ $complete++, $_ = '' if $_ eq ".\r\n";
|
||||
$i++;
|
||||
|
||||
# should probably use \012 and \015 in these checks instead of \r and \n ...
|
||||
@@ -648,7 +648,7 @@
|
||||
unless (($max_size and $size > $max_size)) {
|
||||
s/\r\n$/\n/;
|
||||
s/^\.\./\./;
|
||||
- if ($in_header and m/^$/) {
|
||||
+ if ($in_header and (m/^$/ or $complete > 0)) {
|
||||
$in_header = 0;
|
||||
my @headers = split /^/m, $buffer;
|
||||
|
||||
@@ -691,9 +691,10 @@
|
||||
|
||||
# copy all lines into the spool file, including the headers
|
||||
# we will create a new header later before sending onwards
|
||||
- $self->transaction->body_write($_);
|
||||
+ $self->transaction->body_write($_) unless $complete;
|
||||
$size += length $_;
|
||||
}
|
||||
+ last if $complete > 0;
|
||||
#$self->log(LOGDEBUG, "size is at $size\n") unless ($i % 300);
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -Nuar --exclude '*.orig' --exclude '*.rej' qpsmtpd-0.83.orig/plugins/virus/clamav qpsmtpd-0.83/plugins/virus/clamav
|
||||
--- qpsmtpd-0.83.orig/plugins/virus/clamav 2009-07-20 15:36:17.000000000 +0000
|
||||
+++ qpsmtpd-0.83/plugins/virus/clamav 2009-09-16 01:14:22.903329780 +0000
|
||||
@@ -151,7 +151,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
|
||||
$self->{_declined_on_fail} ||= 0; # decline the message on clamav failure
|
||||
|
||||
unless ($self->{_spool_dir}) {
|
||||
@@ -1,28 +0,0 @@
|
||||
Net::DNS function nextid() changed to id().
|
||||
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
|
||||
diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-async qpsmtpd-0.84/qpsmtpd-async
|
||||
--- qpsmtpd-0.84.orig/qpsmtpd-async 2009-04-03 05:48:34.000000000 +0000
|
||||
+++ qpsmtpd-0.84/qpsmtpd-async 2013-04-15 23:01:49.952857659 +0000
|
||||
@@ -145,7 +145,7 @@
|
||||
# print "Next DNS ID: $Net::DNS::Resolver::global{id}\n";
|
||||
};
|
||||
if ($@) {
|
||||
- # print "Next DNS ID: " . Net::DNS::Header::nextid() . "\n";
|
||||
+ # print "Next DNS ID: " . Net::DNS::Header::id() . "\n";
|
||||
}
|
||||
|
||||
# Fixup lost kqueue after fork
|
||||
diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-forkserver qpsmtpd-0.84/qpsmtpd-forkserver
|
||||
--- qpsmtpd-0.84.orig/qpsmtpd-forkserver 2010-04-08 05:29:52.000000000 +0000
|
||||
+++ qpsmtpd-0.84/qpsmtpd-forkserver 2013-04-15 23:01:49.952857659 +0000
|
||||
@@ -285,7 +285,7 @@
|
||||
# all children should have different seeds, to prevent conflicts
|
||||
srand();
|
||||
for (0 .. rand(65536)) {
|
||||
- Net::DNS::Header::nextid();
|
||||
+ Net::DNS::Header::id();
|
||||
}
|
||||
|
||||
close $_ for $select->handles;
|
||||
@@ -1,80 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils perl-module user
|
||||
|
||||
DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
|
||||
HOMEPAGE="http://smtpd.develooper.com"
|
||||
SRC_URI="http://smtpd.develooper.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="postfix ipv6 syslog"
|
||||
|
||||
RDEPEND=">=dev-lang/perl-5.8.0
|
||||
>=dev-perl/Net-DNS-0.690.0
|
||||
virtual/perl-MIME-Base64
|
||||
dev-perl/MailTools
|
||||
dev-perl/IPC-Shareable
|
||||
dev-perl/Socket6
|
||||
dev-perl/Danga-Socket
|
||||
dev-perl/ParaDNS
|
||||
ipv6? ( dev-perl/IO-Socket-INET6 )
|
||||
syslog? ( virtual/perl-Sys-Syslog )
|
||||
virtual/inetd"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup smtpd
|
||||
local additional_groups
|
||||
if use postfix; then
|
||||
additional_groups="${additional_groups},postdrop"
|
||||
fi
|
||||
enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
|
||||
#epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
|
||||
epatch "${FILESDIR}"/${PN}-0.83-accept-empty-email.patch
|
||||
epatch "${FILESDIR}"/${PN}-0.84-Net-DNS-id.patch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
perl-module_src_install
|
||||
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
|
||||
|
||||
dodir /usr/share/qpsmtpd
|
||||
cp -Rf plugins "${D}"/usr/share/qpsmtpd/
|
||||
|
||||
insinto /etc/qpsmtpd
|
||||
doins config.sample/*
|
||||
|
||||
echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
|
||||
echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
|
||||
cat >"${D}"/etc/qpsmtpd/logging <<-EOF
|
||||
#logging/syslog loglevel LOGINFO priority LOG_NOTICE
|
||||
#logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
|
||||
EOF
|
||||
if use syslog; then
|
||||
sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
|
||||
else
|
||||
sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
|
||||
fi
|
||||
|
||||
newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
|
||||
|
||||
newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd
|
||||
newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd
|
||||
|
||||
dodoc CREDITS Changes README README.plugins STATUS
|
||||
|
||||
diropts -m 0755 -o smtpd -g smtpd
|
||||
dodir /var/spool/qpsmtpd /var/log/qpsmtpd
|
||||
keepdir /var/spool/qpsmtpd /var/log/qpsmtpd
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user