explicitly expect Cassandane modules to be in '.'

Newer perls don't automatically include '.' in @inc for security
reasons.

We expect our Cassandane modules to be in the current directory,
so make that explicit.

Modules not in our distribution are included before the use lib
line, to ensure we use the installed version, not some rogue
version in cwd.

Cassandane/Cassini.pm

@@ -46,6 +46,8 @@ use strict;
 use warnings;
 use Cwd qw(abs_path);
 use Config::IniFiles;
+
+use lib '.';
 use Cassandane::Util::Log;
 
 my $instance;

Cassandane/Config.pm

@@ -41,6 +41,8 @@
 package Cassandane::Config;
 use strict;
 use warnings;
+
+use lib '.';
 use Cassandane::Cassini;
 use Cassandane::Util::Log;
 

Cassandane/Cyrus/ACL.pm

@@ -39,16 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::ACL;
 use strict;
 use warnings;
-package Cassandane::Cyrus::ACL;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Generator;
 use Cassandane::MessageStoreFactory;
 use Cassandane::Instance;
-use Data::Dumper;
 
 sub new
 {

Cassandane/Cyrus/Admin.pm

@@ -37,15 +37,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Admin;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Admin;
+use Data::Dumper;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;
 
-use Data::Dumper;
-
 sub new
 {
     my $class = shift;

Cassandane/Cyrus/Annotator.pm

@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Annotator;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Annotator;
-use base qw(Cassandane::Cyrus::TestCase);
 use Cwd qw(abs_path);
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::Wait;
 

Cassandane/Cyrus/Archive.pm

@@ -39,14 +39,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Archive;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Archive;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::Words;
-use Data::Dumper;
 
 sub new
 {

Cassandane/Cyrus/Bug3072.pm

@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3072;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3072;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 sub new

Cassandane/Cyrus/Bug3463.pm

@@ -39,16 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3463;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3463;
-use base qw(Cassandane::Unit::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Generator;
 use Cassandane::MessageStoreFactory;
 use Cassandane::Instance;
-use Data::Dumper;
 
 sub new
 {

Cassandane/Cyrus/Bug3470.pm

@@ -39,16 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3470;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3470;
-use base qw(Cassandane::Unit::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Unit::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Generator;
 use Cassandane::MessageStoreFactory;
 use Cassandane::Instance;
-use Data::Dumper;
 
 sub new
 {

Cassandane/Cyrus/Bug3649.pm

@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3649;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3649;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;

Cassandane/Cyrus/Bug3903.pm

@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Bug3903;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Bug3903;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 

Cassandane/Cyrus/Caldav.pm

@@ -39,17 +39,18 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Caldav;
 use strict;
 use warnings;
-
-package Cassandane::Cyrus::Caldav;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
-use Cassandane::Util::Log;
 use JSON::XS;
 use Net::CalDAVTalk;
 use Data::Dumper;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;

Cassandane/Cyrus/CaldavAlarm.pm

@@ -39,20 +39,21 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::CaldavAlarm;
 use strict;
 use warnings;
-
-package Cassandane::Cyrus::CaldavAlarm;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
 use DateTime::Format::ISO8601;
-use Cassandane::Util::Log;
 use JSON::XS;
 use Net::CalDAVTalk;
 use Data::Dumper;
 use POSIX;
 use Carp;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;

Cassandane/Cyrus/Carddav.pm

@@ -39,19 +39,20 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Carddav;
 use strict;
 use warnings;
-
-package Cassandane::Cyrus::Carddav;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
-use Cassandane::Util::Log;
 use JSON::XS;
 use Net::CardDAVTalk;
 use Net::CardDAVTalk::VCard;
 use Data::Dumper;
 use XML::Spice;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;

Cassandane/Cyrus/Conversations.pm

@@ -39,12 +39,14 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Conversations;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Conversations;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
 use URI::Escape;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::ThreadedGenerator;
 use Cassandane::Util::Log;
 use Cassandane::Util::DateTime qw(to_iso8601 from_iso8601

Cassandane/Cyrus/CyrusDB.pm

@@ -37,9 +37,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::CyrusDB;
 use strict;
 use warnings;
-package Cassandane::Cyrus::CyrusDB;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Instance;

Cassandane/Cyrus/Delete.pm

@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Delete;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Delete;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 

Cassandane/Cyrus/Delivery.pm

@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Delivery;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Delivery;
-use base qw(Cassandane::Cyrus::TestCase);
 use IO::File;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 Cassandane::Cyrus::TestCase::magic(DuplicateSuppressionOff => sub {

Cassandane/Cyrus/Deny.pm

@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Deny;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Deny;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 

Cassandane/Cyrus/Expunge.pm

@@ -39,9 +39,11 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Expunge;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Expunge;
+
+use lib '.';
 use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 

Cassandane/Cyrus/Fetch.pm

@@ -39,14 +39,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Fetch;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Fetch;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
-use Cassandane::Util::Log;
 use IO::Scalar;
 
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
+use Cassandane::Util::Log;
+
 sub new
 {
     my $class = shift;

Cassandane/Cyrus/Flags.pm

@@ -39,14 +39,16 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Flags;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Flags;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+use Data::Dumper;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 use Cassandane::Util::Words;
-use Data::Dumper;
 
 sub new
 {

Cassandane/Cyrus/Idle.pm

@@ -39,11 +39,13 @@
 #  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+package Cassandane::Cyrus::Idle;
 use strict;
 use warnings;
-package Cassandane::Cyrus::Idle;
-use base qw(Cassandane::Cyrus::TestCase);
 use DateTime;
+
+use lib '.';
+use base qw(Cassandane::Cyrus::TestCase);
 use Cassandane::Util::Log;
 
 sub new