r46374 - in /branches/upstream/libnet-ssh2-perl/current: Changes META.yml Makefile.PL SSH2.xs lib/Net/SSH2.pm t/Net-SSH2.t
carnil-guest at users.alioth.debian.org
carnil-guest at users.alioth.debian.org
Sun Oct 25 13:22:43 UTC 2009
Author: carnil-guest
Date: Sun Oct 25 13:22:38 2009
New Revision: 46374
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46374
Log:
[svn-upgrade] Integrating new upstream version, libnet-ssh2-perl (0.28)
Modified:
branches/upstream/libnet-ssh2-perl/current/Changes
branches/upstream/libnet-ssh2-perl/current/META.yml
branches/upstream/libnet-ssh2-perl/current/Makefile.PL
branches/upstream/libnet-ssh2-perl/current/SSH2.xs
branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm
branches/upstream/libnet-ssh2-perl/current/t/Net-SSH2.t
Modified: branches/upstream/libnet-ssh2-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/Changes?rev=46374&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/Changes (original)
+++ branches/upstream/libnet-ssh2-perl/current/Changes Sun Oct 25 13:22:38 2009
@@ -2,6 +2,10 @@
Developer/maintainer: David B. Robins <dbrobins at cpan.org>.
Project started 2005-10-23 in Redmond, Washington, USA.
+
+0.28 2009-10-24 07:27:42
+ - added patch to find 64bit libs from H.Merijn Brand
+ - fix breakage on versions < 1.0 related to the pty functions
0.27 2009-09-10 06:54:58
- reverting a bad release
Modified: branches/upstream/libnet-ssh2-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/META.yml?rev=46374&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/META.yml (original)
+++ branches/upstream/libnet-ssh2-perl/current/META.yml Sun Oct 25 13:22:38 2009
@@ -21,7 +21,7 @@
provides:
Net::SSH2:
file: lib/Net/SSH2.pm
- version: 0.27
+ version: 0.28
Net::SSH2::Channel:
file: lib/Net/SSH2/Channel.pm
Net::SSH2::Dir:
@@ -39,4 +39,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: git://github.com/rkitover/net-ssh2.git
-version: 0.27
+version: 0.28
Modified: branches/upstream/libnet-ssh2-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/Makefile.PL?rev=46374&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/Makefile.PL (original)
+++ branches/upstream/libnet-ssh2-perl/current/Makefile.PL Sun Oct 25 13:22:38 2009
@@ -1,4 +1,4 @@
-use inc::Module::Install;
+use inc::Module::Install 0.91;
use Cwd;
use Config;
@@ -17,14 +17,14 @@
my @search_paths = (
$Config{siteprefixexp}, $Config{prefixexp},
- '/usr', '/usr/local', '/opt',
+ '/usr/local/ssl', '/usr', '/usr/local', '/opt', '/',
$ENV{HOME}
);
my %uniq;
@uniq{@search_paths} = ();
@search_paths = keys %uniq;
-my @search_libs = grep -d, map "$_/lib", @search_paths;
+my @search_libs = grep -d, map {($_.64,$_)} map "$_/lib", @search_paths;
my @search_incs = grep -d, map "$_/include", @search_paths;
print <<'EOF';
@@ -33,8 +33,8 @@
download it from http://www.libssh2.org; you may also need OpenSSL, which can be
obtained from http://www.openssl.org.
-On Debian do:
-sudo aptitude install libssh2-1-dev
+Debian: sudo aptitude install libssh2-1-dev
+OpenSUSE: sudo zypper in libssh2-1 libssh2-devel
EOF
Modified: branches/upstream/libnet-ssh2-perl/current/SSH2.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/SSH2.xs?rev=46374&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/SSH2.xs (original)
+++ branches/upstream/libnet-ssh2-perl/current/SSH2.xs Sun Oct 25 13:22:38 2009
@@ -1166,6 +1166,8 @@
clear_error(ch->ss);
XSRETURN_IV(libssh2_channel_get_exit_status(ch->channel));
+#if LIBSSH2_VERSION_MAJOR >= 1
+
void
net_ch_pty(SSH2_CHANNEL* ch, SV* terminal, SV* modes = NULL, \
int width = 0, int height = 0)
@@ -1217,6 +1219,21 @@
XSRETURN_IV(!libssh2_channel_request_pty_size_ex(ch->channel,
width, height, width_px, height_px));
+
+#else
+
+void
+net_ch_pty(SSH2_CHANNEL* ch, SV* terminal, SV* modes = NULL, \
+ int width = 0, int height = 0)
+CODE:
+ croak("libssh2 version 1.0 or higher required for PTY support");
+
+void
+net_ch_pty_size(SSH2_CHANNEL* ch, int width = 0, int height = 0)
+CODE:
+ croak("libssh2 version 1.0 or higher required for PTY support");
+
+#endif
void
net_ch_process(SSH2_CHANNEL* ch, SV* request, SV* message = NULL)
Modified: branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm?rev=46374&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm (original)
+++ branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm Sun Oct 25 13:22:38 2009
@@ -188,7 +188,7 @@
our @EXPORT_OK = @{$EXPORT_TAGS{all}};
-our $VERSION = '0.27';
+our $VERSION = '0.28';
$VERSION = eval $VERSION;
# methods
Modified: branches/upstream/libnet-ssh2-perl/current/t/Net-SSH2.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/t/Net-SSH2.t?rev=46374&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/t/Net-SSH2.t (original)
+++ branches/upstream/libnet-ssh2-perl/current/t/Net-SSH2.t Sun Oct 25 13:22:38 2009
@@ -29,10 +29,11 @@
my $version = $ssh2->version();
my ($version2, $vernum, $banner) = $ssh2->version();
is($version, $version2, 'list version match');
-my $major = int($version);
+my ($major) = $version =~ /^(\d+)/;
SKIP: {
skip 'old libssh2', 1 if !defined($vernum);
+ skip 'version not decimal', 1 if ($version =~ y/.//) > 1;
if ($major > 0) {
ok(($vernum >> 8) == ($major << 8) + ($version - $major) * 10,
More information about the Pkg-perl-cvs-commits
mailing list