From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1124085-garchives=archives.gentoo.org@lists.gentoo.org>
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 122C3138334
for <garchives@archives.gentoo.org>; Wed, 20 Nov 2019 16:26:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4BADEE077D;
Wed, 20 Nov 2019 16:26:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 2FD86E077D
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Nov 2019 16:26:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 DFC2934D14C
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Nov 2019 16:26:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5756A8AE
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Nov 2019 16:26:41 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1574267102.18dc49f2ebbef778ce5032e2622edeb4afd39c95.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/fuse/fuse-3.8.0.ebuild
X-VCS-Directories: sys-fs/fuse/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 18dc49f2ebbef778ce5032e2622edeb4afd39c95
X-VCS-Branch: master
Date: Wed, 20 Nov 2019 16:26:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 20a61ae3-1ab5-477a-a64a-3876910a934c
X-Archives-Hash: 5649b529daba242d953cb2e920cc1c42
commit: 18dc49f2ebbef778ce5032e2622edeb4afd39c95
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 16:22:50 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 16:25:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18dc49f2
sys-fs/fuse: pass -Duseroot=false to meson configure
This prevents the /dev/fuse device node from being created by the build
system.
It also prevents the suid bit from being set on fusermount3, so handle
that using fperms in the ebuild, and make it optional via a USE flag.
Closes: https://bugs.gentoo.org/700764
Package-Manager: Portage-2.3.79_p3, Repoman-2.3.18_p2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-fs/fuse/fuse-3.8.0.ebuild | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sys-fs/fuse/fuse-3.8.0.ebuild b/sys-fs/fuse/fuse-3.8.0.ebuild
index 4aa4c87bdf3..44fefeee4ed 100644
--- a/sys-fs/fuse/fuse-3.8.0.ebuild
+++ b/sys-fs/fuse/fuse-3.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
+IUSE="+suid test"
RESTRICT="!test? ( test )"
BDEPEND="virtual/pkgconfig
@@ -44,6 +44,9 @@ src_prepare() {
}
multilib_src_configure() {
+ local emesonargs=(
+ -Duseroot=false
+ )
meson_src_configure
}
@@ -65,8 +68,8 @@ multilib_src_install_all() {
# installed via fuse-common
rm -r "${ED}"/{etc,$(get_udevdir)} || die
- # handled by the device manager
- rm -r "${D}"/dev || die
+ # useroot=false prevents the build system from doing this.
+ use suid && fperms u+s /usr/bin/fusermount3
# manually install man pages to respect compression
rm -r "${ED}"/usr/share/man || die