Sync with libnet 1.15

p4raw-id: //depot/perl@19758

diff --git a/lib/Net/ChangeLog.libnet b/lib/Net/ChangeLog.libnet
index 259d623..cf6e64d 100644 (file)
--- a/lib/Net/ChangeLog.libnet
+++ b/lib/Net/ChangeLog.libnet
@@ -1,3 +1,20 @@
+Change 818 on 2003/06/13 by <gbarr@pobox.com> (Graham Barr)
+
+       Net::FTP
+       - Fix merge error spotted by Slaven Rezic
+
+Change 817 on 2003/06/13 by <gbarr@pobox.com> (Graham Barr)
+
+       Set INSTALLDIRS to 'perl' for perl >= 5.008
+
+Change 816 on 2003/06/13 by <gbarr@pobox.com> (Graham Barr)
+
+       Add SIGNATURE
+
+Change 806 on 2003/06/02 by <gbarr@pobox.com> (Graham Barr)
+
+       Release 1.14
+
 Change 805 on 2003/06/02 by <gbarr@pobox.com> (Graham Barr)
 
        Net::Cmd

diff --git a/lib/Net/FTP.pm b/lib/Net/FTP.pm
index 19420a1..ce402b0 100644 (file)
--- a/lib/Net/FTP.pm
+++ b/lib/Net/FTP.pm
@@ -22,7 +22,7 @@ use Net::Config;
 use Fcntl qw(O_WRONLY O_RDONLY O_APPEND O_CREAT O_TRUNC);
 # use AutoLoader qw(AUTOLOAD);
 
-$VERSION = "2.69"; # $Id: //depot/libnet/Net/FTP.pm#75 $
+$VERSION = "2.70"; # $Id: //depot/libnet/Net/FTP.pm#76 $
 @ISA     = qw(Exporter Net::Cmd IO::Socket::INET);
 
 # Someday I will "use constant", when I am not bothered to much about
@@ -392,6 +392,9 @@ sub type
 
  ${*$ftp}{'net_ftp_type'} = join(" ",$type,@_);
 
+ $oldval;
+}
+
 sub alloc
 {
  my $ftp = shift;
@@ -409,9 +412,6 @@ sub alloc
  $oldval;
 }
 
- $oldval;
-}
-
 sub abort
 {
  my $ftp = shift;
@@ -1766,6 +1766,6 @@ under the same terms as Perl itself.
 
 =for html <hr>
 
-I<$Id: //depot/libnet/Net/FTP.pm#75 $>
+I<$Id: //depot/libnet/Net/FTP.pm#76 $>
 
 =cut