Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/util-linux.git#73e880a882c9a0b0d125eb290300b412356c94c3

.gitignore

@@ -79,3 +79,4 @@
 /util-linux-2.35.2.tar.xz
 /util-linux-2.36.tar.xz
 /util-linux-2.36.1.tar.xz
+/util-linux-2.36.2.tar.xz

libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch

@@ -1,40 +0,0 @@
-From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-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 <kzak@redhat.com>
----
- 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
-

sources

@@ -1 +1 @@
-SHA512 (util-linux-2.36.1.tar.xz) = 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a
+SHA512 (util-linux-2.36.2.tar.xz) = 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b

util-linux.spec

@@ -1,8 +1,8 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux
-Version: 2.36.1
-Release: 4%{?dist}
+Version: 2.36.2
+Release: 1%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 URL: http://en.wikipedia.org/wiki/Util-linux
 
@@ -108,11 +108,9 @@ Patch0: login-lastlog-create.patch
 # https://github.com/karelzak/util-linux/commit/57898c3a7ee8fc5933cddd4526bb3980bef85a02
 # The workaround is unnecessary on Fedora with kernel >= 5.8.
 Patch1: libmount-remove-read-mountinfo-workaround.patch
-# usptream patch, https://github.com/karelzak/util-linux/issues/1193
-Patch2: libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
 # Add `/run/motd.d` to the hardcoded MOTD_FILE
 # https://github.com/coreos/console-login-helper-messages/issues/60
-Patch3: login-default-motd-file.patch
+Patch2: login-default-motd-file.patch
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -948,6 +946,10 @@ fi
 %{_libdir}/python*/site-packages/libmount/
 
 %changelog
+* Fri Feb 12 2021 Karel Zak <kzak@redhat.com> - 2.36.2-1
+- upgrade to stable upstream 2.36.2
+  https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.36/v2.36.2-ReleaseNotes
+
 * Wed Jan 27 2021 Kelvin Fan <kfan@redhat.com> - 2.36.1-4
 - Add patch to add /run/motd.d to default MOTD_FILE in login(1)