Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove Apache::Qpsmtpd #326

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
perl-version: ${{ matrix.perl }}
- run: cpanm --installdeps -n -f .
- run: cpanm --installdeps -n -f Mail::SPF Mail::DMARC GeoIP2 ClamAV::Client Redis
- run: prove -lv t
- run: prove -lv t
3 changes: 3 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@


Remove Apache::Qpsmtpd support

1.00 Feb 16, 2023

Use readable file test for certificate files (#304)
Expand Down
2 changes: 0 additions & 2 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ docs/development.md
docs/hooks.md
docs/logging.md
docs/writing.md
lib/Apache/Qpsmtpd.pm
lib/Qpsmtpd.pm
lib/Qpsmtpd/Address.pm
lib/Qpsmtpd/Auth.pm
Expand Down Expand Up @@ -105,7 +104,6 @@ plugins/karma
plugins/karma_tool
plugins/loadcheck
plugins/logging/adaptive
plugins/logging/apache
plugins/logging/connection_id
plugins/logging/devnull
plugins/logging/file
Expand Down
4 changes: 1 addition & 3 deletions README.plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ subdirectory, the directory must also be given, like the
`virus/clamdscan` in the example below. Alternate plugin directories
may be given in the `config/plugin_dirs` config file, one directory
per line, these will be searched first before using the builtin fallback
of `plugins/` relative to the qpsmtpd root directory. It may be
necessary, that the `config/plugin_dirs` must be used (if you're using
`Apache::Qpsmtpd`, for example).
of `plugins/` relative to the qpsmtpd root directory.

Some plugins may be configured by passing arguments in the `plugins`
config file.
Expand Down
3 changes: 0 additions & 3 deletions config.sample/logging
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ logging/warn 6
#logging/adaptive [accept minlevel] [reject maxlevel] [prefix char]
#logging/adaptive 4 6

# send logs to apache (useful if running qpsmtpd under apache)
#logging/apache

# send logs to the great bit bucket
#logging/devnull

Expand Down
253 changes: 0 additions & 253 deletions lib/Apache/Qpsmtpd.pm

This file was deleted.

20 changes: 0 additions & 20 deletions lib/Qpsmtpd/Base.pm
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,6 @@ sub get_resolver {
return $self->{_resolver};
}

sub get_async_resolver {
my ( $self, %args ) = @_;
return $self->{_async_resolver} if $self->{_async_resolver};

my $async_res;
eval 'use Net::DNS::Async';
if ($@) {
warn "could not load Net::DNS::Async, is it installed?";
return;
}

my $res = Net::DNS::Resolver->new(dnsrch => 0);
$res->tcp_timeout(0); # Net::DNS::Async handles its own timeouts
$res->tcp_timeout(0);

$self->{_async_resolver} = Net::DNS::Async->new( %args );
$self->{_async_resolver}{Resolver} = $res;
return $self->{_async_resolver};
}

sub resolve_a {
my ($self, $name) = @_;
my $q = $self->get_resolver->query($name, 'A') or return;
Expand Down
10 changes: 0 additions & 10 deletions packaging/rpm/files/README.selinux

This file was deleted.

16 changes: 0 additions & 16 deletions packaging/rpm/files/qpsmtpd.conf

This file was deleted.

Loading
Loading