diff options
author | Li Zhou <li.zhou@windriver.com> | 2020-04-27 17:17:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-07 17:32:09 +0100 |
commit | 3412c7b7131fb3b94075d5c654df1908701f64a2 (patch) | |
tree | 17c4ee96873fe37302420e14d1716ac0cc32d6df /meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch | |
parent | cfcd63e044c66b22fcddcbd55df0c2316fe06051 (diff) | |
download | poky-3412c7b7131fb3b94075d5c654df1908701f64a2.tar.gz |
git: Security Advisory - git - CVE-2020-11008
Backport the 1st -- 9th patches listed by
<https://github.com/git/git/compare/v2.17.4...v2.17.5>
to solve CVE-2020-11008.
Also backport the 2nd -- 4th patches listed by
<https://github.com/git/git/compare/v2.17.3...v2.17.4>
for CVE-2020-5260 (not necessary, and only the 1st patch is necessary
for this CVE), because some of the above 9 patches are based on them.
(From OE-Core rev: 63c7f76912f097cdfb95296778c42887b7336925)
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch')
-rw-r--r-- | meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch b/meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch new file mode 100644 index 0000000000..6eb3c16aef --- /dev/null +++ b/meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 70ef9c6ce884b2d466d3d36563f1d2aa31b56443 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jeff King <peff@peff.net> | ||
3 | Date: Wed, 11 Mar 2020 18:11:37 -0400 | ||
4 | Subject: [PATCH 01/12] t/lib-credential: use test_i18ncmp to check stderr | ||
5 | |||
6 | The credential tests have a "check" function which feeds some input to | ||
7 | git-credential and checks the stdout and stderr. We look for exact | ||
8 | matches in the output. For stdout, this makes sense; the output is | ||
9 | the credential protocol. But for stderr, we may be showing various | ||
10 | diagnostic messages, or the prompts fed to the askpass program, which | ||
11 | could be translated. Let's mark them as such. | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | |||
15 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | ||
16 | --- | ||
17 | t/lib-credential.sh | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/t/lib-credential.sh b/t/lib-credential.sh | ||
21 | index 937b831..bb88cc0 100755 | ||
22 | --- a/t/lib-credential.sh | ||
23 | +++ b/t/lib-credential.sh | ||
24 | @@ -19,7 +19,7 @@ check() { | ||
25 | false | ||
26 | fi && | ||
27 | test_cmp expect-stdout stdout && | ||
28 | - test_cmp expect-stderr stderr | ||
29 | + test_i18ncmp expect-stderr stderr | ||
30 | } | ||
31 | |||
32 | read_chunk() { | ||
33 | -- | ||
34 | 1.9.1 | ||
35 | |||