From 4d043ad4cd070b9c1a12569d3174560aaa2776c3 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos 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 " 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 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 -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 ---- - 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 " 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"