[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1125325: trixie-pu: package ffmpegfs/2.17-1+deb13u1



Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: ffmpegfs@packages.debian.org
Control: affects -1 + src:ffmpegfs
User: release.debian.org@packages.debian.org
Usertags: pu

[ Reason ]

This one-line patch fixes the output directory not showing the
complete list of files with the libfuse3 version in Debian Trixie.

https://github.com/nschlia/ffmpegfs/issues/173

[ Impact ]

The ffmpegfs package will work as intended. ;)

[ Tests ]

The bug showed up in upstream's own tests when using a Debian Trixie
image and is confirmed to be fixed by this patch.

[ Risks ]

No risks. This patch is confirmed to be included in the next upstream
release which is due later this month (or next month, you never know).

[ Checklist ]
  [X] *all* changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in (old)stable
  [ ] the issue is verified as fixed in unstable

[ Changes ]

With this change the code in question does not use the
FUSE_FILL_DIR_PLUS flag anymore, which does not do as intended by the
ffmpegfs upstream author with the libfuse3 version in Debian Trixie.

[ Other info ]

Nothing else, other that I was asked by the upstream authot himself to
please port this patch to the ffmpegfs package in Debian Trixie.
diff -Nru ffmpegfs-2.17/debian/changelog ffmpegfs-2.17/debian/changelog
--- ffmpegfs-2.17/debian/changelog	2024-11-22 16:43:59.000000000 +0100
+++ ffmpegfs-2.17/debian/changelog	2026-01-12 16:08:41.000000000 +0100
@@ -1,3 +1,12 @@
+ffmpegfs (2.17-1+deb13u1) trixie; urgency=medium
+
+  * Non-maintainer upload with maintainer's approval.
+  * Backport commit from upstream to fix list of files in output
+    directory which was incomplete
+    (https://github.com/nschlia/ffmpegfs/commit/5581dad)
+
+ -- Fabian Greffrath <fabian@debian.org>  Mon, 12 Jan 2026 16:08:41 +0100
+
 ffmpegfs (2.17-1) unstable; urgency=medium
 
   * Bugfix: Issue #164: Fixed incorrectly discarded HLS seek requests.
diff -Nru ffmpegfs-2.17/debian/patches/0031-Issue-173-Fix-list-of-files-in-output-directory-whic.patch ffmpegfs-2.17/debian/patches/0031-Issue-173-Fix-list-of-files-in-output-directory-whic.patch
--- ffmpegfs-2.17/debian/patches/0031-Issue-173-Fix-list-of-files-in-output-directory-whic.patch	1970-01-01 01:00:00.000000000 +0100
+++ ffmpegfs-2.17/debian/patches/0031-Issue-173-Fix-list-of-files-in-output-directory-whic.patch	2026-01-12 16:08:17.000000000 +0100
@@ -0,0 +1,32 @@
+From 5581dadf0e315cbf332a8ca1089bbeca07af79db Mon Sep 17 00:00:00 2001
+From: Norbert Schlia <nschlia@oblivion-software.de>
+Date: Thu, 4 Dec 2025 11:49:47 +0100
+Subject: [PATCH 31/40] Issue #173: Fix list of files in output directory which
+ was incomplete
+
+---
+ NEWS           | 2 ++
+ README.md      | 1 +
+ src/fuseops.cc | 5 +++--
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+--- a/src/fuseops.cc
++++ b/src/fuseops.cc
+@@ -2403,14 +2403,15 @@ static const FFmpegfs_Format * get_forma
+     return nullptr;
+ }
+ 
+-int add_fuse_entry(void *buf, fuse_fill_dir_t filler, const std::string & name, const struct stat *stbuf, off_t off)
++int add_fuse_entry(void *buf, fuse_fill_dir_t filler, const std::string & name, const struct stat *stbuf, off_t /*off*/)
+ {
+     if (buf == nullptr || filler == nullptr)
+     {
+         return 0;
+     }
+ 
+-    return filler(buf, name.c_str(), stbuf, off, FUSE_FILL_DIR_PLUS);
++    // Issue #173: FUSE_FILL_DIR_PLUS erstmal NICHT nutzen
++    return filler(buf, name.c_str(), stbuf, 0, static_cast<fuse_fill_dir_flags>(0));
+ }
+ 
+ int add_dotdot(void *buf, fuse_fill_dir_t filler, const struct stat *stbuf, off_t off)
diff -Nru ffmpegfs-2.17/debian/patches/series ffmpegfs-2.17/debian/patches/series
--- ffmpegfs-2.17/debian/patches/series	2023-06-25 16:11:38.000000000 +0200
+++ ffmpegfs-2.17/debian/patches/series	2026-01-12 16:08:07.000000000 +0100
@@ -0,0 +1 @@
+0031-Issue-173-Fix-list-of-files-in-output-directory-whic.patch

Reply to: