Merge branch 'libssh2-1.7.0'

Author: conormcd

resources/darwin/libssh2.dylib

@@ -150,7 +150,7 @@
   (log/info "Opening a new channel to receive a file using SCP.")
   (let [fileinfo (Stat/newInstance)]
     {:channel (block-return session
-                (libssh2-scp/recv (:session session) remote-path fileinfo))
+                (libssh2-scp/recv2 (:session session) remote-path fileinfo))
      :fileinfo fileinfo}))
 
 (defn open-scp-send

resources/linux-x86-64/libssh2.so

@@ -5,12 +5,12 @@
 ; prefix since we have real namespaces in Clojure. Other constants defined in
 ; libssh2.h are replicated here without alteration.
 
-(def VERSION "1.6.0")
+(def VERSION "1.7.0")
 (def VERSION_MAJOR 1)
-(def VERSION_MINOR 6)
+(def VERSION_MINOR 7)
 (def VERSION_PATCH 0)
-(def VERSION_NUM 0x010600)
-(def SSH_BANNER "SSH-1.0-libssh2_1.6.0")
+(def VERSION_NUM 0x010700)
+(def SSH_BANNER "SSH-1.0-libssh2_1.7.0")
 (def SSH_DEFAULT_BANNER SSH_BANNER)
 (def SSH_DEFAULT_BANNER_WITH_CRLF (str SSH_DEFAULT_BANNER "\r\n"))
 

src/clj_libssh2/channel.clj

@@ -4,13 +4,20 @@
   (:require [net.n01se.clojure-jna :as jna])
   (:import [com.sun.jna Pointer]))
 
-(def ^{:arglists '([session path sb])} recv
+(def ^{:arglists '([session path sb]) :deprecated "libssh2"} recv
   "
    LIBSSH2_CHANNEL *libssh2_scp_recv(LIBSSH2_SESSION *session,
                                      const char *path,
                                      struct stat *sb);"
   (jna/to-fn Pointer ssh2/libssh2_scp_recv))
 
+(def ^{:arglists '([session path sb])} recv2
+  "
+   LIBSSH2_CHANNEL *libssh2_scp_recv(LIBSSH2_SESSION *session,
+                                     const char *path,
+                                     libssh2_struct_stat *sb);"
+  (jna/to-fn Pointer ssh2/libssh2_scp_recv2))
+
 (def ^{:arglists '([session path mode size mtime atime]) :deprecated "libssh2"} send-ex
   "
    LIBSSH2_CHANNEL *libssh2_scp_send_ex(LIBSSH2_SESSION *session,

src/clj_libssh2/libssh2.clj

@@ -7,4 +7,4 @@
 
 (deftest check-libssh2-version-is-ok
   "This shoudln't change by surprise!"
-  (is (= "1.6.0" (libssh2/version 0))))
+  (is (= "1.7.0" (libssh2/version 0))))