diff --git a/backport-CVE-2024-52005.patch b/backport-CVE-2024-52005.patch index 95419f326d7f8d7885ab0776baf78b587fd3caac..cee35cc57957c5cb1f2b770d1600ecaff814c72b 100644 --- a/backport-CVE-2024-52005.patch +++ b/backport-CVE-2024-52005.patch @@ -162,9 +162,9 @@ index 9384cb02d56a04..8ebf1f0743e6b6 100644 + git_config_get_bool("sideband.allowcontrolcharacters", + &allow_control_characters); + - if (!git_config_get_string_tmp(key, &value)) + if (!repo_config_get_string_tmp(the_repository, key, &value)) use_sideband_colors_cached = git_config_colorbool(key, value); - else if (!git_config_get_string_tmp("color.ui", &value)) + else if (!repo_config_get_string_tmp(the_repository, "color.ui", &value)) @@ -63,6 +68,11 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref static void strbuf_add_sanitized(struct strbuf *dest, const char *src, int n) @@ -275,13 +275,13 @@ index 8ebf1f0743e6b6..afd62aa008154b 100644 - git_config_get_bool("sideband.allowcontrolcharacters", - &allow_control_characters); -+ switch (git_config_get_maybe_bool("sideband.allowcontrolcharacters", &i)) { ++ switch (repo_config_get_maybe_bool(the_repository, "sideband.allowcontrolcharacters", &i)) { + case 0: /* Boolean value */ + allow_control_characters = i ? ALLOW_ALL_CONTROL_CHARACTERS : + ALLOW_NO_CONTROL_CHARACTERS; + break; + case -1: /* non-Boolean value */ -+ if (git_config_get_string("sideband.allowcontrolcharacters", ++ if (repo_config_get_string(the_repository, "sideband.allowcontrolcharacters", + &value)) + ; /* huh? `get_maybe_bool()` returned -1 */ + else if (!strcmp(value, "color")) @@ -294,7 +294,7 @@ index 8ebf1f0743e6b6..afd62aa008154b 100644 + break; /* not configured */ + } - if (!git_config_get_string_tmp(key, &value)) + if (!repo_config_get_string_tmp(the_repository, key, &value)) use_sideband_colors_cached = git_config_colorbool(key, value); @@ -66,9 +86,37 @@ void list_config_color_sideband_slots(struct string_list *list, const char *pref list_config_item(list, prefix, keywords[i].keyword); diff --git a/git-2.50.1.tar.xz b/git-2.51.0.tar.xz similarity index 32% rename from git-2.50.1.tar.xz rename to git-2.51.0.tar.xz index 607b6268e1877c48b1d89c5170a21fed9a6e00b3..af37a41c39525fad8a81d87ad741a276fa62472f 100644 --- a/git-2.50.1.tar.xz +++ b/git-2.51.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e3e6c36decbd8f1eedd14d42db6674be03671c2204864befa2a41756c5c8fc4 -size 7880972 +oid sha256:60a7c2251cc2e588d5cd87bae567260617c6de0c22dca9cdbfc4c7d2b8990b62 +size 7857228 diff --git a/git.spec b/git.spec index f5b7b82be82dc5e0918461478201aacbe5ad55ec..1d4b7db8210aa65bcea78323c5ddac0dbd4269a5 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ %global gitexecdir %{_libexecdir}/git-core Name: git -Version: 2.50.1 +Version: 2.51.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 @@ -285,6 +285,9 @@ grep -E "$not_core_re" bin-man-doc-files > git-bin-files %{_mandir}/man7/git*.7.* %changelog +* Tue Aug 19 2025 Funda Wang - 2.51.0-1 +- update to 2.51.0 + * Thu Jul 10 2025 Funda Wang - 2.50.1-1 - update to 2.50.1