diff options
Diffstat (limited to 'meta/recipes-core/libxcrypt')
| -rw-r--r-- | meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch | 10 | ||||
| -rw-r--r-- | meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb) | 4 | ||||
| -rw-r--r-- | meta/recipes-core/libxcrypt/libxcrypt.inc | 14 | ||||
| -rw-r--r-- | meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb) | 0 |
4 files changed, 11 insertions, 17 deletions
diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch index 0772998c72..94aa3fed49 100644 --- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch +++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch @@ -1,4 +1,4 @@ -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 @@ -15,13 +15,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.36.bb index ec9f9f4fa3..30ec6a4674 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.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 @@ -13,6 +13,6 @@ 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 9186c45e18..ba93d91aef 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -2,27 +2,21 @@ SUMMARY = "Extended cryptographic library (from glibc)" DESCRIPTION = "Forked code from glibc libary to extract only crypto part." HOMEPAGE = "https://github.com/besser82/libxcrypt" SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSING;md5=29c5f9af198623cdce52a77f85695164 \ +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "8ff7a8c5019cbd50419f7d0a8cd691eb99d6b086" -SRCBRANCH ?= "develop" +SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf" +SRCBRANCH ?= "master" SRC_URI += "file://fix_cflags_handling.patch" PROVIDES = "virtual/crypt" -FILES:${PN} = "${libdir}/libcrypt*.so.* \ - ${libdir}/libcrypt-*.so \ - ${libdir}/libowcrypt*.so.* \ - ${libdir}/libowcrypt-*.so \ -" - S = "${WORKDIR}/git" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb index 79dba2f6dc..79dba2f6dc 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb |