diff --git a/abi_libs b/abi_libs new file mode 100644 --- /dev/null +++ b/abi_libs @@ -0,0 +1 @@ +libfuse3.so.3 diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -1,186 +1,144 @@ -libfuse.so.2:FUSE_2.2 -libfuse.so.2:FUSE_2.4 -libfuse.so.2:FUSE_2.5 -libfuse.so.2:FUSE_2.6 -libfuse.so.2:FUSE_2.7 -libfuse.so.2:FUSE_2.7.5 -libfuse.so.2:FUSE_2.8 -libfuse.so.2:FUSE_2.9 -libfuse.so.2:FUSE_2.9.1 -libfuse.so.2:__fuse_exited -libfuse.so.2:__fuse_loop_mt -libfuse.so.2:__fuse_process_cmd -libfuse.so.2:__fuse_read_cmd -libfuse.so.2:__fuse_set_getcontext_func -libfuse.so.2:__fuse_setup -libfuse.so.2:__fuse_teardown -libfuse.so.2:cuse_lowlevel_main -libfuse.so.2:cuse_lowlevel_new -libfuse.so.2:cuse_lowlevel_setup -libfuse.so.2:cuse_lowlevel_teardown -libfuse.so.2:fuse_add_dirent -libfuse.so.2:fuse_add_direntry -libfuse.so.2:fuse_buf_copy -libfuse.so.2:fuse_buf_size -libfuse.so.2:fuse_chan_bufsize -libfuse.so.2:fuse_chan_data -libfuse.so.2:fuse_chan_destroy -libfuse.so.2:fuse_chan_fd -libfuse.so.2:fuse_chan_new -libfuse.so.2:fuse_chan_new_compat24 -libfuse.so.2:fuse_chan_receive -libfuse.so.2:fuse_chan_recv -libfuse.so.2:fuse_chan_send -libfuse.so.2:fuse_chan_session -libfuse.so.2:fuse_clean_cache -libfuse.so.2:fuse_daemonize -libfuse.so.2:fuse_destroy -libfuse.so.2:fuse_dirent_size -libfuse.so.2:fuse_exit -libfuse.so.2:fuse_exited -libfuse.so.2:fuse_fs_access -libfuse.so.2:fuse_fs_bmap -libfuse.so.2:fuse_fs_chmod -libfuse.so.2:fuse_fs_chown -libfuse.so.2:fuse_fs_create -libfuse.so.2:fuse_fs_destroy -libfuse.so.2:fuse_fs_fallocate -libfuse.so.2:fuse_fs_fgetattr -libfuse.so.2:fuse_fs_flock -libfuse.so.2:fuse_fs_flush -libfuse.so.2:fuse_fs_fsync -libfuse.so.2:fuse_fs_fsyncdir -libfuse.so.2:fuse_fs_ftruncate -libfuse.so.2:fuse_fs_getattr -libfuse.so.2:fuse_fs_getxattr -libfuse.so.2:fuse_fs_init -libfuse.so.2:fuse_fs_ioctl -libfuse.so.2:fuse_fs_link -libfuse.so.2:fuse_fs_listxattr -libfuse.so.2:fuse_fs_lock -libfuse.so.2:fuse_fs_mkdir -libfuse.so.2:fuse_fs_mknod -libfuse.so.2:fuse_fs_new -libfuse.so.2:fuse_fs_open -libfuse.so.2:fuse_fs_opendir -libfuse.so.2:fuse_fs_poll -libfuse.so.2:fuse_fs_read -libfuse.so.2:fuse_fs_read_buf -libfuse.so.2:fuse_fs_readdir -libfuse.so.2:fuse_fs_readlink -libfuse.so.2:fuse_fs_release -libfuse.so.2:fuse_fs_releasedir -libfuse.so.2:fuse_fs_removexattr -libfuse.so.2:fuse_fs_rename -libfuse.so.2:fuse_fs_rmdir -libfuse.so.2:fuse_fs_setxattr -libfuse.so.2:fuse_fs_statfs -libfuse.so.2:fuse_fs_symlink -libfuse.so.2:fuse_fs_truncate -libfuse.so.2:fuse_fs_unlink -libfuse.so.2:fuse_fs_utimens -libfuse.so.2:fuse_fs_write -libfuse.so.2:fuse_fs_write_buf -libfuse.so.2:fuse_get_context -libfuse.so.2:fuse_get_session -libfuse.so.2:fuse_getgroups -libfuse.so.2:fuse_interrupted -libfuse.so.2:fuse_invalidate -libfuse.so.2:fuse_is_lib_option -libfuse.so.2:fuse_kern_chan_new -libfuse.so.2:fuse_loop -libfuse.so.2:fuse_loop_mt -libfuse.so.2:fuse_loop_mt_proc -libfuse.so.2:fuse_lowlevel_is_lib_option -libfuse.so.2:fuse_lowlevel_new -libfuse.so.2:fuse_lowlevel_new_compat -libfuse.so.2:fuse_lowlevel_new_compat25 -libfuse.so.2:fuse_lowlevel_notify_delete -libfuse.so.2:fuse_lowlevel_notify_inval_entry -libfuse.so.2:fuse_lowlevel_notify_inval_inode -libfuse.so.2:fuse_lowlevel_notify_poll -libfuse.so.2:fuse_lowlevel_notify_retrieve -libfuse.so.2:fuse_lowlevel_notify_store -libfuse.so.2:fuse_main -libfuse.so.2:fuse_main_compat1 -libfuse.so.2:fuse_main_compat2 -libfuse.so.2:fuse_main_real -libfuse.so.2:fuse_main_real_compat22 -libfuse.so.2:fuse_main_real_compat25 -libfuse.so.2:fuse_mount -libfuse.so.2:fuse_mount_compat1 -libfuse.so.2:fuse_mount_compat22 -libfuse.so.2:fuse_mount_compat25 -libfuse.so.2:fuse_new -libfuse.so.2:fuse_new_compat1 -libfuse.so.2:fuse_new_compat2 -libfuse.so.2:fuse_new_compat22 -libfuse.so.2:fuse_new_compat25 -libfuse.so.2:fuse_notify_poll -libfuse.so.2:fuse_opt_add_arg -libfuse.so.2:fuse_opt_add_opt -libfuse.so.2:fuse_opt_add_opt_escaped -libfuse.so.2:fuse_opt_free_args -libfuse.so.2:fuse_opt_insert_arg -libfuse.so.2:fuse_opt_match -libfuse.so.2:fuse_opt_parse -libfuse.so.2:fuse_parse_cmdline -libfuse.so.2:fuse_pollhandle_destroy -libfuse.so.2:fuse_process_cmd -libfuse.so.2:fuse_read_cmd -libfuse.so.2:fuse_register_module -libfuse.so.2:fuse_remove_signal_handlers -libfuse.so.2:fuse_reply_attr -libfuse.so.2:fuse_reply_bmap -libfuse.so.2:fuse_reply_buf -libfuse.so.2:fuse_reply_create -libfuse.so.2:fuse_reply_data -libfuse.so.2:fuse_reply_entry -libfuse.so.2:fuse_reply_err -libfuse.so.2:fuse_reply_ioctl -libfuse.so.2:fuse_reply_ioctl_iov -libfuse.so.2:fuse_reply_ioctl_retry -libfuse.so.2:fuse_reply_iov -libfuse.so.2:fuse_reply_lock -libfuse.so.2:fuse_reply_none -libfuse.so.2:fuse_reply_open -libfuse.so.2:fuse_reply_open_compat -libfuse.so.2:fuse_reply_poll -libfuse.so.2:fuse_reply_readlink -libfuse.so.2:fuse_reply_statfs -libfuse.so.2:fuse_reply_statfs_compat -libfuse.so.2:fuse_reply_write -libfuse.so.2:fuse_reply_xattr -libfuse.so.2:fuse_req_ctx -libfuse.so.2:fuse_req_getgroups -libfuse.so.2:fuse_req_interrupt_func -libfuse.so.2:fuse_req_interrupted -libfuse.so.2:fuse_req_userdata -libfuse.so.2:fuse_session_add_chan -libfuse.so.2:fuse_session_data -libfuse.so.2:fuse_session_destroy -libfuse.so.2:fuse_session_exit -libfuse.so.2:fuse_session_exited -libfuse.so.2:fuse_session_loop -libfuse.so.2:fuse_session_loop_mt -libfuse.so.2:fuse_session_new -libfuse.so.2:fuse_session_next_chan -libfuse.so.2:fuse_session_process -libfuse.so.2:fuse_session_process_buf -libfuse.so.2:fuse_session_receive_buf -libfuse.so.2:fuse_session_remove_chan -libfuse.so.2:fuse_session_reset -libfuse.so.2:fuse_set_getcontext_func -libfuse.so.2:fuse_set_signal_handlers -libfuse.so.2:fuse_setup -libfuse.so.2:fuse_setup_compat2 -libfuse.so.2:fuse_setup_compat22 -libfuse.so.2:fuse_setup_compat25 -libfuse.so.2:fuse_start_cleanup_thread -libfuse.so.2:fuse_stop_cleanup_thread -libfuse.so.2:fuse_teardown -libfuse.so.2:fuse_teardown_compat22 -libfuse.so.2:fuse_unmount -libfuse.so.2:fuse_unmount_compat22 -libfuse.so.2:fuse_version -libulockmgr.so.1:ulockmgr_op +libfuse3.so.3:FUSE_3.0 +libfuse3.so.3:FUSE_3.1 +libfuse3.so.3:FUSE_3.2 +libfuse3.so.3:FUSE_3.3 +libfuse3.so.3:FUSE_3.4 +libfuse3.so.3:FUSE_3.7 +libfuse3.so.3:cuse_lowlevel_main +libfuse3.so.3:cuse_lowlevel_new +libfuse3.so.3:cuse_lowlevel_setup +libfuse3.so.3:cuse_lowlevel_teardown +libfuse3.so.3:fuse_add_direntry +libfuse3.so.3:fuse_add_direntry_plus +libfuse3.so.3:fuse_apply_conn_info_opts +libfuse3.so.3:fuse_buf_copy +libfuse3.so.3:fuse_buf_size +libfuse3.so.3:fuse_clean_cache +libfuse3.so.3:fuse_cmdline_help +libfuse3.so.3:fuse_daemonize +libfuse3.so.3:fuse_destroy +libfuse3.so.3:fuse_exit +libfuse3.so.3:fuse_fs_access +libfuse3.so.3:fuse_fs_bmap +libfuse3.so.3:fuse_fs_chmod +libfuse3.so.3:fuse_fs_chown +libfuse3.so.3:fuse_fs_copy_file_range +libfuse3.so.3:fuse_fs_create +libfuse3.so.3:fuse_fs_destroy +libfuse3.so.3:fuse_fs_fallocate +libfuse3.so.3:fuse_fs_flock +libfuse3.so.3:fuse_fs_flush +libfuse3.so.3:fuse_fs_fsync +libfuse3.so.3:fuse_fs_fsyncdir +libfuse3.so.3:fuse_fs_getattr +libfuse3.so.3:fuse_fs_getxattr +libfuse3.so.3:fuse_fs_init +libfuse3.so.3:fuse_fs_ioctl +libfuse3.so.3:fuse_fs_link +libfuse3.so.3:fuse_fs_listxattr +libfuse3.so.3:fuse_fs_lock +libfuse3.so.3:fuse_fs_lseek +libfuse3.so.3:fuse_fs_mkdir +libfuse3.so.3:fuse_fs_mknod +libfuse3.so.3:fuse_fs_new +libfuse3.so.3:fuse_fs_open +libfuse3.so.3:fuse_fs_opendir +libfuse3.so.3:fuse_fs_poll +libfuse3.so.3:fuse_fs_read +libfuse3.so.3:fuse_fs_read_buf +libfuse3.so.3:fuse_fs_readdir +libfuse3.so.3:fuse_fs_readlink +libfuse3.so.3:fuse_fs_release +libfuse3.so.3:fuse_fs_releasedir +libfuse3.so.3:fuse_fs_removexattr +libfuse3.so.3:fuse_fs_rename +libfuse3.so.3:fuse_fs_rmdir +libfuse3.so.3:fuse_fs_setxattr +libfuse3.so.3:fuse_fs_statfs +libfuse3.so.3:fuse_fs_symlink +libfuse3.so.3:fuse_fs_truncate +libfuse3.so.3:fuse_fs_unlink +libfuse3.so.3:fuse_fs_utimens +libfuse3.so.3:fuse_fs_write +libfuse3.so.3:fuse_fs_write_buf +libfuse3.so.3:fuse_get_context +libfuse3.so.3:fuse_get_session +libfuse3.so.3:fuse_getgroups +libfuse3.so.3:fuse_interrupted +libfuse3.so.3:fuse_invalidate_path +libfuse3.so.3:fuse_lib_help +libfuse3.so.3:fuse_log +libfuse3.so.3:fuse_loop +libfuse3.so.3:fuse_loop_mt +libfuse3.so.3:fuse_loop_mt_31 +libfuse3.so.3:fuse_lowlevel_help +libfuse3.so.3:fuse_lowlevel_notify_delete +libfuse3.so.3:fuse_lowlevel_notify_inval_entry +libfuse3.so.3:fuse_lowlevel_notify_inval_inode +libfuse3.so.3:fuse_lowlevel_notify_poll +libfuse3.so.3:fuse_lowlevel_notify_retrieve +libfuse3.so.3:fuse_lowlevel_notify_store +libfuse3.so.3:fuse_lowlevel_version +libfuse3.so.3:fuse_main_real +libfuse3.so.3:fuse_mount +libfuse3.so.3:fuse_new +libfuse3.so.3:fuse_new_30 +libfuse3.so.3:fuse_notify_poll +libfuse3.so.3:fuse_open_channel +libfuse3.so.3:fuse_opt_add_arg +libfuse3.so.3:fuse_opt_add_opt +libfuse3.so.3:fuse_opt_add_opt_escaped +libfuse3.so.3:fuse_opt_free_args +libfuse3.so.3:fuse_opt_insert_arg +libfuse3.so.3:fuse_opt_match +libfuse3.so.3:fuse_opt_parse +libfuse3.so.3:fuse_parse_cmdline +libfuse3.so.3:fuse_parse_conn_info_opts +libfuse3.so.3:fuse_pkgversion +libfuse3.so.3:fuse_pollhandle_destroy +libfuse3.so.3:fuse_remove_signal_handlers +libfuse3.so.3:fuse_reply_attr +libfuse3.so.3:fuse_reply_bmap +libfuse3.so.3:fuse_reply_buf +libfuse3.so.3:fuse_reply_create +libfuse3.so.3:fuse_reply_data +libfuse3.so.3:fuse_reply_entry +libfuse3.so.3:fuse_reply_err +libfuse3.so.3:fuse_reply_ioctl +libfuse3.so.3:fuse_reply_ioctl_iov +libfuse3.so.3:fuse_reply_ioctl_retry +libfuse3.so.3:fuse_reply_iov +libfuse3.so.3:fuse_reply_lock +libfuse3.so.3:fuse_reply_lseek +libfuse3.so.3:fuse_reply_none +libfuse3.so.3:fuse_reply_open +libfuse3.so.3:fuse_reply_poll +libfuse3.so.3:fuse_reply_readlink +libfuse3.so.3:fuse_reply_statfs +libfuse3.so.3:fuse_reply_write +libfuse3.so.3:fuse_reply_xattr +libfuse3.so.3:fuse_req_ctx +libfuse3.so.3:fuse_req_getgroups +libfuse3.so.3:fuse_req_interrupt_func +libfuse3.so.3:fuse_req_interrupted +libfuse3.so.3:fuse_req_userdata +libfuse3.so.3:fuse_session_destroy +libfuse3.so.3:fuse_session_exit +libfuse3.so.3:fuse_session_exited +libfuse3.so.3:fuse_session_fd +libfuse3.so.3:fuse_session_loop +libfuse3.so.3:fuse_session_loop_mt +libfuse3.so.3:fuse_session_loop_mt_31 +libfuse3.so.3:fuse_session_loop_mt_32 +libfuse3.so.3:fuse_session_mount +libfuse3.so.3:fuse_session_new +libfuse3.so.3:fuse_session_process_buf +libfuse3.so.3:fuse_session_receive_buf +libfuse3.so.3:fuse_session_reset +libfuse3.so.3:fuse_session_unmount +libfuse3.so.3:fuse_set_log_func +libfuse3.so.3:fuse_set_signal_handlers +libfuse3.so.3:fuse_start_cleanup_thread +libfuse3.so.3:fuse_stop_cleanup_thread +libfuse3.so.3:fuse_unmount +libfuse3.so.3:fuse_version diff --git a/abi_used_symbols b/abi_used_symbols new file mode 100644 --- /dev/null +++ b/abi_used_symbols @@ -0,0 +1,160 @@ +libc.so.6:__assert_fail +libc.so.6:__ctype_b_loc +libc.so.6:__errno_location +libc.so.6:__fprintf_chk +libc.so.6:__fxstat64 +libc.so.6:__isoc99_sscanf +libc.so.6:__libc_start_main +libc.so.6:__lxstat64 +libc.so.6:__memcpy_chk +libc.so.6:__memmove_chk +libc.so.6:__printf_chk +libc.so.6:__realpath_chk +libc.so.6:__snprintf_chk +libc.so.6:__sprintf_chk +libc.so.6:__stack_chk_fail +libc.so.6:__vfprintf_chk +libc.so.6:__xstat64 +libc.so.6:_exit +libc.so.6:abort +libc.so.6:access +libc.so.6:calloc +libc.so.6:chdir +libc.so.6:clock_gettime +libc.so.6:clone +libc.so.6:close +libc.so.6:dup2 +libc.so.6:endmntent +libc.so.6:execl +libc.so.6:execle +libc.so.6:execv +libc.so.6:execvp +libc.so.6:exit +libc.so.6:fclose +libc.so.6:fcntl64 +libc.so.6:ferror +libc.so.6:fgets +libc.so.6:fopen64 +libc.so.6:fork +libc.so.6:free +libc.so.6:getcwd +libc.so.6:getenv +libc.so.6:geteuid +libc.so.6:getgid +libc.so.6:getmntent +libc.so.6:getopt_long +libc.so.6:getpagesize +libc.so.6:getpwnam +libc.so.6:getpwuid +libc.so.6:gettimeofday +libc.so.6:getuid +libc.so.6:iconv +libc.so.6:iconv_close +libc.so.6:iconv_open +libc.so.6:ioctl +libc.so.6:lockf64 +libc.so.6:malloc +libc.so.6:memcpy +libc.so.6:memmove +libc.so.6:memset +libc.so.6:mmap64 +libc.so.6:mount +libc.so.6:munmap +libc.so.6:nl_langinfo +libc.so.6:open64 +libc.so.6:optarg +libc.so.6:optind +libc.so.6:perror +libc.so.6:pipe +libc.so.6:pipe2 +libc.so.6:poll +libc.so.6:posix_memalign +libc.so.6:prctl +libc.so.6:pthread_attr_destroy +libc.so.6:pthread_attr_init +libc.so.6:pthread_self +libc.so.6:puts +libc.so.6:realloc +libc.so.6:recv +libc.so.6:sendmsg +libc.so.6:setenv +libc.so.6:setfsgid +libc.so.6:setfsuid +libc.so.6:setgid +libc.so.6:setlocale +libc.so.6:setmntent +libc.so.6:setreuid +libc.so.6:setsid +libc.so.6:setuid +libc.so.6:sigaddset +libc.so.6:sigemptyset +libc.so.6:sigfillset +libc.so.6:sigprocmask +libc.so.6:sleep +libc.so.6:socketpair +libc.so.6:splice +libc.so.6:statfs64 +libc.so.6:stderr +libc.so.6:stpcpy +libc.so.6:strcat +libc.so.6:strchr +libc.so.6:strcmp +libc.so.6:strcpy +libc.so.6:strdup +libc.so.6:strerror +libc.so.6:strlen +libc.so.6:strncmp +libc.so.6:strncpy +libc.so.6:strrchr +libc.so.6:strstr +libc.so.6:strtok +libc.so.6:strtok_r +libc.so.6:strtol +libc.so.6:strtoul +libc.so.6:syscall +libc.so.6:sysconf +libc.so.6:umask +libc.so.6:umount2 +libc.so.6:uname +libc.so.6:vmsplice +libc.so.6:waitpid +libc.so.6:writev +libdl.so.2:dlclose +libdl.so.2:dlerror +libdl.so.2:dlopen +libdl.so.2:dlsym +libpthread.so.0:__errno_location +libpthread.so.0:close +libpthread.so.0:open64 +libpthread.so.0:pread64 +libpthread.so.0:pthread_attr_setstacksize +libpthread.so.0:pthread_cancel +libpthread.so.0:pthread_cond_broadcast +libpthread.so.0:pthread_cond_destroy +libpthread.so.0:pthread_cond_init +libpthread.so.0:pthread_cond_signal +libpthread.so.0:pthread_cond_timedwait +libpthread.so.0:pthread_cond_wait +libpthread.so.0:pthread_create +libpthread.so.0:pthread_detach +libpthread.so.0:pthread_getspecific +libpthread.so.0:pthread_join +libpthread.so.0:pthread_key_create +libpthread.so.0:pthread_key_delete +libpthread.so.0:pthread_kill +libpthread.so.0:pthread_mutex_destroy +libpthread.so.0:pthread_mutex_init +libpthread.so.0:pthread_mutex_lock +libpthread.so.0:pthread_mutex_unlock +libpthread.so.0:pthread_setcancelstate +libpthread.so.0:pthread_setspecific +libpthread.so.0:pthread_sigmask +libpthread.so.0:pwrite64 +libpthread.so.0:read +libpthread.so.0:recvmsg +libpthread.so.0:sem_destroy +libpthread.so.0:sem_init +libpthread.so.0:sem_post +libpthread.so.0:sem_wait +libpthread.so.0:sigaction +libpthread.so.0:write diff --git a/files/0001-fusermount-Support-a-stateless-configuration.patch b/files/0001-fusermount-Support-a-stateless-configuration.patch --- a/files/0001-fusermount-Support-a-stateless-configuration.patch +++ b/files/0001-fusermount-Support-a-stateless-configuration.patch @@ -1,26 +1,25 @@ -From a50938bc42da56b8e49b57969d371c064207af36 Mon Sep 17 00:00:00 2001 -From: Pierre-Yves -Date: Tue, 24 Jul 2018 16:07:04 +0200 -Subject: [PATCH] fusermount: Support a stateless configuration +From 3f627492c2b57a0b6d510ce770461f841f5c568f Mon Sep 17 00:00:00 2001 +From: "F. von Gellhorn" +Date: Sun, 25 Apr 2021 20:02:00 +0200 +Subject: [PATCH 1/1] fusermount: Support a stateless configuration -Signed-off-by: Pierre-Yves --- - util/fusermount.c | 25 +++++++++++++++++-------- - 1 file changed, 17 insertions(+), 8 deletions(-) + util/fusermount.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/util/fusermount.c b/util/fusermount.c -index 245aeea..e2f6d91 100644 +index e738dbd..08498b5 100644 --- a/util/fusermount.c +++ b/util/fusermount.c -@@ -38,6 +38,7 @@ - #define FUSE_DEV_NEW "/dev/fuse" - #define FUSE_VERSION_FILE_OLD "/proc/fs/fuse/version" - #define FUSE_CONF "/etc/fuse.conf" +@@ -35,6 +35,7 @@ + #define FUSE_COMMFD_ENV "_FUSE_COMMFD" + + #define FUSE_DEV "/dev/fuse" +#define SYSTEM_FUSE_CONF "/usr/share/defaults/fuse/fuse.conf" #ifndef MS_DIRSYNC #define MS_DIRSYNC 128 -@@ -527,7 +528,7 @@ static void strip_line(char *line) +@@ -532,7 +533,7 @@ static void strip_line(char *line) memmove(line, s, strlen(s)+1); } @@ -29,30 +28,28 @@ { int tmp; if (strcmp(line, "user_allow_other") == 0) -@@ -537,12 +538,20 @@ static void parse_line(char *line, int linenum) +@@ -542,12 +543,18 @@ static void parse_line(char *line, int linenum) else if(line[0]) fprintf(stderr, "%s: unknown parameter in %s at line %i: '%s'\n", - progname, FUSE_CONF, linenum, line); -+ progname, conf_file, linenum, line); ++ progname, conf_file, linenum, line); } static void read_conf(void) { - FILE *fp = fopen(FUSE_CONF, "r"); -+ const char *fuse_conf = NULL; -+ -+ if (access(FUSE_CONF, F_OK) == 0) { -+ fuse_conf = FUSE_CONF; -+ } else { -+ fuse_conf = SYSTEM_FUSE_CONF; -+ } ++ const char *fuse_conf = NULL; ++ if (access(FUSE_CONF, F_OK) == 0) { ++ fuse_conf = FUSE_CONF; } ++ else { ++ fuse_conf = SYSTEM_FUSE_CONF; } + + FILE *fp = fopen(fuse_conf, "r"); if (fp != NULL) { int linenum = 1; char line[256]; -@@ -551,12 +560,12 @@ static void read_conf(void) +@@ -556,12 +563,12 @@ static void read_conf(void) if (isnewline) { if (line[strlen(line)-1] == '\n') { strip_line(line); @@ -67,7 +64,7 @@ isnewline = 1; } -@@ -564,11 +573,11 @@ static void read_conf(void) +@@ -569,11 +576,11 @@ static void read_conf(void) linenum ++; } if (!isnewline) { @@ -81,7 +78,7 @@ exit(1); } fclose(fp); -@@ -577,7 +586,7 @@ static void read_conf(void) +@@ -582,7 +589,7 @@ static void read_conf(void) errno != ENAMETOOLONG && errno != ENOTDIR && errno != EOVERFLOW); fprintf(stderr, "%s: failed to open %s: %s\n", @@ -91,5 +88,5 @@ exit(1); } -- -2.18.0 +2.30.2 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,22 +1,30 @@ name : fuse -version : 2.9.9 -release : 13 +version : 3.10.3 +release : 14 source : - - https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz : d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5 -license : LGPL-2.0 -summary : File Systems in User Space + - https://github.com/libfuse/libfuse/releases/download/fuse-3.10.3/fuse-3.10.3.tar.xz : eb8373f208b05a39702f9f437f6e49caf4b1ace26a9acb68110b49912078560f +license : + - GPL-2.0-only + - LGPL-2.1-only component : system.utils +summary : File Systems in User Space description: | File Systems in User Space +builddeps : + - libiconv-devel +patterns : + - common : + - /usr/share/defaults/fuse +rundeps : + - fuse-common setup : | - sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in %patch -p1 < $pkgfiles/0001-fusermount-Support-a-stateless-configuration.patch - UDEV_RULES_PATH=%libdir%/udev/rules.d %configure --disable-static --enable-util + %meson_configure \ + -Dudevrulesdir=/usr/lib64/udev/rules.d build : | - %make + %ninja_build install : | - %make_install - rmdir $installdir/dev - - install -D -m 0644 $pkgfiles/fuse.conf $installdir/usr/share/defaults/fuse/fuse.conf - rm -rfv $installdir/etc/ + %ninja_install + install -Dm0644 $pkgfiles/fuse.conf $installdir/usr/share/defaults/fuse/fuse.conf + rm -rf $installdir/etc + rm -rf $installdir/dev diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,15 +2,16 @@ fuse - Pierre-Yves - pyu@riseup.net + F. von Gellhorn + flinux@vongellhorn.ch - LGPL-2.0 + GPL-2.0-only + LGPL-2.1-only system.utils File Systems in User Space File Systems in User Space - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus fuse @@ -18,19 +19,26 @@ File Systems in User Space system.utils + + fuse-common + + + /usr/bin/fusermount3 + /usr/lib64/libfuse3.so.3 + /usr/lib64/libfuse3.so.3.10.3 + /usr/lib64/udev/rules.d/99-fuse3.rules + /usr/sbin/mount.fuse3 + /usr/share/man/man1/fusermount3.1 + /usr/share/man/man8/mount.fuse3.8 + + + + fuse-common + File Systems in User Space + File Systems in User Space + - /sbin/mount.fuse - /usr/bin/fusermount - /usr/bin/ulockmgr_server - /usr/lib64/libfuse.so.2 - /usr/lib64/libfuse.so.2.9.9 - /usr/lib64/libulockmgr.so.1 - /usr/lib64/libulockmgr.so.1.0.1 - /usr/lib64/udev/rules.d/99-fuse.rules /usr/share/defaults/fuse/fuse.conf - /usr/share/man/man1/fusermount.1 - /usr/share/man/man1/ulockmgr_server.1 - /usr/share/man/man8/mount.fuse.8 @@ -40,31 +48,26 @@ programming.devel - fuse + fuse - /usr/include/fuse.h - /usr/include/fuse/cuse_lowlevel.h - /usr/include/fuse/fuse.h - /usr/include/fuse/fuse_common.h - /usr/include/fuse/fuse_common_compat.h - /usr/include/fuse/fuse_compat.h - /usr/include/fuse/fuse_lowlevel.h - /usr/include/fuse/fuse_lowlevel_compat.h - /usr/include/fuse/fuse_opt.h - /usr/include/ulockmgr.h - /usr/lib64/libfuse.so - /usr/lib64/libulockmgr.so - /usr/lib64/pkgconfig/fuse.pc + /usr/include/fuse3/cuse_lowlevel.h + /usr/include/fuse3/fuse.h + /usr/include/fuse3/fuse_common.h + /usr/include/fuse3/fuse_log.h + /usr/include/fuse3/fuse_lowlevel.h + /usr/include/fuse3/fuse_opt.h + /usr/lib64/libfuse3.so + /usr/lib64/pkgconfig/fuse3.pc - - 2019-01-04 - 2.9.9 + + 2021-04-25 + 3.10.3 Packaging update - Pierre-Yves - pyu@riseup.net + F. von Gellhorn + flinux@vongellhorn.ch \ No newline at end of file