From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CFF4715806E for ; Tue, 23 May 2023 03:14:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 153DDE0961; Tue, 23 May 2023 03:14:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EB426E0961 for ; Tue, 23 May 2023 03:14:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E15F833BE23 for ; Tue, 23 May 2023 03:14:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F0F0A71 for ; Tue, 23 May 2023 03:14:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1684811600.5ef0405e6d22915b93da87d5eb77ff132ca6da14.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch sys-apps/util-linux/util-linux-2.39-r2.ebuild X-VCS-Directories: sys-apps/util-linux/files/ sys-apps/util-linux/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5ef0405e6d22915b93da87d5eb77ff132ca6da14 X-VCS-Branch: master Date: Tue, 23 May 2023 03:14:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 63684e94-e21b-4c68-9e60-faca0abef6fd X-Archives-Hash: 2d0b6884b3a87d4ef9a97f7029cc05c9 commit: 5ef0405e6d22915b93da87d5eb77ff132ca6da14 Author: Sam James gentoo org> AuthorDate: Tue May 23 03:13:09 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 23 03:13:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef0405e sys-apps/util-linux: backport another mount regression fix (user option parsing) Closes: https://bugs.gentoo.org/906859 Signed-off-by: Sam James gentoo.org> .../util-linux-2.39-mount-parse-options-user.patch | 46 ++++++++++++++++++++++ sys-apps/util-linux/util-linux-2.39-r2.ebuild | 1 + 2 files changed, 47 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch b/sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch new file mode 100644 index 000000000000..e02d02c7f503 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/906797#c4 +https://bugs.gentoo.org/906859 +https://github.com/util-linux/util-linux/issues/2238 +https://github.com/util-linux/util-linux/commit/c0267687fd7b41b00d523d1985182d7eb574effd + +From c0267687fd7b41b00d523d1985182d7eb574effd Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Mon, 22 May 2023 15:00:25 +0200 +Subject: [PATCH] libmount: fix options prepend/insert and merging + + * the order of the new options should not be changed + (for example prepend "a,b,c" to list with "d" has to generate "a,b,c,d", not "c,b,a,d") + + * make sure that options map is defined when merging options + +Fixes: https://github.com/util-linux/util-linux/issues/2238 +Signed-off-by: Karel Zak +--- a/libmount/src/optlist.c ++++ b/libmount/src/optlist.c +@@ -338,6 +338,7 @@ int mnt_optlist_merge_opts(struct libmnt_optlist *ls) + + /* remove inverted option */ + else if (opt->ent && x->ent ++ && opt->map == x->map + && opt->ent->id == x->ent->id + && (opt->ent->mask & MNT_INVERT + || x->ent->mask & MNT_INVERT)) +@@ -520,6 +521,8 @@ static int optlist_add_optstr(struct libmnt_optlist *ls, const char *optstr, + if (!opt) + return -ENOMEM; + opt->src = MNT_OPTSRC_STRING; ++ if (where) ++ where = &opt->opts; + } + + optlist_cleanup_cache(ls); +@@ -622,6 +625,8 @@ static int optlist_add_flags(struct libmnt_optlist *ls, unsigned long flags, + if (!opt) + return -ENOMEM; + opt->src = MNT_OPTSRC_FLAG; ++ if (where) ++ where = &opt->opts; + } + + optlist_cleanup_cache(ls); + diff --git a/sys-apps/util-linux/util-linux-2.39-r2.ebuild b/sys-apps/util-linux/util-linux-2.39-r2.ebuild index 43dd41681342..edd0dd68e804 100644 --- a/sys-apps/util-linux/util-linux-2.39-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39-r2.ebuild @@ -97,6 +97,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-2.39-check-for-mount_setattr.patch" "${FILESDIR}/${PN}-2.39-tests-for-mount_setattr.patch" + "${FILESDIR}/${PN}-2.39-mount-parse-options-user.patch" ) pkg_pretend() {