From 59e69a74d2b66084073c0cb56f5012d13c25da8e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 15 Feb 2025 20:19:46 -0800 Subject: libxcrypt-compat,libxcrypt: upgrade 4.4.37 -> 4.4.38 Drop patch which is already applied upstream [1] since 4.4.20 [1] https://github.com/besser82/libxcrypt/commit/fed81d1a98fab52839b60a55447d368899034847 (From OE-Core rev: 7b802e4e55b37e985cc7151a8a8561b206563509) Signed-off-by: Khem Raj Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../libxcrypt/files/fix_cflags_handling.patch | 32 ---------------------- .../libxcrypt/libxcrypt-compat_4.4.37.bb | 19 ------------- .../libxcrypt/libxcrypt-compat_4.4.38.bb | 19 +++++++++++++ meta/recipes-core/libxcrypt/libxcrypt.inc | 3 +- meta/recipes-core/libxcrypt/libxcrypt_4.4.37.bb | 2 -- meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb | 2 ++ 6 files changed, 22 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.37.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.37.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb 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 879950bbe3..0000000000 --- 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 -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 ---- - 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.37.bb deleted file mode 100644 index bb4e2032dd..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.37.bb +++ /dev/null @@ -1,19 +0,0 @@ -# -# This provides libcrypt.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}${libdir}/libcrypt.so - rm -rf ${D}${datadir} -} - diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb new file mode 100644 index 0000000000..bb4e2032dd --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb @@ -0,0 +1,19 @@ +# +# This provides libcrypt.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}${libdir}/libcrypt.so + rm -rf ${D}${datadir} +} + diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 9ecb333fb9..55619daef7 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.37.bb deleted file mode 100644 index 79dba2f6dc..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.37.bb +++ /dev/null @@ -1,2 +0,0 @@ -require libxcrypt.inc - diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb new file mode 100644 index 0000000000..79dba2f6dc --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb @@ -0,0 +1,2 @@ +require libxcrypt.inc + -- cgit v1.2.3-54-g00ecf