From 61de599c1bfc5eb8eeea2073c5c0a431dbe6a01f Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 28 Apr 2012 20:41:31 -0700 Subject: [PATCH] Normalize #! lines on all plugins find . -type f | xargs -n1 perl -pi.bak -0777 -e '$want = "#!perl -Tw"; s/\A#!.*\n/$want\n/; s/\A([^#])/$want\n\1/s' --- 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_patterns | 2 +- plugins/check_badmailfromto | 2 +- plugins/check_badrcptto_patterns | 1 + plugins/check_basicheaders | 2 +- plugins/check_bogus_bounce | 2 +- plugins/check_earlytalker | 1 + plugins/check_loop | 2 +- plugins/check_norelay | 1 + plugins/check_spamhelo | 1 + plugins/connection_time | 1 + plugins/dns_whitelist_soft | 1 + plugins/dnsbl | 2 +- plugins/domainkeys | 1 + plugins/greylisting | 1 + plugins/hosts_allow | 1 + plugins/http_config | 1 + plugins/logging/adaptive | 2 +- plugins/logging/apache | 1 + 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 | 1 + plugins/queue/exim-bsmtp | 1 + plugins/queue/maildir | 2 +- plugins/queue/postfix-queue | 1 + plugins/queue/smtp-forward | 1 + plugins/quit_fortune | 1 + plugins/random_error | 1 + plugins/rcpt_map | 1 + plugins/rcpt_regexp | 1 + plugins/relay_only | 2 +- plugins/require_resolvable_fromhost | 1 + plugins/rhsbl | 2 +- plugins/sender_permitted_from | 1 + 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 | 1 + plugins/virus/sophie | 2 +- plugins/virus/uvscan | 2 +- 65 files changed, 65 insertions(+), 43 deletions(-) diff --git a/plugins/async/check_earlytalker b/plugins/async/check_earlytalker index b5c4038..4af3ccd 100644 --- a/plugins/async/check_earlytalker +++ b/plugins/async/check_earlytalker @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/async/dns_whitelist_soft b/plugins/async/dns_whitelist_soft index a3f40eb..824a50d 100644 --- a/plugins/async/dns_whitelist_soft +++ b/plugins/async/dns_whitelist_soft @@ -1,4 +1,4 @@ -#!perl -w +#!perl -Tw use Qpsmtpd::Plugin::Async::DNSBLBase; diff --git a/plugins/async/dnsbl b/plugins/async/dnsbl index b72d062..c9aeded 100644 --- a/plugins/async/dnsbl +++ b/plugins/async/dnsbl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw use Qpsmtpd::Plugin::Async::DNSBLBase; diff --git a/plugins/async/queue/smtp-forward b/plugins/async/queue/smtp-forward index 4e0d498..dbc9c65 100644 --- a/plugins/async/queue/smtp-forward +++ b/plugins/async/queue/smtp-forward @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/async/require_resolvable_fromhost b/plugins/async/require_resolvable_fromhost index 59822e3..95bfbbd 100644 --- a/plugins/async/require_resolvable_fromhost +++ b/plugins/async/require_resolvable_fromhost @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw use Qpsmtpd::DSN; use ParaDNS; diff --git a/plugins/async/rhsbl b/plugins/async/rhsbl index 82bb850..43378e6 100644 --- a/plugins/async/rhsbl +++ b/plugins/async/rhsbl @@ -1,4 +1,4 @@ -#!perl -w +#!perl -Tw use Qpsmtpd::Plugin::Async::DNSBLBase; diff --git a/plugins/async/uribl b/plugins/async/uribl index 1fabfd1..8d9a67f 100644 --- a/plugins/async/uribl +++ b/plugins/async/uribl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw use Qpsmtpd::Plugin::Async::DNSBLBase; diff --git a/plugins/auth/auth_checkpassword b/plugins/auth/auth_checkpassword index db9231f..609a92b 100644 --- a/plugins/auth/auth_checkpassword +++ b/plugins/auth/auth_checkpassword @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/auth/auth_cvm_unix_local b/plugins/auth/auth_cvm_unix_local index 4c9f460..490f975 100644 --- a/plugins/auth/auth_cvm_unix_local +++ b/plugins/auth/auth_cvm_unix_local @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/auth/auth_flat_file b/plugins/auth/auth_flat_file index 32f2512..a5baa7f 100644 --- a/plugins/auth/auth_flat_file +++ b/plugins/auth/auth_flat_file @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/auth/auth_ldap_bind b/plugins/auth/auth_ldap_bind index 05392f0..86960c7 100644 --- a/plugins/auth/auth_ldap_bind +++ b/plugins/auth/auth_ldap_bind @@ -1,4 +1,4 @@ -#!/usr/bin/perl -Tw +#!perl -Tw sub register { my ( $self, $qp, @args ) = @_; diff --git a/plugins/auth/auth_vpopmail b/plugins/auth/auth_vpopmail index 91cf863..9316a63 100644 --- a/plugins/auth/auth_vpopmail +++ b/plugins/auth/auth_vpopmail @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw use strict; =head1 NAME diff --git a/plugins/auth/auth_vpopmail_sql b/plugins/auth/auth_vpopmail_sql index 948ea4f..cb6b247 100644 --- a/plugins/auth/auth_vpopmail_sql +++ b/plugins/auth/auth_vpopmail_sql @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/auth/auth_vpopmaild b/plugins/auth/auth_vpopmaild index b25b35b..cc34fc3 100644 --- a/plugins/auth/auth_vpopmaild +++ b/plugins/auth/auth_vpopmaild @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw use strict; use warnings; diff --git a/plugins/auth/authdeny b/plugins/auth/authdeny index 892398b..f4c023c 100644 --- a/plugins/auth/authdeny +++ b/plugins/auth/authdeny @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw # # This plugin doesn't actually check anything and will fail any # user no matter what they type. It is strictly a proof of concept for diff --git a/plugins/check_badmailfrom_patterns b/plugins/check_badmailfrom_patterns index 528e49d..906b382 100644 --- a/plugins/check_badmailfrom_patterns +++ b/plugins/check_badmailfrom_patterns @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw =pod diff --git a/plugins/check_badmailfromto b/plugins/check_badmailfromto index 993986a..7e98919 100644 --- a/plugins/check_badmailfromto +++ b/plugins/check_badmailfromto @@ -1,4 +1,4 @@ -#! perl +#!perl -Tw =head1 NAME diff --git a/plugins/check_badrcptto_patterns b/plugins/check_badrcptto_patterns index c551bab..f740251 100644 --- a/plugins/check_badrcptto_patterns +++ b/plugins/check_badrcptto_patterns @@ -1,3 +1,4 @@ +#!perl -Tw =pod =head1 SYNOPSIS diff --git a/plugins/check_basicheaders b/plugins/check_basicheaders index 17bdbb4..a8f85a0 100644 --- a/plugins/check_basicheaders +++ b/plugins/check_basicheaders @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw =head1 NAME diff --git a/plugins/check_bogus_bounce b/plugins/check_bogus_bounce index 968f1c6..4d7ad14 100644 --- a/plugins/check_bogus_bounce +++ b/plugins/check_bogus_bounce @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/check_earlytalker b/plugins/check_earlytalker index 7ac6166..09580c4 100644 --- a/plugins/check_earlytalker +++ b/plugins/check_earlytalker @@ -1,3 +1,4 @@ +#!perl -Tw =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 95caa1f..1762072 100644 --- a/plugins/check_loop +++ b/plugins/check_loop @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw =head1 NAME diff --git a/plugins/check_norelay b/plugins/check_norelay index 08e37c3..610db3b 100644 --- a/plugins/check_norelay +++ b/plugins/check_norelay @@ -1,3 +1,4 @@ +#!perl -Tw =pod =head1 SYNOPSIS diff --git a/plugins/check_spamhelo b/plugins/check_spamhelo index b45f5a2..0363386 100644 --- a/plugins/check_spamhelo +++ b/plugins/check_spamhelo @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME check_spamhelo - Check a HELO message delivered from a connecting host. diff --git a/plugins/connection_time b/plugins/connection_time index 3e6a7d5..cd76dfa 100644 --- a/plugins/connection_time +++ b/plugins/connection_time @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME diff --git a/plugins/dns_whitelist_soft b/plugins/dns_whitelist_soft index 0c03cd9..81a6609 100644 --- a/plugins/dns_whitelist_soft +++ b/plugins/dns_whitelist_soft @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME dns_whitelist_soft - dns-based whitelist override for other qpsmtpd plugins diff --git a/plugins/dnsbl b/plugins/dnsbl index 48df98f..15bcbce 100644 --- a/plugins/dnsbl +++ b/plugins/dnsbl @@ -1,4 +1,4 @@ -#!perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/domainkeys b/plugins/domainkeys index ccabf59..9e90005 100644 --- a/plugins/domainkeys +++ b/plugins/domainkeys @@ -1,3 +1,4 @@ +#!perl -Tw sub init { my ($self, $qp, %args) = @_; diff --git a/plugins/greylisting b/plugins/greylisting index 7860b13..c8c7f88 100644 --- a/plugins/greylisting +++ b/plugins/greylisting @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME denysoft_greylist diff --git a/plugins/hosts_allow b/plugins/hosts_allow index ca445c6..452f521 100644 --- a/plugins/hosts_allow +++ b/plugins/hosts_allow @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME diff --git a/plugins/http_config b/plugins/http_config index 4a2b435..344af02 100644 --- a/plugins/http_config +++ b/plugins/http_config @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME http_config diff --git a/plugins/logging/adaptive b/plugins/logging/adaptive index 27d0eba..ec34c37 100644 --- a/plugins/logging/adaptive +++ b/plugins/logging/adaptive @@ -1,4 +1,4 @@ -#!perl +#!perl -Tw # 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 11168e9..9f3d815 100644 --- a/plugins/logging/apache +++ b/plugins/logging/apache @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME diff --git a/plugins/logging/connection_id b/plugins/logging/connection_id index e54bdcf..c7b61df 100644 --- a/plugins/logging/connection_id +++ b/plugins/logging/connection_id @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw # 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 566ab68..5b7ac7e 100644 --- a/plugins/logging/devnull +++ b/plugins/logging/devnull @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw # this is a simple 'drop packets on the floor' plugin sub hook_logging { diff --git a/plugins/logging/file b/plugins/logging/file index 97d0734..16b5c2a 100644 --- a/plugins/logging/file +++ b/plugins/logging/file @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw =head1 NAME diff --git a/plugins/logging/syslog b/plugins/logging/syslog index acbcbc2..7ef0b33 100644 --- a/plugins/logging/syslog +++ b/plugins/logging/syslog @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw =head1 NAME diff --git a/plugins/logging/transaction_id b/plugins/logging/transaction_id index 66e9386..836f311 100644 --- a/plugins/logging/transaction_id +++ b/plugins/logging/transaction_id @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw # 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 ce25399..6d6a200 100644 --- a/plugins/logging/warn +++ b/plugins/logging/warn @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!perl -Tw # 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 2be6b42..79beee6 100644 --- a/plugins/milter +++ b/plugins/milter @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME milter diff --git a/plugins/queue/exim-bsmtp b/plugins/queue/exim-bsmtp index 29c0de8..619ea4a 100644 --- a/plugins/queue/exim-bsmtp +++ b/plugins/queue/exim-bsmtp @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME exim-bsmtp diff --git a/plugins/queue/maildir b/plugins/queue/maildir index f005f44..26f9eb1 100644 --- a/plugins/queue/maildir +++ b/plugins/queue/maildir @@ -1,4 +1,4 @@ -#!perl +#!perl -Tw =head1 NAME diff --git a/plugins/queue/postfix-queue b/plugins/queue/postfix-queue index 28fa44f..17b7158 100644 --- a/plugins/queue/postfix-queue +++ b/plugins/queue/postfix-queue @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME diff --git a/plugins/queue/smtp-forward b/plugins/queue/smtp-forward index f7e212b..22bb85e 100644 --- a/plugins/queue/smtp-forward +++ b/plugins/queue/smtp-forward @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME smtp-forward diff --git a/plugins/quit_fortune b/plugins/quit_fortune index 211f963..b37ac41 100644 --- a/plugins/quit_fortune +++ b/plugins/quit_fortune @@ -1,3 +1,4 @@ +#!perl -Tw sub hook_quit { my $qp = shift->qp; diff --git a/plugins/random_error b/plugins/random_error index 7585ed1..68246f5 100644 --- a/plugins/random_error +++ b/plugins/random_error @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME random_error diff --git a/plugins/rcpt_map b/plugins/rcpt_map index 77f3f67..558f7e0 100644 --- a/plugins/rcpt_map +++ b/plugins/rcpt_map @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME diff --git a/plugins/rcpt_regexp b/plugins/rcpt_regexp index 9406faa..ae6a2fe 100644 --- a/plugins/rcpt_regexp +++ b/plugins/rcpt_regexp @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME rcpt_regexp - check recipients against a list of regular expressions diff --git a/plugins/relay_only b/plugins/relay_only index 498a766..988fea9 100644 --- a/plugins/relay_only +++ b/plugins/relay_only @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/require_resolvable_fromhost b/plugins/require_resolvable_fromhost index cdb1890..50a0920 100644 --- a/plugins/require_resolvable_fromhost +++ b/plugins/require_resolvable_fromhost @@ -1,3 +1,4 @@ +#!perl -Tw use Qpsmtpd::DSN; use Net::DNS qw(mx); use Socket; diff --git a/plugins/rhsbl b/plugins/rhsbl index 2a613a3..b56f9be 100644 --- a/plugins/rhsbl +++ b/plugins/rhsbl @@ -1,4 +1,4 @@ -#!perl -w +#!perl -Tw sub register { my ($self, $qp, $denial ) = @_; diff --git a/plugins/sender_permitted_from b/plugins/sender_permitted_from index b587f3f..8e7626d 100644 --- a/plugins/sender_permitted_from +++ b/plugins/sender_permitted_from @@ -1,3 +1,4 @@ +#!perl -Tw =head1 NAME diff --git a/plugins/spamassassin b/plugins/spamassassin index 21ec00a..5e590fc 100644 --- a/plugins/spamassassin +++ b/plugins/spamassassin @@ -1,4 +1,4 @@ -#!perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/tls b/plugins/tls index f850d2c..c804233 100644 --- a/plugins/tls +++ b/plugins/tls @@ -1,4 +1,4 @@ -#!perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/tls_cert b/plugins/tls_cert index efbc56c..7a68378 100755 --- a/plugins/tls_cert +++ b/plugins/tls_cert @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw # Very basic script to create TLS certificates for qpsmtpd use File::Temp qw/ tempfile tempdir /; use Getopt::Long; diff --git a/plugins/uribl b/plugins/uribl index 9dc3c1f..8e7adbb 100644 --- a/plugins/uribl +++ b/plugins/uribl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/virus/aveclient b/plugins/virus/aveclient index 5e71d97..6d5faf3 100644 --- a/plugins/virus/aveclient +++ b/plugins/virus/aveclient @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME aveclient diff --git a/plugins/virus/bitdefender b/plugins/virus/bitdefender index 57eb974..0bbdbbf 100644 --- a/plugins/virus/bitdefender +++ b/plugins/virus/bitdefender @@ -1,4 +1,4 @@ -#!/usr/bin/perl -Tw +#!perl -Tw =head1 NAME diff --git a/plugins/virus/clamav b/plugins/virus/clamav index e5d966a..2c5ca3e 100644 --- a/plugins/virus/clamav +++ b/plugins/virus/clamav @@ -1,4 +1,4 @@ -#!/usr/bin/perl -Tw +#!perl -Tw =head1 NAME diff --git a/plugins/virus/clamdscan b/plugins/virus/clamdscan index cf6c2a2..76b91b4 100644 --- a/plugins/virus/clamdscan +++ b/plugins/virus/clamdscan @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME diff --git a/plugins/virus/hbedv b/plugins/virus/hbedv index 000c923..070af27 100644 --- a/plugins/virus/hbedv +++ b/plugins/virus/hbedv @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw # H+B EDV-AV plugin. # diff --git a/plugins/virus/kavscanner b/plugins/virus/kavscanner index b9710c4..89095df 100644 --- a/plugins/virus/kavscanner +++ b/plugins/virus/kavscanner @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw # Kasperski-AV plugin. =head1 NAME diff --git a/plugins/virus/klez_filter b/plugins/virus/klez_filter index 620de98..0427a77 100644 --- a/plugins/virus/klez_filter +++ b/plugins/virus/klez_filter @@ -1,3 +1,4 @@ +#!perl -Tw sub hook_data_post { my ($self, $transaction) = @_; diff --git a/plugins/virus/sophie b/plugins/virus/sophie index 0b35d32..869d383 100644 --- a/plugins/virus/sophie +++ b/plugins/virus/sophie @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw use IO::Socket; sub register { diff --git a/plugins/virus/uvscan b/plugins/virus/uvscan index 941f2e8..22b3849 100644 --- a/plugins/virus/uvscan +++ b/plugins/virus/uvscan @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!perl -Tw =head1 NAME