r37728 - in /trunk/libnet-ssh2-perl: Changes MANIFEST MANIFEST.SKIP META.yml Makefile.PL SSH2.xs debian/changelog fallback/ lib/Net/SSH2.pm t/Net-SSH2.t

ryan52-guest at users.alioth.debian.org ryan52-guest at users.alioth.debian.org
Sat Jun 6 21:54:31 UTC 2009


Author: ryan52-guest
Date: Sat Jun  6 21:54:21 2009
New Revision: 37728

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=37728
Log:
New upstream release

Added:
    trunk/libnet-ssh2-perl/fallback/
      - copied from r37726, branches/upstream/libnet-ssh2-perl/current/fallback/
Modified:
    trunk/libnet-ssh2-perl/Changes
    trunk/libnet-ssh2-perl/MANIFEST
    trunk/libnet-ssh2-perl/MANIFEST.SKIP
    trunk/libnet-ssh2-perl/META.yml
    trunk/libnet-ssh2-perl/Makefile.PL
    trunk/libnet-ssh2-perl/SSH2.xs
    trunk/libnet-ssh2-perl/debian/changelog
    trunk/libnet-ssh2-perl/lib/Net/SSH2.pm
    trunk/libnet-ssh2-perl/t/Net-SSH2.t

Modified: trunk/libnet-ssh2-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/Changes?rev=37728&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/Changes (original)
+++ trunk/libnet-ssh2-perl/Changes Sat Jun  6 21:54:21 2009
@@ -2,6 +2,9 @@
 
 Developer/maintainer: David B. Robins <dbrobins at cpan.org>.
 Project started 2005-10-23 in Redmond, Washington, USA.
+
+0.21  2009-06-06 21:02:34
+        - some fixes for Cygwin
 
 0.20  2009-06-01 04:17:37
         - Added patch from sisyphus for win32 support for tests.

Modified: trunk/libnet-ssh2-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/MANIFEST?rev=37728&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/MANIFEST (original)
+++ trunk/libnet-ssh2-perl/MANIFEST Sat Jun  6 21:54:21 2009
@@ -1,5 +1,7 @@
 Changes
 example/read.pl
+fallback/const-c.inc
+fallback/const-xs.inc
 inc/Devel/CheckLib.pm
 inc/Module/Install.pm
 inc/Module/Install/Base.pm

Modified: trunk/libnet-ssh2-perl/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/MANIFEST.SKIP?rev=37728&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/MANIFEST.SKIP (original)
+++ trunk/libnet-ssh2-perl/MANIFEST.SKIP Sat Jun  6 21:54:21 2009
@@ -1,13 +1,16 @@
-.svn/
-.git/
-.swp$
-.so$
-.exists$
-.o$
-blib/
-.bs$
-.c$
-.old$
-.bak$
-pm_to_blib$
-Makefile$
+^\.svn/
+^\.git/
+\.swp\z
+\.so\z
+\.exists\z
+\.o\z
+^blib/
+\.bs\z
+\.c\z
+\.old\z
+\.bak\z
+\.tar\.gz\z
+^pm_to_blib\z
+^Makefile\z
+^const-c\.inc\z
+^const-xs\.inc\z

Modified: trunk/libnet-ssh2-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/META.yml?rev=37728&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/META.yml (original)
+++ trunk/libnet-ssh2-perl/META.yml Sat Jun  6 21:54:21 2009
@@ -21,7 +21,7 @@
 provides:
   Net::SSH2:
     file: lib/Net/SSH2.pm
-    version: 0.20
+    version: 0.21
   Net::SSH2::Channel:
     file: lib/Net/SSH2/Channel.pm
   Net::SSH2::Dir:
@@ -38,4 +38,4 @@
   perl: 5.6.0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.20
+version: 0.21

Modified: trunk/libnet-ssh2-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/Makefile.PL?rev=37728&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/Makefile.PL (original)
+++ trunk/libnet-ssh2-perl/Makefile.PL Sat Jun  6 21:54:21 2009
@@ -20,9 +20,12 @@
   '/usr', '/usr/local', '/opt',
   $ENV{HOME}
 );
+my %uniq;
+ at uniq{@search_paths} = ();
+ at search_paths = keys %uniq;
 
-my @search_libs = map "$_/lib", @search_paths;
-my @search_incs = map "$_/include", @search_paths;
+my @search_libs = grep -d, map "$_/lib", @search_paths;
+my @search_incs = grep -d, map "$_/include", @search_paths;
 
 print <<'EOF';
 
@@ -35,11 +38,12 @@
 
 EOF
 
-checklibs 
+checklibs
     lib => 'ssh2',
     header => 'libssh2.h',
-    libpath => [@search_libs, $lib],
-    incpath => [@search_incs, $inc];
+    libpath => [@search_libs, $lib ? $lib : ()],
+    incpath => [@search_incs, $inc ? $inc : ()],
+;
 
 if (!$lib && !$inc) {
     $lib = (join ' ', map "-L$_", @search_libs) . " -lssh2 $extra_libs";
@@ -52,6 +56,7 @@
 auto_provides;
 libs $lib;
 inc "$inc -I.";
+realclean_files qw/const-c.inc const-xs.inc/;
 makemaker_args @define;
 WriteAll;
 

Modified: trunk/libnet-ssh2-perl/SSH2.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/SSH2.xs?rev=37728&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/SSH2.xs (original)
+++ trunk/libnet-ssh2-perl/SSH2.xs Sat Jun  6 21:54:21 2009
@@ -578,7 +578,11 @@
     case G_ARRAY:
         EXTEND(SP, 3);
         ST(0) = sv_2mortal(newSVpv(LIBSSH2_VERSION, 0));
+#ifdef LIBSSH2_VERSION_NUM
         ST(1) = sv_2mortal(newSVuv(LIBSSH2_VERSION_NUM));
+#else
+        ST(1) = &PL_sv_undef;
+#endif
         ST(2) = sv_2mortal(newSVpv(LIBSSH2_SSH_DEFAULT_BANNER, 0));
         XSRETURN(3);
     }

Modified: trunk/libnet-ssh2-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/debian/changelog?rev=37728&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/debian/changelog (original)
+++ trunk/libnet-ssh2-perl/debian/changelog Sat Jun  6 21:54:21 2009
@@ -1,8 +1,12 @@
-libnet-ssh2-perl (0.20-2) UNRELEASED; urgency=low
+libnet-ssh2-perl (0.21-1) UNRELEASED; urgency=low
 
+  [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
- -- Nathan Handler <nhandler at ubuntu.com>  Sat, 06 Jun 2009 01:36:42 +0000
+  [ Ryan Niebur ]
+  * New upstream release
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Sat, 06 Jun 2009 14:54:11 -0700
 
 libnet-ssh2-perl (0.20-1) unstable; urgency=low
 

Modified: trunk/libnet-ssh2-perl/lib/Net/SSH2.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/lib/Net/SSH2.pm?rev=37728&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/lib/Net/SSH2.pm (original)
+++ trunk/libnet-ssh2-perl/lib/Net/SSH2.pm Sat Jun  6 21:54:21 2009
@@ -188,7 +188,7 @@
 
 our @EXPORT_OK = @{$EXPORT_TAGS{all}};
 
-our $VERSION = '0.20';
+our $VERSION = '0.21';
 
 # methods
 

Modified: trunk/libnet-ssh2-perl/t/Net-SSH2.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/t/Net-SSH2.t?rev=37728&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/t/Net-SSH2.t (original)
+++ trunk/libnet-ssh2-perl/t/Net-SSH2.t Sat Jun  6 21:54:21 2009
@@ -4,7 +4,7 @@
 
 #########################
 
-use Test::More tests => 74;
+use Test::More tests => 73;
 
 use strict;
 use File::Basename;
@@ -27,17 +27,20 @@
 
 # (4) version
 my $version = $ssh2->version();
-ok($version >= 0.16, "libSSH2 version $version > 0.16");
 my ($version2, $vernum, $banner) = $ssh2->version();
 is($version, $version2, 'list version match');
 my $major = int($version);
 
-if ($major > 0) {
-  ok(($vernum >> 8) == ($major << 8) + ($version - $major) * 10,
-   'decimal version matches');
-} else {
-  ok(($vernum >> 8) == ($major << 8) + ($version - $major) * 100,
-   'decimal version matches');
+SKIP: {
+    skip 'old libssh2', 1 if !defined($vernum);
+
+    if ($major > 0) {
+      ok(($vernum >> 8) == ($major << 8) + ($version - $major) * 10,
+       'decimal version matches');
+    } else {
+      ok(($vernum >> 8) == ($major << 8) + ($version - $major) * 100,
+       'decimal version matches');
+    }
 }
 
 is($banner, "SSH-2.0-libssh2_$version", "banner is $banner");




More information about the Pkg-perl-cvs-commits mailing list