gentoo resync : 25.11.2020

7 files changed, 50 insertions, 237 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 8f1e2a6a0706..1c9455846d4c 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -2,17 +2,16 @@ AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f31680
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
 AUX util-linux-2.35.1-cleanup-pidfd-include.patch 1117 BLAKE2B a207824f36b2167f721b4420b5de47462cdc3f12187316ee0ba37bebd1561aee0c591a522cb9cf7f24986322e1954f1fab1e6fe1751dfebc116aec12f70cc81e SHA512 315b5aabad68d3363f1a06034c22347d755ead4b974fd7879ce41b29953b41be510705a4806577710bb8e9d32a8034002f6868fea287a214640c80324754ea00
-AUX util-linux-2.35.1-hwclock-glibc-2.31.patch 7779 BLAKE2B ba277632152ce2c628c959d31b76cd513fe1a52d8dfc362d357c58b6468293c5b1349cc5751323040892ce25a3a5c7e8c5fcb489e1fe823bf94667307a945cc7 SHA512 8de03a955cb9c90ebb4c08294054ce2d578bfc3d6910f1e7628832baa2fcbba4d80cc6368c4068ba8e14bdd359846923c6dd0493ab9cdd546e16136b9ea4e06e
-AUX util-linux-2.35.1-include_sys_types-header.patch 1774 BLAKE2B 813067f05881846cc0a3f7a06595900aae05e53a18de8d9660c9254326f1736dab701bb16185a2906d75372503d0bf1ac275456a0b213d0545e29ad752fc16cf SHA512 e02c1d4ed4c719c35eb8413c8cdf1868f571937ecaca13e3d5db4f82b690376ae92b4f75c25538e28fbc9d4cf5a1699e34e820d0a2b3e26d3354e916e3524f73
+AUX util-linux-2.36.1-libmount_dont_use_symfollow.patch 1576 BLAKE2B 9248b3a7646881c6cf3b4d53f1e28cf19d4f1444a881310c6569fb87063b5458063b53083872fe316318cd2ad4fd2164792fdfdc506e7371bb8b424f62b79f56 SHA512 fd310fdb8547b86dafd84564b3fb68167c02f25defc9cea1a5b2afc9af9e82f0b108a900b5073dd7394815d4c5bc894ebebe989b2c9a30ebecea7afc4083669f
 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
-DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
+DIST util-linux-2.36.1.tar.xz 5231880 BLAKE2B 52d867aa0b722a84828c37958d80b0bdcc1ceaae4e46fa6550ad0f2f152c52e4aaf2c8bc5fdf4f27b522037a870ff2554382abac0eaa50a6791d8b8016e3d74c SHA512 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a
 DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
 EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
-EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6
 EBUILD util-linux-2.35.2.ebuild 8893 BLAKE2B 7e815f2d65257a1165a5a4f9e60c3338754a5300e800bae1872786e7e4c8be549668565dcb861856f4cce63e20e5f103120d77f0cf7498723f271a95f7ce9d78 SHA512 d0a4c98fb3049508a6a5a8ed0fbe5e1dd73cab5a343cb7d6f4d9a959232618868647c149766b8cd5c73e8ffd7fa4b5a56fb2359e34bd578f51fae60b81cd4415
-EBUILD util-linux-2.36.ebuild 8827 BLAKE2B 8d93a0b2f43af1cb3ec7c54e257f270ffd854a4f51181bfface98d800c75f8f38d40f3d91bcc8336ef0671698a0304da219947e02d4ebf3c1f7955a2a9ca4752 SHA512 8b9794bcbfaa4f653b1a4bfffaddf9a681f8de4e24feae4d890df4a01f55afdbc01021a5c06176470c07233c9fd34d67a93efc1116817c7f105dbd0741281368
-EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b
+EBUILD util-linux-2.36.1-r1.ebuild 8904 BLAKE2B 3db44617352ed3acc74500ea6698e2baa41ce85d0260410cf5dfd9cec4f462254264a4481f89f1d21a8240a089928c2780395074a9413c4b4be6ffdfd4aa8d92 SHA512 f8f052242bf3262e30dac8053c373ad2ade653432d3e2a9ceb3801873ccbe6a134dff3dd368e4832389ed623bc61dd5808771682d9c62aa6a7dd0f8789243484
+EBUILD util-linux-2.36.ebuild 8829 BLAKE2B 65c336d5168454eefa2441d274921fe68df7fc273f593240ea063eaa34c4d1b97c8589849d8a0bc89dcdfee4984c08501847d068aff9e17f6f5d0296d98a6a73 SHA512 b7cc930e138a4763a57468ce2028e78ac4fee20b3748c5a946b5b8f89ba9410b9d2324fd95ccc81f3770ecbd9a127690497476d992f459f3f506462506e14108
+EBUILD util-linux-9999.ebuild 8764 BLAKE2B c9273cc668518f91dbff6ccb5edcbe4f9ba30f580240ec840f91ed66c68e69de682471390a0c9604d0f60926d6667d0265ebe8bc48aa8926cd6e1320b284ffec SHA512 950550197233fa9cafa404e04a69abcaaceeaaff8408cb1dd850efb7ae7a3ed57754210f2802dd81fe37f331ccb0ae58c0c141e192b0943ad99e050502a813eb
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch b/sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch
deleted file mode 100644
index c8b5cf76a23c..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.35.1-hwclock-glibc-2.31.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From cd781c405be82540484da3bfe3d3f17a39b8eb5c Mon Sep 17 00:00:00 2001
-From: J William Piggott <elseifthen@gmx.com>
-Date: Fri, 21 Feb 2020 20:03:47 -0500
-Subject: hwclock: make glibc 2.31 compatible
-
-______________________________________________________
-GNU C Library NEWS -- history of user-visible changes.
-Version 2.31
-Deprecated and removed features, and other changes affecting compatibility:
-
-* The settimeofday function can still be used to set a system-wide time
-  zone when the operating system supports it.  This is because the Linux
-  kernel reused the API, on some architectures, to describe a system-wide
-  time-zone-like offset between the software clock maintained by the kernel,
-  and the "RTC" clock that keeps time when the system is shut down.
-
-  However, to reduce the odds of this offset being set by accident,
-  settimeofday can no longer be used to set the time and the offset
-  simultaneously.  If both of its two arguments are non-null, the call
-  will fail (setting errno to EINVAL).
-
-  Callers attempting to set this offset should also be prepared for the call
-  to fail and set errno to ENOSYS; this already happens on the Hurd and on
-  some Linux architectures.  The Linux kernel maintainers are discussing a
-  more principled replacement for the reused API.  After a replacement
-  becomes available, we will change settimeofday to fail with ENOSYS on all
-  platforms when its 'tzp' argument is not a null pointer.
-
-  settimeofday itself is obsolescent according to POSIX.  Programs that set
-  the system time should use clock_settime and/or the adjtime family of
-  functions instead.  We may cease to make settimeofday available to newly
-  linked binaries after there is a replacement for Linux's time-zone-like
-  offset API.
-______________________________________________________
-
-hwclock(8) had one settimeofday(2) call where both args were set for
---hctosys when the RTC was ticking UTC. This allowed setting the system
-time, timezone, and locking the warp_clock function with a single call.
-That operation now takes 3 calls of settimeofday(2).
-
-Although this common operation now takes three calls, the overall logic
-for the set_system_clock() function was simplified.
-
-Co-Author: Karel Zak <kzak@redhat.com>
-Signed-off-by: J William Piggott <elseifthen@gmx.com>
----
- sys-utils/hwclock.c | 71 ++++++++++++++++++++++++++++-------------------------
- 1 file changed, 37 insertions(+), 34 deletions(-)
-
-diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
-index e736da717..1191a8571 100644
---- a/sys-utils/hwclock.c
-+++ b/sys-utils/hwclock.c
-@@ -643,28 +643,28 @@ display_time(struct timeval hwctime)
-  * tz.tz_minuteswest argument and sets PCIL (see below). At boot settimeofday(2)
-  * has one-shot access to this function as shown in the table below.
-  *
-- * +-------------------------------------------------------------------+
-- * |                       settimeofday(tv, tz)                        |
-- * |-------------------------------------------------------------------|
-- * |     Arguments     |  System Time  | PCIL |           | warp_clock |
-- * |   tv    |   tz    | set  | warped | set  | firsttime |   locked   |
-- * |---------|---------|---------------|------|-----------|------------|
-- * | pointer | NULL    |  yes |   no   |  no  |     1     |    no      |
-- * | pointer | pointer |  yes |   no   |  no  |     0     |    yes     |
-- * | NULL    | ptr2utc |  no  |   no   |  no  |     0     |    yes     |
-- * | NULL    | pointer |  no  |   yes  |  yes |     0     |    yes     |
-- * +-------------------------------------------------------------------+
-+ * +-------------------------------------------------------------------------+
-+ * |                           settimeofday(tv, tz)                          |
-+ * |-------------------------------------------------------------------------|
-+ * |     Arguments     |  System Time  | TZ  | PCIL |           | warp_clock |
-+ * |   tv    |   tz    | set  | warped | set | set  | firsttime |   locked   |
-+ * |---------|---------|---------------|-----|------|-----------|------------|
-+ * | pointer | NULL    |  yes |   no   | no  |  no  |     1     |    no      |
-+ * | NULL    | ptr2utc |  no  |   no   | yes |  no  |     0     |    yes     |
-+ * | NULL    | pointer |  no  |   yes  | yes |  yes |     0     |    yes     |
-+ * +-------------------------------------------------------------------------+
-  * ptr2utc: tz.tz_minuteswest is zero (UTC).
-  * PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale.
-  * firsttime: locks the warp_clock function (initialized to 1 at boot).
-+ * Since glibc v2.31 settimeofday() will fail if both args are non NULL
-  *
-  * +---------------------------------------------------------------------------+
-  * |  op     | RTC scale | settimeofday calls                                  |
-  * |---------|-----------|-----------------------------------------------------|
-  * | systz   |   Local   | 1) warps system time*, sets PCIL* and kernel tz     |
-  * | systz   |   UTC     | 1st) locks warp_clock* 2nd) sets kernel tz          |
-- * | hctosys |   Local   | 1st) sets PCIL* 2nd) sets system time and kernel tz |
-- * | hctosys |   UTC     | 1) sets system time and kernel tz                   |
-+ * | hctosys |   Local   | 1st) sets PCIL* & kernel tz   2nd) sets system time |
-+ * | hctosys |   UTC     | 1st) locks warp* 2nd) sets tz 3rd) sets system time |
-  * +---------------------------------------------------------------------------+
-  *                         * only on first call after boot
-  */
-@@ -675,42 +675,45 @@ set_system_clock(const struct hwclock_control *ctl,
- 	struct tm broken;
- 	int minuteswest;
- 	int rc = 0;
--	const struct timezone tz_utc = { 0 };
- 
- 	localtime_r(&newtime.tv_sec, &broken);
- 	minuteswest = -get_gmtoff(&broken) / 60;
- 
- 	if (ctl->verbose) {
--		if (ctl->hctosys && !ctl->universal)
--			printf(_("Calling settimeofday(NULL, %d) to set "
--				 "persistent_clock_is_local.\n"), minuteswest);
--		if (ctl->systz && ctl->universal)
-+		if (ctl->universal) {
- 			puts(_("Calling settimeofday(NULL, 0) "
--				"to lock the warp function."));
-+			       "to lock the warp_clock function."));
-+			if (!( ctl->universal && !minuteswest ))
-+				printf(_("Calling settimeofday(NULL, %d) "
-+					 "to set the kernel timezone.\n"),
-+				       minuteswest);
-+		} else
-+			printf(_("Calling settimeofday(NULL, %d) to warp "
-+				 "System time, set PCIL and the kernel tz.\n"),
-+			       minuteswest);
-+
- 		if (ctl->hctosys)
--			printf(_("Calling settimeofday(%ld.%06ld, %d)\n"),
--			       newtime.tv_sec, newtime.tv_usec, minuteswest);
--		else {
--			printf(_("Calling settimeofday(NULL, %d) "), minuteswest);
--			if (ctl->universal)
--				 puts(_("to set the kernel timezone."));
--			else
--				 puts(_("to warp System time."));
--		}
-+			printf(_("Calling settimeofday(%ld.%06ld, NULL) "
-+				 "to set the System time.\n"),
-+			       newtime.tv_sec, newtime.tv_usec);
- 	}
- 
- 	if (!ctl->testing) {
-+		const struct timezone tz_utc = { 0 };
- 		const struct timezone tz = { minuteswest };
- 
--		if (ctl->hctosys && !ctl->universal)	/* set PCIL */
--			rc = settimeofday(NULL, &tz);
--		if (ctl->systz && ctl->universal)	/* lock warp_clock */
-+		/* If UTC RTC: lock warp_clock and PCIL */
-+		if (ctl->universal)
- 			rc = settimeofday(NULL, &tz_utc);
--		if (!rc && ctl->hctosys)
--			rc = settimeofday(&newtime, &tz);
--		else if (!rc)
-+
-+		/* Set kernel tz; if localtime RTC: warp_clock and set PCIL */
-+		if (!rc && !( ctl->universal && !minuteswest ))
- 			rc = settimeofday(NULL, &tz);
- 
-+		/* Set the System Clock */
-+		if ((!rc || errno == ENOSYS) && ctl->hctosys)
-+			rc = settimeofday(&newtime, NULL);
-+
- 		if (rc) {
- 			warn(_("settimeofday() failed"));
- 			return  EXIT_FAILURE;
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch b/sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch
deleted file mode 100644
index 8c646ee73a9d..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 3cfde0370d3a8949df0c5bcf447cec6692910ed2 Mon Sep 17 00:00:00 2001
-From: Sami Kerola <kerolasa@iki.fi>
-Date: Sat, 15 Feb 2020 21:12:50 +0000
-Subject: [PATCH] kill: include sys/types.h before checking
- SYS_pidfd_send_signal
-
-Including sys/types.h must happen before SYS_pidfd_send_signal is checked,
-because that header defines variable in normal conditions.  When sys/types.h
-does not have SYS_pidfd_send_signal then fallback is defined in config.h
-that is included by default, and has therefore worked fine before and after
-this change.
-
-Signed-off-by: Sami Kerola <kerolasa@iki.fi>
----
- include/pidfd-utils.h | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
-index 593346576..0baedd2c9 100644
---- a/include/pidfd-utils.h
-+++ b/include/pidfd-utils.h
-@@ -1,26 +1,28 @@
- #ifndef UTIL_LINUX_PIDFD_UTILS
- #define UTIL_LINUX_PIDFD_UTILS
- 
--#if defined(__linux__) && defined(SYS_pidfd_send_signal)
--# include <sys/types.h>
-+#if defined(__linux__)
- # include <sys/syscall.h>
-+# if defined(SYS_pidfd_send_signal)
-+#  include <sys/types.h>
- 
--# ifndef HAVE_PIDFD_OPEN
-+#  ifndef HAVE_PIDFD_OPEN
- static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
- 				    unsigned int flags)
- {
- 	return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags);
- }
--# endif
-+#  endif
- 
--# ifndef HAVE_PIDFD_SEND_SIGNAL
-+#  ifndef HAVE_PIDFD_SEND_SIGNAL
- static inline int pidfd_open(pid_t pid, unsigned int flags)
- {
- 	return syscall(SYS_pidfd_open, pid, flags);
- }
--# endif
-+#  endif
- 
--# define UL_HAVE_PIDFD 1
-+#  define UL_HAVE_PIDFD 1
- 
--#endif /* __linux__ && SYS_pidfd_send_signal */
-+# endif	/* SYS_pidfd_send_signal */
-+#endif /* __linux__ */
- #endif /* UTIL_LINUX_PIDFD_UTILS */
diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch
new file mode 100644
index 000000000000..7c0b73f49d78
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch
@@ -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.29.2
+
diff --git a/sys-apps/util-linux/util-linux-2.35.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild
index 293433d1724c..f7acbfdb1510 100644
--- a/sys-apps/util-linux/util-linux-2.35.1-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
@@ -76,9 +76,7 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/util-linux-2.35.1-include_sys_types-header.patch
-	"${FILESDIR}"/util-linux-2.35.1-cleanup-pidfd-include.patch
-	"${FILESDIR}"/util-linux-2.35.1-hwclock-glibc-2.31.patch
+	"${FILESDIR}/${P}-libmount_dont_use_symfollow.patch" #755878
 )
 
 src_prepare() {
diff --git a/sys-apps/util-linux/util-linux-2.36.ebuild b/sys-apps/util-linux/util-linux-2.36.ebuild
index 904c2e473118..902e36ad068a 100644
--- a/sys-apps/util-linux/util-linux-2.36.ebuild
+++ b/sys-apps/util-linux/util-linux-2.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 345734beabba..d2570255b88c 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -277,7 +277,6 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-	chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die
 
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die