Control: tags -1 -moreinfo
Hi Paul,
On 15/05/25 09:55, Paul Gevers wrote:
While this may be true, as far as I know, nothing blocks you from adding
a 'libfuse3-4 (>= 3.17.2)' for now next to the ${misc:Depends},
${shlibs:Depends}' that currently add the unversioned Depends. That
should do the right thing.
OK. Would you unblock the package if I upload src:osspd/1.3.3-5
with the attached debdiff ?
br,
Sébastien
diff --git a/debian/changelog b/debian/changelog
index 68286a2..91f96e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+osspd (1.3.3-5) unstable; urgency=medium
+
+ * d/control:
+ + Build-Depends on libfuse3-dev (>= 3.17.2)
+ + Remove "Breaks: libfuse3-4 (<< 3.17.2)"
+ + Hardcode "Depends: libfuse3-4 (>= 3.17.2)"
+
+ -- Sébastien Noel <sebast...@twolife.be> Thu, 15 May 2025 10:32:15 +0200
+
+osspd (1.3.3-4) unstable; urgency=medium
+
+ * Remove previous workaround now that fuse3 v3.17.2 is in unstable
+ and add "Breaks: libfuse3-4 (<< 3.17.2)" in d/control
+
+ -- Sébastien Noel <sebast...@twolife.be> Fri, 09 May 2025 08:30:50 +0200
+
osspd (1.3.3-3) unstable; urgency=medium
* Fix SIGTERM handling on the libfuse side.
diff --git a/debian/control b/debian/control
index fe8ed77..51e7ccf 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Ralf Jung <p...@ralfj.de>
Build-Depends: debhelper-compat (= 13),
cmake,
libasound2-dev,
- libfuse3-dev,
+ libfuse3-dev (>= 3.17.2),
libpulse-dev,
pkgconf,
systemd-dev
@@ -20,6 +20,7 @@ Architecture: linux-any
Multi-Arch: foreign
Pre-Depends: ${misc:Pre-Depends}
Depends: osspd-pulseaudio | osspd-backend,
+ libfuse3-4 (>= 3.17.2),
${misc:Depends},
${shlibs:Depends}
Provides: oss-compat
diff --git a/debian/patches/series b/debian/patches/series
index 0492b0f..b7980bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
0004-Allow-to-set-slave-installation-path-during-compilat.patch
spelling.patch
-sigterm.patch
diff --git a/debian/patches/sigterm.patch b/debian/patches/sigterm.patch
deleted file mode 100644
index e3a0328..0000000
--- a/debian/patches/sigterm.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Sébastien Noel <sebast...@twolife.be>
-Date: Wed, 23 Apr 2025 14:06:15 +0200
-Bug: https://github.com/libfuse/libfuse/issues/1182
-Subject: Re-order calls to setup_ossp_cuse/cuse_lowlevel_setup
- in v3.17 libfuse store the first fuse_session for the signals handling,
- but we actually want it to store dsp_se, as this is the one running
- in the main thread.
- This issue should be fixed upstream in fuse v3.17.2, but I doubt
- it will migrate in trixie before the hard freeze.
-Forwarded: not-needed
---- a/osspd.c
-+++ b/osspd.c
-@@ -2394,6 +2394,12 @@ int main(int argc, char **argv)
- fatal_e(ret, "failed to create slave reaper thread");
-
- /* we're set, let's setup fuse structures */
-+ dsp_se = setup_ossp_cuse(&dsp_ops, param.dsp_name,
-+ param.dsp_major, param.dsp_minor,
-+ args.argc, args.argv);
-+ if (!dsp_se)
-+ fatal("can't create dsp, giving up");
-+
- if (strlen(param.mixer_name))
- mixer_se = setup_ossp_cuse(&mixer_ops, param.mixer_name,
- param.mixer_major, param.mixer_minor,
-@@ -2403,12 +2409,6 @@ int main(int argc, char **argv)
- param.adsp_major, param.adsp_minor,
- args.argc, args.argv);
-
-- dsp_se = setup_ossp_cuse(&dsp_ops, param.dsp_name,
-- param.dsp_major, param.dsp_minor,
-- args.argc, args.argv);
-- if (!dsp_se)
-- fatal("can't create dsp, giving up");
--
- if (mixer_se)
- snprintf(mixer_buf, sizeof(mixer_buf), ", %s (%d:%d)",
- param.mixer_name, param.mixer_major, param.mixer_minor);
