From b04560f589cbd85212041dd8c6e95083225dd80d Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 13 Jul 2023 14:03:38 +0200
Subject: [PATCH] Update to version 0.15.2+1.6.4; Fixes RHBZ#2112152

---
 .gitignore                                    |  1 +
 ...ith-vendored-libgit2-unconditionally.patch | 22 +++++++------------
 libgit2-sys-fix-metadata.diff                 |  8 +++----
 rust-libgit2-sys.spec                         |  7 +++---
 sources                                       |  2 +-
 5 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index eb92306..ea928a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /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
+/libgit2-sys-0.15.2+1.6.4.crate
diff --git a/0001-build-with-vendored-libgit2-unconditionally.patch b/0001-build-with-vendored-libgit2-unconditionally.patch
index f3bfc46..d970241 100644
--- a/0001-build-with-vendored-libgit2-unconditionally.patch
+++ b/0001-build-with-vendored-libgit2-unconditionally.patch
@@ -1,17 +1,17 @@
-From b2a2a074e167993e5ece5219db410be24eea5cef Mon Sep 17 00:00:00 2001
+From 9da92f6c0981aae2f4e6267e4a1cb4eaf0b92357 Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
-Date: Mon, 29 May 2023 22:43:19 +0200
+Date: Thu, 13 Jul 2023 13:53:24 +0200
 Subject: [PATCH] build with vendored libgit2 unconditionally
 
 ---
- build.rs | 18 ------------------
- 1 file changed, 18 deletions(-)
+ build.rs | 12 ------------
+ 1 file changed, 12 deletions(-)
 
 diff --git a/build.rs b/build.rs
-index e888b94..a3ea132 100644
+index 24df572..7b551a7 100644
 --- a/build.rs
 +++ b/build.rs
-@@ -10,24 +10,6 @@ fn main() {
+@@ -10,18 +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,13 +19,7 @@ index e888b94..a3ea132 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.5.1".."1.6.0")
--            .probe("libgit2")
--            .or_else(|_| cfg.range_version("1.4.5".."1.5.0").probe("libgit2"))
--        {
+-        if let Ok(lib) = cfg.range_version("1.6.4".."1.7.0").probe("libgit2") {
 -            for include in &lib.include_paths {
 -                println!("cargo:root={}", include.display());
 -            }
@@ -37,5 +31,5 @@ index e888b94..a3ea132 100644
  
      if !Path::new("libgit2/src").exists() {
 -- 
-2.40.1
+2.41.0
 
diff --git a/libgit2-sys-fix-metadata.diff b/libgit2-sys-fix-metadata.diff
index 686e282..e81f354 100644
--- a/libgit2-sys-fix-metadata.diff
+++ b/libgit2-sys-fix-metadata.diff
@@ -1,11 +1,11 @@
---- 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
+--- libgit2-sys-0.15.2+1.6.4/Cargo.toml	1970-01-01T00:00:01+00:00
++++ libgit2-sys-0.15.2+1.6.4/Cargo.toml	2023-07-13T11:49:40.922952+00:00
 @@ -12,7 +12,7 @@
  [package]
  edition = "2018"
  name = "libgit2-sys"
--version = "0.14.2+1.5.1"
-+version = "0.14.2"
+-version = "0.15.2+1.6.4"
++version = "0.15.2"
  authors = [
      "Josh Triplett <josh@joshtriplett.org>",
      "Alex Crichton <alex@alexcrichton.com>",
diff --git a/rust-libgit2-sys.spec b/rust-libgit2-sys.spec
index efc555a..46dab43 100644
--- a/rust-libgit2-sys.spec
+++ b/rust-libgit2-sys.spec
@@ -3,10 +3,10 @@
 %global debug_package %{nil}
 
 %global crate libgit2-sys
-%global upstream_version 0.14.2+1.5.1
+%global upstream_version 0.15.2+1.6.4
 
 Name:           rust-libgit2-sys
-Version:        0.14.2
+Version:        0.15.2
 Release:        %autorelease
 Summary:        Native bindings to the libgit2 library
 
@@ -36,7 +36,7 @@ Native bindings to the libgit2 library.}
 Summary:        %{summary}
 BuildArch:      noarch
 
-Provides:       bundled(libgit2) = 1.5.1
+Provides:       bundled(libgit2) = 1.6.4
 Provides:       bundled(http-parser) = 2.0
 Provides:       bundled(pcre) = 8.44
 
@@ -51,6 +51,7 @@ use the "%{crate}" crate.
 %license %{crate_instdir}/libgit2/COPYING
 %license %{crate_instdir}/libgit2/deps/http-parser/COPYING
 %license %{crate_instdir}/libgit2/deps/pcre/LICENCE
+%doc %{crate_instdir}/CHANGELOG.md
 %{crate_instdir}/
 
 %package     -n %{name}+default-devel
diff --git a/sources b/sources
index d12b890..cf05c62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libgit2-sys-0.14.2+1.5.1.crate) = eb9602706036ea62ecbc08250f297119a1c51ea09ea86ae8630dc6d0521b74db96d8eccc4106343572eb70d9a156415c017c6a91fb5529100fbed091ff8e7921
+SHA512 (libgit2-sys-0.15.2+1.6.4.crate) = 28b66ffe6da956bd1127aef295b222b55681b25c1820e016284802531f5360e6d21c11c695be569d26a318321868a0ce0b2c848bfcc887f09f47fbaadb13b478