Attached is a debdiff against 1.0.3-3 that is "working for me" so far.
diff --git a/debian/changelog b/debian/changelog index b641b61..33801af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +squashfuse (0.1.105-1) unstable; urgency=medium + + * New upstream release. + * Link against libfuse3 rather than libfuse2 (Closes: #1025706). + * debian/patches/* - drop patches. + + -- Scott Moser <smo...@ubuntu.com> Wed, 07 Dec 2022 16:33:06 -0500 + squashfuse (0.1.103-3) unstable; urgency=medium * Fix "Switch from deprecated <attr/xattr.h> to <sys/xattr.h>" diff --git a/debian/control b/debian/control index 1b0f6f7..ea84c4f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Scarlett Moore <sgmo...@kde.org> Build-Depends: debhelper-compat (= 13), - libfuse-dev, + libfuse3-dev, liblz4-dev, liblzma-dev, liblzo2-dev, diff --git a/debian/libfuseprivate0.install b/debian/libfuseprivate0.install deleted file mode 100644 index d6268cc..0000000 --- a/debian/libfuseprivate0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libfuseprivate.so.* diff --git a/debian/libsquashfuse-dev.install b/debian/libsquashfuse-dev.install index b2eb5cd..f21b6a1 100644 --- a/debian/libsquashfuse-dev.install +++ b/debian/libsquashfuse-dev.install @@ -2,3 +2,4 @@ usr/include/ usr/lib/*/*.a usr/lib/*/*.so usr/lib/*/pkgconfig/squashfuse.pc +usr/lib/*/pkgconfig/squashfuse_ll.pc diff --git a/debian/libsquashfuse0.install b/debian/libsquashfuse0.install index 3ef587c..7f296f1 100644 --- a/debian/libsquashfuse0.install +++ b/debian/libsquashfuse0.install @@ -1,3 +1,2 @@ -usr/lib/*/libfuseprivate.so.* usr/lib/*/libsquashfuse.so.* usr/lib/*/libsquashfuse_ll.so.* diff --git a/debian/libsquashfuse0.symbols b/debian/libsquashfuse0.symbols index c755067..b3b0383 100644 --- a/debian/libsquashfuse0.symbols +++ b/debian/libsquashfuse0.symbols @@ -1,11 +1,3 @@ -libfuseprivate.so.0 libsquashfuse0 #MINVER# -* Build-Depends-Package: libsquashfuse-dev - sqfs_enoattr@Base 0.0.0 - sqfs_listxattr@Base 0.0.0 - sqfs_makedev@Base 0.0.0 - sqfs_opt_proc@Base 0.0.0 - sqfs_stat@Base 0.0.0 - sqfs_usage@Base 0.0.0 libsquashfuse.so.0 libsquashfuse0 #MINVER# * Build-Depends-Package: libsquashfuse-dev sqfs_block_cache_init@Base 0.0.0 @@ -79,12 +71,6 @@ libsquashfuse.so.0 libsquashfuse0 #MINVER# sqfs_stack_size@Base 0.0.0 sqfs_stack_top@Base 0.0.0 sqfs_swap16@Base 0.0.0 - sqfs_swapin16@Base 0.0.0 - sqfs_swapin16_internal@Base 0.0.0 - sqfs_swapin32@Base 0.0.0 - sqfs_swapin32_internal@Base 0.0.0 - sqfs_swapin64@Base 0.0.0 - sqfs_swapin64_internal@Base 0.0.0 sqfs_swapin_base_inode@Base 0.0.0 sqfs_swapin_dev_inode@Base 0.0.0 sqfs_swapin_dir_entry@Base 0.0.0 @@ -127,10 +113,148 @@ libsquashfuse.so.0 libsquashfuse0 #MINVER# sqfs_xattr_value_size@Base 0.0.0 libsquashfuse_ll.so.0 libsquashfuse0 #MINVER# * Build-Depends-Package: libsquashfuse-dev - fusefs_main@Base 0.1.103 + alarm_tick@Base 0.0.0 + setup_idle_timeout@Base 0.0.0 + sqfs_block_cache_init@Base 0.0.0 + sqfs_block_dispose@Base 0.0.0 + sqfs_block_read@Base 0.0.0 + sqfs_blockidx_add@Base 0.0.0 + sqfs_blockidx_blocklist@Base 0.0.0 + sqfs_blockidx_init@Base 0.0.0 + sqfs_blocklist_count@Base 0.0.0 + sqfs_blocklist_init@Base 0.0.0 + sqfs_blocklist_next@Base 0.0.0 + sqfs_cache_add@Base 0.0.0 + sqfs_cache_destroy@Base 0.0.0 + sqfs_cache_get@Base 0.0.0 + sqfs_cache_init@Base 0.0.0 + sqfs_cache_invalidate@Base 0.0.0 + sqfs_compression@Base 0.0.0 + sqfs_compression_name@Base 0.0.0 + sqfs_compression_supported@Base 0.0.0 + sqfs_data_block_read@Base 0.0.0 + sqfs_data_cache@Base 0.0.0 + sqfs_data_header@Base 0.0.0 + sqfs_decompressor_get@Base 0.0.0 + sqfs_dentry_init@Base 0.0.0 + sqfs_dentry_inode@Base 0.0.0 + sqfs_dentry_inode_num@Base 0.0.0 + sqfs_dentry_is_dir@Base 0.0.0 + sqfs_dentry_mode@Base 0.0.0 + sqfs_dentry_name@Base 0.0.0 + sqfs_dentry_name_size@Base 0.0.0 + sqfs_dentry_next_offset@Base 0.0.0 + sqfs_dentry_offset@Base 0.0.0 + sqfs_dentry_type@Base 0.0.0 + sqfs_destroy@Base 0.0.0 + sqfs_dir_lookup@Base 0.0.0 + sqfs_dir_next@Base 0.0.0 + sqfs_dir_open@Base 0.0.0 + sqfs_divceil@Base 0.0.0 + sqfs_enoattr@Base 0.0.0 + sqfs_export_inode@Base 0.0.0 + sqfs_export_ok@Base 0.0.0 + sqfs_fd_close@Base 0.0.0 + sqfs_fd_open@Base 0.0.0 + sqfs_frag_block@Base 0.0.0 + sqfs_frag_entry@Base 0.0.0 + sqfs_hash_add@Base 0.0.0 + sqfs_hash_destroy@Base 0.0.0 + sqfs_hash_get@Base 0.0.0 + sqfs_hash_init@Base 0.0.0 + sqfs_hash_remove@Base 0.0.0 + sqfs_id_get@Base 0.0.0 + sqfs_init@Base 0.0.0 + sqfs_inode_get@Base 0.0.0 + sqfs_inode_root@Base 0.0.0 + sqfs_listxattr@Base 0.0.0 + sqfs_ll_add_direntry@Base 0.0.0 sqfs_ll_daemonize@Base 0.1.103 sqfs_ll_destroy@Base 0.1.103 sqfs_ll_iget@Base 0.1.103 sqfs_ll_init@Base 0.1.103 sqfs_ll_inode@Base 0.1.103 + sqfs_ll_mount@Base 0.0.0 + sqfs_ll_op_create@Base 0.0.0 + sqfs_ll_op_forget@Base 0.0.0 + sqfs_ll_op_getattr@Base 0.0.0 + sqfs_ll_op_getxattr@Base 0.0.0 + sqfs_ll_op_listxattr@Base 0.0.0 + sqfs_ll_op_lookup@Base 0.0.0 + sqfs_ll_op_open@Base 0.0.0 + sqfs_ll_op_opendir@Base 0.0.0 + sqfs_ll_op_read@Base 0.0.0 + sqfs_ll_op_readdir@Base 0.0.0 + sqfs_ll_op_readlink@Base 0.0.0 + sqfs_ll_op_release@Base 0.0.0 + sqfs_ll_op_releasedir@Base 0.0.0 + sqfs_ll_open@Base 0.0.0 sqfs_ll_stat@Base 0.1.103 + sqfs_ll_unmount@Base 0.0.0 + sqfs_lookup_path@Base 0.0.0 + sqfs_makedev@Base 0.0.0 + sqfs_md_block_read@Base 0.0.0 + sqfs_md_cache@Base 0.0.0 + sqfs_md_cursor_inode@Base 0.0.0 + sqfs_md_header@Base 0.0.0 + sqfs_md_read@Base 0.0.0 + sqfs_mode@Base 0.0.0 + sqfs_open_image@Base 0.0.0 + sqfs_opt_proc@Base 0.0.0 + sqfs_pread@Base 0.0.0 + sqfs_read_range@Base 0.0.0 + sqfs_readlink@Base 0.0.0 + sqfs_stack_at@Base 0.0.0 + sqfs_stack_create@Base 0.0.0 + sqfs_stack_destroy@Base 0.0.0 + sqfs_stack_init@Base 0.0.0 + sqfs_stack_pop@Base 0.0.0 + sqfs_stack_push@Base 0.0.0 + sqfs_stack_size@Base 0.0.0 + sqfs_stack_top@Base 0.0.0 + sqfs_stat@Base 0.0.0 + sqfs_statfs@Base 0.0.0 + sqfs_swap16@Base 0.0.0 + sqfs_swapin_base_inode@Base 0.0.0 + sqfs_swapin_dev_inode@Base 0.0.0 + sqfs_swapin_dir_entry@Base 0.0.0 + sqfs_swapin_dir_header@Base 0.0.0 + sqfs_swapin_dir_index@Base 0.0.0 + sqfs_swapin_dir_inode@Base 0.0.0 + sqfs_swapin_fragment_entry@Base 0.0.0 + sqfs_swapin_ipc_inode@Base 0.0.0 + sqfs_swapin_ldev_inode@Base 0.0.0 + sqfs_swapin_ldir_inode@Base 0.0.0 + sqfs_swapin_lipc_inode@Base 0.0.0 + sqfs_swapin_lreg_inode@Base 0.0.0 + sqfs_swapin_reg_inode@Base 0.0.0 + sqfs_swapin_super_block@Base 0.0.0 + sqfs_swapin_symlink_inode@Base 0.0.0 + sqfs_swapin_xattr_entry@Base 0.0.0 + sqfs_swapin_xattr_id@Base 0.0.0 + sqfs_swapin_xattr_id_table@Base 0.0.0 + sqfs_swapin_xattr_val@Base 0.0.0 + sqfs_table_destroy@Base 0.0.0 + sqfs_table_get@Base 0.0.0 + sqfs_table_init@Base 0.0.0 + sqfs_traverse_close@Base 0.0.0 + sqfs_traverse_next@Base 0.0.0 + sqfs_traverse_open@Base 0.0.0 + sqfs_traverse_open_inode@Base 0.0.0 + sqfs_traverse_prune@Base 0.0.0 + sqfs_traverse_state@Base 0.0.0 + sqfs_usage@Base 0.0.0 + sqfs_version@Base 0.0.0 + sqfs_version_supported@Base 0.0.0 + sqfs_xattr_find@Base 0.0.0 + sqfs_xattr_init@Base 0.0.0 + sqfs_xattr_lookup@Base 0.0.0 + sqfs_xattr_name@Base 0.0.0 + sqfs_xattr_name_size@Base 0.0.0 + sqfs_xattr_open@Base 0.0.0 + sqfs_xattr_prefixes@Base 0.0.0 + sqfs_xattr_read@Base 0.0.0 + sqfs_xattr_value@Base 0.0.0 + sqfs_xattr_value_size@Base 0.0.0 + stfs_ll_op_statfs@Base 0.0.0 + teardown_idle_timeout@Base 0.0.0 diff --git a/debian/patches/add_libraries_to_LIBADD.patch b/debian/patches/add_libraries_to_LIBADD.patch deleted file mode 100644 index a975e85..0000000 --- a/debian/patches/add_libraries_to_LIBADD.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Add libraries to LIBADD in Makefile.am - Adding libraries to LIBADD in Makefile.am resolves the many - not found in and library errors generated by dpkg-shlibsdeps. -Forwarded: not-needed -Author: Scarlett Moore <sgmo...@kde.org> -Last-Update: 2020-10-30 - ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,13 +28,13 @@ - util.h fs.h - libsquashfuse_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \ - $(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) --libsquashfuse_la_LIBADD = -+libsquashfuse_la_LIBADD = $(COMPRESSION_LIBS) - - # Helper for FUSE clients: libfuseprivate - libfuseprivate_la_SOURCES = fuseprivate.c nonstd-makedev.c nonstd-enoattr.c \ - fuseprivate.h - libfuseprivate_la_CPPFLAGS = $(FUSE_CPPFLAGS) --libfuseprivate_la_LIBADD = -+libfuseprivate_la_LIBADD = libsquashfuse.la $(FUSE_LIBS) - - # High-level squashfuse - if SQ_WANT_HIGHLEVEL diff --git a/debian/patches/include_all_headers.patch b/debian/patches/include_all_headers.patch deleted file mode 100644 index 73d1d83..0000000 --- a/debian/patches/include_all_headers.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Include all headers in build. - Patch to include all headers in build. -Origin: https://github.com/TheAssassin -Forwarded: not-needed -Last-Update: 2020-10-30 -Author: Scarlett Moore <sgmo...@kde.org> ---- - - ---- squashfuse-0.1.103.orig/Makefile.am -+++ squashfuse-0.1.103/Makefile.am -@@ -16,6 +16,12 @@ noinst_PROGRAMS = - lib_LTLIBRARIES = libsquashfuse.la libfuseprivate.la - include_HEADERS = squashfuse.h squashfs_fs.h - -+nobase_pkginclude_HEADERS = config.h util.h traverse.h hash.h dir.h \ -+ common.h table.h fs.h autogen.sh \ -+ stack.h fuseprivate.h nonstd.h file.h ll.h xattr.h swap.h \ -+ decompress.h squashfs_fs.h cache.h gen_swap.sh squashfuse.h \ -+ nonstd-internal.h -+ - pkgconfigdir = @pkgconfigdir@ - pkgconfig_DATA = squashfuse.pc - ---- squashfuse-0.1.103.orig/squashfuse.pc.in -+++ squashfuse-0.1.103/squashfuse.pc.in -@@ -9,4 +9,4 @@ Version: @VERSION@ - - Requires: - Libs: -L${libdir} -lsquashfuse --Cflags: -I${includedir} -+Cflags: -I${includedir} -I${includedir}/squashfuse - diff --git a/debian/patches/install_squashfuse_lowlevel.patch b/debian/patches/install_squashfuse_lowlevel.patch deleted file mode 100644 index cf19dc3..0000000 --- a/debian/patches/install_squashfuse_lowlevel.patch +++ /dev/null @@ -1,72 +0,0 @@ -Description: Install lowlevel binary by default. - Install the faster lowlevel binary by default. -Author: Scarlett Moore <sgmo...@kde.org> -Origin: https://github.com/TheAssassin -Forwarded: not-needed -Last-Update: 2020-10-30 ---- - - -Index: squashfuse-0.1.103/Makefile.am -=================================================================== ---- squashfuse-0.1.103.orig/Makefile.am -+++ squashfuse-0.1.103/Makefile.am -@@ -55,12 +55,12 @@ endif - - # Low-level squashfuse_ll, if supported - if SQ_WANT_LOWLEVEL --bin_PROGRAMS += squashfuse_ll --squashfuse_ll_SOURCES = ll.c ll_inode.c nonstd-daemon.c ll.h --squashfuse_ll_CPPFLAGS = $(FUSE_CPPFLAGS) --squashfuse_ll_LDADD = libsquashfuse.la libfuseprivate.la $(COMPRESSION_LIBS) \ -+libsquashfuse_ll_la_SOURCES = ll.c ll_inode.c nonstd-daemon.c ll.h -+libsquashfuse_ll_la_CPPFLAGS = $(FUSE_CPPFLAGS) -+libsquashfuse_ll_la_LIBADD = libsquashfuse.la libfuseprivate.la $(COMPRESSION_LIBS) \ - $(FUSE_LIBS) - -+lib_LTLIBRARIES += libsquashfuse_ll.la - endif - - if SQ_WANT_DEMO -Index: squashfuse-0.1.103/squashfuse.pc.in -=================================================================== ---- squashfuse-0.1.103.orig/squashfuse.pc.in -+++ squashfuse-0.1.103/squashfuse.pc.in -@@ -8,5 +8,5 @@ Description: squashfuse library to mount - Version: @VERSION@ - - Requires: --Libs: -L${libdir} -lsquashfuse -+Libs: -L${libdir} -lsquashfuse -lsquashfuse_ll - Cflags: -I${includedir} -I${includedir}/squashfuse -Index: squashfuse-0.1.103/ll.c -=================================================================== ---- squashfuse-0.1.103.orig/ll.c -+++ squashfuse-0.1.103/ll.c -@@ -469,7 +469,7 @@ static sqfs_ll *sqfs_ll_open(const char - return NULL; - } - --int main(int argc, char *argv[]) { -+int fusefs_main(int argc, char *argv[], void (*mounted) (void)) { - struct fuse_args args; - sqfs_opts opts; - -@@ -534,6 +534,8 @@ int main(int argc, char *argv[]) { - setup_idle_timeout(se, opts.idle_timeout_secs); - } - fuse_session_add_chan(se, ch.ch); -+ if (mounted) -+ mounted (); - /* FIXME: multithreading */ - err = fuse_session_loop(se); - teardown_idle_timeout(); -@@ -550,6 +552,8 @@ int main(int argc, char *argv[]) { - } - } - fuse_opt_free_args(&args); -+ if (mounted) -+ rmdir (mountpoint); - free(ll); - free(mountpoint); - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 5966e33..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -add_libraries_to_LIBADD.patch -include_all_headers.patch -install_squashfuse_lowlevel.patch diff --git a/debian/squashfuse.install b/debian/squashfuse.install index ce9a738..c52b990 100644 --- a/debian/squashfuse.install +++ b/debian/squashfuse.install @@ -1,2 +1,3 @@ usr/bin/squashfuse +usr/bin/squashfuse_ll usr/share/man/man1/squashfuse.1