[OE-core] [PATCH] glibc: Remove ChangeLog diff from patch

[Khem Raj]

On Mon, Feb 25, 2019 at 1:50 PM Alistair Francis
<Alistair.Francis at wdc.com> wrote:
>
> To avoid conflicts with other forks of glibc remove the diff from the
> ChangeLog.
>

LGTM

> Signed-off-by: Alistair Francis <alistair.francis at wdc.com>
> ---
>  ...e-unsigned-Jcc-instructions-on-size-.patch | 21 +------------------
>  1 file changed, 1 insertion(+), 20 deletions(-)
>
> diff --git a/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch b/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch
> index 1c625f63c7..1a343149c0 100644
> --- a/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch
> +++ b/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch
> @@ -21,33 +21,14 @@ Tested on x86-64 and x32, with and without --disable-multi-arch.
>  CVE: CVE-2019-7309
>  Upstream-Status: Backport
>  Signed-off-by: Zhixiong Chi <zhixiong.chi at windriver.com>
> +Signed-off-by: Alistair Francis <alistair.francis at wdc.com>
>  ---
> - ChangeLog                                | 11 ++++
>   sysdeps/x86_64/memcmp.S                  | 20 +++---
>   sysdeps/x86_64/x32/Makefile              |  3 +-
>   sysdeps/x86_64/x32/tst-size_t-memcmp-2.c | 79 ++++++++++++++++++++++++
>   5 files changed, 111 insertions(+), 10 deletions(-)
>   create mode 100644 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c
>
> -diff --git a/ChangeLog b/ChangeLog
> -index 29bc4451ef..a0dcdac323 100644
> ---- a/ChangeLog
> -+++ b/ChangeLog
> -@@ -1,3 +1,14 @@
> -+2019-02-04  H.J. Lu  <hongjiu.lu at intel.com>
> -+
> -+      [BZ #24155]
> -+      CVE-2019-7309
> -+      * NEWS: Updated for CVE-2019-7309.
> -+      * sysdeps/x86_64/memcmp.S: Use RDX_LP for size.  Clear the
> -+      upper 32 bits of RDX register for x32.  Use unsigned Jcc
> -+      instructions, instead of signed.
> -+      * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memcmp-2.
> -+      * sysdeps/x86_64/x32/tst-size_t-memcmp-2.c: New test.
> -+
> - 2019-01-31  Carlos O'Donell  <carlos at redhat.com>
> -           Torvald Riegel  <triegel at redhat.com>
> -           Rik Prohaska  <prohaska7 at gmail.com>
>  diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S
>  index 1fc487caa5..1322bb3b92 100644
>  --- a/sysdeps/x86_64/memcmp.S
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core