From b14f3c47ee6c7362706384e6e6adb810839b60fa41419d37b6c019c6aca386de Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues Date: Wed, 26 Jul 2023 02:38:20 +0000 Subject: [PATCH 1/2] Accepting request 1100706 from home:neilbrown:branches:Base:System - Upgrade to version 2.39.1 (bsc#1213328) Various bug fixes including problem with parsing mount options. - Dropped upstreamed patches: 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch 0001-libmount-fix-sync-options-between-context-and-fs-str.patch util-linux-fix-tests-with-64k-pagesize.patch OBS-URL: https://build.opensuse.org/request/show/1100706 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=522 --- ...ibblkid-try-LUKS2-first-when-probing.patch | 43 --- ...c-options-between-context-and-fs-str.patch | 213 -------------- ...n-on-blacklisted-modules-to-mount-8-.patch | 18 +- util-linux-2.39.1.tar.sign | 16 + util-linux-2.39.1.tar.xz | 3 + util-linux-2.39.tar.sign | 16 - util-linux-2.39.tar.xz | 3 - util-linux-fix-tests-with-64k-pagesize.patch | 276 ------------------ util-linux.changes | 11 + util-linux.spec | 11 +- 10 files changed, 41 insertions(+), 569 deletions(-) delete mode 100644 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch delete mode 100644 0001-libmount-fix-sync-options-between-context-and-fs-str.patch create mode 100644 util-linux-2.39.1.tar.sign create mode 100644 util-linux-2.39.1.tar.xz delete mode 100644 util-linux-2.39.tar.sign delete mode 100644 util-linux-2.39.tar.xz delete mode 100644 util-linux-fix-tests-with-64k-pagesize.patch diff --git a/0001-Revert-libblkid-try-LUKS2-first-when-probing.patch b/0001-Revert-libblkid-try-LUKS2-first-when-probing.patch deleted file mode 100644 index cb36dc9..0000000 --- a/0001-Revert-libblkid-try-LUKS2-first-when-probing.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 93ba7961779789217a1f814ce3110ff8c040c8c3 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Wed, 12 Jul 2023 15:48:27 +0200 -Subject: [PATCH] Revert "libblkid: try LUKS2 first when probing" - -mdadm superblocks before 1.1 are placed at the end of the device, which -means that the data contained inside the array starts at offset 0. For -LUKS inside MD, blkid falsely detects this as plain LUKS instead of a -linux_raid_member. This causes e.g. dracut to not assemble the array -during boot and system startup fails. - -This reverts commit b8889c0a214aeb3dd47bf1ab280fe5534b64d2aa. ---- - libblkid/src/superblocks/superblocks.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c -index fb0392707..c7789a15b 100644 ---- a/libblkid/src/superblocks/superblocks.c -+++ b/libblkid/src/superblocks/superblocks.c -@@ -94,11 +94,6 @@ static int blkid_probe_set_usage(blkid_probe pr, int usage); - */ - static const struct blkid_idinfo *idinfos[] = - { -- /* In case the volume is locked with OPAL we are going to get -- * an I/O error when reading past the LUKS header, so try it -- * first. */ -- &luks_idinfo, -- - /* RAIDs */ - &linuxraid_idinfo, - &ddfraid_idinfo, -@@ -124,6 +119,7 @@ static const struct blkid_idinfo *idinfos[] = - &snapcow_idinfo, - &verity_hash_idinfo, - &integrity_idinfo, -+ &luks_idinfo, - &vmfs_volume_idinfo, - &ubi_idinfo, - &vdo_idinfo, --- -2.41.0 - diff --git a/0001-libmount-fix-sync-options-between-context-and-fs-str.patch b/0001-libmount-fix-sync-options-between-context-and-fs-str.patch deleted file mode 100644 index 84eb10c..0000000 --- a/0001-libmount-fix-sync-options-between-context-and-fs-str.patch +++ /dev/null @@ -1,213 +0,0 @@ -From 7b37d5b5667103beac16f7ae3cca5feaf00a21b0 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 22 Jun 2023 13:11:57 +0200 -Subject: [PATCH] libmount: fix sync options between context and fs structs - -Since v2.39 libmount prefers "struct libmnt_optlist" to keep mount options -rather than the original "struct libmnt_fs". This is problem if the -"fs" struct is defined and maintained outside the context. - -The library has already a way how to sync "fs" and "optlist", but this -needs to be improved and used more widely. Changes: - -* force "fs" from context to always read options from "optlist" - -* copy options from "fs" to "optlist" in mnt_context_set_fs() - -* internally redirect mnt_fs_* API for options to "optlist" if optlist - defined - -* add simple test to make sure options from different sources are - always merged together - -Addresses: https://github.com/util-linux/util-linux/issues/2326 -Signed-off-by: Karel Zak ---- - libmount/src/context.c | 82 ++++++++++++++++++++++++++++++++++++++++-- - libmount/src/fs.c | 23 +++++++++--- - 2 files changed, 97 insertions(+), 8 deletions(-) - -diff --git a/libmount/src/context.c b/libmount/src/context.c -index 4c5e65659..0cd320190 100644 ---- a/libmount/src/context.c -+++ b/libmount/src/context.c -@@ -911,9 +911,29 @@ int mnt_context_set_fs(struct libmnt_context *cxt, struct libmnt_fs *fs) - if (!cxt) - return -EINVAL; - -+ if (cxt->fs == fs) -+ return 0; -+ - DBG(CXT, ul_debugobj(cxt, "setting new FS")); -- mnt_ref_fs(fs); /* new */ -- mnt_unref_fs(cxt->fs); /* old */ -+ -+ /* new */ -+ if (fs) { -+ struct libmnt_optlist *ol = mnt_context_get_optlist(cxt); -+ -+ if (!ol) -+ return -ENOMEM; -+ -+ mnt_ref_fs(fs); -+ -+ mnt_optlist_set_optstr(ol, mnt_fs_get_options(fs), NULL); -+ mnt_fs_follow_optlist(fs, ol); -+ } -+ -+ /* old */ -+ if (cxt->fs) -+ mnt_fs_follow_optlist(cxt->fs, NULL); -+ mnt_unref_fs(cxt->fs); -+ - cxt->fs = fs; - return 0; - } -@@ -932,8 +952,17 @@ struct libmnt_fs *mnt_context_get_fs(struct libmnt_context *cxt) - { - if (!cxt) - return NULL; -- if (!cxt->fs) -+ if (!cxt->fs) { -+ struct libmnt_optlist *ol = mnt_context_get_optlist(cxt); -+ -+ if (!ol) -+ return NULL; - cxt->fs = mnt_new_fs(); -+ if (!cxt->fs) -+ return NULL; -+ -+ mnt_fs_follow_optlist(cxt->fs, ol); -+ } - return cxt->fs; - } - -@@ -3314,6 +3343,50 @@ static int test_flags(struct libmnt_test *ts, int argc, char *argv[]) - return rc; - } - -+static int test_cxtsync(struct libmnt_test *ts, int argc, char *argv[]) -+{ -+ struct libmnt_context *cxt; -+ struct libmnt_fs *fs; -+ unsigned long flags = 0; -+ int rc; -+ -+ if (argc != 4) -+ return -EINVAL; -+ -+ fs = mnt_new_fs(); -+ if (!fs) -+ return -ENOMEM; -+ -+ rc = mnt_fs_set_options(fs, argv[1]); -+ if (rc) -+ return rc; -+ -+ cxt = mnt_new_context(); -+ if (!cxt) -+ return -ENOMEM; -+ -+ rc = mnt_context_set_fs(cxt, fs); -+ if (rc) -+ return rc; -+ -+ rc = mnt_context_append_options(cxt, argv[2]); -+ if (rc) -+ return rc; -+ -+ rc = mnt_fs_append_options(fs, argv[3]); -+ if (rc) -+ return rc; -+ -+ mnt_context_get_mflags(cxt, &flags); -+ -+ printf(" fs options: %s\n", mnt_fs_get_options(fs)); -+ printf("context options: %s\n", mnt_context_get_options(cxt)); -+ printf(" context mflags: %08lx\n", flags); -+ -+ mnt_free_context(cxt); -+ return 0; -+} -+ - static int test_mountall(struct libmnt_test *ts, int argc, char *argv[]) - { - struct libmnt_context *cxt; -@@ -3361,6 +3434,8 @@ static int test_mountall(struct libmnt_test *ts, int argc, char *argv[]) - return 0; - } - -+ -+ - int main(int argc, char *argv[]) - { - struct libmnt_test tss[] = { -@@ -3368,6 +3443,7 @@ int main(int argc, char *argv[]) - { "--umount", test_umount, "[-t ] [-f][-l][-r] |" }, - { "--mount-all", test_mountall, "[-O ] [-t ] " }, -+ { "--cxtsync", test_cxtsync, " " }, - { "--search-helper", test_search_helper, "" }, - { NULL }}; - -diff --git a/libmount/src/fs.c b/libmount/src/fs.c -index 655f07171..79e32a170 100644 ---- a/libmount/src/fs.c -+++ b/libmount/src/fs.c -@@ -228,10 +228,14 @@ int mnt_fs_follow_optlist(struct libmnt_fs *fs, struct libmnt_optlist *ol) - - if (fs->optlist == ol) - return 0; -+ if (fs->optlist) -+ mnt_unref_optlist(fs->optlist); - - fs->opts_age = 0; - fs->optlist = ol; -- mnt_ref_optlist(ol); -+ -+ if (ol) -+ mnt_ref_optlist(ol); - return 0; - } - -@@ -919,7 +923,11 @@ int mnt_fs_set_options(struct libmnt_fs *fs, const char *optstr) - - if (!fs) - return -EINVAL; -- fs->opts_age = 0; -+ -+ if (fs->optlist) { -+ fs->opts_age = 0; -+ return mnt_optlist_set_optstr(fs->optlist, optstr, NULL); -+ } - - if (optstr) { - int rc = mnt_split_optstr(optstr, &u, &v, &f, 0, 0); -@@ -968,8 +976,10 @@ int mnt_fs_append_options(struct libmnt_fs *fs, const char *optstr) - return -EINVAL; - if (!optstr) - return 0; -- -- fs->opts_age = 0; -+ if (fs->optlist) { -+ fs->opts_age = 0; -+ return mnt_optlist_append_optstr(fs->optlist, optstr, NULL); -+ } - - rc = mnt_split_optstr(optstr, &u, &v, &f, 0, 0); - if (rc) -@@ -1013,7 +1023,10 @@ int mnt_fs_prepend_options(struct libmnt_fs *fs, const char *optstr) - if (!optstr) - return 0; - -- fs->opts_age = 0; -+ if (fs->optlist) { -+ fs->opts_age = 0; -+ return mnt_optlist_prepend_optstr(fs->optlist, optstr, NULL); -+ } - - rc = mnt_split_optstr(optstr, &u, &v, &f, 0, 0); - if (rc) --- -2.41.0 - diff --git a/Add-documentation-on-blacklisted-modules-to-mount-8-.patch b/Add-documentation-on-blacklisted-modules-to-mount-8-.patch index a3a037b..ba612ac 100644 --- a/Add-documentation-on-blacklisted-modules-to-mount-8-.patch +++ b/Add-documentation-on-blacklisted-modules-to-mount-8-.patch @@ -5,17 +5,15 @@ Subject: [PATCH] Add documentation on blacklisted modules to mount(8) man page Signed-off-by: Martin Wilck --- - sys-utils/mount.8 | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) + sys-utils/mount.8 | 28 +++++++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) -Index: util-linux-2.37.2/sys-utils/mount.8 -=================================================================== ---- util-linux-2.37.2.orig/sys-utils/mount.8 -+++ util-linux-2.37.2/sys-utils/mount.8 -@@ -203,6 +203,32 @@ Note that \fBmount\fP is very strict abo - Since util\-linux 2.35, \fBmount\fP does not exit when user permissions are inadequate according to libmount\(cqs internal security rules. Instead, it drops suid permissions and continues as regular non\-root user. This behavior supports use\-cases where root permissions are not necessary (e.g., fuse filesystems, user namespaces, etc). - .sp +--- a/sys-utils/mount.8 ++++ b/sys-utils/mount.8 +@@ -205,6 +205,32 @@ Since util\-linux 2.35, \fBmount\fP does For more details, see \fBfstab\fP(5). Only the user that mounted a filesystem can unmount it again. If any user should be able to unmount it, then use \fBusers\fP instead of \fBuser\fP in the \fIfstab\fP line. The \fBowner\fP option is similar to the \fBuser\fP option, with the restriction that the user must be the owner of the special file. This may be useful e.g. for \fI/dev/fd\fP if a login script makes the console user owner of this device. The \fBgroup\fP option is similar, with the restriction that the user must be a member of the group of the special file. + .sp + The \fBuser\fP mount option is accepted if no username is specified. If used in the format \fBuser=someone\fP, the option is silently ignored and visible only for external mount helpers (/sbin/mount.) for compatibility with some network filesystems. +.SS Blacklisted file systems +In the Linux kernel, file system types are implemented as kernel +modules. While many of these file systems are well maintained, @@ -45,7 +43,7 @@ Index: util-linux-2.37.2/sys-utils/mount.8 .SS "Bind mount operation" .sp Remount part of the file hierarchy somewhere else. The call is: -@@ -2396,4 +2422,4 @@ For bug reports, use the issue tracker a +@@ -2571,4 +2597,4 @@ For bug reports, use the issue tracker a .SH "AVAILABILITY" .sp The \fBmount\fP command is part of the util\-linux package which can be downloaded from \c diff --git a/util-linux-2.39.1.tar.sign b/util-linux-2.39.1.tar.sign new file mode 100644 index 0000000..07b56f1 --- /dev/null +++ b/util-linux-2.39.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAmSa2ZsACgkQ5LcdXuw5 +woT0eg/+KxzwVA1xH5/NFJclvXMpNNUYwuHkMHFt7WKXs/K9FG1dELEIhm7h2tUs +v87uiG5sr1EKOjY0CjWULiVklqNIksxBTmPcg1sxm1S7Mef8kgsylxiXoL8npGVR +5t2A7VMpY9/WxaN/9IYD7t5Zb9mc/WnZuJrExclaXRY/mqfpnfTgyvH8cobNBQNg +NgrXqZP17eacK+cpKGzqL/3UXY8G16Wu2TjUvWUk+CajCMc/rCv/zPtHgH+mTP9r +GJwV7Ps8OU87k2zJh5awfOLdEePcE9ZzlmEpi9bF0BFdIJ6kIqU1j6ATQCp8E4y/ +0pjYZVKavS+UcOJ98ykwRdDGEd02vLXntGUIdWb+eYZud1w/2MAtIBbRsRt0nKOZ +i2WmbsN77u99yX87L6pIDZ212lFWyBfobZHn2rUwpYhLtFJem2ujzSKslIvkOrNs +sDk5TYx12BdzHt9q0YuYFKW+bIyqtjelxI3TFFdmltDG9FkKh606Ff0GAPRTL8i6 +EJ4pVLdc6k035+fwYi+QlIBYo7tzRYdqjOyFbnYDBAjykzIBojL1QqzbMys530TW +7Wg2JFYv3xgbYqZlLEVQc77kkF+ZRSa7/T6JmmevXS0SxsQxTS9AMDx9pcitnkVQ +p3nJXirz+pqrDVwjLYAs93WTP0CzclsOU12LYPboNiEH9VPSP9o= +=6Jlu +-----END PGP SIGNATURE----- diff --git a/util-linux-2.39.1.tar.xz b/util-linux-2.39.1.tar.xz new file mode 100644 index 0000000..945bf81 --- /dev/null +++ b/util-linux-2.39.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b +size 8351164 diff --git a/util-linux-2.39.tar.sign b/util-linux-2.39.tar.sign deleted file mode 100644 index a5f1fda..0000000 --- a/util-linux-2.39.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAmRktYcACgkQ5LcdXuw5 -woSHyQ/9HIJaa48NCjD318dsoBmxPvoiPncrSmgFhLvNXk+nOWHT83c3oYuz69bH -9r/ySeMuJj69H5+yLZ3aGaP9jm1Qf7Y/c1HXRPt3iZp2/vDKC07V7PQ/ShiISZla -CXsqgPBqbW8WOgdeWRkaH4KI79aT8zrcnXc6kwB0SbYMqVlwksQC/PqS9tqzTf5H -zKdTuQGUOk9jSv3dCYnX0ZAcycFJsvot5GMbwd/vcJklI2abw7E4scGN+ek9W/QN -uXhTnR1oF7ICd9DBc+ocddmRGUHSosSHo9hBor5D7I3GJeoJw05ecQ/SLRrehXoB -lhPSJ9kwLMr+tZiDSwMzb/8hT3xEjII0RXJ2jLV8Z0hfCVGH/C16vIW+KXL0W13+ -x/ZRJZf7tFrU68yYhHjGjUSWZns8KCSx3cy2yWM1snJoBYwvempK/mn3oZ6HJOzg -Vb08SuuG0xRpEB5gG2qHvK2+ExUdI3nd9cJgRNg47KoHo0W+z3Al9IzmS5Nqwocd -AYtKA8VjRxmXnm6OFFt2WI/3lwCE7DCmph278JGuouoprF2HoGN6f0FGvi7MR1yc -UGxTtUEvn1okr5Odx4izJs9FORS+jml0oCtmLl2FK9pT7zee3uNHL3+Nz8igNPGL -zwMbWgd6fiFwAXI5huOxhIOVM1xAfcGjwdUAzoioUJSdLNNJ+1Q= -=Epvd ------END PGP SIGNATURE----- diff --git a/util-linux-2.39.tar.xz b/util-linux-2.39.tar.xz deleted file mode 100644 index 783456f..0000000 --- a/util-linux-2.39.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb -size 8103428 diff --git a/util-linux-fix-tests-with-64k-pagesize.patch b/util-linux-fix-tests-with-64k-pagesize.patch deleted file mode 100644 index 3996bae..0000000 --- a/util-linux-fix-tests-with-64k-pagesize.patch +++ /dev/null @@ -1,276 +0,0 @@ -From 8b36444f447949c3ab477f2c43b45a94c30ee7bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:42:14 +0200 -Subject: [PATCH 1/4] fadvise: (test) dynamically calculate expected test - values -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Thomas Weißschuh ---- - tests/ts/fadvise/drop | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 7c7eee5dc..86c0d5b0a 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -16,7 +16,7 @@ ts_check_prog "sleep" - ts_cd "$TS_OUTDIR" - - FILE="ddtest" --BS=4k -+BS=4096 - COUNT=8 - - FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" -@@ -41,22 +41,22 @@ create_file() { - echo - - create_file -- echo "offset: 8192" -- "$TS_CMD_FADVISE" -o 8192 "$FILE" -+ echo "offset: $(( 2 * $BS ))" -+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - - create_file -- echo "length: 16384" -- "$TS_CMD_FADVISE" -l 16384 "$FILE" -+ echo "length: $(( 4 * $BS ))" -+ "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - - create_file -- echo "offset: 8192, length: 16384 fd: 42" -- "$TS_CMD_FADVISE" -o 8192 -l 16384 --fd 42 42<"$FILE" -+ echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" -+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo --- -2.40.0 - - -From e5009e773fc801eca887dd43b721cd1b1aa327be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:43:38 +0200 -Subject: [PATCH 2/4] fadvise: (tests) factor out calls to "fincore" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will make it easier to pass argument later. - -Signed-off-by: Thomas Weißschuh ---- - tests/ts/fadvise/drop | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 86c0d5b0a..8869b7da4 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -28,37 +28,41 @@ create_file() { - dd if=/dev/zero of="$FILE" bs=$BS count=$COUNT conv=fsync >& /dev/null - } - -+do_fincore() { -+ "$TS_CMD_FINCORE" "$FILE" -+} -+ - { - create_file -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "whole file" - "$TS_CMD_FADVISE" "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "offset: $(( 2 * $BS ))" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "length: $(( 4 * $BS ))" - "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - rm "$FILE" --- -2.40.0 - - -From 33980996d0b429fc59c40f8352633c0a21a0f96a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:44:20 +0200 -Subject: [PATCH 3/4] fadvise: (test) don't compare fincore page counts -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These depend on the machines pagesize and are therefore not a good -comparision. - -Signed-off-by: Thomas Weißschuh ---- - tests/expected/fadvise/drop | 20 ++++++++++---------- - tests/ts/fadvise/drop | 2 +- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop -index f2360b56f..25f23e050 100644 ---- a/tests/expected/fadvise/drop -+++ b/tests/expected/fadvise/drop -@@ -1,23 +1,23 @@ -- RES PAGES SIZE FILE -- 32K 8 32K ddtest -+ RES SIZE FILE -+ 32K 32K ddtest - - whole file - status: 0 --RES PAGES SIZE FILE -- 0B 0 32K ddtest -+RES SIZE FILE -+ 0B 32K ddtest - - offset: 8192 - status: 0 --RES PAGES SIZE FILE -- 8K 2 32K ddtest -+RES SIZE FILE -+ 8K 32K ddtest - - length: 16384 - status: 0 -- RES PAGES SIZE FILE -- 16K 4 32K ddtest -+ RES SIZE FILE -+ 16K 32K ddtest - - offset: 8192, length: 16384 fd: 42 - status: 0 -- RES PAGES SIZE FILE -- 16K 4 32K ddtest -+ RES SIZE FILE -+ 16K 32K ddtest - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 8869b7da4..6c4298e87 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -29,7 +29,7 @@ create_file() { - } - - do_fincore() { -- "$TS_CMD_FINCORE" "$FILE" -+ "$TS_CMD_FINCORE" -o RES,SIZE,FILE "$FILE" - } - - { --- -2.40.0 - - -From c0f31b79f5d1c665cdc057fb32f4d161d28aa5b2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:45:10 +0200 -Subject: [PATCH 4/4] fadvise: (test) test with 64k blocks -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will allow the tests to also pass on systems with 64k pagesizes. - -Closes #2249 -Signed-off-by: Thomas Weißschuh ---- - tests/expected/fadvise/drop | 26 +++++++++++++------------- - tests/ts/fadvise/drop | 2 +- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop -index 25f23e050..e7bb26b6e 100644 ---- a/tests/expected/fadvise/drop -+++ b/tests/expected/fadvise/drop -@@ -1,23 +1,23 @@ -- RES SIZE FILE -- 32K 32K ddtest -+ RES SIZE FILE -+ 512K 512K ddtest - - whole file - status: 0 --RES SIZE FILE -- 0B 32K ddtest -+RES SIZE FILE -+ 0B 512K ddtest - --offset: 8192 -+offset: 131072 - status: 0 --RES SIZE FILE -- 8K 32K ddtest -+ RES SIZE FILE -+ 128K 512K ddtest - --length: 16384 -+length: 262144 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - --offset: 8192, length: 16384 fd: 42 -+offset: 131072, length: 262144 fd: 42 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 6c4298e87..45dcb9110 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -16,7 +16,7 @@ ts_check_prog "sleep" - ts_cd "$TS_OUTDIR" - - FILE="ddtest" --BS=4096 -+BS=65536 - COUNT=8 - - FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" --- -2.40.0 - diff --git a/util-linux.changes b/util-linux.changes index 1831fde..514e96f 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jul 26 01:22:20 UTC 2023 - Neil Brown + +- Upgrade to version 2.39.1 + (bsc#1213328) + Various bug fixes including problem with parsing mount options. +- Dropped upstreamed patches: + 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch + 0001-libmount-fix-sync-options-between-context-and-fs-str.patch + util-linux-fix-tests-with-64k-pagesize.patch + ------------------------------------------------------------------- Thu Jul 13 06:33:54 UTC 2023 - Fabian Vogt diff --git a/util-linux.spec b/util-linux.spec index 5a6ef15..d8f46c5 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -85,7 +85,7 @@ Group: Development/Languages/Python %endif # ulbuild == python -Version: 2.39 +Version: 2.39.1 Release: 0 License: GPL-2.0-or-later URL: https://www.kernel.org/pub/linux/utils/util-linux/ @@ -109,13 +109,8 @@ Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff 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. -Patch4: util-linux-bash-completion-su-chsh-l.patch -# PATCH-FIX-UPSTREAM util-linux-fix-tests-with-64k-pagesize.patch -- fadvise: fix tests with 64k pagesize -Patch5: util-linux-fix-tests-with-64k-pagesize.patch -# https://github.com/util-linux/util-linux/pull/2331 -Patch6: 0001-libmount-fix-sync-options-between-context-and-fs-str.patch -# https://github.com/util-linux/util-linux/pull/2373 -Patch7: 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch +Patch3: util-linux-bash-completion-su-chsh-l.patch + BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel From 89f694e0791bb464096ea1526f25c4702aa38d61915cf3e4122fe5b0217a6ddd Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 28 Jul 2023 16:39:56 +0000 Subject: [PATCH 2/2] Accepting request 1101224 from home:goldwynr:branches:Base:System Readded patch because of https://build.opensuse.org/request/show/1100707#status-history-20975903 OBS-URL: https://build.opensuse.org/request/show/1101224 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=523 --- ...ibblkid-try-LUKS2-first-when-probing.patch | 43 +++++++++++++++++++ util-linux.changes | 6 +++ util-linux.spec | 2 + 3 files changed, 51 insertions(+) create mode 100644 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch diff --git a/0001-Revert-libblkid-try-LUKS2-first-when-probing.patch b/0001-Revert-libblkid-try-LUKS2-first-when-probing.patch new file mode 100644 index 0000000..cb36dc9 --- /dev/null +++ b/0001-Revert-libblkid-try-LUKS2-first-when-probing.patch @@ -0,0 +1,43 @@ +From 93ba7961779789217a1f814ce3110ff8c040c8c3 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 12 Jul 2023 15:48:27 +0200 +Subject: [PATCH] Revert "libblkid: try LUKS2 first when probing" + +mdadm superblocks before 1.1 are placed at the end of the device, which +means that the data contained inside the array starts at offset 0. For +LUKS inside MD, blkid falsely detects this as plain LUKS instead of a +linux_raid_member. This causes e.g. dracut to not assemble the array +during boot and system startup fails. + +This reverts commit b8889c0a214aeb3dd47bf1ab280fe5534b64d2aa. +--- + libblkid/src/superblocks/superblocks.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c +index fb0392707..c7789a15b 100644 +--- a/libblkid/src/superblocks/superblocks.c ++++ b/libblkid/src/superblocks/superblocks.c +@@ -94,11 +94,6 @@ static int blkid_probe_set_usage(blkid_probe pr, int usage); + */ + static const struct blkid_idinfo *idinfos[] = + { +- /* In case the volume is locked with OPAL we are going to get +- * an I/O error when reading past the LUKS header, so try it +- * first. */ +- &luks_idinfo, +- + /* RAIDs */ + &linuxraid_idinfo, + &ddfraid_idinfo, +@@ -124,6 +119,7 @@ static const struct blkid_idinfo *idinfos[] = + &snapcow_idinfo, + &verity_hash_idinfo, + &integrity_idinfo, ++ &luks_idinfo, + &vmfs_volume_idinfo, + &ubi_idinfo, + &vdo_idinfo, +-- +2.41.0 + diff --git a/util-linux.changes b/util-linux.changes index 514e96f..65371cc 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 28 14:47:15 UTC 2023 - Goldwyn Rodrigues + +- Re-add 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch + because the patch is not in 2.39.1 + ------------------------------------------------------------------- Wed Jul 26 01:22:20 UTC 2023 - Neil Brown diff --git a/util-linux.spec b/util-linux.spec index d8f46c5..6b2efc7 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -110,6 +110,8 @@ 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 +# https://github.com/util-linux/util-linux/pull/2373 +Patch4: 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch BuildRequires: audit-devel BuildRequires: bc