From c541aadf5e019d1399ff488b222cd2e83f420a27 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 19 Oct 2021 17:33:33 +0200 Subject: libxcrypt: upgrade 4.4.25 -> 4.4.26 License-Update: additional copyright holders (From OE-Core rev: a124dc48780013abed70de4acb68cc8eeb719eaf) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.25.bb | 18 ------------------ meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb | 18 ++++++++++++++++++ meta/recipes-core/libxcrypt/libxcrypt.inc | 4 ++-- meta/recipes-core/libxcrypt/libxcrypt_4.4.25.bb | 2 -- meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb | 2 ++ 5 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.25.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.25.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb (limited to 'meta') diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.25.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.25.bb deleted file mode 100644 index ec9f9f4fa3..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.25.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.26.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb new file mode 100644 index 0000000000..ec9f9f4fa3 --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.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 29b941d380..ea877bbbb6 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -3,14 +3,14 @@ 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=afed27a72ae2a8075978299eebaa1f5d \ +LIC_FILES_CHKSUM = "file://LICENSING;md5=29c5f9af198623cdce52a77f85695164 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "b9116ef2245abb128a22a975d187b1272312a80c" +SRCREV = "8ff7a8c5019cbd50419f7d0a8cd691eb99d6b086" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.25.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.25.bb deleted file mode 100644 index 79dba2f6dc..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.25.bb +++ /dev/null @@ -1,2 +0,0 @@ -require libxcrypt.inc - diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb new file mode 100644 index 0000000000..79dba2f6dc --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb @@ -0,0 +1,2 @@ +require libxcrypt.inc + -- cgit v1.2.3-54-g00ecf