Control: tags 1067010 + patch
Control: tags 1067010 + pending
Dear maintainer,
I've prepared an NMU for squashfuse (versioned as 0.5.2-0.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Cheers
--
Sebastian Ramacher
diff -Nru squashfuse-0.5.0/.cirrus.yml squashfuse-0.5.2/.cirrus.yml
--- squashfuse-0.5.0/.cirrus.yml 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/.cirrus.yml 2024-02-22 16:19:33.000000000 +0100
@@ -3,12 +3,12 @@
freebsd_task:
freebsd_instance:
- image_family: freebsd-12-3
+ image_family: freebsd-14-0
setup_script:
- pkg install -y autoconf automake libtool pkgconf fusefs-libs
- pkg install -y lzo2 liblz4 zstd
- pkg install -y squashfs-tools coreutils
- - kldload fuse
+ - kldload fusefs
- sysctl vfs.usermount=1
build_script:
- ./autogen.sh
diff -Nru squashfuse-0.5.0/configure.ac squashfuse-0.5.2/configure.ac
--- squashfuse-0.5.0/configure.ac 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/configure.ac 2024-02-22 16:19:33.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([squashfuse], [0.5.0], [d...@vasilevsky.ca])
+AC_INIT([squashfuse], [0.5.2], [d...@vasilevsky.ca])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
@@ -91,6 +91,7 @@
AC_SUBST([sq_mksquashfs_compressors])
AC_CONFIG_FILES([tests/ll-smoke.sh],[chmod +x tests/ll-smoke.sh])
+AC_CONFIG_FILES([tests/ll-smoke-singlethreaded.sh],[chmod +x tests/ll-smoke-singlethreaded.sh])
AC_CONFIG_FILES([tests/umount-test.sh],[chmod +x tests/umount-test.sh])
diff -Nru squashfuse-0.5.0/debian/changelog squashfuse-0.5.2/debian/changelog
--- squashfuse-0.5.0/debian/changelog 2023-11-02 09:42:28.000000000 +0100
+++ squashfuse-0.5.2/debian/changelog 2024-04-01 23:02:32.000000000 +0200
@@ -1,3 +1,11 @@
+squashfuse (0.5.2-0.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload
+ * New upstream release
+ - Fix pointer types on 32 bit architectures (Closes: #1067010)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Mon, 01 Apr 2024 23:02:32 +0200
+
squashfuse (0.5.0-2) unstable; urgency=medium
* Fix "needed headers (e.g. config.h) are not shipped"
diff -Nru squashfuse-0.5.0/.github/workflows/ci.yml squashfuse-0.5.2/.github/workflows/ci.yml
--- squashfuse-0.5.0/.github/workflows/ci.yml 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/.github/workflows/ci.yml 2024-02-22 16:19:33.000000000 +0100
@@ -17,6 +17,8 @@
os: ubuntu-latest
disable_fuse: "--disable-fuse"
check_features: demo
+ - name: distcheck
+ os: ubuntu-latest
- name: Old distro
os: ubuntu-20.04
- name: Mac
@@ -29,6 +31,7 @@
uses: actions/checkout@v2
- name: apt dependencies
run: >
+ sudo apt-get update &&
sudo apt-get install -y automake autoconf libtool pkg-config
zlib1g-dev liblzo2-dev liblzma-dev liblz4-dev libzstd-dev
fio
@@ -46,17 +49,20 @@
brew install autoconf automake libtool pkgconfig squashfs coreutils
brew install --cask macfuse
if: runner.os == 'macOS'
- - name: build
+ - name: configure
run: |
./autogen.sh
CPPFLAGS="-Werror" ./configure $DISABLE_FUSE
+ - name: build
+ run: |
make -j2 V=1
+ if: matrix.name != 'distcheck'
- name: test
run: |
make check
diff -u ci/expected-features/${CHECK_FEATURES:-all} ci/features
- if: runner.os != 'macOS'
- - name: test
+ if: runner.os != 'macOS' && matrix.name != 'distcheck'
+ - name: test mac
run: |
# On macOS loading the macfuse extension is needed. This
# command should load it without rebooting, except System
@@ -68,8 +74,13 @@
diff -u ci/expected-features/${CHECK_FEATURES:-all} ci/features
fi
if: runner.os == 'macOS'
+ - name: distcheck
+ run: |
+ make distcheck
+ if: matrix.name == 'distcheck'
- name: install
run: sudo make install
+ if: matrix.name != 'distcheck'
- name: output
run: |
cp /tmp/*.log . || true
diff -Nru squashfuse-0.5.0/.gitignore squashfuse-0.5.2/.gitignore
--- squashfuse-0.5.0/.gitignore 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/.gitignore 2024-02-22 16:19:33.000000000 +0100
@@ -33,4 +33,5 @@
ci/features
tests/lib.sh
tests/ll-smoke.sh
+tests/ll-smoke-singlethreaded.sh
tests/umount-test.sh
diff -Nru squashfuse-0.5.0/ll.c squashfuse-0.5.2/ll.c
--- squashfuse-0.5.0/ll.c 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/ll.c 2024-02-22 16:19:33.000000000 +0100
@@ -410,7 +410,12 @@
}
void sqfs_ll_op_forget(fuse_req_t req, fuse_ino_t ino,
- unsigned long nlookup) {
+#ifdef HAVE_FUSE_LL_FORGET_OP_64T
+ uint64_t nlookup
+#else
+ unsigned long nlookup
+#endif
+ ) {
sqfs_ll_i lli;
update_access_time();
sqfs_ll_iget(req, &lli, SQFS_FUSE_INODE_NONE);
diff -Nru squashfuse-0.5.0/ll.h squashfuse-0.5.2/ll.h
--- squashfuse-0.5.0/ll.h 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/ll.h 2024-02-22 16:19:33.000000000 +0100
@@ -109,7 +109,12 @@
);
void sqfs_ll_op_forget(fuse_req_t req, fuse_ino_t ino,
- unsigned long nlookup);
+#ifdef HAVE_FUSE_LL_FORGET_OP_64T
+ uint64_t nlookup
+#else
+ unsigned long nlookup
+#endif
+ );
void sqfs_ll_op_init(void *userdata, struct fuse_conn_info *conn);
diff -Nru squashfuse-0.5.0/m4/squashfuse_fuse.m4 squashfuse-0.5.2/m4/squashfuse_fuse.m4
--- squashfuse-0.5.0/m4/squashfuse_fuse.m4 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/m4/squashfuse_fuse.m4 2024-02-22 16:19:33.000000000 +0100
@@ -272,6 +272,25 @@
[Define if we have two-argument fuse_unmount])
])
+ AC_CACHE_CHECK([for 64_t third argument to fuse ll forget op],
+ [sq_cv_decl_fuse_forget_64_t],[
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([
+ #include <fuse.h>
+ #include <fuse_lowlevel.h>],
+ [
+ void f(fuse_req_t, fuse_ino_t, uint64_t);
+ struct fuse_lowlevel_ops flo;
+ flo.forget = f;
+ ])],
+ [sq_cv_decl_fuse_forget_64_t=yes],
+ [sq_cv_decl_fuse_forget_64_t=no])
+ ])
+ AS_IF([test "x$sq_cv_decl_fuse_forget_64_t" = xyes],[
+ AC_DEFINE([HAVE_FUSE_LL_FORGET_OP_64T],1,
+ [Define if we have uint64_t as type of 3rd arg to ll forget op])
+ ])
+
AC_CHECK_DECLS([fuse_cmdline_help],,,
[#include <fuse_lowlevel.h>])
])
diff -Nru squashfuse-0.5.0/Makefile.am squashfuse-0.5.2/Makefile.am
--- squashfuse-0.5.0/Makefile.am 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/Makefile.am 2024-02-22 16:19:33.000000000 +0100
@@ -126,7 +126,7 @@
TESTS += tests/ls.sh
endif
tests/ll-smoke.sh tests/ls.sh: tests/lib.sh
-
+EXTRA_DIST += tests/ll-smoke-singlethreaded.sh tests/ls.sh tests/notify_test.sh
# Handle generation of swap include files
CLEANFILES = swap.h.inc swap.c.inc
@@ -134,3 +134,5 @@
$(libsquashfuse_convenience_la_OBJECTS): swap.h.inc
swap.h.inc swap.c.inc: gen_swap.sh squashfs_fs.h Makefile
SED="$(SED)" $(srcdir)/gen_swap.sh $(srcdir)/squashfs_fs.h
+
+EXTRA_DIST += ci/expected-features/all ci/expected-features/demo
diff -Nru squashfuse-0.5.0/NEWS squashfuse-0.5.2/NEWS
--- squashfuse-0.5.0/NEWS 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/NEWS 2024-02-22 16:19:33.000000000 +0100
@@ -1,3 +1,13 @@
+0.5.2 - 22 February 2024
+
+ * No code changes, just changing the tag style back to what it was,
+ without a `v` prefix.
+
+0.5.1 - 19 February 2024
+
+ * Fix 32-bit builds
+ * Add nix as a supported build type
+
0.5.0 - 13 September 2023
* Add `--notify_fd` option
diff -Nru squashfuse-0.5.0/PLATFORMS squashfuse-0.5.2/PLATFORMS
--- squashfuse-0.5.0/PLATFORMS 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/PLATFORMS 2024-02-22 16:19:33.000000000 +0100
@@ -29,17 +29,22 @@
+ Versions: Kernel 2.4.20 or later, most distros since ~2004
+ Tested on:
- Debian / squeeze 6.0 / i386, ppc
- - Ubuntu / Trusty 14.04 / amd64
- - Ubuntu / Precise 12.04 / amd64
- - Ubuntu / Natty 11.10 / amd64
- - Ubuntu / Lucid 10.04 / amd64
+ - Ubuntu / Trusty 14.04 / amd64
+ - Ubuntu / Precise 12.04 / amd64
+ - Ubuntu / Natty 11.10 / amd64
+ - Ubuntu / Lucid 10.04 / amd64
- CentOS / 3.9 / i386 / FUSE 2.5
+ - NixOS / Tapir 23.11 / amd64
+ Requirements: CONFIG_FUSE_FS kernel option
+ Packages:
- apt-get
Build: gcc make libc-dev libfuse-dev libz-dev liblzo2-dev
liblzma-dev liblz4-dev libattr1-dev pkg-config
Runtime: libfuse2 zlib1g liblzo2-2 liblzma2
+ - nix (all packages provided in `shell.nix')
+ Build: gcc gnumake autoconf automake libtool pkg-config
+ fuse3 zlib zstd lzo lz4 lzma xz
+ Runtime: fuse/fuse3 zlib zstd lzo lz4 lzma xz
* Mac OS X
+ Versions: Mac OS X 10.4 and later
diff -Nru squashfuse-0.5.0/README squashfuse-0.5.2/README
--- squashfuse-0.5.0/README 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/README 2024-02-22 16:19:33.000000000 +0100
@@ -114,19 +114,46 @@
2d. Example: Ubuntu
-------------------
-For example on Ubuntu 16.04:
+For example on Ubuntu 22.04:
-sudo apt-get -y install git autoconf libtool make gcc libtool libfuse-dev liblzma-dev
-libtoolize --force
-aclocal
-autoheader
-automake --force-missing --add-missing
-autoconf
-./configure --with-xz=/usr/lib/
-make
+ $ sudo apt install gcc make pkg-config libfuse3-dev \
+ zlib1g-dev liblzo2-dev liblzma-dev liblz4-dev libzstd-dev \
+ automake autoconf libtool \
+ fuse3 fio squashfs-tools
+ $ ./autogen.sh
+ $ ./configure
+ $ make -j4
+ $ make check
+ $ sudo make install
+2e. Example: NixOS
+------------------
-2e. Usage
+For example on NixOS:
+
+ $ nix-shell
+ $ ./autogen.sh
+ $ ./configure
+ $ make -j4
+
+To install to your system, a custom Nix package should be built. Otherwise,
+you can simply move the binaries to `~/.local/bin'
+
+2f. Example: macOS
+------------------
+
+On macOS, for example, install macFUSE, and then:
+
+ $ brew install autoconf automake pkg-config libtool lzo xz
+ $ ./autogen.sh
+ $ ./configure --prefix=/usr/local/ \
+ --with-lzo=/usr/local/Cellar/lzo/2.10 \
+ --with-xz=/usr/local/Cellar/xz/5.4.4
+ $ make -j
+ $ make check
+ $ make install
+
+2g. Usage
---------
You'll need a SquashFS archive to use squashfuse. If you don't already have
one, you can create one using the `mksquashfs' utility from the squashfs-tools
diff -Nru squashfuse-0.5.0/shell.nix squashfuse-0.5.2/shell.nix
--- squashfuse-0.5.0/shell.nix 1970-01-01 01:00:00.000000000 +0100
+++ squashfuse-0.5.2/shell.nix 2024-02-22 16:19:33.000000000 +0100
@@ -0,0 +1,22 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell {
+ nativeBuildInputs = with pkgs.buildPackages; [
+ # Required build tools
+ gcc
+ gnumake
+ autoconf
+ automake
+ libtool
+ pkg-config
+
+ # Required libraries
+ fuse
+ fuse3
+ zlib
+ zstd
+ lzo
+ lz4
+ xz
+ ];
+}
diff -Nru squashfuse-0.5.0/tests/ll-smoke-singlethreaded.sh squashfuse-0.5.2/tests/ll-smoke-singlethreaded.sh
--- squashfuse-0.5.0/tests/ll-smoke-singlethreaded.sh 2023-09-13 16:50:21.000000000 +0200
+++ squashfuse-0.5.2/tests/ll-smoke-singlethreaded.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-!/bin/bash
-
-# Singlethreaded ll-smoke test.
-#
-# When multithreading is enabled at build time, it is the default
-# behavior of squashfuse_ll, but can be disabled at runtime with
-# the FUSE '-s' commandline option.
-#
-# So we just re-run the normal ll-smoke test with the '-s' option.
-SFLL_EXTRA_ARGS="-s" $(dirname -- $0)/ll-smoke.sh
diff -Nru squashfuse-0.5.0/tests/ll-smoke-singlethreaded.sh.in squashfuse-0.5.2/tests/ll-smoke-singlethreaded.sh.in
--- squashfuse-0.5.0/tests/ll-smoke-singlethreaded.sh.in 1970-01-01 01:00:00.000000000 +0100
+++ squashfuse-0.5.2/tests/ll-smoke-singlethreaded.sh.in 2024-02-22 16:19:33.000000000 +0100
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Singlethreaded ll-smoke test.
+#
+# When multithreading is enabled at build time, it is the default
+# behavior of squashfuse_ll, but can be disabled at runtime with
+# the FUSE '-s' commandline option.
+#
+# So we just re-run the normal ll-smoke test with the '-s' option.
+SFLL_EXTRA_ARGS="-s" @builddir@/tests/ll-smoke.sh
