From 426a610ebfd2d8451730b3b726cd310ca4a88c84 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 13 Jul 2023 14:03:01 +0200 Subject: [PATCH] Update to version 0.3.0; Fixes RHBZ#2162920 --- .gitignore | 1 + libssh2-sys-fix-metadata-auto.diff | 9 ++++++--- libssh2-sys-fix-metadata.diff | 8 +++++--- rust-libssh2-sys.spec | 6 +++--- sources | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index cc69c4e..1ee64c4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /libssh2-sys-0.2.20.crate /libssh2-sys-0.2.21.crate /libssh2-sys-0.2.23.crate +/libssh2-sys-0.3.0.crate diff --git a/libssh2-sys-fix-metadata-auto.diff b/libssh2-sys-fix-metadata-auto.diff index c863000..e7b29c8 100644 --- a/libssh2-sys-fix-metadata-auto.diff +++ b/libssh2-sys-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- libssh2-sys-0.2.23/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ libssh2-sys-0.2.23/Cargo.toml 2023-05-22T20:34:08.770958+00:00 -@@ -38,13 +38,8 @@ +--- libssh2-sys-0.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libssh2-sys-0.3.0/Cargo.toml 2023-07-13T11:57:38.558993+00:00 +@@ -43,16 +43,10 @@ version = "0.3.11" [features] @@ -9,10 +9,13 @@ +openssl-on-win32 = [] +vendored-openssl = [] zlib-ng-compat = ["libz-sys/zlib-ng"] +- -[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] -version = "0.2" + [target."cfg(unix)".dependencies.openssl-sys] version = "0.9.35" + -[target."cfg(windows)".dependencies.openssl-sys] -version = "0.9.35" -optional = true diff --git a/libssh2-sys-fix-metadata.diff b/libssh2-sys-fix-metadata.diff index b9f628c..9b59653 100644 --- a/libssh2-sys-fix-metadata.diff +++ b/libssh2-sys-fix-metadata.diff @@ -1,6 +1,6 @@ ---- libssh2-sys-0.2.23/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ libssh2-sys-0.2.23/Cargo.toml 2023-05-22T20:34:14.292984+00:00 -@@ -37,9 +37,5 @@ +--- libssh2-sys-0.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libssh2-sys-0.3.0/Cargo.toml 2023-07-13T11:58:09.757124+00:00 +@@ -42,11 +42,6 @@ [build-dependencies.pkg-config] version = "0.3.11" @@ -8,5 +8,7 @@ -openssl-on-win32 = [] -vendored-openssl = [] -zlib-ng-compat = ["libz-sys/zlib-ng"] +- [target."cfg(unix)".dependencies.openssl-sys] version = "0.9.35" + diff --git a/rust-libssh2-sys.spec b/rust-libssh2-sys.spec index 9c9758a..993aa2d 100644 --- a/rust-libssh2-sys.spec +++ b/rust-libssh2-sys.spec @@ -5,7 +5,7 @@ %global crate libssh2-sys Name: rust-libssh2-sys -Version: 0.2.23 +Version: 0.3.0 Release: %autorelease Summary: Native bindings to the libssh2 library @@ -14,8 +14,8 @@ License: MIT OR Apache-2.0 URL: https://crates.io/crates/libssh2-sys Source0: %{crates_source} # https://github.com/alexcrichton/ssh2-rs/issues/289 -Source1: https://github.com/alexcrichton/ssh2-rs/raw/libssh2-sys-0.2.23/LICENSE-APACHE -Source2: https://github.com/alexcrichton/ssh2-rs/raw/libssh2-sys-0.2.23/LICENSE-MIT +Source1: https://github.com/alexcrichton/ssh2-rs/raw/libssh2-sys-0.3.0/LICENSE-APACHE +Source2: https://github.com/alexcrichton/ssh2-rs/raw/libssh2-sys-0.3.0/LICENSE-MIT # Automatically generated patch to strip foreign dependencies Patch: libssh2-sys-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes diff --git a/sources b/sources index 659cd49..5446c8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libssh2-sys-0.2.23.crate) = 9617fb1d5826dacce23658b42e3eb3f8427b33db1b5a4424081e148bd90a3f776aa50ef66183c93ae19086d64321fc10b19b1a496c3feb12a669c7313cdf39cf +SHA512 (libssh2-sys-0.3.0.crate) = cb8dfeade699d97fa5fa393bd87315f44810731f78458267ab098a08d949fde47fd57b64ed3e882c10a83ffff8f869de13eda50c72e140f57d802fa07650403d