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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 925FA1382C5 for ; Wed, 7 Mar 2018 09:28:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A13F9E08DB; Wed, 7 Mar 2018 09:28:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70857E08DB for ; Wed, 7 Mar 2018 09:28:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32405335C0C for ; Wed, 7 Mar 2018 09:28:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D486231 for ; Wed, 7 Mar 2018 09:28:03 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1520414866.da1d16289d67d7d99ec17e1d04f0aa0bbab5c7b8.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch sys-apps/util-linux/util-linux-2.30.2-r1.ebuild sys-apps/util-linux/util-linux-2.30.2.ebuild sys-apps/util-linux/util-linux-2.31.1-r1.ebuild sys-apps/util-linux/util-linux-2.31.1.ebuild X-VCS-Directories: sys-apps/util-linux/ sys-apps/util-linux/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: da1d16289d67d7d99ec17e1d04f0aa0bbab5c7b8 X-VCS-Branch: master Date: Wed, 7 Mar 2018 09:28: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-Archives-Salt: 8b5a4d6e-e014-47a8-9003-13aae8c1947c X-Archives-Hash: 264ba348732eb9de704fd776eb80b915 commit: da1d16289d67d7d99ec17e1d04f0aa0bbab5c7b8 Author: Lars Wendler gentoo org> AuthorDate: Wed Mar 7 09:27:46 2018 +0000 Commit: Lars Wendler gentoo 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 +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 + +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 +--- + 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 }