[Rt-commit] rtir branch, 4.2/update-whois-ripe, repushed

[Aaron Trevena]

The branch 4.2/update-whois-ripe was deleted and repushed:
       was bd99de4acbd1208e27c1a61bfbd45db73bbeb6ec
       now 17f5d0dcd1066c079436f25c038a43b3025e51c1

1: 3a469c9a ! 1: 17f5d0dc Updated Net::Whois::RIPE to 2.x
    @@ -1,8 +1,33 @@
    -Author: Aaron Trevena <aaron at aarontrevena.co.uk>
    +Author: Aaron Trevena <ast at bestpractical.com>
     
         Updated Net::Whois::RIPE to 2.x
         
         Removed local copy of old version of module, updated codebase to use current API
    +    Updated Net::Whois::Ripe dependancy
    +
    +diff --git a/META.yml b/META.yml
    +--- a/META.yml
    ++++ b/META.yml
    +@@
    +   DBIx::SearchBuilder: 1.61
    +   Parse::BooleanLogic: 0
    +   Regexp::Common: 0
    ++  Net::Whois::RIPE: 2.006001
    +   perl: 5.10.1
    + resources:
    +   license: http://opensource.org/licenses/gpl-license.php
    +
    +diff --git a/Makefile.PL b/Makefile.PL
    +--- a/Makefile.PL
    ++++ b/Makefile.PL
    +@@
    + 
    + # RTIR needs this version of SB because of cud-from-select
    + requires('DBIx::SearchBuilder', 1.61);
    ++requires('Net::Whois::RIPE', 2.006001);
    + 
    + # IP searching
    + requires('Regexp::Common');
     
     diff --git a/html/RTIR/Tools/Elements/GetEmailFromIP b/html/RTIR/Tools/Elements/GetEmailFromIP
     --- a/html/RTIR/Tools/Elements/GetEmailFromIP
    @@ -71,7 +96,7 @@
     +       my $value = join("\n", ' ', @values);
      </%perl>
     -     <b><%$attribute%></b>: 
    -+     <b><% $attribute %></b>: 
    ++     <b><% $attribute %></b>:
      <& /Elements/MakeClicky, 
          ticket => $TicketObj, 
          lookup_params => "ticket=".$TicketObj->id, 
    @@ -1630,11 +1655,10 @@
          }
     -    my $whois = Net::Whois::RIPE->new( $host, Port => $port, Debug => $debug || 0 );
     +
    -+    my $whois = Net::Whois::RIPE->new( hostname => $host, port => $port );
    ++    my $whois = Net::Whois::RIPE->new( hostname => $host, port => $port, recursive => 1 );
          my $iterator;
     -    $iterator = $whois->query_iterator( $args{'Query'} )
     +    $iterator = $whois->query( $args{'Query'} )
              if $whois;
          return (undef, $args{'CurrentUser'}->loc("Unable to connect to WHOIS server '[_1]'", $server) )
              unless $iterator;
    -
2: bf1d7178 < -:  ------- Update Net::Whois::Ripe dependancy
3: bd99de4a < -:  ------- Fix extra argument passed to whois queries in lookups