diff --git a/skip-lsfd-tests-PR2888.patch b/skip-lsfd-tests-PR2888.patch deleted file mode 100644 index 9363695..0000000 --- a/skip-lsfd-tests-PR2888.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f98a4c12b366ae2b5e01fa30d72eef34f3bab681 Mon Sep 17 00:00:00 2001 -From: Masatake YAMATO -Date: Tue, 2 Apr 2024 06:34:40 +0900 -Subject: [PATCH 2/2] tests: (test_mkfds::sockdiag) verify the recieved message - to detect whether the socket is usable or not - -Close #2822. - -Signed-off-by: Masatake YAMATO ---- - tests/helpers/test_mkfds.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c -index 39427ba09a..4b138c2efd 100644 ---- a/tests/helpers/test_mkfds.c -+++ b/tests/helpers/test_mkfds.c -@@ -3200,6 +3200,25 @@ static int send_diag_request(int diagsd, void *req, size_t req_size) - return 0; - } - -+static int recv_diag_request(int diagsd) -+{ -+ __attribute__((aligned(sizeof(void *)))) uint8_t buf[8192]; -+ const struct nlmsghdr *h; -+ int r = recvfrom(diagsd, buf, sizeof(buf), 0, NULL, NULL);; -+ if (r < 0) -+ return errno; -+ -+ h = (void *)buf; -+ if (!NLMSG_OK(h, (size_t)r)) -+ return -1; -+ -+ if (h->nlmsg_type == NLMSG_ERROR) { -+ struct nlmsgerr *e = (struct nlmsgerr *)NLMSG_DATA(h); -+ return - e->error; -+ } -+ return 0; -+} -+ - static void *make_sockdiag(const struct factory *factory, struct fdesc fdescs[], - int argc, char ** argv) - { -@@ -3243,6 +3262,16 @@ static void *make_sockdiag(const struct factory *factory, struct fdesc fdescs[], - err(EXIT_FAILURE, "failed in sendmsg()"); - } - -+ e = recv_diag_request(diagsd); -+ if (e != 0) { -+ close (diagsd); -+ if (e == ENOENT) -+ err(EXIT_ENOENT, "failed in recvfrom()"); -+ if (e > 0) -+ err(EXIT_FAILURE, "failed in recvfrom()"); -+ if (e < 0) -+ errx(EXIT_FAILURE, "failed in recvfrom() => -1"); -+ } - - if (diagsd != fdescs[0].fd) { - if (dup2(diagsd, fdescs[0].fd) < 0) { diff --git a/util-linux-2.40.1.tar.sign b/util-linux-2.40.1.tar.sign new file mode 100644 index 0000000..4ca2db7 --- /dev/null +++ b/util-linux-2.40.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAmY4lxMACgkQ5LcdXuw5 +woSckw//ZmoxCcjdDBv5LkAK0Yl5EMKZYzkvqswsp/Uwllgevb/FcCGwZ+F49RM3 +H8F5Kj5CIJW9wh2UNWxaMm4MxcGd3eG2NEwgYh8RiXSS84zEL78yaIJLyFlPziMp +kZb0fpc2HpyCzDrvtlw6S5TGkUUx2uFqTQQG7GFd6TOlbPpGp4OpqY3adf85mwmr +NKy0XbYLo6sqGENz6Uklbf5Qhc19UEEc1jScOYNpkuCxhRQguxq3Jc6W8A8DQkjB +EWaw9Q1XYDV3Bnd40F0K+bo3CYB6z3pMM51NlsYxV0fKt/SoEvJw3S7u3VcbtJWn +S6xl6q/sMINDrMIpSL5PAAg5yoBNIIoWW7OxSh0nv6ctp9dmln0sKBtXNr09zTWT +q9mLUt7LwXB6LT3XI64262vF21bKq/hQO8IObsx8vfPSlp1SyGq7VqGh6QVbkjx6 +2vA7ueV5jfIKiAlZAcXz6NHjwxcBqYq7wASeUEmYPgh5lb4HBOuOgatYBNAmQoxp +2t5AXPPhI/u95GRa4WntpgqlQm/1CKA9kHiezvO4P0lnpUluT24DXclMTcq4xaiN +ci+dzVF2EPRoPJgYy9crKNsr7dftVtvAVXIRk3UaTwDe1o7OK4vSykDc0PSNxsHQ +mMabBuFt17oweonotSOZ8z7blHnCVnzZWVxyIxC3Pw/0ChHFAkw= +=68JD +-----END PGP SIGNATURE----- diff --git a/util-linux-2.40.1.tar.xz b/util-linux-2.40.1.tar.xz new file mode 100644 index 0000000..ea93fed --- /dev/null +++ b/util-linux-2.40.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f +size 8823784 diff --git a/util-linux-2.40.tar.sign b/util-linux-2.40.tar.sign deleted file mode 100644 index 4157924..0000000 --- a/util-linux-2.40.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAmYECuEACgkQ5LcdXuw5 -woTCTg/9HwvHA+Gzd1rMO4UakgavnNqxzFP0rcC5HTTPHHX7rXLWVtd4u2pjStCt -EWodiy7doRRuVOAKwn93nygt/m22w23omfODdTWejCAX1ALx00LliiySkFDFWUlY -angRDG4p8nyLn03I3XBAWEvcWa7OIM4ddXlEuWSTNHTeBWSzCs0be0bbFgws2m/p -ejqo7CAHXNVx4lbtsgLQgemAkr6WhALxPEcBrXj2V/rwYF8a/uwnWK3AfGDaTeoK -DeYYsgWGkQdsPL3GDPiDttYtO9sJC8THvEOA1l0pzRyA0lI4hRbcqTXD+kvLGrZq -csk5dprZ+CvejmBtagymQoSfAEJH0b6rKBmzJYhgbKreM8byy51sQ4pmUVAB/pBz -MGAtj7PAAwcrot3CC5whMHsnB77qx0xBDlxrc+3BUKgZBiVhqe55gVGh2LnLdgCa -rAVA3QhjgZlvuH/EsVJIv0cCIBMpYTyUJLDW1Or1CLDKAl+nR2Xu9X9Hj5sXc3In -k9oU6i8/DOi1EZWJqwhf4nFZMFHgwgkHHaOXDLwlTTCFN11pOrEAnxRcsC/319Za -RlfMhX56J+GYhmFW8I5OxRrvS6PInZ4WZ/1+Qzdmas/nqBGbnctZGqv3bF/Cp/qQ -KAYTcaGqvjURmM9vcRWKjW33ZtGkD8JDrt1DvC3yQ/R/h+/Hy6I= -=7ZO0 ------END PGP SIGNATURE----- diff --git a/util-linux-2.40.tar.xz b/util-linux-2.40.tar.xz deleted file mode 100644 index 940fbf8..0000000 --- a/util-linux-2.40.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d57a626081f9ead02fa44c63a6af162ec19c58f53e993f206ab7c3a6641c2cd7 -size 8762888 diff --git a/util-linux.changes b/util-linux.changes index 6f810cf..4c6a7bf 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed May 8 14:06:51 UTC 2024 - Thorsten Kukuk + +- Update to version 2.40.1 + * agetty: don't overwrite TERM passed by the user + * fsck.minix: fix possible overrun + * libblkid: fix segfault when blkid.conf doesn't exist + * libfdisk: add initializer to geometry + * libmount: fix access check for utab in context + * libmount: fix umount --read-only + * lsns: fix netns use +- Drop skip-lsfd-tests-PR2888.patch, was a backport + ------------------------------------------------------------------- Mon May 6 17:09:08 UTC 2024 - Stanislav Brabec diff --git a/util-linux.spec b/util-linux.spec index 8dc0164..fce4065 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -85,7 +85,7 @@ Group: Development/Languages/Python %endif # ulbuild == python -Version: 2.40 +Version: 2.40.1 Release: 0 License: GPL-2.0-or-later URL: https://www.kernel.org/pub/linux/utils/util-linux/ @@ -110,7 +110,6 @@ Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch # PATCH-FIX-SUSE util-linux-bash-completion-su-chsh-l.patch bsc1172427 -- Fix "su -s" bash completion. Patch3: util-linux-bash-completion-su-chsh-l.patch -Patch4: skip-lsfd-tests-PR2888.patch Patch5: static_lib.patch BuildRequires: audit-devel BuildRequires: bc