From 3b263f09170e396121955d0ddd49f8f4a32560de Mon Sep 17 00:00:00 2001 From: bl-ue <54780737+bl-ue@users.noreply.github.com> Date: Tue, 13 Jul 2021 09:19:51 -0400 Subject: [PATCH 1/4] Fix typo in README (cherry picked from commit fc0794a83dc9afc36cf5ee9402cdd0c3dd93d6dd) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46bc6e6a..cd32c721 100644 --- a/README.md +++ b/README.md @@ -719,7 +719,7 @@ Take a look at the [`CONTRIBUTING.md`](CONTRIBUTING.md) guide. ## Security vulnerabilities -Please contact [David Peter](https://david-peter.de/) via email if you want to report a vulnarability in `bat`. +Please contact [David Peter](https://david-peter.de/) via email if you want to report a vulnerability in `bat`. ## Project goals and alternatives From d8339808a1e0d25717f5239f7896818cc9c68f80 Mon Sep 17 00:00:00 2001 From: David Peter Date: Thu, 29 Jul 2021 20:40:21 +0200 Subject: [PATCH 2/4] Update git2 dependency to fix incompatibility with Rust 1.54 (cherry picked from commit f3d53b79a2d7a51f470ac8a06b6bdd9a4f225e8f) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c78654da..b1ba282e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -460,9 +460,9 @@ dependencies = [ [[package]] name = "git2" -version = "0.13.19" +version = "0.13.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17929de7239dea9f68aa14f94b2ab4974e7b24c1314275ffcc12a7758172fa18" +checksum = "d9831e983241f8c5591ed53f17d874833e2fa82cac2625f3888c50cbfe136cba" dependencies = [ "bitflags", "libc", @@ -587,9 +587,9 @@ checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" [[package]] name = "libgit2-sys" -version = "0.12.20+1.1.0" +version = "0.12.21+1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2f09917e00b9ad194ae72072bb5ada2cca16d8171a43e91ddba2afbb02664b" +checksum = "86271bacd72b2b9e854c3dcfb82efd538f15f870e4c11af66900effb462f6825" dependencies = [ "cc", "libc", From 15c701b19625bf8f8646238eecb28c2f8f43afeb Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 8 Aug 2021 06:32:12 +0200 Subject: [PATCH 3/4] Bump bugreport to 0.4.1 (cherry picked from commit f6975e2acdb10a7c60a7668fbb8b3b43af1c0309) --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1ba282e..bf03f06b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "bugreport" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0e97e538864a7c95d33accbf64c8d354018ba3b6e032502fd0fe7259cf1aa3d" +checksum = "0014b4b2b4f63bfe69c3838470121290cc437fdc79785d408a761a21e8b2404c" dependencies = [ "git-version", "shell-escape", From b146958ecbb8c8c926159509ca7fb32a8573f897 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sat, 21 Aug 2021 19:54:10 +0200 Subject: [PATCH 4/4] Bump version to v0.18.3 --- CHANGELOG.md | 7 +++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 2 +- doc/README-ja.md | 2 +- doc/README-ko.md | 2 +- doc/README-ru.md | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 438c902e..23c454d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,13 @@ +# v0.18.3 + +## Bugfixes + +- Bump `git2` dependency to fix build with Rust 1.54, see #1761 + + # v0.18.2 ## Features diff --git a/Cargo.lock b/Cargo.lock index bf03f06b..e91cf83f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -83,7 +83,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bat" -version = "0.18.2" +version = "0.18.3" dependencies = [ "ansi_colours", "ansi_term 0.12.1", diff --git a/Cargo.toml b/Cargo.toml index 55bc07eb..efd55836 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://github.com/sharkdp/bat" license = "MIT/Apache-2.0" name = "bat" repository = "https://github.com/sharkdp/bat" -version = "0.18.2" +version = "0.18.3" exclude = ["assets/syntaxes/*", "assets/themes/*"] build = "build.rs" edition = '2018' diff --git a/README.md b/README.md index cd32c721..bbc99b9a 100644 --- a/README.md +++ b/README.md @@ -222,7 +222,7 @@ the most recent release of `bat`, download the latest `.deb` package from the [release page](https://github.com/sharkdp/bat/releases) and install it via: ```bash -sudo dpkg -i bat_0.18.2_amd64.deb # adapt version number and architecture +sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture ``` ### On Alpine Linux diff --git a/doc/README-ja.md b/doc/README-ja.md index 527dff77..2636ec27 100644 --- a/doc/README-ja.md +++ b/doc/README-ja.md @@ -202,7 +202,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat batの最新リリースを実行する場合、または Ubuntu/Debian の古いバージョンを使用している場合は、[release page](https://github.com/sharkdp/bat/releases) から最新の `.deb` パッケージをダウンロードし、 次の方法でインストールします: ```bash -sudo dpkg -i bat_0.18.2_amd64.deb # adapt version number and architecture +sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture ``` ### On Alpine Linux diff --git a/doc/README-ko.md b/doc/README-ko.md index 3b6ec101..aa248ad1 100644 --- a/doc/README-ko.md +++ b/doc/README-ko.md @@ -244,7 +244,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat 다음과 같이 `.deb` 패키지를 받아 설치하세요: ```bash -sudo dpkg -i bat_0.18.2_amd64.deb # adapt version number and architecture +sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture ``` ### Alpine Linux에서 diff --git a/doc/README-ru.md b/doc/README-ru.md index e00852fc..516541b7 100644 --- a/doc/README-ru.md +++ b/doc/README-ru.md @@ -185,7 +185,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat [release page](https://github.com/sharkdp/bat/releases) и установить так: ```bash -sudo dpkg -i bat_0.18.2_amd64.deb # измените архитектуру и версию +sudo dpkg -i bat_0.18.3_amd64.deb # измените архитектуру и версию ``` ### Alpine Linux