From 1fcf8d38d401b230561863d1e40fd41d76e8601c Mon Sep 17 00:00:00 2001 From: Matteo Bigoi Date: Sun, 22 Nov 2020 19:31:47 +0000 Subject: Update libssh2 submodule to track back from https://github.com/libssh2/libssh2 (#205) * Update libssh2 submodule to track back from https://github.com/libssh2/libssh2 * Update sys crate to track latest change from https://github.com/libssh2/libssh2 --- .gitmodules | 4 ++-- Cargo.toml | 4 ++-- README.md | 3 +-- libssh2-sys/Cargo.toml | 4 ++-- libssh2-sys/libssh2 | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7640858..76593a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "libssh2-sys/libssh2"] path = libssh2-sys/libssh2 - url = https://github.com/wez/libssh2 - branch = pr484 + url = https://github.com/libssh2/libssh2 + branch = master diff --git a/Cargo.toml b/Cargo.toml index 91e3240..3a6843f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ssh2" version = "0.9.0" -authors = ["Alex Crichton ", "Wez Furlong "] +authors = ["Alex Crichton ", "Wez Furlong ", "Matteo Bigoi "] license = "MIT/Apache-2.0" keywords = ["ssh"] readme = "README.md" @@ -19,7 +19,7 @@ vendored-openssl = ["libssh2-sys/vendored-openssl"] [dependencies] bitflags = "1.2" libc = "0.2" -libssh2-sys = { path = "libssh2-sys", version = "0.2.19" } +libssh2-sys = { path = "libssh2-sys", version = "0.2.20" } parking_lot = "0.10" [dev-dependencies] diff --git a/README.md b/README.md index d0acdf3..4915594 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # ssh2-rs -[![Build Status](https://travis-ci.com/alexcrichton/ssh2-rs.svg?branch=master)](https://travis-ci.com/alexcrichton/ssh2-rs) [![Build Status](https://github.com/alexcrichton/ssh2-rs/workflows/linux/badge.svg)](https://github.com/alexcrichton/ssh2-rs/actions?workflow=linux) [![Build Status](https://github.com/alexcrichton/ssh2-rs/workflows/Windows/badge.svg)](https://github.com/alexcrichton/ssh2-rs/actions?workflow=Windows) [![Build Status](https://github.com/alexcrichton/ssh2-rs/workflows/macOS/badge.svg)](https://github.com/alexcrichton/ssh2-rs/actions?workflow=macOS) @@ -14,7 +13,7 @@ Rust bindings to libssh2, an ssh client library. ```toml # Cargo.toml [dependencies] -ssh2 = "0.8" +ssh2 = "0.9" ``` ## Building on OSX 10.10+ diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml index 408d6b0..3960840 100644 --- a/libssh2-sys/Cargo.toml +++ b/libssh2-sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "libssh2-sys" -version = "0.2.19" -authors = ["Alex Crichton ", "Wez Furlong "] +version = "0.2.20" +authors = ["Alex Crichton ", "Wez Furlong ", "Matteo Bigoi "] links = "ssh2" build = "build.rs" license = "MIT/Apache-2.0" diff --git a/libssh2-sys/libssh2 b/libssh2-sys/libssh2 index 6da9d78..cfe0bf6 160000 --- a/libssh2-sys/libssh2 +++ b/libssh2-sys/libssh2 @@ -1 +1 @@ -Subproject commit 6da9d789c79a3bdfee9b9c2fd1cb6982ef805bcd +Subproject commit cfe0bf64985fd6a5db3b45ffc31a2fe3b8fd9948 -- cgit v1.2.3