From 154caddc12729910806f727e6c93807f382a3434 Mon Sep 17 00:00:00 2001 From: fly_fzc <2385803914@qq.com> Date: Wed, 9 Jul 2025 17:06:10 +0800 Subject: [PATCH] fix malformed patch --- ...384-config-quote-values-containing-CR-character.patch | 2 +- git.spec | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/backport-CVE-2025-48384-config-quote-values-containing-CR-character.patch b/backport-CVE-2025-48384-config-quote-values-containing-CR-character.patch index d5f1010..5f7641d 100644 --- a/backport-CVE-2025-48384-config-quote-values-containing-CR-character.patch +++ b/backport-CVE-2025-48384-config-quote-values-containing-CR-character.patch @@ -60,7 +60,7 @@ diff --git a/t/t1300-config.sh b/t/t1300-config.sh index f4e2752134..1010410b7e 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh -@@ -2590,4 +2590,17 @@ test_expect_success 'includeIf.hasconfig:remote.*.url forbids remote url in such included files' ' +@@ -2590,4 +2590,15 @@ test_expect_success 'includeIf.hasconfig:remote.*.url forbids remote url in such included files' ' grep "fatal: remote URLs cannot be configured in file directly or indirectly included by includeIf.hasconfig:remote.*.url" err ' diff --git a/git.spec b/git.spec index 0337926..dd5dcd7 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ %global gitexecdir %{_libexecdir}/git-core Name: git Version: 2.43.0 -Release: 7 +Release: 8 Summary: A popular and widely used Version Control System License: GPLv2+ or LGPLv2.1 URL: https://git-scm.com/ @@ -311,6 +311,13 @@ make %{?_smp_mflags} test %{_mandir}/man7/git*.7.* %changelog +* Wed Jul 9 2025 fuanan - 2.43.0-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix malformed patch: + backport-CVE-2025-48385-bundle-uri-fix-arbitrary-file-writes-via-parameter-i.patch + * Wed Jul 9 2025 fuanan - 2.43.0-7 - Type:CVE - ID:CVE-2025-48384 CVE-2025-48385 CVE-2025-48386 -- Gitee