commit 0df63a3c1d2d63d9a4e00d3c504aa9c6276f80f3 Author: tigro Date: Mon Jan 15 21:45:44 2024 +0300 import rust-libssh2-sys0.2-0.2.23-1.el9 diff --git a/.rust-libssh2-sys0.2.metadata b/.rust-libssh2-sys0.2.metadata new file mode 100644 index 0000000..e69de29 diff --git a/SOURCES/0001-build.rs-always-use-pkg-config.patch b/SOURCES/0001-build.rs-always-use-pkg-config.patch new file mode 100644 index 0000000..e9e7696 --- /dev/null +++ b/SOURCES/0001-build.rs-always-use-pkg-config.patch @@ -0,0 +1,42 @@ +From 9bc1ff5c78821b5056d4009f19761ad0beb6b6b3 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sat, 14 Jul 2018 09:32:07 +0200 +Subject: [PATCH] build.rs: always use pkg-config + +Signed-off-by: Igor Gnatenko +--- + build.rs | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +diff --git a/build.rs b/build.rs +index d4bd6a0..1720f12 100644 +--- a/build.rs ++++ b/build.rs +@@ -16,20 +16,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 zlib_ng_compat { +- panic!("LIBSSH2_SYS_USE_PKG_CONFIG set, but cannot use zlib-ng-compat with system libssh2"); +- } +- if let Ok(lib) = pkg_config::find_library("libssh2") { +- for path in &lib.include_paths { +- println!("cargo:include={}", path.display()); +- } +- return; ++ if let Ok(lib) = pkg_config::find_library("libssh2") { ++ for path in &lib.include_paths { ++ println!("cargo:include={}", path.display()); + } ++ return; + } + + if !Path::new("libssh2/.git").exists() { +-- +2.22.0 + diff --git a/SOURCES/LICENSE-APACHE b/SOURCES/LICENSE-APACHE new file mode 100644 index 0000000..16fe87b --- /dev/null +++ b/SOURCES/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/SOURCES/LICENSE-MIT b/SOURCES/LICENSE-MIT new file mode 100644 index 0000000..39e0ed6 --- /dev/null +++ b/SOURCES/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2014 Alex Crichton + +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/SOURCES/libssh2-sys-0.2.23.crate b/SOURCES/libssh2-sys-0.2.23.crate new file mode 100644 index 0000000..05c3c88 Binary files /dev/null and b/SOURCES/libssh2-sys-0.2.23.crate differ diff --git a/SOURCES/libssh2-sys-fix-metadata-auto.diff b/SOURCES/libssh2-sys-fix-metadata-auto.diff new file mode 100644 index 0000000..c863000 --- /dev/null +++ b/SOURCES/libssh2-sys-fix-metadata-auto.diff @@ -0,0 +1,18 @@ +--- 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 @@ + version = "0.3.11" + + [features] +-openssl-on-win32 = ["openssl-sys"] +-vendored-openssl = ["openssl-sys/vendored"] ++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/SOURCES/libssh2-sys-fix-metadata.diff b/SOURCES/libssh2-sys-fix-metadata.diff new file mode 100644 index 0000000..b9f628c --- /dev/null +++ b/SOURCES/libssh2-sys-fix-metadata.diff @@ -0,0 +1,12 @@ +--- 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 @@ + [build-dependencies.pkg-config] + version = "0.3.11" + +-[features] +-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/SPECS/rust-libssh2-sys0.2.spec b/SPECS/rust-libssh2-sys0.2.spec new file mode 100644 index 0000000..e89d61b --- /dev/null +++ b/SPECS/rust-libssh2-sys0.2.spec @@ -0,0 +1,100 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.3.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +# Generated by rust2rpm 24 +%bcond_without check +%global debug_package %{nil} + +%global crate libssh2-sys + +Name: rust-libssh2-sys0.2 +Version: 0.2.23 +Release: %autorelease +Summary: Native bindings to the libssh2 library + +# Upstream license specification: MIT/Apache-2.0 +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 +# Automatically generated patch to strip foreign dependencies +Patch: libssh2-sys-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes +# * drop windows-specific dependencies and features +# * drop dependency and feature for unused zlib-ng support +# * drop feature for vendored OpenSSL sources +Patch: libssh2-sys-fix-metadata.diff +# * unconditionally link against system libssh2 with pkg-config +Patch: 0001-build.rs-always-use-pkg-config.patch + +BuildRequires: rust-packaging >= 21 + +%global _description %{expand: +Native bindings to the libssh2 library.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(libssh2) + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +# remove bundled copy of libssh2 sources +rm -rv libssh2/ +%cargo_prep +cp -pav %{SOURCE1} %{SOURCE2} . + +%generate_buildrequires +%cargo_generate_buildrequires +echo 'pkgconfig(libssh2)' + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Mon Jan 15 2024 Arkady L. Shane - 0.2.23-1 +- Rebuilt for MSVSphere 9.3 + +* Thu Jul 13 2023 Fabio Valentini - 0.2.23-1 +- Initial import (libssh2-sys 0.2 compat package)