[PR PATCH] Util linux

[ailiop-git <ailiop-git@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1581 bytes --]

There is a new pull request by ailiop-git against master on the void-packages repository

https://github.com/ailiop-git/void-packages util-linux
https://github.com/void-linux/void-packages/pull/28769

Util linux
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28769.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-util-linux-28769.patch --]
[-- Type: text/x-diff, Size: 4792 bytes --]

From 4d043ad4cd070b9c1a12569d3174560aaa2776c3 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 12 Feb 2021 17:17:49 +0100
Subject: [PATCH 1/2] util-linux-libs: update to 2.36.2.

---
 srcpkgs/util-linux-libs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-libs/template
index ebca35ccb74..ad8c4512a35 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-libs/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux-libs'
 # Keep this package sync with util-linux
 pkgname=util-linux-libs
-version=2.36.1
-revision=2
+version=2.36.2
+revision=1
 wrksrc="util-linux-$version"
 build_style=meta
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed
+checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
 
 pre_configure() {
 	local _cfgdir="$XBPS_COMMONDIR/environment/configure"

From d9ce56fe9200a44340a7088bd6b6d5c67823aa69 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 12 Feb 2021 17:18:15 +0100
Subject: [PATCH 2/2] util-linux: update to 2.36.2.

---
 ...se-symfollow-for-helpers-on-user-mou.patch | 40 -------------------
 srcpkgs/util-linux/template                   |  6 +--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch

diff --git a/srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch b/srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
deleted file mode 100644
index d0c0ca4047d..00000000000
--- a/srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 52f730e47869ce630fafb24fd46f755dc7ffc691 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
---- libmount/src/context_mount.c
-+++ 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.30.1
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index fddaff9c8c4..4fb8292531b 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-libs
 pkgname=util-linux
-version=2.36.1
-revision=2
+version=2.36.2
+revision=1
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
  eudev-libudev-devel"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed
+checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"