diff mbox series

[v2] libxcrypt-compat,libxcrypt: upgrade 4.4.37 -> 4.4.38

Message ID 20250216041946.2854447-1-raj.khem@gmail.com
State Accepted, archived
Commit 7b802e4e55b37e985cc7151a8a8561b206563509
Headers show
Series [v2] libxcrypt-compat,libxcrypt: upgrade 4.4.37 -> 4.4.38 | expand

Commit Message

Khem Raj Feb. 16, 2025, 4:19 a.m. UTC 
Drop patch which is already applied upstream [1] since 4.4.20

[1] https://github.com/besser82/libxcrypt/commit/fed81d1a98fab52839b60a55447d368899034847

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Drop doubly applied patch

 .../libxcrypt/files/fix_cflags_handling.patch | 32 -------------------
 ...t_4.4.37.bb => libxcrypt-compat_4.4.38.bb} |  0
 meta/recipes-core/libxcrypt/libxcrypt.inc     |  3 +-
 ...ibxcrypt_4.4.37.bb => libxcrypt_4.4.38.bb} |  0
 4 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
 rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.37.bb => libxcrypt-compat_4.4.38.bb} (100%)
 rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.37.bb => libxcrypt_4.4.38.bb} (100%)
diff mbox series

Patch

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 879950bbe37..00000000000
--- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From 1e94a03541e35718dc1eaa8023e0ec3cf2de369b 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.37.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.37.bb
rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
index 9ecb333fb96..55619daef7d 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -10,9 +10,8 @@  LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
 inherit autotools pkgconfig
 
 SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https \
-           file://fix_cflags_handling.patch \
            "
-SRCREV = "e5714d1f0a477f91ce3986fa63651c7710f0e183"
+SRCREV = "55ea777e8d567e5e86ffac917c28815ac54cc341"
 SRCBRANCH ?= "master"
 
 PROVIDES = "virtual/crypt"
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.37.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.37.bb
rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb