From d7eb1125e974fddd43062665bd5eb29f352832dc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 15 May 2021 03:51:20 +0000 Subject: libxcrypt-compat: upgrade 4.4.19 -> 4.4.20 Signed-off-by: Richard Purdie --- .../libxcrypt/files/fix_cflags_handling.patch | 17 +++++++++++++---- meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb | 18 ------------------ meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb | 18 ++++++++++++++++++ meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb | 2 -- meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb | 2 ++ 6 files changed, 34 insertions(+), 25 deletions(-) delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch index 5448fe0fa6..0772998c72 100644 --- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch +++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch @@ -1,3 +1,8 @@ +From fd9a46695594c3cd836ecb7d959f03f605e69a2f Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Fri, 30 Apr 2021 10:35:02 +0100 +Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version + 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 like: @@ -9,8 +14,12 @@ Avoid this by stripping empty elements out of CFLAGS. Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126] Signed-off-by: Richard Purdie -Index: a/build-aux/compute-symver-floor -=================================================================== +--- + build-aux/compute-symver-floor | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/build-aux/compute-symver-floor b/build-aux/compute-symver-floor +index 4ec82e1..8117342 100644 --- a/build-aux/compute-symver-floor +++ b/build-aux/compute-symver-floor @@ -36,6 +36,8 @@ sub preprocessor_check { @@ -20,5 +29,5 @@ Index: a/build-aux/compute-symver-floor + # Remove empty elements, particularly leading ones which cause issues with popen below + @CFLAGS = grep {$_} @CFLAGS; - # We call ensure_C_locale here, not from the main section, - # because this sub might not get called at all, in which + # Remove empty elements, particularly leading ones which + # cause issues with popen below. diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb deleted file mode 100644 index ba74eb1f94..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.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.20.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb new file mode 100644 index 0000000000..ba74eb1f94 --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb @@ -0,0 +1,18 @@ +# +# 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.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 694e55546f..c16068c161 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=afed27a72ae2a8075978299eebaa1f5d \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "c79119414d7e30017d7b49566e7e4ea35112bdc8" +SRCREV = "e73ff0137de5152e69e8abb0bd260541804dfe5a" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb deleted file mode 100644 index 79dba2f6dc..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb +++ /dev/null @@ -1,2 +0,0 @@ -require libxcrypt.inc - diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb new file mode 100644 index 0000000000..79dba2f6dc --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb @@ -0,0 +1,2 @@ +require libxcrypt.inc + -- cgit 1.2.3-korg