Upgrade libnet from 1.22_02 to 1.23

Changed my mind over the UPSTREAM status too: 'cpan' is probably better
after all. As long as someone (currently me) is responsive in rolling new
CPAN releases then any patches from core can safely go to rt.cpan.org
without getting stuck on a pile for a long time. Meanwhile, other patches
sent to rt.cpan.org may also get applied, and hopefully one day a more
active maintainer may be found. This also saves having to move it from
cpan/ to dist/.

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index fd7d12b..1f526e8 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1045,7 +1045,7 @@ use File::Glob qw(:case);
 
     'libnet' => {
         'MAINTAINER'   => 'gbarr',
-        'DISTRIBUTION' => 'SHAY/libnet-1.22_02.tar.gz',
+        'DISTRIBUTION' => 'SHAY/libnet-1.23.tar.gz',
         'FILES'        => q[cpan/libnet],
         'EXCLUDED'     => [
             qw( Configure
@@ -1053,7 +1053,7 @@ use File::Glob qw(:case);
                 ),
         ],
         'CUSTOMIZED' => ['Makefile.PL'],
-        'UPSTREAM'   => 'blead',
+        'UPSTREAM'   => 'cpan',
     },
 
     'Locale-Codes' => {

diff --git a/cpan/libnet/Changes b/cpan/libnet/Changes
index f957369..98b2647 100644 (file)
--- a/cpan/libnet/Changes
+++ b/cpan/libnet/Changes
@@ -1,3 +1,7 @@
+libnet 1.23  -- Mon Aug 12 2013
+
+  * Typo fixes [David Steinbrunner; resolves CPAN RT#87681]
+
 libnet 1.22_02 -- Thu Aug 08 2013
 
   * Make Net::FTP::dataconn::close() more robust [Together with changes to

diff --git a/cpan/libnet/Makefile.PL b/cpan/libnet/Makefile.PL
index afc7267..905a283 100644 (file)
--- a/cpan/libnet/Makefile.PL
+++ b/cpan/libnet/Makefile.PL
@@ -4,7 +4,7 @@ use ExtUtils::MakeMaker;
 WriteMakefile (
     NAME            => 'Net',
     DISTNAME        => 'libnet',
-    VERSION         => '1.22_02', # finds $VERSION
+    VERSION         => '1.23', # finds $VERSION
     AUTHOR          => 'Graham Barr <gbarr@pobox.com>',
     ABSTRACT        => 'Collection of Network protocol modules',
 );

diff --git a/cpan/libnet/Net/Cmd.pm b/cpan/libnet/Net/Cmd.pm
index b4988b4..d1a1fed 100644 (file)
--- a/cpan/libnet/Net/Cmd.pm
+++ b/cpan/libnet/Net/Cmd.pm
@@ -37,7 +37,7 @@ BEGIN {
   }
 }
 
-$VERSION = "2.29_2";
+$VERSION = "2.30";
 @ISA     = qw(Exporter);
 @EXPORT  = qw(CMD_INFO CMD_OK CMD_MORE CMD_REJECT CMD_ERROR CMD_PENDING);
 

diff --git a/cpan/libnet/Net/Config.pm b/cpan/libnet/Net/Config.pm
index 24ae2c0..885d9cb 100644 (file)
--- a/cpan/libnet/Net/Config.pm
+++ b/cpan/libnet/Net/Config.pm
@@ -13,7 +13,7 @@ use strict;
 
 @EXPORT  = qw(%NetConfig);
 @ISA     = qw(Net::LocalCfg Exporter);
-$VERSION = "1.11_01";
+$VERSION = "1.12";
 
 eval { local $SIG{__DIE__}; require Net::LocalCfg };
 

diff --git a/cpan/libnet/Net/Domain.pm b/cpan/libnet/Net/Domain.pm
index 017cc92..d47f8be 100644 (file)
--- a/cpan/libnet/Net/Domain.pm
+++ b/cpan/libnet/Net/Domain.pm
@@ -16,7 +16,7 @@ use Net::Config;
 @ISA       = qw(Exporter);
 @EXPORT_OK = qw(hostname hostdomain hostfqdn domainname);
 
-$VERSION = "2.21";
+$VERSION = "2.22";
 
 my ($host, $domain, $fqdn) = (undef, undef, undef);
 
@@ -234,7 +234,7 @@ sub domainname {
   # Assumption: If the host name does not contain a period
   # and the domain name does, then assume that they are correct
   # this helps to eliminate calls to gethostbyname, and therefore
-  # eleminate DNS lookups
+  # eliminate DNS lookups
 
   return $fqdn = $host . "." . $domain
     if (defined $host

diff --git a/cpan/libnet/Net/FTP.pm b/cpan/libnet/Net/FTP.pm
index 1c0deb2..01e3649 100644 (file)
--- a/cpan/libnet/Net/FTP.pm
+++ b/cpan/libnet/Net/FTP.pm
@@ -21,11 +21,11 @@ use Net::Cmd;
 use Net::Config;
 use Fcntl qw(O_WRONLY O_RDONLY O_APPEND O_CREAT O_TRUNC);
 
-$VERSION = '2.77_3';
+$VERSION = '2.78';
 @ISA     = qw(Exporter Net::Cmd IO::Socket::INET);
 
 # Someday I will "use constant", when I am not bothered to much about
-# compatability with older releases of perl
+# compatibility with older releases of perl
 
 use vars qw($TELNET_IAC $TELNET_IP $TELNET_DM);
 ($TELNET_IAC, $TELNET_IP, $TELNET_DM) = (255, 244, 242);

diff --git a/cpan/libnet/Net/FTP/dataconn.pm b/cpan/libnet/Net/FTP/dataconn.pm
index 64eaeec..3f93668 100644 (file)
--- a/cpan/libnet/Net/FTP/dataconn.pm
+++ b/cpan/libnet/Net/FTP/dataconn.pm
@@ -9,7 +9,7 @@ use vars qw(@ISA $timeout $VERSION);
 use Net::Cmd;
 use Errno;
 
-$VERSION = '0.11_02';
+$VERSION = '0.12';
 @ISA     = qw(IO::Socket::INET);
 
 
@@ -27,7 +27,7 @@ sub abort {
   return $data->close
     if ${*$data}{'net_ftp_eof'};
 
-  # for some reason if we continously open RETR connections and not
+  # for some reason if we continuously open RETR connections and not
   # read a single byte, then abort them after a while the server will
   # close our connection, this prevents the unexpected EOF on the
   # command channel -- GMB

diff --git a/cpan/libnet/Net/NNTP.pm b/cpan/libnet/Net/NNTP.pm
index a9a5592..9b6a894 100644 (file)
--- a/cpan/libnet/Net/NNTP.pm
+++ b/cpan/libnet/Net/NNTP.pm
@@ -14,7 +14,7 @@ use Carp;
 use Time::Local;
 use Net::Config;
 
-$VERSION = "2.24_1";
+$VERSION = "2.25";
 @ISA     = qw(Net::Cmd IO::Socket::INET);
 
 
@@ -75,7 +75,7 @@ sub new {
     # talking to innd not nnrpd
     if ($obj->reader) {
 
-      # If reader suceeds the we need to consider this code to determine postok
+      # If reader succeeds the we need to consider this code to determine postok
       $c = $obj->code;
     }
     else {

diff --git a/cpan/libnet/Net/Netrc.pm b/cpan/libnet/Net/Netrc.pm
index 7d153a2..fbe8d6d 100644 (file)
--- a/cpan/libnet/Net/Netrc.pm
+++ b/cpan/libnet/Net/Netrc.pm
@@ -11,7 +11,7 @@ use strict;
 use FileHandle;
 use vars qw($VERSION $TESTING);
 
-$VERSION = "2.13_01";
+$VERSION = "2.14";
 
 my %netrc = ();
 
@@ -27,7 +27,7 @@ sub _readrc {
   }
   else {
 
-    # Some OS's don't have `getpwuid', so we default to $ENV{HOME}
+    # Some OS's don't have "getpwuid", so we default to $ENV{HOME}
     $home = eval { (getpwuid($>))[7] } || $ENV{HOME};
     $home ||= $ENV{HOMEDRIVE} . ($ENV{HOMEPATH} || '') if defined $ENV{HOMEDRIVE};
     if (-e $home . "/.netrc") {
@@ -47,7 +47,7 @@ sub _readrc {
 
   $netrc{default} = undef;
 
-  # OS/2 and Win32 do not handle stat in a way compatable with this check :-(
+  # OS/2 and Win32 do not handle stat in a way compatible with this check :-(
   unless ($^O eq 'os2'
     || $^O eq 'MSWin32'
     || $^O eq 'MacOS'

diff --git a/cpan/libnet/Net/POP3.pm b/cpan/libnet/Net/POP3.pm
index 0d227fd..b79a3bf 100644 (file)
--- a/cpan/libnet/Net/POP3.pm
+++ b/cpan/libnet/Net/POP3.pm
@@ -13,7 +13,7 @@ use Net::Cmd;
 use Carp;
 use Net::Config;
 
-$VERSION = "2.29_01";
+$VERSION = "2.30";
 
 @ISA = qw(Net::Cmd IO::Socket::INET);
 
@@ -484,9 +484,9 @@ sub auth {
     return 0;
     };
 
-  # We dont support sasl mechanisms that encrypt the socket traffic.
+  # We don't support sasl mechanisms that encrypt the socket traffic.
   # todo that we would really need to change the ISA hierarchy
-  # so we dont inherit from IO::Socket, but instead hold it in an attribute
+  # so we don't inherit from IO::Socket, but instead hold it in an attribute
 
   my @cmd = ("AUTH", $client->mechanism);
   my $code;

diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm
index 67a7418..5dba19e 100644 (file)
--- a/cpan/libnet/Net/SMTP.pm
+++ b/cpan/libnet/Net/SMTP.pm
@@ -16,7 +16,7 @@ use IO::Socket;
 use Net::Cmd;
 use Net::Config;
 
-$VERSION = "2.31_2";
+$VERSION = "2.32";
 
 @ISA = qw(Net::Cmd IO::Socket::INET);
 
@@ -147,9 +147,9 @@ sub auth {
   my $client = $sasl->client_new('smtp', ${*$self}{'net_smtp_host'}, 0);
   my $str    = $client->client_start;
 
-  # We dont support sasl mechanisms that encrypt the socket traffic.
+  # We don't support sasl mechanisms that encrypt the socket traffic.
   # todo that we would really need to change the ISA hierarchy
-  # so we dont inherit from IO::Socket, but instead hold it in an attribute
+  # so we don't inherit from IO::Socket, but instead hold it in an attribute
 
   my @cmd = ("AUTH", $client->mechanism);
   my $code;
@@ -860,7 +860,7 @@ to extract the mail address and pass that.
 
 If C<ExactAddresses> is passed to the constructor, then addresses
 should be a valid rfc2821-quoted address, although Net::SMTP will
-accept accept the address surrounded by angle brackets.
+accept the address surrounded by angle brackets.
 
  funny user@domain      WRONG
  "funny user"@domain    RIGHT, recommended

diff --git a/cpan/libnet/Net/libnetFAQ.pod b/cpan/libnet/Net/libnetFAQ.pod
index b729f13..78efe8c 100644 (file)
--- a/cpan/libnet/Net/libnetFAQ.pod
+++ b/cpan/libnet/Net/libnetFAQ.pod
@@ -187,7 +187,7 @@ Net::FTP uses IO::Socket to open the connection and IO::Socket allows
 the port number to be specified as part of the hostname. So this problem
 can be resolved by either passing a Firewall option like C<"hostname:1234">
 or by setting the C<ftp_firewall> option in Net::Config to be a string
-in in the same form.
+in the same form.
 
 =head2 Is it possible to change the file permissions of a file on an FTP server ?
 

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index cbeab2a..69bf85e 100644 (file)
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -183,7 +183,7 @@ needed and a regression introduced in 0.78 has been fixed.
 
 =item *
 
-The libnet module collection has been upgraded from version 1.22 to 1.22_02.
+The libnet module collection has been upgraded from version 1.22 to 1.23.
 
 =item *