Re: [OE-core] [PATCH 10/24] libxcrypt-compat: upgrade 4.4.26 -> 4.4.27

Richard Purdie
2022-01-03T17:43:44Z

On Mon, 2022-01-03 at 13:18 -0300, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> .../libxcrypt/files/fix_cflags_handling.patch | 11 +-
> .../libxcrypt/libxcrypt-compat_4.4.26.bb | 18 ---
> .../libxcrypt/libxcrypt-compat_4.4.27.bb | 103 ++++++++++++++++++
> meta/recipes-core/libxcrypt/libxcrypt.inc | 4 +-
> 4 files changed, 111 insertions(+), 25 deletions(-)
> delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb
> create mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.27.bb
>
> diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
> index 0772998c72..d979796226 100644
> --- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
> +++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
> @@ -1,7 +1,8 @@
> -From fd9a46695594c3cd836ecb7d959f03f605e69a2f Mon Sep 17 00:00:00 2001
> +From 7b2a0cdc281d94a5782c37ef87040c341447b4b4 Mon Sep 17 00:00:00 2001
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Date: Fri, 30 Apr 2021 10:35:02 +0100
> Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version
> +Organization: O.S. Systems Software LTDA.
>
> If you pass CFLAGS with a leading space, " " gets passed to popen and convinces
> gcc to try and open a file called " ". This results in a confusing error message
> @@ -15,13 +16,13 @@ Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126]
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> ---
> - build-aux/compute-symver-floor | 2 ++
> + build-aux/scripts/compute-symver-floor | 2 ++
> 1 file changed, 2 insertions(+)
>
> -diff --git a/build-aux/compute-symver-floor b/build-aux/compute-symver-floor
> +diff --git a/build-aux/scripts/compute-symver-floor b/build-aux/scripts/compute-symver-floor
> index 4ec82e1..8117342 100644
> ---- a/build-aux/compute-symver-floor
> -+++ b/build-aux/compute-symver-floor
> +--- a/build-aux/scripts/compute-symver-floor
> ++++ b/build-aux/scripts/compute-symver-floor
> @@ -36,6 +36,8 @@ sub preprocessor_check {
> die "C compiler not available\n" unless @CC;
>
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb
> deleted file mode 100644
> index ec9f9f4fa3..0000000000
> --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -#
> -# This provides libcrypto.so.1 which contains obsolete APIs, needed for uninative in particular
> -#
> -
> -require libxcrypt.inc
> -
> -PROVIDES = ""
> -AUTO_LIBNAME_PKGS = ""
> -EXCLUDE_FROM_WORLD = "1"
> -
> -API = "--enable-obsolete-api"
> -
> -do_install:append () {
> - rm -rf ${D}${includedir}
> - rm -rf ${D}${libdir}/pkgconfig
> - rm -rf ${D}${datadir}
> -}
> -
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.27.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.27.bb
> new file mode 100644
> index 0000000000..fd773fc859
> --- /dev/null
> +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.27.bb
> @@ -0,0 +1,103 @@
> +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
> +# The following is the difference between the old and the new license text.
> +# Please update the LICENSE value if needed, and summarize the changes in
> +# the commit message via 'License-Update:' tag.
> +# (example: 'License-Update: copyright years updated.')
> +#

Needs further review!

Cheers,

Richard