Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fuse3 for openSUSE:Factory checked in at 2023-02-11 21:55:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fuse3 (Old) and /work/SRC/openSUSE:Factory/.fuse3.new.1848 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fuse3" Sat Feb 11 21:55:55 2023 rev:23 rq:1064198 version:3.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fuse3/fuse3.changes 2023-01-14 20:31:54.793282131 +0100 +++ /work/SRC/openSUSE:Factory/.fuse3.new.1848/fuse3.changes 2023-02-11 21:55:59.719126433 +0100 @@ -1,0 +2,11 @@ +Mon Feb 6 19:46:51 UTC 2023 - Jan Engelhardt <[email protected]> + +- Update to release 3.13.1 + * Fixed an issue that resulted in errors when attempting to + compile against installed libfuse headers (because libc + symbol versioning support was not detected correctly in this + case). +- Add 0001-Split-config.h-into-private-and-public-config.patch + to fix doubly-defined macros and build failure elsewhere. + +------------------------------------------------------------------- Old: ---- fuse-3.13.0.tar.xz fuse-3.13.0.tar.xz.asc New: ---- 0001-Split-config.h-into-private-and-public-config.patch fuse-3.13.1.tar.xz fuse-3.13.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse3.spec ++++++ --- /var/tmp/diff_new_pack.sj6iHO/_old 2023-02-11 21:56:00.907133830 +0100 +++ /var/tmp/diff_new_pack.sj6iHO/_new 2023-02-11 21:56:00.915133879 +0100 @@ -17,7 +17,7 @@ Name: fuse3 -Version: 3.13.0 +Version: 3.13.1 Release: 0 Summary: Reference implementation of the "Filesystem in Userspace" License: BSD-2-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later @@ -28,6 +28,7 @@ Source2: fuse.keyring Source1000: baselibs.conf Patch1: conf-rename.patch +Patch2: 0001-Split-config.h-into-private-and-public-config.patch BuildRequires: fdupes BuildRequires: meson BuildRequires: pkgconfig ++++++ 0001-Split-config.h-into-private-and-public-config.patch ++++++ >From d7560cc9916b086bfe5d86459cc9f04033edd904 Mon Sep 17 00:00:00 2001 From: Bernd Schubert <[email protected]> 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. --- 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 | 47 ++++++++++++++++++++++++++++------------- 7 files changed, 47 insertions(+), 25 deletions(-) diff --git a/include/fuse.h b/include/fuse.h index 2888d2b..6f162dd 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 1d050bb..8ee1a34 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 96088d7..9099e45 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 cab6cbf..0bac39e 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 37e3635..855edc3 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 54d0759..9044630 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 eb7b477..fb6451a 100644 --- a/meson.build +++ b/meson.build @@ -16,12 +16,23 @@ elif platform == 'cygwin' or platform == 'windows' 'Take a look at http://www.secfs.net/winfsp/ instead') endif -# -# Feature detection -# -cfg = configuration_data() cc = meson.get_compiler('c') +# +# Feature detection, only available at libfuse compilation time, +# but not for application linking to libfuse. +# +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 include_default = ''' @@ -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 ++++++ fuse-3.13.0.tar.xz -> fuse-3.13.1.tar.xz ++++++ ++++ 92237 lines of diff (skipped)
