--- amanda-3.3.0/perl/Amanda/Util.pm	2011-06-02 20:18:57.000000000 +0200

+++ amanda-3.3.2/perl/Amanda/Util.pm	2012-07-25 17:59:54.000000000 +0200

@@ -67,6 +67,10 @@

 *stream_server = *Amanda::Utilc::stream_server;

 *stream_accept = *Amanda::Utilc::stream_accept;

 *check_security = *Amanda::Utilc::check_security;

+*match_host = *Amanda::Utilc::match_host;

+*match_disk = *Amanda::Utilc::match_disk;

+*match_datestamp = *Amanda::Utilc::match_datestamp;

+*match_level = *Amanda::Utilc::match_level;

 *set_pname = *Amanda::Utilc::set_pname;

 *get_pname = *Amanda::Utilc::get_pname;

 *set_ptype = *Amanda::Utilc::set_ptype;

@@ -542,7 +546,17 @@

   burp $filename, $header;

 These functions can (and should) be exported to the main namespace

-  

+

+=head1 MATCHING

+

+The following functions are available to match strings against patterns using

+the rules described in amanda(8):

+

+  match_host($pat, $str);

+  match_disk($pat, $str);

+  match_datestamp($pat, $str);

+  match_level($pat, $str);

+

 =cut

@@ -955,6 +969,8 @@

 }

+push @EXPORT_OK, qw(match_host match_disk match_datestamp match_level);

+

 sub check_std_fds {

     fcntl(STDIN, F_GETFD, 0) or critical("Standard input is not open");

     fcntl(STDOUT, F_GETFD, 0) or critical("Standard output is not open");

--- amanda-3.3.0/perl/Amanda/Logfile.pm	2011-06-02 20:18:56.000000000 +0200

+++ amanda-3.3.2/perl/Amanda/Logfile.pm	2012-07-25 17:59:54.000000000 +0200

@@ -61,10 +61,6 @@

 *search_holding_disk = *Amanda::Logfilec::search_holding_disk;

 *dumps_match = *Amanda::Logfilec::dumps_match;

 *dumps_match_dumpspecs = *Amanda::Logfilec::dumps_match_dumpspecs;

-*match_host = *Amanda::Logfilec::match_host;

-*match_disk = *Amanda::Logfilec::match_disk;

-*match_datestamp = *Amanda::Logfilec::match_datestamp;

-*match_level = *Amanda::Logfilec::match_level;

 ############# Class : Amanda::Logfile::find_result_t ##############

@@ -365,16 +361,6 @@

 All of these functions can be imported by name.

-=head1 MATCHING

-

-The following functions are available to match strings against patterns using

-the rules described in amanda(8):

-

-  match_host($pat, $str);

-  match_disk($pat, $str);

-  match_datestamp($pat, $str);

-  match_level($pat, $str);

-

 =head1 DEBUG LOGGING HANDLER

 This package provides C<$amanda_log_trace_log>, which sends C<die>

@@ -610,8 +596,7 @@

 #copy symbols in program_t to constants

 push @{$EXPORT_TAGS{"constants"}},  @{$EXPORT_TAGS{"program_t"}};

-push @EXPORT_OK, qw(find_log search_logfile dumps_match log_rename

-    match_host match_disk match_datestamp match_level);

+push @EXPORT_OK, qw(find_log search_logfile dumps_match log_rename);

 push @EXPORT_OK, qw($amanda_log_trace_log);