commit: da1d16289d67d7d99ec17e1d04f0aa0bbab5c7b8 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Mar 7 09:27:46 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Mar 7 09:27:46 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1d1628
sys-apps/util-linux: Revbump fix bash-completion umount code execution Committed straight to stable. Bug: https://bugs.gentoo.org/649812 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../util-linux-2.32_rc2-umount_completion.patch | 41 ++++++++++++++++++++++ ...x-2.30.2.ebuild => util-linux-2.30.2-r1.ebuild} | 4 +++ ...x-2.31.1.ebuild => util-linux-2.31.1-r1.ebuild} | 4 +++ 3 files changed, 49 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch b/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch new file mode 100644 index 00000000000..1317c56f89e --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch @@ -0,0 +1,41 @@ +From 75f03badd7ed9f1dd951863d75e756883d3acc55 Mon Sep 17 00:00:00 2001 +From: Karel Zak <k...@redhat.com> +Date: Thu, 16 Nov 2017 16:27:32 +0100 +Subject: [PATCH] bash-completion: (umount) use findmnt, escape a space in + paths + + # mount /dev/sdc1 /mnt/test/foo\ bar + # umount <tab> + +has to return "/mnt/test/foo\ bar". + +Changes: + + * don't use mount | awk output, we have findmnt + * force compgen use \n as entries separator + +Addresses: https://github.com/karelzak/util-linux/issues/539 +Signed-off-by: Karel Zak <k...@redhat.com> +--- + bash-completion/umount | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/bash-completion/umount b/bash-completion/umount +index d76cb9fff..98c90d61a 100644 +--- a/bash-completion/umount ++++ b/bash-completion/umount +@@ -40,9 +40,10 @@ _umount_module() + return 0 + ;; + esac +- local DEVS_MPOINTS +- DEVS_MPOINTS="$(mount | awk '{print $1, $3}')" +- COMPREPLY=( $(compgen -W "$DEVS_MPOINTS" -- $cur) ) +- return 0 ++ ++ local oldifs=$IFS ++ IFS=$'\n' ++ COMPREPLY=( $( compgen -W '$(findmnt -lno TARGET | sed "s/\([[:blank:]]\)/\\\\\1/g")' -- "$cur" ) ) ++ IFS=$oldifs + } + complete -F _umount_module umount diff --git a/sys-apps/util-linux/util-linux-2.30.2.ebuild b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild similarity index 98% rename from sys-apps/util-linux/util-linux-2.30.2.ebuild rename to sys-apps/util-linux/util-linux-2.30.2-r1.ebuild index 09c71996e90..3077f85b78e 100644 --- a/sys-apps/util-linux/util-linux-2.30.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild @@ -61,6 +61,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${PN}-2.32_rc2-umount_completion.patch" #649812 +) + pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-apps/util-linux/util-linux-2.31.1.ebuild b/sys-apps/util-linux/util-linux-2.31.1-r1.ebuild similarity index 98% rename from sys-apps/util-linux/util-linux-2.31.1.ebuild rename to sys-apps/util-linux/util-linux-2.31.1-r1.ebuild index 41dd4c18eec..ce356da9a59 100644 --- a/sys-apps/util-linux/util-linux-2.31.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.31.1-r1.ebuild @@ -62,6 +62,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${PN}-2.32_rc2-umount_completion.patch" #649812 +) + pkg_setup() { use python && python-single-r1_pkg_setup }
