diff --git a/backport-CVE-2022-23521-attr-fix-silently-splitting-up-lines-longer-than-204.patch b/backport-CVE-2022-23521-attr-fix-silently-splitting-up-lines-longer-than-204.patch index 681f52a35a8301a8452324a18b4ba1ea10a3fd8d..15fa388ef0b9626d33e2e6b6c185c437faeba29e 100644 --- a/backport-CVE-2022-23521-attr-fix-silently-splitting-up-lines-longer-than-204.patch +++ b/backport-CVE-2022-23521-attr-fix-silently-splitting-up-lines-longer-than-204.patch @@ -51,7 +51,7 @@ index a9f7063cfc..41657479ff 100644 + while (strbuf_getline(&buf, fp) != EOF) { + if (!lineno && starts_with(buf.buf, utf8_bom)) + strbuf_remove(&buf, 0, strlen(utf8_bom)); -+ handle_attr_line(res, buf.buf, path, ++lineno, macro_ok); ++ handle_attr_line(res, buf.buf, path, ++lineno, flags); } + fclose(fp); diff --git a/backport-CVE-2022-23521-attr-ignore-overly-large-gitattributes-files.patch b/backport-CVE-2022-23521-attr-ignore-overly-large-gitattributes-files.patch index 4dc1fc46062d486b7a9cf1ec9f1f5b16fcadfc7e..7298732e5c2f95f910d981065416c8b21f88e083 100644 --- a/backport-CVE-2022-23521-attr-ignore-overly-large-gitattributes-files.patch +++ b/backport-CVE-2022-23521-attr-ignore-overly-large-gitattributes-files.patch @@ -45,7 +45,7 @@ index 38ecd2fff3..f9316d14ba 100644 if (flags & READ_ATTR_NOFOLLOW) fd = open_nofollow(path, O_RDONLY); -@@ -725,12 +725,22 @@ static struct attr_stack *read_attr_from_file(const char *path, unsigned flags) +@@ -725,6 +725,16 @@ static struct attr_stack *read_attr_from_file(const char *path, unsigned flags) return NULL; } fp = xfdopen(fd, "r"); @@ -62,13 +62,6 @@ index 38ecd2fff3..f9316d14ba 100644 CALLOC_ARRAY(res, 1); while (strbuf_getline(&buf, fp) != EOF) { - if (!lineno && starts_with(buf.buf, utf8_bom)) - strbuf_remove(&buf, 0, strlen(utf8_bom)); -- handle_attr_line(res, buf.buf, path, ++lineno, macro_ok); -+ handle_attr_line(res, buf.buf, path, ++lineno, flags); - } - - fclose(fp); @@ -730,13 +745,18 @@ static struct attr_stack *read_attr_from_index(const struct index_state *istate, struct attr_stack *res; char *buf, *sp; diff --git a/git.spec b/git.spec index a0b64252a6a0b7db288a29b9eb94b8f07f6cf716..a7121aa419891599eca7071523ce3b7d7f368093 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ %global gitexecdir %{_libexecdir}/git-core Name: git Version: 2.33.0 -Release: 7 +Release: 8 Summary: A popular and widely used Version Control System License: GPLv2+ or LGPLv2.1 URL: https://git-scm.com/ @@ -331,6 +331,12 @@ make %{?_smp_mflags} test %{_mandir}/man7/git*.7.* %changelog +* Tue Jan 31 2023 fuanan - 2.33.0-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Modify parameter in backport-CVE-2022-23521-attr-fix-silently-splitting-up-lines-longer-than-204.patch + * Sat Jan 28 2023 fuanan - 2.33.0-7 - Type:CVE - ID:CVE-2022-41953