new file mode 100644
@@ -0,0 +1,49 @@
+From 048f65847761514ebccf3cd8a889fef7a0068c07 Mon Sep 17 00:00:00 2001
+From: abhiprd2000 <8292aniarc@gmail.com>
+Date: Thu, 9 Jul 2026 21:22:50 +0530
+Subject: [PATCH] Reject abbreviated forms of unsafe git options
+
+CVE: CVE-2026-67325
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/2ab051697940144545a14d2f4a639c6409c3187f]
+
+Backport Changes:
+- Omitted test/test_clone.py because the current PyPI source
+ archive does not include the test suite and the python3-git
+ recipe does not run it.
+
+(cherry picked from commit 2ab051697940144545a14d2f4a639c6409c3187f)
+Signed-off-by: Yogita Urade <yurade@cisco.com>
+---
+ git/cmd.py | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/git/cmd.py b/git/cmd.py
+index 016d476e38e84439dd325113b4a38133b6d768a0..d6afe26206dd86597cb7bddd653b1de6eca385d9 100644
+--- a/git/cmd.py
++++ b/git/cmd.py
+@@ -740,13 +740,20 @@ class Git(metaclass=_GitMeta):
+ arbitrary commands. These are blocked by default.
+ """
+ # Options can be of the form `foo`, `--foo`, `--foo bar`, or `--foo=bar`.
++ # Git accepts any unambiguous prefix of a long option, so an abbreviated
++ # spelling such as `--upl` for `--upload-pack` must be rejected too. An
++ # option is unsafe if its canonical name is a prefix of any blocked
++ # option's canonical name.
+ canonical_unsafe_options = {cls._canonicalize_option_name(option): option for option in unsafe_options}
+ for option in options:
+- unsafe_option = canonical_unsafe_options.get(cls._canonicalize_option_name(option))
+- if unsafe_option is not None:
+- raise UnsafeOptionError(
+- f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it."
+- )
++ candidate = cls._canonicalize_option_name(option)
++ if not candidate:
++ continue
++ for canonical, unsafe_option in canonical_unsafe_options.items():
++ if canonical.startswith(candidate):
++ raise UnsafeOptionError(
++ f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it."
++ )
+
+ @classmethod
+ def _option_candidates(cls, args: Sequence[Any] = (), kwargs: Optional[Mapping[str, Any]] = None) -> List[str]:
new file mode 100644
@@ -0,0 +1,50 @@
+From 6de6760007664e5e9178b98e616d0b9edc959a53 Mon Sep 17 00:00:00 2001
+From: "GPT 5.6" <codex@openai.com>
+Date: Sun, 12 Jul 2026 13:45:42 +0200
+Subject: [PATCH] Address review feedback about unsafe option abbreviations
+
+The prefix check could reject otherwise allowed one-letter short options when an unrelated blocked long option began with the same character. Keep exact matches for every spelling, but restrict prefix matching to explicit long options and multi-character kwargs.
+
+This addresses the review comment: single-letter short options and kwargs must not be treated as long-option abbreviations. It also adds coverage for abbreviated unsafe kwargs so both clone validation paths remain protected.
+
+CVE: CVE-2026-67325
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/181e8ede7543dbbdcee92756cea260f675316c63]
+
+Backport Changes:
+- Omitted test/test_clone.py, test/test_git.py because the current
+ PyPI source archive does not include the test suite and the
+ python3-git recipe does not run it.
+
+Reviewd-by: Sebastian Thiel <sebastian.thiel@icloud.com>
+(cherry picked from commit 181e8ede7543dbbdcee92756cea260f675316c63)
+Signed-off-by: Yogita Urade <yurade@cisco.com>
+---
+ git/cmd.py | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/git/cmd.py b/git/cmd.py
+index f3f08503..d90092c6 100644
+--- a/git/cmd.py
++++ b/git/cmd.py
+@@ -737,12 +737,20 @@ class Git(metaclass=_GitMeta):
+ # Git accepts any unambiguous prefix of a long option, so an abbreviated
+ # spelling such as `--upl` for `--upload-pack` must be rejected too. An
+ # option is unsafe if its canonical name is a prefix of any blocked
+- # option's canonical name.
++ # option's canonical name. Only long options and multi-character kwargs
++ # can be abbreviations; single-character short options remain exact-match
++ # only.
+ canonical_unsafe_options = {cls._canonicalize_option_name(option): option for option in unsafe_options}
++ options_are_kwargs = all(not option.startswith("-") for option in options)
+ for option in options:
+ candidate = cls._canonicalize_option_name(option)
+ if not candidate:
+ continue
++ unsafe_option = canonical_unsafe_options.get(candidate)
++ if unsafe_option is not None:
++ raise UnsafeOptionError(f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it.")
++ if not (option.startswith("--") or (options_are_kwargs and len(candidate) > 1)):
++ continue
+ for canonical, unsafe_option in canonical_unsafe_options.items():
+ if canonical.startswith(candidate):
+ raise UnsafeOptionError(
@@ -23,6 +23,8 @@ SRC_URI += "file://CVE-2026-42284.patch \
file://CVE-2026-44244_p2.patch \
file://CVE-2026-67326.patch \
file://CVE-2026-67323.patch \
+ file://CVE-2026-67325_p1.patch \
+ file://CVE-2026-67325_p2.patch \
"
SRC_URI[sha256sum] = "35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c"
This patch applies the upstream fix as referenced in [3], using the commit shown in [1] and [2]. [1] https://github.com/gitpython-developers/GitPython/commit/2ab051697940144545a14d2f4a639c6409c3187f [2] https://github.com/gitpython-developers/GitPython/commit/181e8ede7543dbbdcee92756cea260f675316c63 [3] https://nvd.nist.gov/vuln/detail/CVE-2026-67325 Signed-off-by: Yogita Urade <yurade@cisco.com> --- .../python3-git/CVE-2026-67325_p1.patch | 49 ++++++++++++++++++ .../python3-git/CVE-2026-67325_p2.patch | 50 +++++++++++++++++++ .../python/python3-git_3.1.43.bb | 2 + 3 files changed, 101 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-67325_p1.patch create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-67325_p2.patch