libxcrypt, libxcrypt-compat: upgrade 4.4.26 -> 4.4.27
PATCH 1/3 libxcrypt, libxcrypt-compat: upgrade 4.4.26 -> 4.4.27
License-Update: build-aux files updated.
---
Changes in v2:
- fix license checksum error
- update libxcrypt too
.../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%)meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch +5 -5
@@ -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 <[email protected]> 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 <[email protected]> --- - 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;
meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.27.bb renamed from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.26.bb +0 -0
meta/recipes-core/libxcrypt/libxcrypt.inc +2 -2
@@ -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"
meta/recipes-core/libxcrypt/libxcrypt_4.4.27.bb renamed from meta/recipes-core/libxcrypt/libxcrypt_4.4.26.bb +0 -0
Signature · 1 line
2.34.0
PATCH 2/3 python3-setuptools: upgrade 59.5.0 -> 60.2.0
---
The patch seems to break some native package building due do host contamination; I faced it at btrfs-progs, for example.
I need someone which has more intimacy in Python to help on this so I'd like to ask for the patch to not be merged as it has known issues.
Changes in v2:
- remove wrong patch header
...01-conditionally-do-not-fetch-code-by-easy_install.patch | 6 +++---
...n3-setuptools_59.5.0.bb => python3-setuptools_60.2.0.bb} | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/python/{python3-setuptools_59.5.0.bb => python3-setuptools_60.2.0.bb} (94%)meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +3 -3
@@ -1,4 +1,4 @@ -From da88c57fe03e4474ba20325edacf519e80c1d7a8 Mon Sep 17 00:00:00 2001 +From 74abf3fae060c87b04e5fb8c382ecc835afc3a50 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index fc848d0..c04a5de 100644 +index fb34d10..217fce1 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -642,6 +642,11 @@ class easy_install(Command): +@@ -649,6 +649,11 @@ class easy_install(Command): os.path.exists(tmpdir) and rmtree(tmpdir) def easy_install(self, spec, deps=False):
meta/recipes-devtools/python/python3-setuptools_60.2.0.bb renamed from meta/recipes-devtools/python/python3-setuptools_59.5.0.bb +1 -1
@@ -13,7 +13,7 @@ SRC_URI += "\ file://0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch \ " -SRC_URI[sha256sum] = "d144f85102f999444d06f9c0e8c737fd0194f10f2f7e5fdb77573f6e2fa4fad0" +SRC_URI[sha256sum] = "675fcebecb43c32eb930481abf907619137547f4336206e4d673180242e1a278" DEPENDS += "${PYTHON_PN}"
Signature · 1 line
2.34.0
PATCH 3/3 e2fsprogs: upgrade 1.46.4 -> 1.46.5
In reply to Otavio Salvador---
The ptest is failing[1]; I didn't spot anything obvious and couldn't reproduce the error in my NixOS host (ended sending the update so it also runs on their CI - https://github.com/NixOS/nixpkgs/pull/153660).
1. https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2963/steps/12/logs/stdio
I need someone to help on this so I'd like to ask for the patch to not be merged as it has known issues.
Changes in v2:
- remove patch headers
- avoid changing not required patches
...ct_io-expect-correct-expected-output.patch | 69 -------------------
...2fsprogs_1.46.4.bb => e2fsprogs_1.46.5.bb} | 9 +--
2 files changed, 3 insertions(+), 75 deletions(-)
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.46.4.bb => e2fsprogs_1.46.5.bb} (94%)meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-tests-u_direct_io-expect-correct-expected-output.patch deleted +0 -69
@@ -1,69 +0,0 @@ -From ea5adf259e01c790f9ba69d6fe88d691de410b6f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Sun, 22 Aug 2021 14:37:32 +0200 -Subject: [PATCH] tests/u_direct_io/expect: correct expected output - -This is likely the right fix, but upstream needs to confirm. - -Upstream-Status: Inappropriate [issue reported https://github.com/tytso/e2fsprogs/issues/80] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - tests/u_direct_io/expect | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/tests/u_direct_io/expect b/tests/u_direct_io/expect -index b0cdc730..830cbd75 100644 ---- a/tests/u_direct_io/expect -+++ b/tests/u_direct_io/expect -@@ -19,8 +19,8 @@ Filesystem OS type: Linux - Inode count: 32768 - Block count: 32768 - Reserved block count: 1638 --Overhead clusters: 5131 --Free blocks: 27631 -+Overhead clusters: 6155 -+Free blocks: 26607 - Free inodes: 32757 - First block: 0 - Block size: 4096 -@@ -29,27 +29,29 @@ Reserved GDT blocks: 7 - Blocks per group: 32768 - Fragments per group: 32768 - Inodes per group: 32768 --Inode blocks per group: 1024 -+Inode blocks per group: 2048 - Flex block group size: 16 - Mount count: 0 - Check interval: 15552000 (6 months) - Reserved blocks uid: 0 - Reserved blocks gid: 0 - First inode: 11 --Inode size: 128 -+Inode size: 256 -+Required extra isize: 32 -+Desired extra isize: 32 - Journal inode: 8 - Default directory hash: half_md4 - Journal backup: inode blocks - Directories: 2 - Group 0: block bitmap at 9, inode bitmap at 25, inode table at 41 -- 27631 free blocks, 32757 free inodes, 2 used directories -+ 26607 free blocks, 32757 free inodes, 2 used directories - e2fsck -fn -N test_filesys $LOOP - Pass 1: Checking inodes, blocks, and sizes - Pass 2: Checking directory structure - Pass 3: Checking directory connectivity - Pass 4: Checking reference counts - Pass 5: Checking group summary information --test_filesys: 11/32768 files (9.1% non-contiguous), 5137/32768 blocks -+test_filesys: 11/32768 files (9.1% non-contiguous), 6161/32768 blocks - Exit status is 0 - e2fsck -fn -N test_filesys $TMPFILE - Pass 1: Checking inodes, blocks, and sizes -@@ -57,5 +59,5 @@ Pass 2: Checking directory structure - Pass 3: Checking directory connectivity - Pass 4: Checking reference counts - Pass 5: Checking group summary information --test_filesys: 11/32768 files (9.1% non-contiguous), 5137/32768 blocks -+test_filesys: 11/32768 files (9.1% non-contiguous), 6161/32768 blocks - Exit status is 0
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.4.bb +3 -6
@@ -4,14 +4,11 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://0001-tests-u_direct_io-expect-correct-expected-output.patch \ + file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ + file://quiet-debugfs.patch \ " -SRC_URI:append:class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ - file://quiet-debugfs.patch \ -" - -SRCREV = "849005eac51ea2097bd9e5f2b0adc16b53c5486d" +SRCREV = "02540dedd3ddc52c6ae8aaa8a95ce75c3f8be1c0" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
Signature · 1 line
2.34.0