| Message ID | 1640012619-3685-1-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | libxcrypt: upgrade 4.4.26 -> 4.4.27 | expand |
On Mon, 2021-12-20 at 23:03 +0800, wangmy wrote: > License-Update: directory of copyright file changed. > refresh fix_cflags_handling.patch > > Changelog: > =========== > Limit the maximum amount of rbytes to 64 bytes (512 bits) for > yescrypt, > gost-yescrypt, and scrypt. Also reflect this limit in the > documentation > (issue #145). > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > .../libxcrypt/files/fix_cflags_handling.patch | 10 +++++--- > -- > ...ypt-compat_4.4.26.bb => libxcrypt-compat_4.4.27.bb} | 0 > meta/recipes-core/libxcrypt/libxcrypt.inc | 4 ++-- > .../{libxcrypt_4.4.26.bb => libxcrypt_4.4.27.bb} | 0 > 4 files changed, 7 insertions(+), 7 deletions(-) > rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.26.bb => > libxcrypt-compat_4.4.27.bb} (100%) > rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.26.bb => > libxcrypt_4.4.27.bb} (100%) > > diff --git a/meta/recipes- > core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes- > core/libxcrypt/files/fix_cflags_handling.patch > index 0772998c72..26a35560fc 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 0607aae55517e1ac0982f99778fa0df0a3165ff4 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> This patch can be dropped. https://github.com/besser82/libxcrypt/commit/fed81d1a98fab52839b60a55447d368899034847 It now is just adding the same but slightly different change twice. Thanks, Anuj
diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch index 0772998c72..26a35560fc 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 0607aae55517e1ac0982f99778fa0df0a3165ff4 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.27.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.27.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 9186c45e18..725965e535 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=29c5f9af198623cdce52a77f85695164 \ +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" +SRCREV = "814e715dd8580ff00344112d7d8383a6a5a5b83d" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.27.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.27.bb
License-Update: directory of copyright file changed. refresh fix_cflags_handling.patch Changelog: =========== Limit the maximum amount of rbytes to 64 bytes (512 bits) for yescrypt, gost-yescrypt, and scrypt. Also reflect this limit in the documentation (issue #145). Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- .../libxcrypt/files/fix_cflags_handling.patch | 10 +++++----- ...ypt-compat_4.4.26.bb => libxcrypt-compat_4.4.27.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 4 ++-- .../{libxcrypt_4.4.26.bb => libxcrypt_4.4.27.bb} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.26.bb => libxcrypt-compat_4.4.27.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.26.bb => libxcrypt_4.4.27.bb} (100%)