aboutsummaryrefslogtreecommitdiffstats
path: root/main/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'main/util-linux')
-rw-r--r--main/util-linux/APKBUILD8
-rw-r--r--main/util-linux/libmount-dont-use-symfollow-for-helpers-on-user-mounts.patch40
2 files changed, 3 insertions, 45 deletions
diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD
index a4b0e2e277..d0d18884d5 100644
--- a/main/util-linux/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -2,14 +2,14 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=util-linux
-pkgver=2.36.1
+pkgver=2.36.2
case $pkgver in
*.*.*) _v=${pkgver%.*};;
*.*) _v=$pkgver;;
esac
-pkgrel=1
+pkgrel=0
pkgdesc="Random collection of Linux utilities"
url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git"
arch="all"
@@ -20,7 +20,6 @@ makedepends_build="autoconf automake libtool"
makedepends_host="zlib-dev ncurses-dev linux-headers libcap-ng-dev"
options="suid"
source="https://www.kernel.org/pub/linux/utils/util-linux/v$_v/util-linux-$pkgver.tar.xz
- libmount-dont-use-symfollow-for-helpers-on-user-mounts.patch
ttydefaults.h
rfkill.confd
rfkill.initd
@@ -146,8 +145,7 @@ _py3() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a util-linux-2.36.1.tar.xz
-ef916685b7b8d36f6c0e5a0b4697bc9edcc139427eb050a16d5af4bc28960ba4760faf37550bc1d8afa183724a884eb23de6316ffca6f2903126872e8394686d libmount-dont-use-symfollow-for-helpers-on-user-mounts.patch
+sha512sums="6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b util-linux-2.36.2.tar.xz
876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h
401d2ccbdbfb0ebd573ac616c1077e2c2b79ff03e9221007759d8ac25eb522c401f705abbf7daac183d5e8017982b8ec5dd0a5ebad39507c5bb0a9f31f04ee97 rfkill.confd
c4e7ba6d257496c99934add2ca532db16fb070ea2367554587c9fb4e24ab1d80b8ba3fd0fd4fdd5ef1374c3ec6414007369b292ee334ef23171d0232ef709db2 rfkill.initd"
diff --git a/main/util-linux/libmount-dont-use-symfollow-for-helpers-on-user-mounts.patch b/main/util-linux/libmount-dont-use-symfollow-for-helpers-on-user-mounts.patch
deleted file mode 100644
index 9504df6f9d..0000000000
--- a/main/util-linux/libmount-dont-use-symfollow-for-helpers-on-user-mounts.patch
+++ /dev/null
@@ -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: 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)
---
-cgit 1.2.3-1.el7
-