[OE-core] [PATCH v2] coreutils: update to 8.31

[Randy MacLeod]

On 4/24/19 1:32 PM, Oleksandr Kravchuk wrote:
> lc.c license checksum changed due to modified copyright year.

It's
   ls.c not lc.c.

Could you change the log to say:

    The license checksum for src/ls.c changed due
    to an updated copyright year.

Thanks,
../Randy


> 
> musl fix was backported from RHEL5 and is musl specific as the patched
> file is autogenerated during configure phase.
> 
> Signed-off-by: Oleksandr Kravchuk <open.source at oleksandr-kravchuk.com>
> ---
>   .../strtod_fix_clash_with_strtold.patch       | 56 +++++++++++++++++++
>   .../{coreutils_8.30.bb => coreutils_8.31.bb}  |  8 ++-
>   2 files changed, 61 insertions(+), 3 deletions(-)
>   create mode 100644 meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch
>   rename meta/recipes-core/coreutils/{coreutils_8.30.bb => coreutils_8.31.bb} (94%)
> 
> diff --git a/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch b/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch
> new file mode 100644
> index 0000000000..19410715f5
> --- /dev/null
> +++ b/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch
> @@ -0,0 +1,56 @@
> +From 0562b040fa17f1722ba2b3096067b45d0582ca53 Mon Sep 17 00:00:00 2001
> +From: Paul Eggert <eggert at cs.ucla.edu>
> +Date: Mon, 11 Mar 2019 16:40:29 -0700
> +Subject: [PATCH] strtod: fix clash with strtold
> +
> +Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817).
> +* lib/strtod.c (compute_minus_zero, minus_zero):
> +Simplify by remving the macro / external variable,
> +and having just a function.  User changed.  This avoids
> +the need for an external variable that might clash.
> +
> +Upstream-Status: Backported [rhel5]
> +
> +Signed-off-by: Oleksandr Kravchuk <open.source at oleksandr-kravchuk.com>
> +
> +---
> + ChangeLog    |  9 +++++++++
> + lib/strtod.c | 11 +++++------
> + 2 files changed, 14 insertions(+), 6 deletions(-)
> +
> +diff --git a/lib/strtod.c b/lib/strtod.c
> +index b9eaa51b4..69b1564e1 100644
> +--- a/lib/strtod.c
> ++++ b/lib/strtod.c
> +@@ -294,16 +294,15 @@ parse_number (const char *nptr,
> +    ICC 10.0 has a bug when optimizing the expression -zero.
> +    The expression -MIN * MIN does not work when cross-compiling
> +    to PowerPC on Mac OS X 10.5.  */
> +-#if defined __hpux || defined __sgi || defined __ICC
> + static DOUBLE
> +-compute_minus_zero (void)
> ++minus_zero (void)
> + {
> ++#if defined __hpux || defined __sgi || defined __ICC
> +   return -MIN * MIN;
> +-}
> +-# define minus_zero compute_minus_zero ()
> + #else
> +-DOUBLE minus_zero = -0.0;
> ++  return -0.0;
> + #endif
> ++}
> +
> + /* Convert NPTR to a DOUBLE.  If ENDPTR is not NULL, a pointer to the
> +    character after the last one used in the number is put in *ENDPTR.  */
> +@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr)
> +   /* Special case -0.0, since at least ICC miscompiles negation.  We
> +      can't use copysign(), as that drags in -lm on some platforms.  */
> +   if (!num && negative)
> +-    return minus_zero;
> ++    return minus_zero ();
> +   return negative ? -num : num;
> + }
> +--
> +2.20.1
> +
> diff --git a/meta/recipes-core/coreutils/coreutils_8.30.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb
> similarity index 94%
> rename from meta/recipes-core/coreutils/coreutils_8.30.bb
> rename to meta/recipes-core/coreutils/coreutils_8.31.bb
> index 8f4ee55712..4a74f619af 100644
> --- a/meta/recipes-core/coreutils/coreutils_8.30.bb
> +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb
> @@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/"
>   BUGTRACKER = "http://debbugs.gnu.org/coreutils"
>   LICENSE = "GPLv3+"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
> -                    file://src/ls.c;beginline=1;endline=15;md5=dbe356a88b09c29232b083d1ff8ac82a"
> +                    file://src/ls.c;beginline=1;endline=15;md5=c456f9896277a0543e3866777ccc0255"
>   DEPENDS = "gmp libcap"
>   DEPENDS_class-native = ""
>   
> @@ -20,8 +20,10 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
>              file://0001-local.mk-fix-cross-compiling-problem.patch \
>             "
>   
> -SRC_URI[md5sum] = "ab06d68949758971fe744db66b572816"
> -SRC_URI[sha256sum] = "e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057"
> +SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch"
> +
> +SRC_URI[md5sum] = "0009a224d8e288e8ec406ef0161f9293"
> +SRC_URI[sha256sum] = "ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd"
>   
>   EXTRA_OECONF_class-native = "--without-gmp"
>   EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}"
> 


-- 
# Randy MacLeod
# Wind River Linux