From 3bd681c8e35f2760015a12992ed96dbe22374b95 Mon Sep 17 00:00:00 2001 From: Ximo Guanter Date: Thu, 13 Apr 2023 08:25:13 +0200 Subject: [PATCH 1/3] Bump libgit2 to 1.6.4 --- CHANGELOG.md | 8 ++++++++ Cargo.toml | 4 ++-- README.md | 4 ++-- libgit2-sys/CHANGELOG.md | 10 ++++++++++ libgit2-sys/Cargo.toml | 2 +- libgit2-sys/build.rs | 2 +- libgit2-sys/libgit2 | 2 +- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d23f46239c..36ee314179 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.17.1 - 2023-04-13 +[0.17.0...0.17.1](https://github.com/rust-lang/git2-rs/compare/0.17.0...0.17.1) + +### Changed + +- Updated to libgit2 [1.6.4](https://github.com/libgit2/libgit2/releases/tag/v1.6.4). + [#935](TODO) + ## 0.17.0 - 2023-04-02 [0.16.1...0.17.0](https://github.com/rust-lang/git2-rs/compare/0.16.1...0.17.0) diff --git a/Cargo.toml b/Cargo.toml index 526e29800a..c3f13f55c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "git2" -version = "0.17.0" +version = "0.17.1" authors = ["Josh Triplett ", "Alex Crichton "] license = "MIT OR Apache-2.0" readme = "README.md" @@ -20,7 +20,7 @@ url = "2.0" bitflags = "1.1.0" libc = "0.2" log = "0.4.8" -libgit2-sys = { path = "libgit2-sys", version = "0.15.0" } +libgit2-sys = { path = "libgit2-sys", version = "0.15.1" } [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies] openssl-sys = { version = "0.9.0", optional = true } diff --git a/README.md b/README.md index a5321126a3..e17d94324f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ libgit2 bindings for Rust. ```toml [dependencies] -git2 = "0.17.0" +git2 = "0.17.1" ``` ## Rust version requirements @@ -16,7 +16,7 @@ stable release as well. ## Version of libgit2 -Currently this library requires libgit2 1.6.3 (or newer patch versions). The +Currently this library requires libgit2 1.6.4 (or newer patch versions). The source for libgit2 is included in the libgit2-sys crate so there's no need to pre-install the libgit2 library, the libgit2-sys crate will figure that and/or build that for you. diff --git a/libgit2-sys/CHANGELOG.md b/libgit2-sys/CHANGELOG.md index 24989fdcdd..19918bfab2 100644 --- a/libgit2-sys/CHANGELOG.md +++ b/libgit2-sys/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 0.15.1+1.6.4 - 2023-04-13 +[0.15.0...0.15.1](https://github.com/rust-lang/git2-rs/compare/libgit2-sys-0.15.0+1.6.3...libgit2-sys-0.15.1+1.6.4) + +### Changed + +- Updated to libgit2 [1.6.4](https://github.com/libgit2/libgit2/releases/tag/v1.6.4). + This brings in many changes, including better SSH host key support on Windows and better SSH host key algorithm negotiation. + 1.6.3 is now the minimum supported version. + [#935](TODO) + ## 0.15.0+1.6.3 - 2023-04-02 [0.14.2...0.15.0](https://github.com/rust-lang/git2-rs/compare/libgit2-sys-0.14.2+1.5.1...libgit2-sys-0.15.0+1.6.3) diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml index b21169ad1e..28a1fec657 100644 --- a/libgit2-sys/Cargo.toml +++ b/libgit2-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libgit2-sys" -version = "0.15.0+1.6.3" +version = "0.15.1+1.6.4" authors = ["Josh Triplett ", "Alex Crichton "] links = "git2" build = "build.rs" diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs index c050fb3874..24df572ef6 100644 --- a/libgit2-sys/build.rs +++ b/libgit2-sys/build.rs @@ -14,7 +14,7 @@ fn main() { let try_to_use_system_libgit2 = !vendored && !zlib_ng_compat; if try_to_use_system_libgit2 { let mut cfg = pkg_config::Config::new(); - if let Ok(lib) = cfg.range_version("1.6.3".."1.7.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()); } diff --git a/libgit2-sys/libgit2 b/libgit2-sys/libgit2 index c058aa87dc..e6325351ce 160000 --- a/libgit2-sys/libgit2 +++ b/libgit2-sys/libgit2 @@ -1 +1 @@ -Subproject commit c058aa87dce4c67a3b86b3349beebd64b7bedcd3 +Subproject commit e6325351ceee58cf56f58bdce61b38907805544f From 55d0e671d7b2357297c9119b821cb87200ab8bef Mon Sep 17 00:00:00 2001 From: Ximo Guanter Date: Thu, 13 Apr 2023 08:27:46 +0200 Subject: [PATCH 2/3] Add links to this PR in changelog --- CHANGELOG.md | 2 +- libgit2-sys/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36ee314179..c77626b6a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ ### Changed - Updated to libgit2 [1.6.4](https://github.com/libgit2/libgit2/releases/tag/v1.6.4). - [#935](TODO) + [#948](https://github.com/rust-lang/git2-rs/pull/948) ## 0.17.0 - 2023-04-02 [0.16.1...0.17.0](https://github.com/rust-lang/git2-rs/compare/0.16.1...0.17.0) diff --git a/libgit2-sys/CHANGELOG.md b/libgit2-sys/CHANGELOG.md index 19918bfab2..ed43fb686c 100644 --- a/libgit2-sys/CHANGELOG.md +++ b/libgit2-sys/CHANGELOG.md @@ -8,7 +8,7 @@ - Updated to libgit2 [1.6.4](https://github.com/libgit2/libgit2/releases/tag/v1.6.4). This brings in many changes, including better SSH host key support on Windows and better SSH host key algorithm negotiation. 1.6.3 is now the minimum supported version. - [#935](TODO) + [#948](https://github.com/rust-lang/git2-rs/pull/948) ## 0.15.0+1.6.3 - 2023-04-02 [0.14.2...0.15.0](https://github.com/rust-lang/git2-rs/compare/libgit2-sys-0.14.2+1.5.1...libgit2-sys-0.15.0+1.6.3) From 8656d0e024b5e902c5e8b0dd50498502e8dd9c40 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sun, 16 Apr 2023 10:46:49 -0700 Subject: [PATCH 3/3] Update 1.6.4 changelog entry. The previous looked to be a copy/paste from the previous one. --- libgit2-sys/CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libgit2-sys/CHANGELOG.md b/libgit2-sys/CHANGELOG.md index ed43fb686c..c92232431a 100644 --- a/libgit2-sys/CHANGELOG.md +++ b/libgit2-sys/CHANGELOG.md @@ -6,8 +6,7 @@ ### Changed - Updated to libgit2 [1.6.4](https://github.com/libgit2/libgit2/releases/tag/v1.6.4). - This brings in many changes, including better SSH host key support on Windows and better SSH host key algorithm negotiation. - 1.6.3 is now the minimum supported version. + This brings in a minor fix on Windows when the ProgramData directory does not exist. [#948](https://github.com/rust-lang/git2-rs/pull/948) ## 0.15.0+1.6.3 - 2023-04-02