[libnet-ssh2-perl] 01/01: Imported Upstream version 0.53

[Salvatore Bonaccorso]

This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to annotated tag upstream/0.53
in repository libnet-ssh2-perl.

commit 81ebc50ef4bbdfe8d491c026d63fe27ee2167a09
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sun Sep 8 23:05:20 2013 +0200

    Imported Upstream version 0.53
---
 Changes         |    4 ++++
 META.yml        |    2 +-
 MYMETA.json     |    4 ++--
 MYMETA.yml      |    4 ++--
 Makefile.PL     |   28 ++++++++++++++++++----------
 lib/Net/SSH2.pm |    2 +-
 6 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/Changes b/Changes
index 6ae38cd..476e0bc 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Net::SSH2.
 
+0.53  2013-09-01 06:05:17
+        - add support for ldargs, and LIBSSH2_LIB, LIBSSH2_INCLUDE,
+          LIBSSH2_LDARGS env vars while building (RT#88265)
+
 0.52  2013-08-14 02:43:11
         - detect scp not being installed on the remote and return undef from
           scp_put (krimdomu: Jan) (GitHub PR: #17)
diff --git a/META.yml b/META.yml
index c372e23..40421c1 100644
--- a/META.yml
+++ b/META.yml
@@ -24,4 +24,4 @@ requires:
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://github.com/rkitover/net-ssh2.git
-version: 0.52
+version: 0.53
diff --git a/MYMETA.json b/MYMETA.json
index f7d97fd..a0a923b 100644
--- a/MYMETA.json
+++ b/MYMETA.json
@@ -4,7 +4,7 @@
       "David B. Robins, <dbrobins at cpan.org>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.131560",
+   "generated_by" : "ExtUtils::MakeMaker version 6.72, CPAN::Meta::Converter version 2.131560",
    "license" : [
       "perl_5"
    ],
@@ -37,5 +37,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "0.52"
+   "version" : "0.53"
 }
diff --git a/MYMETA.yml b/MYMETA.yml
index ad0701c..88e2a1c 100644
--- a/MYMETA.yml
+++ b/MYMETA.yml
@@ -7,7 +7,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: 0
 dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.131560'
+generated_by: 'ExtUtils::MakeMaker version 6.72, CPAN::Meta::Converter version 2.131560'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -19,4 +19,4 @@ no_index:
     - inc
 requires:
   perl: 5.006
-version: 0.52
+version: 0.53
diff --git a/Makefile.PL b/Makefile.PL
index 651741e..96dad37 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,16 +4,17 @@ use Config;
 use Module::Install::CheckLib ();
 
 # override library and include directories here if desired
-my $lib = '';
-my $inc = '';
-my $extra_libs = '-lz';
+my $lib = $ENV{LIBSSH2_LIB} || '';
+my $inc = $ENV{LIBSSH2_INCLUDE} || '';
+my $extra_libs = '-lz' . ($ENV{LIBSSH2_LDARGS} ? (' ' . $ENV{LIBSSH2_LDARGS}) : '');
+my $ldargs; # from command line
 my $use_gcrypt = 0;
 
 my @args = @ARGV;
 my @pass_through_args;
 while (my $arg = shift @args) {
-    if (my ($param, $val) = $arg =~ /^(inc|lib)=(.*)\z/) {
-        my $var = $param eq 'inc' ? \$inc : \$lib;
+    if (my ($param, $val) = $arg =~ /^(inc|lib|ldargs)=(.*)\z/) {
+        my $var = $param eq 'inc' ? \$inc : ($param eq 'lib' ? \$lib : \$ldargs);
         $$var   = $val;
         next;
     }
@@ -43,6 +44,8 @@ else {
   }
 }
 
+$extra_libs = "$extra_libs $ldargs" if $ldargs;
+
 my $defines = '';
 $defines .= '-DLIBSSH2_WIN32 ' if $win32;
 $defines .= '-DUSE_GCRYPT ' if $use_gcrypt;
@@ -84,16 +87,21 @@ my @search_incs = grep -d, map "$_/include", @search_paths;
 print <<'EOF';
 
 The libssh2 library is required by this module.  If you don't have it, you can
-download it from http://www.libssh2.org; you may also need OpenSSL, which can be
-obtained from http://www.openssl.org, or libgcrypt, which can be obtained from
-http://www.gnupg.org.
+download it from http://www.libssh2.org; you may also need OpenSSL, which can
+be obtained from http://www.openssl.org , or libgcrypt, which can be obtained
+from http://www.gnupg.org .
 
 Debian:   sudo aptitude install libssh2-1-dev
 OpenSUSE: sudo zypper in libssh2-1 libssh2-devel
 
-You can pass your libssh2 lib and include dirs on the command line. E.g.:
+You can pass your libssh2 lib and include dirs (and extra link args) on the
+command line. E.g.:
+
+    perl Makefile.PL lib=$HOME/libssh2/lib inc=$HOME/libssh2/include \
+        ldargs="-lz"
 
-    perl Makefile.PL lib=$HOME/libssh2/lib inc=$HOME/libssh2/include
+These can also be set through the LIBSSH2_LIB/LIBSSH2_INCLUDE/LIBSSH2_LDARGS
+environment variables.
 
 To build with libgcrypt instead of OpenSSL, pass 'gcrypt' as a parameter to
 Makefile.PL, e.g.:
diff --git a/lib/Net/SSH2.pm b/lib/Net/SSH2.pm
index b7c0ca2..d585141 100644
--- a/lib/Net/SSH2.pm
+++ b/lib/Net/SSH2.pm
@@ -208,7 +208,7 @@ our %EXPORT_TAGS = (
 
 our @EXPORT_OK = @{$EXPORT_TAGS{all}};
 
-our $VERSION = '0.52';
+our $VERSION = '0.53';
 
 # methods
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-ssh2-perl.git