From 0a72c4bbafd9d0cf8a12aee9cef47e8785d0aa8b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 30 May 2023 00:56:04 +0200 Subject: [PATCH] Update to version 0.14.2+1.5.1 --- .gitignore | 1 + ...ith-vendored-libgit2-unconditionally.patch | 20 ++++++++++--------- README.md | 3 --- libgit2-sys-fix-metadata.diff | 10 +++++----- rust-libgit2-sys.spec | 10 +++++----- sources | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 README.md diff --git a/.gitignore b/.gitignore index 1c97f13..eb92306 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /libgit2-sys-0.12.26+1.3.0.crate /libgit2-sys-0.13.4+1.4.2.crate /libgit2-sys-0.13.5+1.4.5.crate +/libgit2-sys-0.14.2+1.5.1.crate diff --git a/0001-build-with-vendored-libgit2-unconditionally.patch b/0001-build-with-vendored-libgit2-unconditionally.patch index e11ae2a..f3bfc46 100644 --- a/0001-build-with-vendored-libgit2-unconditionally.patch +++ b/0001-build-with-vendored-libgit2-unconditionally.patch @@ -1,17 +1,17 @@ -From d62d7eeb071fc93a3238aa068e0220c85918f140 Mon Sep 17 00:00:00 2001 +From b2a2a074e167993e5ece5219db410be24eea5cef Mon Sep 17 00:00:00 2001 From: Fabio Valentini -Date: Sat, 21 Jan 2023 20:46:45 +0100 +Date: Mon, 29 May 2023 22:43:19 +0200 Subject: [PATCH] build with vendored libgit2 unconditionally --- - build.rs | 16 ---------------- - 1 file changed, 16 deletions(-) + build.rs | 18 ------------------ + 1 file changed, 18 deletions(-) diff --git a/build.rs b/build.rs -index acb5aa4..526aedd 100644 +index e888b94..a3ea132 100644 --- a/build.rs +++ b/build.rs -@@ -10,22 +10,6 @@ fn main() { +@@ -10,24 +10,6 @@ fn main() { let vendored = env::var("CARGO_FEATURE_VENDORED").is_ok(); let zlib_ng_compat = env::var("CARGO_FEATURE_ZLIB_NG_COMPAT").is_ok(); @@ -19,10 +19,12 @@ index acb5aa4..526aedd 100644 - let try_to_use_system_libgit2 = !vendored && !zlib_ng_compat; - if try_to_use_system_libgit2 { - let mut cfg = pkg_config::Config::new(); +- // These version ranges specifically request a version that includes +- // the SSH fixes for CVE-2023-22742 (1.5.1+ or 1.4.5+). - if let Ok(lib) = cfg -- .range_version("1.4.5".."1.5.0") -- .print_system_libs(false) +- .range_version("1.5.1".."1.6.0") - .probe("libgit2") +- .or_else(|_| cfg.range_version("1.4.5".."1.5.0").probe("libgit2")) - { - for include in &lib.include_paths { - println!("cargo:root={}", include.display()); @@ -35,5 +37,5 @@ index acb5aa4..526aedd 100644 if !Path::new("libgit2/src").exists() { -- -2.39.1 +2.40.1 diff --git a/README.md b/README.md deleted file mode 100644 index b16a9d6..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-libgit2-sys - -The rust-libgit2-sys package \ No newline at end of file diff --git a/libgit2-sys-fix-metadata.diff b/libgit2-sys-fix-metadata.diff index 40bc501..686e282 100644 --- a/libgit2-sys-fix-metadata.diff +++ b/libgit2-sys-fix-metadata.diff @@ -1,11 +1,11 @@ ---- libgit2-sys-0.13.5+1.4.5/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ libgit2-sys-0.13.5+1.4.5/Cargo.toml 2023-01-21T19:35:28.384059+00:00 +--- libgit2-sys-0.14.2+1.5.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libgit2-sys-0.14.2+1.5.1/Cargo.toml 2023-05-29T20:38:44.883195+00:00 @@ -12,7 +12,7 @@ [package] edition = "2018" name = "libgit2-sys" --version = "0.13.5+1.4.5" -+version = "0.13.5" +-version = "0.14.2+1.5.1" ++version = "0.14.2" authors = [ "Josh Triplett ", "Alex Crichton ", @@ -14,7 +14,7 @@ ] description = "Native bindings to the libgit2 library" -license = "MIT OR Apache-2.0" -+license = "MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause" ++license = "(MIT OR Apache-2.0) AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT" repository = "https://github.com/rust-lang/git2-rs" [lib] diff --git a/rust-libgit2-sys.spec b/rust-libgit2-sys.spec index 383a576..efc555a 100644 --- a/rust-libgit2-sys.spec +++ b/rust-libgit2-sys.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm 23 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate libgit2-sys -%global upstream_version 0.13.5+1.4.5 +%global upstream_version 0.14.2+1.5.1 Name: rust-libgit2-sys -Version: 0.13.5 +Version: 0.14.2 Release: %autorelease Summary: Native bindings to the libgit2 library @@ -14,7 +14,7 @@ Summary: Native bindings to the libgit2 library # * bundled libgit2: GPL-2.0-only WITH GCC-exception-2.0 # * bundled http-parser: MIT # * bundled pcre: BSD-3-Clause -License: MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause +License: (MIT OR Apache-2.0) AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT URL: https://crates.io/crates/libgit2-sys Source: %{crates_source %{crate} %{upstream_version}} # Manually created patch for downstream crate metadata changes @@ -36,7 +36,7 @@ Native bindings to the libgit2 library.} Summary: %{summary} BuildArch: noarch -Provides: bundled(libgit2) = 1.4.5 +Provides: bundled(libgit2) = 1.5.1 Provides: bundled(http-parser) = 2.0 Provides: bundled(pcre) = 8.44 diff --git a/sources b/sources index 2366506..d12b890 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgit2-sys-0.13.5+1.4.5.crate) = 0f35f819b873113f7e1dab7074dd873bc9f2893e2ae76b35f0a5d38e54a88dc53ed1bd91aba634d8b3d84aa3cb9908b04ca807c1a6ef075ec164ff46530696f8 +SHA512 (libgit2-sys-0.14.2+1.5.1.crate) = eb9602706036ea62ecbc08250f297119a1c51ea09ea86ae8630dc6d0521b74db96d8eccc4106343572eb70d9a156415c017c6a91fb5529100fbed091ff8e7921