From 805f5d3b0dad6de888b38950e5e6e3446192ab34 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 7 Jan 2021 11:14:05 +0100 Subject: [PATCH] f33: 2.36.1-1 (upgrade, fix "symfollow") --- .gitignore | 1 + ...t-free-sector-detection-if-partition.patch | 42 ------------------- ...se-symfollow-for-helpers-on-user-mou.patch | 40 ++++++++++++++++++ sources | 2 +- util-linux.spec | 13 ++++-- 5 files changed, 51 insertions(+), 47 deletions(-) delete mode 100644 0001-libfdisk-fix-last-free-sector-detection-if-partition.patch create mode 100644 libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch diff --git a/.gitignore b/.gitignore index 3126fff..8149425 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ /util-linux-2.35.1.tar.xz /util-linux-2.35.2.tar.xz /util-linux-2.36.tar.xz +/util-linux-2.36.1.tar.xz diff --git a/0001-libfdisk-fix-last-free-sector-detection-if-partition.patch b/0001-libfdisk-fix-last-free-sector-detection-if-partition.patch deleted file mode 100644 index eca67e6..0000000 --- a/0001-libfdisk-fix-last-free-sector-detection-if-partition.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 430952f254cddf1ccb47a5f8caf5b5cd64193c3a Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 10 Aug 2020 11:37:32 +0200 -Subject: [PATCH] libfdisk: fix last free sector detection if partition size - specified - -We need to skip useless gaps between partition if the gap is no large -enough for a new partition. Unfortunately, the current code checks -size of the gap, but does not care for location of the gap -- this is -good enough for dialog driven partitioning, but it's pretty bad if -start of the partition is explicitly specified (e.g. sfdisk). - -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1860461 -Signed-off-by: Karel Zak ---- - libfdisk/src/dos.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c -index 176969883..890e33a26 100644 ---- a/libfdisk/src/dos.c -+++ b/libfdisk/src/dos.c -@@ -1274,14 +1274,14 @@ static int add_partition(struct fdisk_context *cxt, size_t n, - fdisk_sector_t last; - - rc = find_last_free(cxt, is_logical, start, limit, &last); -- - if (rc == 0 && last - start + 1 < fdisk_partition_get_size(pa)) { - DBG(LABEL, ul_debug("DOS: area <%ju,%ju> too small [wanted=%ju aval=%ju]", - (uintmax_t) start, (uintmax_t) last, - fdisk_partition_get_size(pa), - last - start)); - -- if (fdisk_partition_has_start(pa)) -+ if (fdisk_partition_has_start(pa) -+ && fdisk_partition_get_start(pa) <= last) - rc = -ENOSPC; - else { - start = last + 1; --- -2.25.4 - diff --git a/libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch b/libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch new file mode 100644 index 0000000..edc7477 --- /dev/null +++ b/libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch @@ -0,0 +1,40 @@ +From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 19 Nov 2020 09:49:16 +0100 +Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts + +Addresses: https://github.com/karelzak/util-linux/issues/1193 +Signed-off-by: Karel Zak +--- + libmount/src/context_mount.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c +index 8c394c1ff..dd1786176 100644 +--- a/libmount/src/context_mount.c ++++ b/libmount/src/context_mount.c +@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr) + * string, because there is nothing like MS_EXEC (we only have + * MS_NOEXEC in mount flags and we don't care about the original + * mount string in libmount for VFS options). ++ * ++ * This use-case makes sense for MS_SECURE flags only (see ++ * mnt_optstr_get_flags() and mnt_context_merge_mflags()). + */ + if (!(cxt->mountflags & MS_NOEXEC)) + mnt_optstr_append_option(optstr, "exec", NULL); +@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr) + mnt_optstr_append_option(optstr, "suid", NULL); + if (!(cxt->mountflags & MS_NODEV)) + mnt_optstr_append_option(optstr, "dev", NULL); +- if (!(cxt->mountflags & MS_NOSYMFOLLOW)) +- mnt_optstr_append_option(optstr, "symfollow", NULL); + } + +- + if (cxt->flags & MNT_FL_SAVED_USER) + rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user); + if (rc) +-- +2.25.4 + diff --git a/sources b/sources index e271813..bf4b5be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (util-linux-2.36.tar.xz) = cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd +SHA512 (util-linux-2.36.1.tar.xz) = 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a diff --git a/util-linux.spec b/util-linux.spec index e439507..d63d4e8 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,8 +1,8 @@ ### Header Summary: A collection of basic system utilities Name: util-linux -Version: 2.36 -Release: 3%{?dist} +Version: 2.36.1 +Release: 1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: http://en.wikipedia.org/wiki/Util-linux @@ -101,8 +101,8 @@ Requires: libfdisk = %{version}-%{release} ### # 151635 - makeing /var/log/lastlog Patch0: 2.36-login-lastlog-create.patch -# 1860461 - sfdisk regression creating simple 3 partition MBR disk -Patch1: 0001-libfdisk-fix-last-free-sector-detection-if-partition.patch +# usptream patch, https://github.com/karelzak/util-linux/issues/1193 +Patch1: libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch %description The util-linux package contains a large variety of low-level system @@ -935,6 +935,11 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Thu Jan 7 2021 Karel Zak - 2.36.1-1 +- add upstream patch to fix 'symfollow' mount issue +- upgrade to upstream v2.36.1 + https://www.kernel.org/pub/linux/utils/util-linux/v2.36/v2.36.1-ReleaseNotes + * Thu Aug 27 2020 Karel Zak - 2.36-3 - fix #1860461 - sfdisk regression creating simple 3 partition MBR disk