* [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/files/, sys-fs/fuse/
@ 2021-08-03 22:20 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-08-03 22:20 UTC (permalink / raw
To: gentoo-commits
commit: 8a970396fca7aca2d5a761b8e7a8242f1eef14c9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 3 22:19:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 3 22:19:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a970396
sys-fs/fuse: fix build with glibc 2.34
Backporting the same patch which is now upstream,
converted to patches for autotools changes rather
than sed for further changes.
Bug: https://bugs.gentoo.org/438250
Closes: https://bugs.gentoo.org/803923
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/fuse-2.9.9-avoid-calling-umount.patch | 38 ++++++++++++++
.../files/fuse-2.9.9-closefrom-glibc-2-34.patch | 60 ++++++++++++++++++++++
sys-fs/fuse/fuse-2.9.9-r1.ebuild | 22 ++++----
3 files changed, 110 insertions(+), 10 deletions(-)
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
new file mode 100644
index 00000000000..b5c141d29ed
--- /dev/null
+++ b/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 00000000000..beb8d51da1e
--- /dev/null
+++ b/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch
@@ -0,0 +1,60 @@
+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-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
index aaf77a867a8..d7a2b42e611 100644
--- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic libtool linux-info udev
+inherit autotools flag-o-matic linux-info udev
DESCRIPTION="An interface for filesystems implemented in userspace"
HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -18,6 +18,12 @@ PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
BDEPEND="virtual/pkgconfig"
RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch
+ "${FILESDIR}"/${PN}-2.9.9-avoid-calling-umount.patch
+ "${FILESDIR}"/${PN}-2.9.9-closefrom-glibc-2-34.patch
+)
+
pkg_setup() {
if use kernel_linux ; then
if kernel_is lt 2 6 9 ; then
@@ -30,21 +36,17 @@ pkg_setup() {
}
src_prepare() {
- local PATCHES=( "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch )
- # 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
- elibtoolize
+ default
+ eautoreconf
+}
+
+src_configure() {
# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
# gcc-9 with -flto leads to link failures: #663518,
# https://gcc.gnu.org/PR91186
filter-flags -flto*
- default
-}
-
-src_configure() {
econf \
INIT_D_PATH="${EPREFIX}/etc/init.d" \
MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/files/, sys-fs/fuse/
@ 2023-02-12 21:56 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-02-12 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 0792f75841ee6ec2c9a08b52d42f94917cc7c0fe
Author: Martin Kletzander <nert.pinx <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 14:54:11 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 21:55:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0792f758
sys-fs/fuse: Fix polluted public header
Backport upstream commit d7560cc9916b086bfe5d86459cc9f04033edd904 [1]
which fixes fuse header having non-uniques defines, particularly
PACKAGE_VERSION which then breaks the build of dependent packages that
have the same define even in just private headers.
Signed-off-by: Martin Kletzander <nert.pinx <AT> gmail.com>
[1] https://github.com/libfuse/libfuse/commit/d7560cc9916b086bfe5d86459cc9f04033edd904
Closes: https://github.com/gentoo/gentoo/pull/29530
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch | 256 ++++++++++++++++++++++
sys-fs/fuse/fuse-3.13.1-r1.ebuild | 76 +++++++
2 files changed, 332 insertions(+)
diff --git a/sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch b/sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch
new file mode 100644
index 000000000000..d61657f3c285
--- /dev/null
+++ b/sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch
@@ -0,0 +1,256 @@
+From d7560cc9916b086bfe5d86459cc9f04033edd904 Mon Sep 17 00:00:00 2001
+Message-Id: <d7560cc9916b086bfe5d86459cc9f04033edd904.1676039329.git.nert.pinx@gmail.com>
+From: Bernd Schubert <bschubert@ddn.com>
+Date: Tue, 7 Feb 2023 23:06:42 +0100
+Subject: [PATCH] Split config.h into private and public config
+
+This addresses https://github.com/libfuse/libfuse/issues/729
+
+commit db35a37def14b72181f3630efeea0e0433103c41 introduced a public
+config.h (rename to fuse_config.h to avoid conflicts) that
+was installed with the package and included by libfuse users
+through fuse_common.h. Probablem is that this file does not have
+unique defines so that they are unique to libfuse - on including
+the file conflicts with libfuse users came up.
+
+In principle all defines could be prefixed, but then most of them
+are internal for libfuse compilation only. So this splits out
+publically required defines to a new file 'libfuse_config.h'
+and changes back to include of "fuse_config.h" only when
+HAVE_LIBFUSE_PRIVATE_CONFIG_H is defined.
+
+This also renames HAVE_LIBC_VERSIONED_SYMBOLS to
+LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS, as it actually
+better explains for libfuse users what that variable
+is for.
+
+Signed-off-by: Martin Kletzander <nert.pinx@gmail.com>
+---
+ include/fuse.h | 10 ++++-----
+ include/fuse_common.h | 5 +++++
+ include/fuse_lowlevel.h | 4 ++--
+ lib/compat.c | 2 +-
+ lib/fuse_misc.h | 2 +-
+ lib/meson.build | 2 +-
+ meson.build | 45 ++++++++++++++++++++++++++++-------------
+ 7 files changed, 46 insertions(+), 24 deletions(-)
+
+diff --git a/include/fuse.h b/include/fuse.h
+index 2888d2b497c1..6f162dd07821 100644
+--- a/include/fuse.h
++++ b/include/fuse.h
+@@ -948,15 +948,15 @@ struct fuse *fuse_new_30(struct fuse_args *args, const struct fuse_operations *o
+ size_t op_size, void *private_data);
+ #define fuse_new(args, op, size, data) fuse_new_30(args, op, size, data)
+ #else
+-#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
++#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
+ struct fuse *fuse_new(struct fuse_args *args, const struct fuse_operations *op,
+ size_t op_size, void *private_data);
+-#else /* HAVE_LIBC_VERSIONED_SYMBOLS */
++#else /* LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS */
+ struct fuse *fuse_new_31(struct fuse_args *args,
+ const struct fuse_operations *op,
+ size_t op_size, void *user_data);
+ #define fuse_new(args, op, size, data) fuse_new_31(args, op, size, data)
+-#endif /* HAVE_LIBC_VERSIONED_SYMBOLS */
++#endif /* LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS */
+ #endif
+
+ /**
+@@ -1053,11 +1053,11 @@ int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config);
+ *
+ * See also: fuse_loop()
+ */
+-#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
++#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
+ int fuse_loop_mt(struct fuse *f, struct fuse_loop_config *config);
+ #else
+ #define fuse_loop_mt(f, config) fuse_loop_mt_312(f, config)
+-#endif /* HAVE_LIBC_VERSIONED_SYMBOLS */
++#endif /* LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS */
+ #endif
+
+
+diff --git a/include/fuse_common.h b/include/fuse_common.h
+index 1d050bb3a00a..8ee1a34029ff 100644
+--- a/include/fuse_common.h
++++ b/include/fuse_common.h
+@@ -14,7 +14,12 @@
+ #ifndef FUSE_COMMON_H_
+ #define FUSE_COMMON_H_
+
++#ifdef HAVE_LIBFUSE_PRIVATE_CONFIG_H
+ #include "fuse_config.h"
++#endif
++
++#include "libfuse_config.h"
++
+ #include "fuse_opt.h"
+ #include "fuse_log.h"
+ #include <stdint.h>
+diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
+index 96088d7ae8f2..9099e45357f3 100644
+--- a/include/fuse_lowlevel.h
++++ b/include/fuse_lowlevel.h
+@@ -1958,7 +1958,7 @@ struct fuse_cmdline_opts {
+ * @param opts output argument for parsed options
+ * @return 0 on success, -1 on failure
+ */
+-#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
++#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
+ int fuse_parse_cmdline(struct fuse_args *args,
+ struct fuse_cmdline_opts *opts);
+ #else
+@@ -2076,7 +2076,7 @@ int fuse_session_loop(struct fuse_session *se);
+ int fuse_session_loop_mt_32(struct fuse_session *se, struct fuse_loop_config *config);
+ #define fuse_session_loop_mt(se, config) fuse_session_loop_mt_32(se, config)
+ #else
+- #if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
++ #if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
+ /**
+ * Enter a multi-threaded event loop.
+ *
+diff --git a/lib/compat.c b/lib/compat.c
+index cab6cbfe9641..0bac39e597f4 100644
+--- a/lib/compat.c
++++ b/lib/compat.c
+@@ -34,7 +34,7 @@
+ /**
+ * Compatibility ABI symbol for systems that do not support version symboling
+ */
+-#if (!defined(HAVE_LIBC_VERSIONED_SYMBOLS))
++#if (!defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
+ /* With current libfuse fuse_parse_cmdline is a macro pointing to the
+ * versioned function. Here in this file we need to provide the ABI symbol
+ * and the redirecting macro is conflicting.
+diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h
+index 37e3635bbc1d..855edc326d0f 100644
+--- a/lib/fuse_misc.h
++++ b/lib/fuse_misc.h
+@@ -15,7 +15,7 @@
+ Note: "@@" denotes the default symbol, "@" is binary a compat version.
+
+ */
+-#ifdef HAVE_LIBC_VERSIONED_SYMBOLS
++#ifdef LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS
+ # if HAVE_SYMVER_ATTRIBUTE
+ # define FUSE_SYMVER(sym1, sym2) __attribute__ ((symver (sym2)))
+ # else
+diff --git a/lib/meson.build b/lib/meson.build
+index 54d07597c519..904463095d98 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -11,7 +11,7 @@ else
+ endif
+
+ deps = [ thread_dep ]
+-if cfg.get('HAVE_ICONV')
++if private_cfg.get('HAVE_ICONV')
+ libfuse_sources += [ 'modules/iconv.c' ]
+ libiconv = cc.find_library('iconv', required: false)
+ if libiconv.found()
+diff --git a/meson.build b/meson.build
+index eb7b47727b4f..fb6451a0daac 100644
+--- a/meson.build
++++ b/meson.build
+@@ -16,11 +16,22 @@ elif platform == 'cygwin' or platform == 'windows'
+ 'Take a look at http://www.secfs.net/winfsp/ instead')
+ endif
+
++cc = meson.get_compiler('c')
++
+ #
+-# Feature detection
++# Feature detection, only available at libfuse compilation time,
++# but not for application linking to libfuse.
+ #
+-cfg = configuration_data()
+-cc = meson.get_compiler('c')
++private_cfg = configuration_data()
++
++#
++# Feature detection, the resulting config file is installed
++# with the package.
++# Note: Symbols need to be care fully named, to avoid conflicts
++# with applications linking to libfuse and including
++# this config.
++#
++public_cfg = configuration_data()
+
+ # Default includes when checking for presence of functions and
+ # struct members
+@@ -35,27 +46,27 @@ include_default = '''
+ '''
+ args_default = [ '-D_GNU_SOURCE' ]
+
+-cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
++private_cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
+
+ # Test for presence of some functions
+ test_funcs = [ 'fork', 'fstatat', 'openat', 'readlinkat', 'pipe2',
+ 'splice', 'vmsplice', 'posix_fallocate', 'fdatasync',
+ 'utimensat', 'copy_file_range', 'fallocate' ]
+ foreach func : test_funcs
+- cfg.set('HAVE_' + func.to_upper(),
++ private_cfg.set('HAVE_' + func.to_upper(),
+ cc.has_function(func, prefix: include_default, args: args_default))
+ endforeach
+-cfg.set('HAVE_SETXATTR',
++private_cfg.set('HAVE_SETXATTR',
+ cc.has_function('setxattr', prefix: '#include <sys/xattr.h>'))
+-cfg.set('HAVE_ICONV',
++private_cfg.set('HAVE_ICONV',
+ cc.has_function('iconv', prefix: '#include <iconv.h>'))
+
+ # Test if structs have specific member
+-cfg.set('HAVE_STRUCT_STAT_ST_ATIM',
++private_cfg.set('HAVE_STRUCT_STAT_ST_ATIM',
+ cc.has_member('struct stat', 'st_atim',
+ prefix: include_default,
+ args: args_default))
+-cfg.set('HAVE_STRUCT_STAT_ST_ATIMESPEC',
++private_cfg.set('HAVE_STRUCT_STAT_ST_ATIMESPEC',
+ cc.has_member('struct stat', 'st_atimespec',
+ prefix: include_default,
+ args: args_default))
+@@ -63,7 +74,7 @@ cfg.set('HAVE_STRUCT_STAT_ST_ATIMESPEC',
+ #
+ # Compiler configuration
+ #
+-add_project_arguments('-D_REENTRANT', '-DHAVE_CONFIG_H', '-Wno-sign-compare',
++add_project_arguments('-D_REENTRANT', '-DHAVE_LIBFUSE_PRIVATE_CONFIG_H', '-Wno-sign-compare',
+ '-Wstrict-prototypes', '-Wmissing-declarations', '-Wwrite-strings',
+ '-fno-strict-aliasing', language: 'c')
+ add_project_arguments('-D_REENTRANT', '-DHAVE_CONFIG_H', '-D_GNU_SOURCE',
+@@ -111,7 +122,7 @@ endif
+
+ if versioned_symbols == 1
+ message('Enabling versioned libc symbols')
+- cfg.set('HAVE_LIBC_VERSIONED_SYMBOLS', 1)
++ public_cfg.set('LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS', 1)
+
+ # gcc-10 and newer support the symver attribute which we need to use if we
+ # want to support LTO
+@@ -140,9 +151,15 @@ else
+ message('Disabling versioned libc symbols')
+ endif
+
+-# Write the test results into config.h (stored in build directory)
+-configure_file(output: 'fuse_config.h',
+- configuration : cfg, install: true, install_dir: 'include/fuse3')
++# Write private test results into fuse_config.h (stored in build directory)
++configure_file(output: 'fuse_config.h', configuration : private_cfg)
++
++# Write the test results, installed with the package,
++# symbols need to be properly prefixed to avoid
++# symbol (define) conflicts
++configure_file(output: 'libfuse_config.h',
++ configuration : public_cfg,
++ install: true, install_dir: 'include/fuse3')
+
+ # '.' will refer to current build directory, which contains config.h
+ include_dirs = include_directories('include', 'lib', '.')
+--
+2.39.1
+
diff --git a/sys-fs/fuse/fuse-3.13.1-r1.ebuild b/sys-fs/fuse/fuse-3.13.1-r1.ebuild
new file mode 100644
index 000000000000..2d12bd5021b5
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.13.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit flag-o-matic 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+suid test"
+RESTRICT="!test? ( test ) test? ( userpriv )"
+
+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 )
+
+PATCHES=(
+ "${FILESDIR}"/fuse-3.13.1-r1-fix-config.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ # bug #853058
+ filter-lto
+
+ local emesonargs=(
+ $(meson_use test examples)
+ $(meson_use test tests)
+ -Duseroot=false
+ -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+ )
+ meson_src_configure
+}
+
+src_test() {
+ if has sandbox ${FEATURES}; then
+ ewarn "Sandbox enabled, skipping tests"
+ else
+ multilib-minimal_src_test
+ fi
+}
+
+multilib_src_test() {
+ epytest
+}
+
+multilib_src_install_all() {
+ # Installed via fuse-common
+ rm -r "${ED}"{/etc,$(get_udevdir)} || die
+ rm -rf "${ED}"/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}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/files/, sys-fs/fuse/
@ 2023-06-27 7:06 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-06-27 7:06 UTC (permalink / raw
To: gentoo-commits
commit: baaa749c367804e327ab4a0c6db13220d326b582
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 07:02:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 07:06:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baaa749c
sys-fs/fuse: drop 3.12.0, 3.13.1-r1, 3.14.0, 3.14.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/fuse/Manifest | 4 -
sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch | 256 ----------------------
sys-fs/fuse/fuse-3.12.0.ebuild | 69 ------
sys-fs/fuse/fuse-3.13.1-r1.ebuild | 76 -------
sys-fs/fuse/fuse-3.14.0.ebuild | 72 ------
sys-fs/fuse/fuse-3.14.1.ebuild | 72 ------
6 files changed, 549 deletions(-)
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 87e684f9ba2b..c1f37d2e4a7f 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,7 +1,3 @@
DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
-DIST fuse-3.12.0.tar.xz 3206368 BLAKE2B 9f7df324f5c28480e48264c53c23fd2afc372592aab586bebdee38a809881603c93d05d0ca20c9007ba4b77efdf391705a93a0a6a12b218c9bd5541aa6a5275d SHA512 b66232785fbe83ec32a9779542d085dc2c19f1fe0655e5f1e22e1a7add69795df40eb58da256a963537e64a9bf798ed8dfbc678f977fdd22567c5befa5b6ca04
-DIST fuse-3.13.1.tar.xz 4011224 BLAKE2B b8e6cb54bc88e2133a90e9a1dce549f81ce1503906424dd36825cfdfc2b7340217b84176c9e9c707403ea4fe0e0a10a723613bb475c95fb59ff0cb35e7180c60 SHA512 7630e17a68d81e1ac66c9e8937bc9e1a99d8887d48639cbd5a96d04c7f687729dbab71a875d90bb77bdf361a154f195223f34c3438ab149630286bf87238c679
-DIST fuse-3.14.0.tar.xz 4351852 BLAKE2B c8765b72c95b6983b9c561baf4b4d6f9eb63441348f04e1992463241df0a8ed426f4336dd2e9ee7fc4b1f550ce30d3c3c08b80a4a476754667c698bcc5dcdb0b SHA512 4589df0ed975d6cc75a0a8ec032e934ad65c77f99194da6aba968cb6d5ee73f13c7eee1a78800965c4a9355b8d7d04c861aa881d502fc147a1e7c6677418ce1c
-DIST fuse-3.14.1.tar.xz 4404984 BLAKE2B 36e982066c10aea1cff269bac635fca0776d0a7844c35ff21db568b22e5dc0ffb8877be50e42646ba120ba29367b6de282a62960f6b28c4c2b462c49e335f6bc SHA512 ef5a67c857ab4cb4d2d3dcb252fa98acb102c3c2db226f812a899f2a137026b7037f757d76d196a63fff0e11683b7e13b8c13c67aaa1fec8c223b26a621c806d
DIST fuse-3.15.0.tar.xz 4589124 BLAKE2B 4777a956f8429aee2e5da43b9606ac6acc66744943739051f2be87a646b93c2aaa8f0b7f0c188f6d1724c1ab3fdf706d35c981066b0ba8c4dd647c0eb1f3c821 SHA512 5046b827c2cdccd03031761aeb995caf159f075a16cdda7248fcdd81177500f337368208948e0ff0e4bee32d06dd3d2d966828d3b5e82a79339f28a01727b1ae
DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55
diff --git a/sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch b/sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch
deleted file mode 100644
index d61657f3c285..000000000000
--- a/sys-fs/fuse/files/fuse-3.13.1-r1-fix-config.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From d7560cc9916b086bfe5d86459cc9f04033edd904 Mon Sep 17 00:00:00 2001
-Message-Id: <d7560cc9916b086bfe5d86459cc9f04033edd904.1676039329.git.nert.pinx@gmail.com>
-From: Bernd Schubert <bschubert@ddn.com>
-Date: Tue, 7 Feb 2023 23:06:42 +0100
-Subject: [PATCH] Split config.h into private and public config
-
-This addresses https://github.com/libfuse/libfuse/issues/729
-
-commit db35a37def14b72181f3630efeea0e0433103c41 introduced a public
-config.h (rename to fuse_config.h to avoid conflicts) that
-was installed with the package and included by libfuse users
-through fuse_common.h. Probablem is that this file does not have
-unique defines so that they are unique to libfuse - on including
-the file conflicts with libfuse users came up.
-
-In principle all defines could be prefixed, but then most of them
-are internal for libfuse compilation only. So this splits out
-publically required defines to a new file 'libfuse_config.h'
-and changes back to include of "fuse_config.h" only when
-HAVE_LIBFUSE_PRIVATE_CONFIG_H is defined.
-
-This also renames HAVE_LIBC_VERSIONED_SYMBOLS to
-LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS, as it actually
-better explains for libfuse users what that variable
-is for.
-
-Signed-off-by: Martin Kletzander <nert.pinx@gmail.com>
----
- include/fuse.h | 10 ++++-----
- include/fuse_common.h | 5 +++++
- include/fuse_lowlevel.h | 4 ++--
- lib/compat.c | 2 +-
- lib/fuse_misc.h | 2 +-
- lib/meson.build | 2 +-
- meson.build | 45 ++++++++++++++++++++++++++++-------------
- 7 files changed, 46 insertions(+), 24 deletions(-)
-
-diff --git a/include/fuse.h b/include/fuse.h
-index 2888d2b497c1..6f162dd07821 100644
---- a/include/fuse.h
-+++ b/include/fuse.h
-@@ -948,15 +948,15 @@ struct fuse *fuse_new_30(struct fuse_args *args, const struct fuse_operations *o
- size_t op_size, void *private_data);
- #define fuse_new(args, op, size, data) fuse_new_30(args, op, size, data)
- #else
--#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- struct fuse *fuse_new(struct fuse_args *args, const struct fuse_operations *op,
- size_t op_size, void *private_data);
--#else /* HAVE_LIBC_VERSIONED_SYMBOLS */
-+#else /* LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS */
- struct fuse *fuse_new_31(struct fuse_args *args,
- const struct fuse_operations *op,
- size_t op_size, void *user_data);
- #define fuse_new(args, op, size, data) fuse_new_31(args, op, size, data)
--#endif /* HAVE_LIBC_VERSIONED_SYMBOLS */
-+#endif /* LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS */
- #endif
-
- /**
-@@ -1053,11 +1053,11 @@ int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config);
- *
- * See also: fuse_loop()
- */
--#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- int fuse_loop_mt(struct fuse *f, struct fuse_loop_config *config);
- #else
- #define fuse_loop_mt(f, config) fuse_loop_mt_312(f, config)
--#endif /* HAVE_LIBC_VERSIONED_SYMBOLS */
-+#endif /* LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS */
- #endif
-
-
-diff --git a/include/fuse_common.h b/include/fuse_common.h
-index 1d050bb3a00a..8ee1a34029ff 100644
---- a/include/fuse_common.h
-+++ b/include/fuse_common.h
-@@ -14,7 +14,12 @@
- #ifndef FUSE_COMMON_H_
- #define FUSE_COMMON_H_
-
-+#ifdef HAVE_LIBFUSE_PRIVATE_CONFIG_H
- #include "fuse_config.h"
-+#endif
-+
-+#include "libfuse_config.h"
-+
- #include "fuse_opt.h"
- #include "fuse_log.h"
- #include <stdint.h>
-diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
-index 96088d7ae8f2..9099e45357f3 100644
---- a/include/fuse_lowlevel.h
-+++ b/include/fuse_lowlevel.h
-@@ -1958,7 +1958,7 @@ struct fuse_cmdline_opts {
- * @param opts output argument for parsed options
- * @return 0 on success, -1 on failure
- */
--#if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+#if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- int fuse_parse_cmdline(struct fuse_args *args,
- struct fuse_cmdline_opts *opts);
- #else
-@@ -2076,7 +2076,7 @@ int fuse_session_loop(struct fuse_session *se);
- int fuse_session_loop_mt_32(struct fuse_session *se, struct fuse_loop_config *config);
- #define fuse_session_loop_mt(se, config) fuse_session_loop_mt_32(se, config)
- #else
-- #if (defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+ #if (defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- /**
- * Enter a multi-threaded event loop.
- *
-diff --git a/lib/compat.c b/lib/compat.c
-index cab6cbfe9641..0bac39e597f4 100644
---- a/lib/compat.c
-+++ b/lib/compat.c
-@@ -34,7 +34,7 @@
- /**
- * Compatibility ABI symbol for systems that do not support version symboling
- */
--#if (!defined(HAVE_LIBC_VERSIONED_SYMBOLS))
-+#if (!defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS))
- /* With current libfuse fuse_parse_cmdline is a macro pointing to the
- * versioned function. Here in this file we need to provide the ABI symbol
- * and the redirecting macro is conflicting.
-diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h
-index 37e3635bbc1d..855edc326d0f 100644
---- a/lib/fuse_misc.h
-+++ b/lib/fuse_misc.h
-@@ -15,7 +15,7 @@
- Note: "@@" denotes the default symbol, "@" is binary a compat version.
-
- */
--#ifdef HAVE_LIBC_VERSIONED_SYMBOLS
-+#ifdef LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS
- # if HAVE_SYMVER_ATTRIBUTE
- # define FUSE_SYMVER(sym1, sym2) __attribute__ ((symver (sym2)))
- # else
-diff --git a/lib/meson.build b/lib/meson.build
-index 54d07597c519..904463095d98 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -11,7 +11,7 @@ else
- endif
-
- deps = [ thread_dep ]
--if cfg.get('HAVE_ICONV')
-+if private_cfg.get('HAVE_ICONV')
- libfuse_sources += [ 'modules/iconv.c' ]
- libiconv = cc.find_library('iconv', required: false)
- if libiconv.found()
-diff --git a/meson.build b/meson.build
-index eb7b47727b4f..fb6451a0daac 100644
---- a/meson.build
-+++ b/meson.build
-@@ -16,11 +16,22 @@ elif platform == 'cygwin' or platform == 'windows'
- 'Take a look at http://www.secfs.net/winfsp/ instead')
- endif
-
-+cc = meson.get_compiler('c')
-+
- #
--# Feature detection
-+# Feature detection, only available at libfuse compilation time,
-+# but not for application linking to libfuse.
- #
--cfg = configuration_data()
--cc = meson.get_compiler('c')
-+private_cfg = configuration_data()
-+
-+#
-+# Feature detection, the resulting config file is installed
-+# with the package.
-+# Note: Symbols need to be care fully named, to avoid conflicts
-+# with applications linking to libfuse and including
-+# this config.
-+#
-+public_cfg = configuration_data()
-
- # Default includes when checking for presence of functions and
- # struct members
-@@ -35,27 +46,27 @@ include_default = '''
- '''
- args_default = [ '-D_GNU_SOURCE' ]
-
--cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
-+private_cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
-
- # Test for presence of some functions
- test_funcs = [ 'fork', 'fstatat', 'openat', 'readlinkat', 'pipe2',
- 'splice', 'vmsplice', 'posix_fallocate', 'fdatasync',
- 'utimensat', 'copy_file_range', 'fallocate' ]
- foreach func : test_funcs
-- cfg.set('HAVE_' + func.to_upper(),
-+ private_cfg.set('HAVE_' + func.to_upper(),
- cc.has_function(func, prefix: include_default, args: args_default))
- endforeach
--cfg.set('HAVE_SETXATTR',
-+private_cfg.set('HAVE_SETXATTR',
- cc.has_function('setxattr', prefix: '#include <sys/xattr.h>'))
--cfg.set('HAVE_ICONV',
-+private_cfg.set('HAVE_ICONV',
- cc.has_function('iconv', prefix: '#include <iconv.h>'))
-
- # Test if structs have specific member
--cfg.set('HAVE_STRUCT_STAT_ST_ATIM',
-+private_cfg.set('HAVE_STRUCT_STAT_ST_ATIM',
- cc.has_member('struct stat', 'st_atim',
- prefix: include_default,
- args: args_default))
--cfg.set('HAVE_STRUCT_STAT_ST_ATIMESPEC',
-+private_cfg.set('HAVE_STRUCT_STAT_ST_ATIMESPEC',
- cc.has_member('struct stat', 'st_atimespec',
- prefix: include_default,
- args: args_default))
-@@ -63,7 +74,7 @@ cfg.set('HAVE_STRUCT_STAT_ST_ATIMESPEC',
- #
- # Compiler configuration
- #
--add_project_arguments('-D_REENTRANT', '-DHAVE_CONFIG_H', '-Wno-sign-compare',
-+add_project_arguments('-D_REENTRANT', '-DHAVE_LIBFUSE_PRIVATE_CONFIG_H', '-Wno-sign-compare',
- '-Wstrict-prototypes', '-Wmissing-declarations', '-Wwrite-strings',
- '-fno-strict-aliasing', language: 'c')
- add_project_arguments('-D_REENTRANT', '-DHAVE_CONFIG_H', '-D_GNU_SOURCE',
-@@ -111,7 +122,7 @@ endif
-
- if versioned_symbols == 1
- message('Enabling versioned libc symbols')
-- cfg.set('HAVE_LIBC_VERSIONED_SYMBOLS', 1)
-+ public_cfg.set('LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS', 1)
-
- # gcc-10 and newer support the symver attribute which we need to use if we
- # want to support LTO
-@@ -140,9 +151,15 @@ else
- message('Disabling versioned libc symbols')
- endif
-
--# Write the test results into config.h (stored in build directory)
--configure_file(output: 'fuse_config.h',
-- configuration : cfg, install: true, install_dir: 'include/fuse3')
-+# Write private test results into fuse_config.h (stored in build directory)
-+configure_file(output: 'fuse_config.h', configuration : private_cfg)
-+
-+# Write the test results, installed with the package,
-+# symbols need to be properly prefixed to avoid
-+# symbol (define) conflicts
-+configure_file(output: 'libfuse_config.h',
-+ configuration : public_cfg,
-+ install: true, install_dir: 'include/fuse3')
-
- # '.' will refer to current build directory, which contains config.h
- include_dirs = include_directories('include', 'lib', '.')
---
-2.39.1
-
diff --git a/sys-fs/fuse/fuse-3.12.0.ebuild b/sys-fs/fuse/fuse-3.12.0.ebuild
deleted file mode 100644
index dc5ea9f7073f..000000000000
--- a/sys-fs/fuse/fuse-3.12.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test ) test? ( userpriv )"
-
-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() {
- python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use test examples)
- $(meson_use test tests)
- -Duseroot=false
- -Dinitscriptdir=
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- )
- meson_src_configure
-}
-
-src_test() {
- if has sandbox ${FEATURES}; then
- ewarn "Sandbox enabled, skipping tests"
- else
- multilib-minimal_src_test
- fi
-}
-
-multilib_src_test() {
- epytest
-}
-
-multilib_src_install_all() {
- # Installed via fuse-common
- rm -r "${ED}"{/etc,$(get_udevdir)} || 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/fuse-3.13.1-r1.ebuild b/sys-fs/fuse/fuse-3.13.1-r1.ebuild
deleted file mode 100644
index 7f4f571e0b4e..000000000000
--- a/sys-fs/fuse/fuse-3.13.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test ) test? ( userpriv )"
-
-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 )
-
-PATCHES=(
- "${FILESDIR}"/fuse-3.13.1-r1-fix-config.patch
-)
-
-python_check_deps() {
- python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- # bug #853058
- filter-lto
-
- local emesonargs=(
- $(meson_use test examples)
- $(meson_use test tests)
- -Duseroot=false
- -Dinitscriptdir=
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- )
- meson_src_configure
-}
-
-src_test() {
- if has sandbox ${FEATURES}; then
- ewarn "Sandbox enabled, skipping tests"
- else
- multilib-minimal_src_test
- fi
-}
-
-multilib_src_test() {
- epytest
-}
-
-multilib_src_install_all() {
- # Installed via fuse-common
- rm -r "${ED}"{/etc,$(get_udevdir)} || 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/fuse-3.14.0.ebuild b/sys-fs/fuse/fuse-3.14.0.ebuild
deleted file mode 100644
index f1216a8b72b8..000000000000
--- a/sys-fs/fuse/fuse-3.14.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic 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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test ) test? ( userpriv )"
-
-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() {
- python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- # bug #853058
- filter-lto
-
- local emesonargs=(
- $(meson_use test examples)
- $(meson_use test tests)
- -Duseroot=false
- -Dinitscriptdir=
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- )
- meson_src_configure
-}
-
-src_test() {
- if has sandbox ${FEATURES}; then
- ewarn "Sandbox enabled, skipping tests"
- else
- multilib-minimal_src_test
- fi
-}
-
-multilib_src_test() {
- epytest
-}
-
-multilib_src_install_all() {
- # Installed via fuse-common
- rm -r "${ED}"{/etc,$(get_udevdir)} || 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/fuse-3.14.1.ebuild b/sys-fs/fuse/fuse-3.14.1.ebuild
deleted file mode 100644
index f1216a8b72b8..000000000000
--- a/sys-fs/fuse/fuse-3.14.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic 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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test ) test? ( userpriv )"
-
-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() {
- python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- # bug #853058
- filter-lto
-
- local emesonargs=(
- $(meson_use test examples)
- $(meson_use test tests)
- -Duseroot=false
- -Dinitscriptdir=
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- )
- meson_src_configure
-}
-
-src_test() {
- if has sandbox ${FEATURES}; then
- ewarn "Sandbox enabled, skipping tests"
- else
- multilib-minimal_src_test
- fi
-}
-
-multilib_src_test() {
- epytest
-}
-
-multilib_src_install_all() {
- # Installed via fuse-common
- rm -r "${ED}"{/etc,$(get_udevdir)} || 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}
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-27 7:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-12 21:56 [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/files/, sys-fs/fuse/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-06-27 7:06 Sam James
2021-08-03 22:20 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox