further sync blead with Net-Ping-2.36

(followup to 59ea7c6d8e0c5d0244e7496dd44e31e7c14e8f83)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 8af00e8..5aab57c 100644 (file)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1186,7 +1186,7 @@ package Maintainers;
     'Net::Ping' =>
        {
        'MAINTAINER'    => 'smpeters',
-       'DISTRIBUTION'  => 'SMPETERS/Net-Ping-2.35.tar.gz',
+       'DISTRIBUTION'  => 'SMPETERS/Net-Ping-2.36.tar.gz',
        'FILES'         => q[lib/Net/Ping.pm lib/Net/Ping],
        'CPAN'          => 1,
        'UPSTREAM'      => 'blead',

diff --git a/lib/Net/Ping/Changes b/lib/Net/Ping/Changes
index b0e711a..43a13f5 100644 (file)
--- a/lib/Net/Ping/Changes
+++ b/lib/Net/Ping/Changes
@@ -1,6 +1,19 @@
 CHANGES
 -------
 
+2.35  Feb 08 14:42 2008
+       - Patch in Perl change #33242 by Nicholas Clark 
+               <http://public.activestate.com/cgi-bin/perlbrowse/p/33242>
+
+2.34  Dec 19 08:51 2007
+        - Release primarily to prevent problems with the Perl core in
+         preparation for the Perl 5.10 release.  No real bug fixes, but
+          text fixes are included.
+       - skip test t/510_ping_udp.t on Windows Vista.  Thanks to Jan
+         Dubois for the code to test for Vista.
+        - t/510_ping_udp.t should check for a udp echo port, not a tcp
+         echo port.
+
 2.33  Jul 31 20:15 2007
        - add new method port_number() rather than asking users to
           twiddle with the internals of Net::Ping to probe a specific

diff --git a/lib/Net/Ping/t/190_alarm.t b/lib/Net/Ping/t/190_alarm.t
index 4d31f11..9ea5185 100644 (file)
--- a/lib/Net/Ping/t/190_alarm.t
+++ b/lib/Net/Ping/t/190_alarm.t
@@ -9,7 +9,7 @@ BEGIN {
       print "1..0 \# Skip: network dependent test\n";
         exit;
     }
-  }
+  } 
   unless (eval "require Socket") {
     print "1..0 \# Skip: no Socket\n";
     exit;

diff --git a/lib/Net/Ping/t/510_ping_udp.t b/lib/Net/Ping/t/510_ping_udp.t
index d6fd4a0..ce55a7d 100644 (file)
--- a/lib/Net/Ping/t/510_ping_udp.t
+++ b/lib/Net/Ping/t/510_ping_udp.t
@@ -13,7 +13,7 @@ BEGIN {
     exit;
   }
   unless (getservbyname('echo', 'udp')) {
-    print "1..0 \# Skip: no echo port\n";
+    print "1..0 \# Skip: no udp echo port\n";
     exit;
   }