Control: retitle -1 unblock: osspd/1.3.2-12.2 Control: tags -1 - moreinfo On Mon, 21 Jun 2021 at 11:08:22 +0100, Simon McVittie wrote: > When we have a version in unstable that everyone is happy with, I'll > respond to this unblock bug with an updated debdiff.
After discussing this with the maintainers I've done a follow-up NMU that also reverts the other non-critical patches, so the only changes since bullseye (or in fact buster) are the RC bug fix and metadata. I hope this is suitable for an unblock so we can have a working osspd in bullseye. [ Reason ] Fix RC bug #986662, an incompatibility with modern PulseAudio, by trying to guess XDG_RUNTIME_DIR after dropping privileges from root to a user [ Impact ] If not fixed, osspd doesn't work with Debian desktops' default sound system and will likely have to be removed. [ Tests ] Tested manually with the splay package, which is an OSS-only MP3 player. I can reproduce the bug with 1.3.2-11 and it is gone with 1.3.2-12.2. The sound quality isn't great (there's some distortion), but it's better than nothing. [ Risks ] The patch only touches the pulseaudio backend, so the worst-case scenario is that it still doesn't work, which would be no worse than #986662. [ Checklist ] [x] All changes are documented in d/changelog [x] I reviewed all changes and I approve them [x] Attached debdiff against the package in testing Thanks, smcv
diffstat for osspd-1.3.2 osspd-1.3.2 changelog | 33 +++++++++++++++++++ control | 5 +- patches/Hack-to-work-with-modern-PulseAudio.patch | 37 ++++++++++++++++++++++ patches/series | 1 4 files changed, 74 insertions(+), 2 deletions(-) diff -Nru osspd-1.3.2/debian/changelog osspd-1.3.2/debian/changelog --- osspd-1.3.2/debian/changelog 2019-01-25 14:36:20.000000000 +0000 +++ osspd-1.3.2/debian/changelog 2021-06-22 11:29:44.000000000 +0100 @@ -1,3 +1,36 @@ +osspd (1.3.2-12.2) unstable; urgency=medium + + * Non-maintainer upload. + * Revert non-critical patch backports from 1.3.2-12. + These do seem correct, but it's too close to the bullseye release + to be making unimportant changes. (Closes: #990121) + * Move VCS to salsa.debian.org with maintainer's agreement + + -- Simon McVittie <s...@debian.org> Tue, 22 Jun 2021 11:29:44 +0100 + +osspd (1.3.2-12.1) unstable; urgency=medium + + * Non-maintainer upload. + * Revert debhelper compat bump to try to get #986662 fixed in bullseye. + At this point in the freeze, a debhelper compat level change is + considered unnecessarily risky. + + -- Simon McVittie <s...@debian.org> Mon, 21 Jun 2021 10:17:56 +0100 + +osspd (1.3.2-12) unstable; urgency=low + + [ Sébastien Noel ] + * cherrypick 2 commits from upstream GIT: + + d/p/GIT-fix-adsp_se.patch + + d/p/GIT-fix-compiler-warnings.patch + * Add workaround for pulseaudio >= 13 + d/p/Hack-to-work-with-modern-PulseAudio.patch (Closes: #986662) + + [ Ralf Jung ] + * Switch to debhelper compat level 13. + + -- Ralf Jung <p...@ralfj.de> Sat, 17 Apr 2021 14:28:09 +0200 + osspd (1.3.2-11) unstable; urgency=medium * Update Standards-Version to 4.3.0. No changes needed. diff -Nru osspd-1.3.2/debian/control osspd-1.3.2/debian/control --- osspd-1.3.2/debian/control 2019-01-25 14:36:20.000000000 +0000 +++ osspd-1.3.2/debian/control 2021-06-22 11:29:44.000000000 +0100 @@ -2,14 +2,15 @@ Section: sound Priority: optional Maintainer: Ralf Jung <p...@ralfj.de> +Uploaders: Sébastien Noel <sebast...@twolife.be> Build-Depends: debhelper (>= 9.20160709), libasound2-dev, libfuse-dev, libpulse-dev Standards-Version: 4.3.0 Homepage: https://sourceforge.net/projects/osspd/ -Vcs-Browser: https://git.ralfj.de/osspd.git -Vcs-Git: git://ralfj.de/osspd.git +Vcs-Browser: https://salsa.debian.org/debian/osspd +Vcs-Git: https://salsa.debian.org/debian/osspd.git Package: osspd Architecture: linux-any diff -Nru osspd-1.3.2/debian/patches/Hack-to-work-with-modern-PulseAudio.patch osspd-1.3.2/debian/patches/Hack-to-work-with-modern-PulseAudio.patch --- osspd-1.3.2/debian/patches/Hack-to-work-with-modern-PulseAudio.patch 1970-01-01 01:00:00.000000000 +0100 +++ osspd-1.3.2/debian/patches/Hack-to-work-with-modern-PulseAudio.patch 2021-06-22 11:29:44.000000000 +0100 @@ -0,0 +1,37 @@ +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Fri, 18 Dec 2020 23:17:36 +0000 +Subject: Hack to work with modern PulseAudio + +--- + ossp-padsp.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/ossp-padsp.c b/ossp-padsp.c +index 1871f5b..178d869 100644 +--- a/ossp-padsp.c ++++ b/ossp-padsp.c +@@ -22,6 +22,8 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <linux/limits.h> ++#include <stdlib.h> + + #include <pulse/pulseaudio.h> + #include <sys/soundcard.h> +@@ -1481,9 +1483,15 @@ static void action_post(void) + int main(int argc, char **argv) + { + int rc; ++ static char runtime_dir[PATH_MAX]; + + ossp_slave_init(argc, argv); + ++ snprintf(runtime_dir, sizeof runtime_dir, "/run/user/%llu", ++ (long long unsigned) getuid()); ++ if (access(runtime_dir, R_OK | X_OK) == 0) ++ setenv("XDG_RUNTIME_DIR", runtime_dir, 0); ++ + page_size = sysconf(_SC_PAGE_SIZE); + + mainloop = pa_threaded_mainloop_new(); diff -Nru osspd-1.3.2/debian/patches/series osspd-1.3.2/debian/patches/series --- osspd-1.3.2/debian/patches/series 2019-01-25 14:36:20.000000000 +0000 +++ osspd-1.3.2/debian/patches/series 2021-06-22 11:29:44.000000000 +0100 @@ -5,3 +5,4 @@ 0005-Add-pthread-compiler-and-linker-flag.patch 0006-fix-build-on-MIPS.patch 0007-cross.patch +Hack-to-work-with-modern-PulseAudio.patch