From 9a60816ed92d7a856128b09d5e5bd9c773522224 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Wed, 29 Apr 2020 15:59:47 -0700 Subject: [PATCH] Update to 0.2.17 --- .gitignore | 1 + 0001-build.rs-always-use-pkg-config.patch | 3 ++- rust-libssh2-sys.spec | 5 ++++- sources | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 973ab7f..4f3d058 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libssh2-sys-0.2.14.crate /libssh2-sys-0.2.15.crate /libssh2-sys-0.2.16.crate +/libssh2-sys-0.2.17.crate diff --git a/0001-build.rs-always-use-pkg-config.patch b/0001-build.rs-always-use-pkg-config.patch index 3e5819e..43ad25e 100644 --- a/0001-build.rs-always-use-pkg-config.patch +++ b/0001-build.rs-always-use-pkg-config.patch @@ -12,13 +12,14 @@ diff --git a/build.rs b/build.rs index d4bd6a0..1720f12 100644 --- a/build.rs +++ b/build.rs -@@ -14,16 +14,11 @@ fn main() { +@@ -14,17 +14,11 @@ fn main() { return; } - // The system copy of libssh2 is not used by default because it - // can lead to having two copies of libssl loaded at once. - // See https://github.com/alexcrichton/ssh2-rs/pull/88 +- println!("cargo:rerun-if-env-changed=LIBSSH2_SYS_USE_PKG_CONFIG"); - if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() { - if let Ok(lib) = pkg_config::find_library("libssh2") { - for path in &lib.include_paths { diff --git a/rust-libssh2-sys.spec b/rust-libssh2-sys.spec index 432ad68..ae71c1f 100644 --- a/rust-libssh2-sys.spec +++ b/rust-libssh2-sys.spec @@ -5,7 +5,7 @@ %global crate libssh2-sys Name: rust-%{crate} -Version: 0.2.16 +Version: 0.2.17 Release: 1%{?dist} Summary: Native bindings to the libssh2 library @@ -80,6 +80,9 @@ echo 'pkgconfig(libssh2)' %endif %changelog +* Wed Apr 29 2020 Josh Stone - 0.2.17-1 +- Update to 0.2.17 + * Wed Mar 04 2020 Josh Stone - 0.2.16-1 - Update to 0.2.16 diff --git a/sources b/sources index 911ea4d..2a83ad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libssh2-sys-0.2.16.crate) = ada58da5ba71d577010ecae04504c9542ca5ce13b7d1f56b3408e018d28f7a3b39ab4821e82e1b212fd52a9e80bdc57d944651b33e923602b26153caf81b2400 +SHA512 (libssh2-sys-0.2.17.crate) = b4e4fb75e24c2f27fee43cba1a5aedf72b0629cce8dc08c6ffb337051679e65ca53a8eb02e8ad60923d50fe36b3adc6d295c1b792a786d4cfa1f39bf63ec45a5