Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
805f5d3b0d | ||
|
072774b4ff |
1
.gitignore
vendored
1
.gitignore
vendored
@ -78,3 +78,4 @@
|
|||||||
/util-linux-2.35.1.tar.xz
|
/util-linux-2.35.1.tar.xz
|
||||||
/util-linux-2.35.2.tar.xz
|
/util-linux-2.35.2.tar.xz
|
||||||
/util-linux-2.36.tar.xz
|
/util-linux-2.36.tar.xz
|
||||||
|
/util-linux-2.36.1.tar.xz
|
||||||
|
40
libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
Normal file
40
libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
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
|
||||||
|
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (util-linux-2.36.tar.xz) = cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
|
SHA512 (util-linux-2.36.1.tar.xz) = 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
### Header
|
### Header
|
||||||
Summary: A collection of basic system utilities
|
Summary: A collection of basic system utilities
|
||||||
Name: util-linux
|
Name: util-linux
|
||||||
Version: 2.36
|
Version: 2.36.1
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||||
URL: http://en.wikipedia.org/wiki/Util-linux
|
URL: http://en.wikipedia.org/wiki/Util-linux
|
||||||
|
|
||||||
@ -101,6 +101,8 @@ Requires: libfdisk = %{version}-%{release}
|
|||||||
###
|
###
|
||||||
# 151635 - makeing /var/log/lastlog
|
# 151635 - makeing /var/log/lastlog
|
||||||
Patch0: 2.36-login-lastlog-create.patch
|
Patch0: 2.36-login-lastlog-create.patch
|
||||||
|
# usptream patch, https://github.com/karelzak/util-linux/issues/1193
|
||||||
|
Patch1: libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The util-linux package contains a large variety of low-level system
|
The util-linux package contains a large variety of low-level system
|
||||||
@ -933,6 +935,14 @@ fi
|
|||||||
%{_libdir}/python*/site-packages/libmount/
|
%{_libdir}/python*/site-packages/libmount/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 7 2021 Karel Zak <kzak@redhat.com> - 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 <kzak@redhat.com> - 2.36-3
|
||||||
|
- fix #1860461 - sfdisk regression creating simple 3 partition MBR disk
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.36-2
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.36-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user