Revert "fuse: Import fuse 3"
This reverts commit 553b9a2b92a017cb624cad1c36d2e5275d0ae8ad.
Reason for revert: No longer needed
Original change's description:
> fuse: Import fuse 3
>
> Import libfuse3 alongside libfuse2 as a separate slot (3).
> libfuse2 remains slot 0 and thus the default.
> libfuse3 will be needed for drivefs soon.
>
> libfuse2 and 3 are designed to both run alongside each
> other which is why they are packaged as separate slots.
>
> libfuse3 is not used by any other package yet and this
> version is also not ready to be used yet, as we still
> need to apply patches in a follow-up.
>
> BUG=chromium:1242814
> TEST=emerge-zork sys-fs/fuse:3, cros deploy sys-fs/fuse-3.10.4
>
> Change-Id: I4715959126dbfbe5abea299f133aba4f599987e9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/3127962
> Reviewed-by: Austin Tankiang <austinct@chromium.org>
> Commit-Queue: Peter Marshall <petermarshall@chromium.org>
> Tested-by: Peter Marshall <petermarshall@chromium.org>
Bug=b/202788640
TEST=presubmit
RELEASE_NOTE=None
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/3229246
Tested-by: Peter Marshall <petermarshall@chromium.org>
Reviewed-by: Austin Tankiang <austinct@chromium.org>
Commit-Queue: Peter Marshall <petermarshall@chromium.org>
Change-Id: I2cad67b8f977d19001dcf441dbe98347ab8288f0
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/chromiumos-overlay/+/24840
Reviewed-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index a6fb3c7..9be808c 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,2 +1 @@
DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c06ba1f5b5756d27f5c32d3a0cc199d826b0c041118c5d2260ff023f58432a0d7b623807c0a4af4da7c34eff SHA512 0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad
-DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6
diff --git a/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch b/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch
deleted file mode 100644
index b5c141d..0000000
--- a/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From acb69eca6c25db44523efb4cb1e7088ae66d093d Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 3 Aug 2021 23:14:12 +0100
-Subject: [PATCH] Avoid calling umount
-
-Converting a sed into a patch.
-
-Ebuild had:
- # sandbox violation with mtab writability wrt #438250
- # don't sed configure.in without eautoreconf because of maintainer mode
- sed -i 's:umount --fake:true --fake:' configure || die
-
-Bug: https://bugs.gentoo.org/438250
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9946a0e..de433cb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,11 +101,11 @@ util_linux_ok=yes
- if test "$arch" = linux -a "$cross_compiling" != "yes"; then
- AC_MSG_CHECKING([if umount supports --fake --no-canonicalize])
- # exit code of umount is 1 if option is unrecognised, 2 otherwise
-- umount --fake --no-canonicalize > /dev/null 2>&1
-+ true --fake --no-canonicalize > /dev/null 2>&1
- if test $? != 1; then
- AC_MSG_RESULT([yes])
- else
-- firstline=`umount --fake --no-canonicalize 2>&1 | head -1`
-+ firstline=`true --fake --no-canonicalize 2>&1 | head -1`
- if test "$firstline" = 'umount: only root can use "--fake" option'; then
- AC_MSG_RESULT([yes])
- else
---
-2.32.0
-
diff --git a/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch b/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch
deleted file mode 100644
index beb8d51..0000000
--- a/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From ae2352bca9b4e607538412da0cc2a9625cd8b692 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 24 Jul 2021 22:02:45 +0100
-Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix
- glibc-2.34+)
-
-closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since
-it's available in glibc 2.34+, we want to detect it and only define our
-fallback if the libc doesn't provide it.
-
-Bug: https://bugs.gentoo.org/803923
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.ac | 1 +
- util/ulockmgr_server.c | 6 ++++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 9946a0efa..a2d481aa9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -55,6 +55,7 @@ fi
-
- AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
- AC_CHECK_FUNCS([posix_fallocate])
-+AC_CHECK_FUNCS([closefrom])
- AC_CHECK_MEMBERS([struct stat.st_atim])
- AC_CHECK_MEMBERS([struct stat.st_atimespec])
-
-diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
-index 273c7d923..a04dac5c6 100644
---- a/util/ulockmgr_server.c
-+++ b/util/ulockmgr_server.c
-@@ -22,6 +22,10 @@
- #include <sys/socket.h>
- #include <sys/wait.h>
-
-+#ifdef HAVE_CONFIG_H
-+ #include "config.h"
-+#endif
-+
- struct message {
- unsigned intr : 1;
- unsigned nofd : 1;
-@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp,
- return res;
- }
-
-+#if !defined(HAVE_CLOSEFROM)
- static int closefrom(int minfd)
- {
- DIR *dir = opendir("/proc/self/fd");
-@@ -141,6 +146,7 @@ static int closefrom(int minfd)
- }
- return 0;
- }
-+#endif
-
- static void send_reply(int cfd, struct message *msg)
- {
diff --git a/sys-fs/fuse/fuse-3.10.4.ebuild b/sys-fs/fuse/fuse-3.10.4.ebuild
deleted file mode 100644
index 9d02b0b..0000000
--- a/sys-fs/fuse/fuse-3.10.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit meson-multilib udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="*"
-IUSE="+suid test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
- )"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
- has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python_setup
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use test examples)
- -Duseroot=false
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- )
- meson_src_configure
-}
-
-src_test() {
- if [[ ${EUID} != 0 ]]; then
- ewarn "Running as non-root user, skipping tests"
- elif has sandbox ${FEATURES}; then
- ewarn "Sandbox enabled, skipping tests"
- else
- multilib-minimal_src_test
- fi
-}
-
-multilib_src_test() {
- ${EPYTHON} -m pytest test || die
-}
-
-multilib_src_install_all() {
- # installed via fuse-common
- rm -r "${ED}"{/etc,$(get_udevdir)} || die
-
- # init script location is hard-coded in install_helper.sh
- rm -rf "${D}"/etc || 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
- doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/fuse/metadata.xml b/sys-fs/fuse/metadata.xml
index b23dca6..4234371 100644
--- a/sys-fs/fuse/metadata.xml
+++ b/sys-fs/fuse/metadata.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
- <remote-id type="github">libfuse/libfuse</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
+ <remote-id type="github">libfuse/libfuse</remote-id>
+ </upstream>
</pkgmetadata>
