From 21b82b3cacc97ca77ed9447498a31864998b0306 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sat, 15 Mar 2025 15:28:49 +0800 Subject: [PATCH] 2.49.0 --- backport-CVE-2024-52005.patch | 30 +++++++++++++------------- git-2.48.1.tar.xz => git-2.49.0.tar.xz | 4 ++-- git.spec | 7 ++++-- 3 files changed, 22 insertions(+), 19 deletions(-) rename git-2.48.1.tar.xz => git-2.49.0.tar.xz (32%) diff --git a/backport-CVE-2024-52005.patch b/backport-CVE-2024-52005.patch index 9557730..95419f3 100644 --- a/backport-CVE-2024-52005.patch +++ b/backport-CVE-2024-52005.patch @@ -111,31 +111,31 @@ protections: `sideband.allowControlCharacters`. Signed-off-by: Johannes Schindelin --- - Documentation/config.txt | 2 ++ - Documentation/config/sideband.txt | 5 +++++ + Documentation/config.adoc | 2 ++ + Documentation/config/sideband.adoc | 5 +++++ sideband.c | 10 ++++++++++ t/t5409-colorize-remote-messages.sh | 8 +++++++- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 Documentation/config/sideband.txt -diff --git a/Documentation/config.txt b/Documentation/config.txt +diff --git a/Documentation/config.adoc b/Documentation/config.adoc index 0e93aef86264db..abdbfba9bd756a 100644 ---- a/Documentation/config.txt -+++ b/Documentation/config.txt +--- a/Documentation/config.adoc ++++ b/Documentation/config.adoc @@ -511,6 +511,8 @@ include::config/sequencer.txt[] - include::config/showbranch.txt[] + include::config/showbranch.adoc[] -+include::config/sideband.txt[] ++include::config/sideband.adoc[] + - include::config/sparse.txt[] + include::config/sparse.adoc[] - include::config/splitindex.txt[] -diff --git a/Documentation/config/sideband.txt b/Documentation/config/sideband.txt + include::config/splitindex.adoc[] +diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc new file mode 100644 index 00000000000000..3fb5045cd79581 --- /dev/null -+++ b/Documentation/config/sideband.txt ++++ b/Documentation/config/sideband.adoc @@ -0,0 +1,5 @@ +sideband.allowControlCharacters:: + By default, control characters that are delivered via the sideband @@ -223,15 +223,15 @@ sequences. Signed-off-by: Johannes Schindelin --- - Documentation/config/sideband.txt | 17 ++++++-- + Documentation/config/sideband.adoc | 17 ++++++-- sideband.c | 61 ++++++++++++++++++++++++++--- t/t5409-colorize-remote-messages.sh | 16 +++++++- 3 files changed, 84 insertions(+), 10 deletions(-) -diff --git a/Documentation/config/sideband.txt b/Documentation/config/sideband.txt +diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc index 3fb5045cd79581..f347fd6b33004a 100644 ---- a/Documentation/config/sideband.txt -+++ b/Documentation/config/sideband.txt +--- a/Documentation/config/sideband.adoc ++++ b/Documentation/config/sideband.adoc @@ -1,5 +1,16 @@ sideband.allowControlCharacters:: By default, control characters that are delivered via the sideband diff --git a/git-2.48.1.tar.xz b/git-2.49.0.tar.xz similarity index 32% rename from git-2.48.1.tar.xz rename to git-2.49.0.tar.xz index 7b99ec1..ba6d227 100644 --- a/git-2.48.1.tar.xz +++ b/git-2.49.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c5d545f5dc1eb51e95d2c50d98fdf88b1a36ba1fa30e9ae5d5385c6024f82ad -size 7723580 +oid sha256:618190cf590b7e9f6c11f91f23b1d267cd98c3ab33b850416d8758f8b5a85628 +size 7771796 diff --git a/git.spec b/git.spec index b51f2c5..b2d59e5 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ %global gitexecdir %{_libexecdir}/git-core Name: git -Version: 2.48.1 -Release: 2 +Version: 2.49.0 +Release: 1 Summary: A popular and widely used Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ @@ -285,6 +285,9 @@ grep -E "$not_core_re" bin-man-doc-files > git-bin-files %{_mandir}/man7/git*.7.* %changelog +* Sat Mar 15 2025 Funda Wang - 2.49.0-1 +- update to 2.49.0 + * Fri Jan 17 2025 fuanan - 2.48.1-2 - Fix CVE-2024-52005 -- Gitee