4 files changed, 5 insertions, 40 deletions

diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
deleted file mode 100644
index 94aa3fed49..0000000000
--- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-
-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:
-
-x86_64-pokysdk-linux-gcc: error: : No such file or directory
-
-Avoid this by stripping empty elements out of CFLAGS.
-
-Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126]
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
----
- build-aux/scripts/compute-symver-floor | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/build-aux/scripts/compute-symver-floor b/build-aux/scripts/compute-symver-floor
-index 4ec82e1..8117342 100644
---- 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;
- 
-         @CFLAGS = sh_split($ENV{CFLAGS} // q{});
-+        # Remove empty elements, particularly leading ones which cause issues with popen below
-+        @CFLAGS = grep {$_} @CFLAGS;
- 
-         # Remove empty elements, particularly leading ones which
-         # cause issues with popen below.
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb
index d5546ce9ba..bb4e2032dd 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb
@@ -1,5 +1,5 @@
 #
-# This provides libcrypto.so.1 which contains obsolete APIs, needed for uninative in particular
+# This provides libcrypt.so.1 which contains obsolete APIs, needed for uninative in particular
 #
 
 require libxcrypt.inc
@@ -16,3 +16,4 @@ do_install:append () {
         rm -rf ${D}${libdir}/libcrypt.so
         rm -rf ${D}${datadir}
 }
+
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
index ba93d91aef..77fec83234 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -9,16 +9,13 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
 
 inherit autotools pkgconfig
 
-SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
-SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf"
+SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https \
+           "
+SRCREV = "55ea777e8d567e5e86ffac917c28815ac54cc341"
 SRCBRANCH ?= "master"
 
-SRC_URI += "file://fix_cflags_handling.patch"
-
 PROVIDES = "virtual/crypt"
 
-S = "${WORKDIR}/git"
-
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error"
 CPPFLAGS:append:class-nativesdk = " -Wno-error"
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb
index 79dba2f6dc..79dba2f6dc 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb