From a23d4b3da952d9e006c735fe61083a5a50ca4dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= Date: Sun, 29 Apr 2012 01:35:59 -0700 Subject: [PATCH] Fix 01-syntax test failures Exclude some tests with dependencies. Remove -T from perl line in plugins This makes it harder to test with PERL5LIB/perlbrew etc --- Makefile.PL | 1 + plugins/async/check_earlytalker | 2 +- plugins/async/dns_whitelist_soft | 2 +- plugins/async/dnsbl | 2 +- plugins/async/queue/smtp-forward | 2 +- plugins/async/require_resolvable_fromhost | 2 +- plugins/async/rhsbl | 2 +- plugins/async/uribl | 2 +- plugins/auth/auth_checkpassword | 2 +- plugins/auth/auth_cvm_unix_local | 2 +- plugins/auth/auth_flat_file | 2 +- plugins/auth/auth_ldap_bind | 2 +- plugins/auth/auth_vpopmail | 2 +- plugins/auth/auth_vpopmail_sql | 2 +- plugins/auth/auth_vpopmaild | 2 +- plugins/auth/authdeny | 2 +- plugins/check_badmailfrom | 2 +- plugins/check_badmailfromto | 2 +- plugins/check_badrcptto | 2 +- plugins/check_badrcptto_patterns | 2 +- plugins/check_basicheaders | 2 +- plugins/check_bogus_bounce | 2 +- plugins/check_earlytalker | 2 +- plugins/check_loop | 2 +- plugins/check_norelay | 2 +- plugins/check_relay | 2 +- plugins/check_spamhelo | 2 +- plugins/connection_time | 2 +- plugins/content_log | 2 +- plugins/count_unrecognized_commands | 2 +- plugins/dns_whitelist_soft | 2 +- plugins/dnsbl | 2 +- plugins/domainkeys | 2 +- plugins/dont_require_anglebrackets | 2 +- plugins/dspam | 2 +- plugins/greylisting | 2 +- plugins/help | 2 +- plugins/hosts_allow | 2 +- plugins/http_config | 2 +- plugins/ident/geoip | 2 +- plugins/ident/p0f | 2 +- plugins/logging/adaptive | 2 +- plugins/logging/apache | 2 +- plugins/logging/connection_id | 2 +- plugins/logging/devnull | 2 +- plugins/logging/file | 2 +- plugins/logging/syslog | 2 +- plugins/logging/transaction_id | 2 +- plugins/logging/warn | 2 +- plugins/milter | 2 +- plugins/noop_counter | 2 +- plugins/parse_addr_withhelo | 2 +- plugins/queue/exim-bsmtp | 2 +- plugins/queue/maildir | 2 +- plugins/queue/postfix-queue | 2 +- plugins/queue/qmail-queue | 2 +- plugins/queue/smtp-forward | 2 +- plugins/quit_fortune | 2 +- plugins/random_error | 2 +- plugins/rcpt_map | 2 +- plugins/rcpt_ok | 2 +- plugins/rcpt_regexp | 2 +- plugins/relay_only | 2 +- plugins/require_resolvable_fromhost | 2 +- plugins/rhsbl | 2 +- plugins/sender_permitted_from | 2 +- plugins/spamassassin | 2 +- plugins/tls | 2 +- plugins/tls_cert | 2 +- plugins/uribl | 2 +- plugins/virus/aveclient | 2 +- plugins/virus/bitdefender | 2 +- plugins/virus/clamav | 2 +- plugins/virus/clamdscan | 2 +- plugins/virus/hbedv | 2 +- plugins/virus/kavscanner | 2 +- plugins/virus/klez_filter | 2 +- plugins/virus/sophie | 2 +- plugins/virus/uvscan | 2 +- t/01-syntax.t | 7 ++++++- 80 files changed, 85 insertions(+), 79 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index 4bca60b..3a40c1b 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -14,6 +14,7 @@ WriteMakefile( 'File::Temp' => 0, 'Time::HiRes' => 0, 'Net::IP' => 0, + 'Date::Parse' => 0, }, ABSTRACT => 'Flexible smtpd daemon written in Perl', AUTHOR => 'Ask Bjoern Hansen ', diff --git a/plugins/async/check_earlytalker b/plugins/async/check_earlytalker index 4778dd4..238bee1 100644 --- a/plugins/async/check_earlytalker +++ b/plugins/async/check_earlytalker @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/async/dns_whitelist_soft b/plugins/async/dns_whitelist_soft index 04b913b..1d42a03 100644 --- a/plugins/async/dns_whitelist_soft +++ b/plugins/async/dns_whitelist_soft @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use Qpsmtpd::Plugin::Async::DNSBLBase; diff --git a/plugins/async/dnsbl b/plugins/async/dnsbl index 9d4ba18..1c51401 100644 --- a/plugins/async/dnsbl +++ b/plugins/async/dnsbl @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use Qpsmtpd::Plugin::Async::DNSBLBase; diff --git a/plugins/async/queue/smtp-forward b/plugins/async/queue/smtp-forward index dbc9c65..10665bf 100644 --- a/plugins/async/queue/smtp-forward +++ b/plugins/async/queue/smtp-forward @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/async/require_resolvable_fromhost b/plugins/async/require_resolvable_fromhost index de680ae..dd99db4 100644 --- a/plugins/async/require_resolvable_fromhost +++ b/plugins/async/require_resolvable_fromhost @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use Qpsmtpd::DSN; use ParaDNS; diff --git a/plugins/async/rhsbl b/plugins/async/rhsbl index 6cd0b72..c0a5e53 100644 --- a/plugins/async/rhsbl +++ b/plugins/async/rhsbl @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use Qpsmtpd::Plugin::Async::DNSBLBase; diff --git a/plugins/async/uribl b/plugins/async/uribl index c99eefe..27b991b 100644 --- a/plugins/async/uribl +++ b/plugins/async/uribl @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use Qpsmtpd::Plugin::Async::DNSBLBase; diff --git a/plugins/auth/auth_checkpassword b/plugins/auth/auth_checkpassword index dc75c51..739478f 100644 --- a/plugins/auth/auth_checkpassword +++ b/plugins/auth/auth_checkpassword @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/auth/auth_cvm_unix_local b/plugins/auth/auth_cvm_unix_local index 1bc00b1..c5daa6f 100644 --- a/plugins/auth/auth_cvm_unix_local +++ b/plugins/auth/auth_cvm_unix_local @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/auth/auth_flat_file b/plugins/auth/auth_flat_file index a5baa7f..2e74f5a 100644 --- a/plugins/auth/auth_flat_file +++ b/plugins/auth/auth_flat_file @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/auth/auth_ldap_bind b/plugins/auth/auth_ldap_bind index 86960c7..8c191ff 100644 --- a/plugins/auth/auth_ldap_bind +++ b/plugins/auth/auth_ldap_bind @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w sub register { my ( $self, $qp, @args ) = @_; diff --git a/plugins/auth/auth_vpopmail b/plugins/auth/auth_vpopmail index 504f273..0ad1406 100644 --- a/plugins/auth/auth_vpopmail +++ b/plugins/auth/auth_vpopmail @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use strict; =head1 NAME diff --git a/plugins/auth/auth_vpopmail_sql b/plugins/auth/auth_vpopmail_sql index e65903d..c1c613e 100644 --- a/plugins/auth/auth_vpopmail_sql +++ b/plugins/auth/auth_vpopmail_sql @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/auth/auth_vpopmaild b/plugins/auth/auth_vpopmaild index cc34fc3..0157c9e 100644 --- a/plugins/auth/auth_vpopmaild +++ b/plugins/auth/auth_vpopmaild @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use strict; use warnings; diff --git a/plugins/auth/authdeny b/plugins/auth/authdeny index d027cf4..53b69eb 100644 --- a/plugins/auth/authdeny +++ b/plugins/auth/authdeny @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/check_badmailfrom b/plugins/check_badmailfrom index e831bb9..0a92f23 100644 --- a/plugins/check_badmailfrom +++ b/plugins/check_badmailfrom @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/check_badmailfromto b/plugins/check_badmailfromto index 7e98919..a57f6f6 100644 --- a/plugins/check_badmailfromto +++ b/plugins/check_badmailfromto @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/check_badrcptto b/plugins/check_badrcptto index 2bedbc0..6c2e66f 100644 --- a/plugins/check_badrcptto +++ b/plugins/check_badrcptto @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # this plugin checks the badrcptto config (like badmailfrom, but for rcpt address # rather than sender address) diff --git a/plugins/check_badrcptto_patterns b/plugins/check_badrcptto_patterns index f740251..807eb69 100644 --- a/plugins/check_badrcptto_patterns +++ b/plugins/check_badrcptto_patterns @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =pod =head1 SYNOPSIS diff --git a/plugins/check_basicheaders b/plugins/check_basicheaders index a8f85a0..973c768 100644 --- a/plugins/check_basicheaders +++ b/plugins/check_basicheaders @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/check_bogus_bounce b/plugins/check_bogus_bounce index 4d7ad14..6bbf29c 100644 --- a/plugins/check_bogus_bounce +++ b/plugins/check_bogus_bounce @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/check_earlytalker b/plugins/check_earlytalker index 5af2d99..c0849a6 100644 --- a/plugins/check_earlytalker +++ b/plugins/check_earlytalker @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME check_earlytalker - Check that the client doesn't talk before we send the SMTP banner diff --git a/plugins/check_loop b/plugins/check_loop index 1762072..5ffa608 100644 --- a/plugins/check_loop +++ b/plugins/check_loop @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/check_norelay b/plugins/check_norelay index 610db3b..5e317bc 100644 --- a/plugins/check_norelay +++ b/plugins/check_norelay @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =pod =head1 SYNOPSIS diff --git a/plugins/check_relay b/plugins/check_relay index 8333404..fcb3054 100644 --- a/plugins/check_relay +++ b/plugins/check_relay @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # this plugin checks the relayclients config file and # $ENV{RELAYCLIENT} to see if relaying is allowed. diff --git a/plugins/check_spamhelo b/plugins/check_spamhelo index 0363386..3b60a0a 100644 --- a/plugins/check_spamhelo +++ b/plugins/check_spamhelo @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME check_spamhelo - Check a HELO message delivered from a connecting host. diff --git a/plugins/connection_time b/plugins/connection_time index cd76dfa..e569a16 100644 --- a/plugins/connection_time +++ b/plugins/connection_time @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/content_log b/plugins/content_log index 8520b0c..696c9e0 100644 --- a/plugins/content_log +++ b/plugins/content_log @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # A simple example of a plugin that logs all incoming mail to a file. # Useful for debugging other plugins or keeping an archive of things. diff --git a/plugins/count_unrecognized_commands b/plugins/count_unrecognized_commands index 9113cbc..5330a99 100644 --- a/plugins/count_unrecognized_commands +++ b/plugins/count_unrecognized_commands @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/dns_whitelist_soft b/plugins/dns_whitelist_soft index 81a6609..12f1a74 100644 --- a/plugins/dns_whitelist_soft +++ b/plugins/dns_whitelist_soft @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME dns_whitelist_soft - dns-based whitelist override for other qpsmtpd plugins diff --git a/plugins/dnsbl b/plugins/dnsbl index 8236210..f64012a 100644 --- a/plugins/dnsbl +++ b/plugins/dnsbl @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/domainkeys b/plugins/domainkeys index 4e3ce95..b449bf5 100644 --- a/plugins/domainkeys +++ b/plugins/domainkeys @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w sub init { my ($self, $qp, %args) = @_; diff --git a/plugins/dont_require_anglebrackets b/plugins/dont_require_anglebrackets index 268f978..7bb1eea 100644 --- a/plugins/dont_require_anglebrackets +++ b/plugins/dont_require_anglebrackets @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/dspam b/plugins/dspam index 86f59f0..cd797f1 100644 --- a/plugins/dspam +++ b/plugins/dspam @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/greylisting b/plugins/greylisting index 8d4edd3..793dd20 100644 --- a/plugins/greylisting +++ b/plugins/greylisting @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME denysoft_greylist diff --git a/plugins/help b/plugins/help index 9baa3f9..e9cd4d5 100644 --- a/plugins/help +++ b/plugins/help @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/hosts_allow b/plugins/hosts_allow index 82a56e9..2874811 100644 --- a/plugins/hosts_allow +++ b/plugins/hosts_allow @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/http_config b/plugins/http_config index 344af02..bb3f674 100644 --- a/plugins/http_config +++ b/plugins/http_config @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME http_config diff --git a/plugins/ident/geoip b/plugins/ident/geoip index 7b25f36..6ee2836 100644 --- a/plugins/ident/geoip +++ b/plugins/ident/geoip @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 SYNOPSIS diff --git a/plugins/ident/p0f b/plugins/ident/p0f index 9c8e450..772d965 100644 --- a/plugins/ident/p0f +++ b/plugins/ident/p0f @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/logging/adaptive b/plugins/logging/adaptive index f622582..4e96ba6 100644 --- a/plugins/logging/adaptive +++ b/plugins/logging/adaptive @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # Adaptive logging plugin - logs at one level for successful messages and # one level for DENY'd messages diff --git a/plugins/logging/apache b/plugins/logging/apache index 184461d..317b45c 100644 --- a/plugins/logging/apache +++ b/plugins/logging/apache @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/logging/connection_id b/plugins/logging/connection_id index bbcc7fc..7023601 100644 --- a/plugins/logging/connection_id +++ b/plugins/logging/connection_id @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # this is a simple 'connection_id' plugin like the default builtin logging # # It demonstrates that a logging plugin can call ->log itself as well diff --git a/plugins/logging/devnull b/plugins/logging/devnull index 5b7ac7e..e8bbf8f 100644 --- a/plugins/logging/devnull +++ b/plugins/logging/devnull @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # this is a simple 'drop packets on the floor' plugin sub hook_logging { diff --git a/plugins/logging/file b/plugins/logging/file index b1b807d..cc51d92 100644 --- a/plugins/logging/file +++ b/plugins/logging/file @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/logging/syslog b/plugins/logging/syslog index 540232b..8552650 100644 --- a/plugins/logging/syslog +++ b/plugins/logging/syslog @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/logging/transaction_id b/plugins/logging/transaction_id index d70c30b..bc5a293 100644 --- a/plugins/logging/transaction_id +++ b/plugins/logging/transaction_id @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # this is a simple 'transaction_id' plugin like the default builtin logging # # It demonstrates that a logging plugin can call ->log itself as well diff --git a/plugins/logging/warn b/plugins/logging/warn index 896452b..204ffdb 100644 --- a/plugins/logging/warn +++ b/plugins/logging/warn @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # this is a simple 'warn' plugin like the default builtin logging # # It demonstrates that a logging plugin can call ->log itself as well diff --git a/plugins/milter b/plugins/milter index b715f06..3cf8da5 100644 --- a/plugins/milter +++ b/plugins/milter @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME milter diff --git a/plugins/noop_counter b/plugins/noop_counter index b6e8cae..6ce949b 100644 --- a/plugins/noop_counter +++ b/plugins/noop_counter @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/parse_addr_withhelo b/plugins/parse_addr_withhelo index 4409a20..49c8a0f 100644 --- a/plugins/parse_addr_withhelo +++ b/plugins/parse_addr_withhelo @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/queue/exim-bsmtp b/plugins/queue/exim-bsmtp index effbfbe..0dd4246 100644 --- a/plugins/queue/exim-bsmtp +++ b/plugins/queue/exim-bsmtp @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME exim-bsmtp diff --git a/plugins/queue/maildir b/plugins/queue/maildir index 26f9eb1..0c71b85 100644 --- a/plugins/queue/maildir +++ b/plugins/queue/maildir @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/queue/postfix-queue b/plugins/queue/postfix-queue index 69d85e5..2586d9a 100644 --- a/plugins/queue/postfix-queue +++ b/plugins/queue/postfix-queue @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/queue/qmail-queue b/plugins/queue/qmail-queue index 1aa07e4..de639eb 100644 --- a/plugins/queue/qmail-queue +++ b/plugins/queue/qmail-queue @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/queue/smtp-forward b/plugins/queue/smtp-forward index 22bb85e..a6c23c3 100644 --- a/plugins/queue/smtp-forward +++ b/plugins/queue/smtp-forward @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME smtp-forward diff --git a/plugins/quit_fortune b/plugins/quit_fortune index b37ac41..2e1effe 100644 --- a/plugins/quit_fortune +++ b/plugins/quit_fortune @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w sub hook_quit { my $qp = shift->qp; diff --git a/plugins/random_error b/plugins/random_error index 88a2a82..48e7283 100644 --- a/plugins/random_error +++ b/plugins/random_error @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME random_error diff --git a/plugins/rcpt_map b/plugins/rcpt_map index cb0189f..32c0a3b 100644 --- a/plugins/rcpt_map +++ b/plugins/rcpt_map @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/rcpt_ok b/plugins/rcpt_ok index aac329e..fd977b1 100644 --- a/plugins/rcpt_ok +++ b/plugins/rcpt_ok @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/rcpt_regexp b/plugins/rcpt_regexp index be0c7c2..40705b7 100644 --- a/plugins/rcpt_regexp +++ b/plugins/rcpt_regexp @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME rcpt_regexp - check recipients against a list of regular expressions diff --git a/plugins/relay_only b/plugins/relay_only index 988fea9..e6414e9 100644 --- a/plugins/relay_only +++ b/plugins/relay_only @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/require_resolvable_fromhost b/plugins/require_resolvable_fromhost index 4125021..55040b0 100644 --- a/plugins/require_resolvable_fromhost +++ b/plugins/require_resolvable_fromhost @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use Qpsmtpd::DSN; use Net::DNS qw(mx); use Socket; diff --git a/plugins/rhsbl b/plugins/rhsbl index 8b3ccb3..03a1c29 100644 --- a/plugins/rhsbl +++ b/plugins/rhsbl @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w sub register { my ($self, $qp, $denial ) = @_; diff --git a/plugins/sender_permitted_from b/plugins/sender_permitted_from index 6f4b75f..8ddccfb 100644 --- a/plugins/sender_permitted_from +++ b/plugins/sender_permitted_from @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/spamassassin b/plugins/spamassassin index b59216e..e5c05c3 100644 --- a/plugins/spamassassin +++ b/plugins/spamassassin @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/tls b/plugins/tls index f31a2be..1be2245 100644 --- a/plugins/tls +++ b/plugins/tls @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/tls_cert b/plugins/tls_cert index 825f6b9..fede0e0 100644 --- a/plugins/tls_cert +++ b/plugins/tls_cert @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use warnings; # Very basic script to create TLS certificates for qpsmtpd diff --git a/plugins/uribl b/plugins/uribl index fa5b182..163797a 100644 --- a/plugins/uribl +++ b/plugins/uribl @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/virus/aveclient b/plugins/virus/aveclient index 6d5faf3..f321f76 100644 --- a/plugins/virus/aveclient +++ b/plugins/virus/aveclient @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME aveclient diff --git a/plugins/virus/bitdefender b/plugins/virus/bitdefender index 3ea8fe4..17609a2 100644 --- a/plugins/virus/bitdefender +++ b/plugins/virus/bitdefender @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/virus/clamav b/plugins/virus/clamav index f480f29..73d505c 100644 --- a/plugins/virus/clamav +++ b/plugins/virus/clamav @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/virus/clamdscan b/plugins/virus/clamdscan index 33c98fe..0b795a5 100644 --- a/plugins/virus/clamdscan +++ b/plugins/virus/clamdscan @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/plugins/virus/hbedv b/plugins/virus/hbedv index 5a1bd7b..60e01de 100644 --- a/plugins/virus/hbedv +++ b/plugins/virus/hbedv @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # H+B EDV-AV plugin. =head1 NAME diff --git a/plugins/virus/kavscanner b/plugins/virus/kavscanner index c148f54..92a1bd5 100644 --- a/plugins/virus/kavscanner +++ b/plugins/virus/kavscanner @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w # Kasperski-AV plugin. =head1 NAME diff --git a/plugins/virus/klez_filter b/plugins/virus/klez_filter index 0427a77..8a977fc 100644 --- a/plugins/virus/klez_filter +++ b/plugins/virus/klez_filter @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w sub hook_data_post { my ($self, $transaction) = @_; diff --git a/plugins/virus/sophie b/plugins/virus/sophie index 869d383..6fc0f52 100644 --- a/plugins/virus/sophie +++ b/plugins/virus/sophie @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w use IO::Socket; sub register { diff --git a/plugins/virus/uvscan b/plugins/virus/uvscan index 22b3849..8faa531 100644 --- a/plugins/virus/uvscan +++ b/plugins/virus/uvscan @@ -1,4 +1,4 @@ -#!perl -Tw +#!perl -w =head1 NAME diff --git a/t/01-syntax.t b/t/01-syntax.t index 9b9cebd..a44e3a7 100644 --- a/t/01-syntax.t +++ b/t/01-syntax.t @@ -16,6 +16,10 @@ my @skip_syntax = qw( plugins/auth/auth_ldap_bind plugins/ident/geoip plugins/logging/apache + plugins/auth/auth_vpopmail + plugins/virus/clamdscan + plugins/sender_permitted_from + plugins/domainkeys lib/Apache/Qpsmtpd.pm lib/Danga/Client.pm lib/Danga/TimeoutSocket.pm @@ -33,8 +37,9 @@ sub test_syntax { chomp $f; return if ! -f $f; return if $skip_syntax{$f}; + return if $f =~ m/(~|\.(bak|orig|rej))/; return if $f =~ /async/; # requires ParaDNS - my $r = `$this_perl -Tc $f 2>&1`; + my $r = `$this_perl -Ilib -MQpsmtpd::Constants -c $f 2>&1`; my $exit_code = sprintf ("%d", $CHILD_ERROR >> 8); ok( $exit_code == 0, "syntax $f"); };