diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-03-16 20:11:40 +0000 |
---|---|---|
committer | Ross Burton <ross.burton@intel.com> | 2018-03-19 12:15:13 +0000 |
commit | c591f97432047a2add48ff0ec9c20babba2915c6 (patch) | |
tree | 02c5375840c7f20e1d7c092636d51e273ba2b4e8 /recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch | |
parent | 2c168fef0cc3c02f0abd4d3b881478b326593a7f (diff) | |
download | meta-gplv2-c591f97432047a2add48ff0ec9c20babba2915c6.tar.gz |
nettle: refresh the patches2.5_M3
* fixes:
WARNING: nettle-2.7.1-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch Add-target-to-only-build-tests-not-run-them.patch
patching file Makefile.in
Hunk #1 succeeded at 53 (offset -2 lines).
patching file testsuite/Makefile.in
Hunk #1 succeeded at 105 with fuzz 2 (offset -11 lines).
Now at patch Add-target-to-only-build-tests-not-run-them.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch')
-rw-r--r-- | recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch b/recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch index 73723a9..f6906fd 100644 --- a/recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch +++ b/recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch | |||
@@ -1,13 +1,23 @@ | |||
1 | From 8cbd1d71caf56d45c54b1d8d073b330c07c66d12 Mon Sep 17 00:00:00 2001 | ||
2 | From: Armin Kuster <akuster@mvista.com> | ||
3 | Date: Thu, 2 Mar 2017 12:24:31 +0000 | ||
4 | Subject: [PATCH] Create meta-gplv2 from files from OE-Core | ||
5 | |||
1 | Upstream-Status: Backport | 6 | Upstream-Status: Backport |
2 | https://git.lysator.liu.se/nettle/nettle/commit/fa269b6ad06dd13c901dbd84a12e52b918a09cd7 | 7 | https://git.lysator.liu.se/nettle/nettle/commit/fa269b6ad06dd13c901dbd84a12e52b918a09cd7 |
3 | 8 | ||
4 | CVE: CVE-2015-8804 | 9 | CVE: CVE-2015-8804 |
5 | Signed-off-by: Armin Kuster <akuster@mvista.com> | 10 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
6 | 11 | ||
7 | Index: nettle-2.7.1/ChangeLog | 12 | --- |
8 | =================================================================== | 13 | ChangeLog | 8 +++ |
9 | --- nettle-2.7.1.orig/ChangeLog | 14 | x86_64/ecc-384-modp.asm | 169 +++++++++++++++++++++--------------------------- |
10 | +++ nettle-2.7.1/ChangeLog | 15 | 2 files changed, 83 insertions(+), 94 deletions(-) |
16 | |||
17 | diff --git a/ChangeLog b/ChangeLog | ||
18 | index abdd974..c81168b 100644 | ||
19 | --- a/ChangeLog | ||
20 | +++ b/ChangeLog | ||
11 | @@ -1,3 +1,11 @@ | 21 | @@ -1,3 +1,11 @@ |
12 | +2015-12-15 Niels Möller <nisse@lysator.liu.se> | 22 | +2015-12-15 Niels Möller <nisse@lysator.liu.se> |
13 | + | 23 | + |
@@ -20,10 +30,10 @@ Index: nettle-2.7.1/ChangeLog | |||
20 | 2015-12-10 Niels Möller <nisse@lysator.liu.se> | 30 | 2015-12-10 Niels Möller <nisse@lysator.liu.se> |
21 | 31 | ||
22 | * ecc-256.c (ecc_256_modp): Fixed carry propagation bug. Problem | 32 | * ecc-256.c (ecc_256_modp): Fixed carry propagation bug. Problem |
23 | Index: nettle-2.7.1/x86_64/ecc-384-modp.asm | 33 | diff --git a/x86_64/ecc-384-modp.asm b/x86_64/ecc-384-modp.asm |
24 | =================================================================== | 34 | index 698838f..31b739e 100644 |
25 | --- nettle-2.7.1.orig/x86_64/ecc-384-modp.asm | 35 | --- a/x86_64/ecc-384-modp.asm |
26 | +++ nettle-2.7.1/x86_64/ecc-384-modp.asm | 36 | +++ b/x86_64/ecc-384-modp.asm |
27 | @@ -20,7 +20,7 @@ C MA 02111-1301, USA. | 37 | @@ -20,7 +20,7 @@ C MA 02111-1301, USA. |
28 | .file "ecc-384-modp.asm" | 38 | .file "ecc-384-modp.asm" |
29 | 39 | ||