Control: tags -1 +patch

Dear maintainer,

I've prepared an NMU with the following git patchset to fix this bug
(note that the last NMU is missing from the nas repository on debian
salsa and I'm adding a patch to integrate that too)
(I'm also attaching a dsc debdiff for this NMU).

0001 =  NMU for 1.9.4-9.1 
0002 = fix for 1029999 (this bug)
0003 = changelog for this NMU

I intend to ask for sponsorship on mentors soon: please let me know if
you want to care of this by yourself.

Best Regards,
Lorenzo



>From d1e749cdd8cb6517a1e7e8fc1c27d53e25ee9b6d Mon Sep 17 00:00:00 2001
From: Adrian Bunk <[email protected]>
Date: Mon, 5 Jan 2026 15:00:18 +0200
Subject: [PATCH 1/3] Import Debian changes 1.9.4-9.1

nas (1.9.4-9.1) unstable; urgency=medium
.
  * Non-maintainer upload.
  * Build with -std=gnu17 to workaround FTBFS with GCC 15.
    (Closes: #1097431)
---
 .gitignore                    |  5 -----
 debian/changelog              |  8 ++++++++
 debian/patches/auto-gitignore | 19 +++++++++++++++++++
 debian/patches/series         |  1 +
 debian/rules                  |  2 ++
 5 files changed, 30 insertions(+), 5 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 debian/patches/auto-gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 83b913f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.pc
-config.guess
-Makefile
-config.sub
-config.guess
diff --git a/debian/changelog b/debian/changelog
index 44dba29..682a5ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nas (1.9.4-9.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build with -std=gnu17 to workaround FTBFS with GCC 15.
+    (Closes: #1097431)
+
+ -- Adrian Bunk <[email protected]>  Mon, 05 Jan 2026 15:00:18 +0200
+
 nas (1.9.4-9) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/auto-gitignore b/debian/patches/auto-gitignore
new file mode 100644
index 0000000..cfb37df
--- /dev/null
+++ b/debian/patches/auto-gitignore
@@ -0,0 +1,19 @@
+Subject: Update .gitignore from Debian packaging branch
+
+The Debian packaging git branch contains these updates to the upstream
+.gitignore file(s).  This patch is autogenerated, to provide these
+updates to users of the official Debian archive view of the package.
+
+[dgit (11.8) update-gitignore]
+---
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..83b913f
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,5 @@
++/.pc
++config.guess
++Makefile
++config.sub
++config.guess
diff --git a/debian/patches/series b/debian/patches/series
index 808cccd..765de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ snprintf.m4
 Build-the-voxware-server-on-Hurd.patch
 fix-missing-defs.patch
 0005-Drop-ifndef-mips.patch
+auto-gitignore
diff --git a/debian/rules b/debian/rules
index 3e27933..711e16e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+export DEB_CFLAGS_MAINT_APPEND = -std=gnu17
+
 instdirs=BINDIR=/usr/bin USRLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) MANPATH=/usr/share/man INCDIR=/usr/include PROJECTMANSUFFIX=nas ETCDIR=/etc/nas
 
 %:
-- 
2.51.0

>From 2313f48377fc0b41ebf0b74f8bdb1649eb0721a4 Mon Sep 17 00:00:00 2001
From: Lorenzo Puliti <[email protected]>
Date: Mon, 16 Feb 2026 00:54:05 +0100
Subject: [PATCH 2/3] Add a systemd nas.service

add a systemd service for nas, with standard debhelper integration.
add Recommends: psmisc (due to fuser), mark as linux any as the
package currently fails to build on Hurd but this may be fixed in
future (and fuser is used in systemd service which is linux only)

Closes: #1029999
---
 debian/control     |  1 +
 debian/nas.service | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 debian/nas.service

diff --git a/debian/control b/debian/control
index 37c9eb4..915699e 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Section: libs
 Package: nas
 Architecture: any
 Depends: libaudio2 (>= ${binary:Version}), ${shlibs:Depends}, debconf | debconf-2.0, ${misc:Depends}
+Recommends: psmisc [linux-any]
 Suggests: audiooss
 Description: Network Audio System - local server
  The Network Audio System (NAS) was developed by NCD for playing,
diff --git a/debian/nas.service b/debian/nas.service
new file mode 100644
index 0000000..36c3477
--- /dev/null
+++ b/debian/nas.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Network Audio System daemon
+After=syslog.target
+After=network.target
+
+[Service]
+Type=simple
+EnvironmentFile=-/etc/default/nas
+#NOTE nasd fails if the audio device is busy
+# maybe conflicts with all audio servers could help, but it fails also
+# with plain alsa.. so try with fuser for now
+ExecCondition=sh -c 'if fuser /dev/snd/* ; then exit 1; else exit 0; fi'
+ExecStart=/usr/bin/nasd $NASD_OPTS
+
+[Install]
+WantedBy=multi-user.target
-- 
2.51.0

>From 2ca335516629128e725ed80276afbf5fb8a734af Mon Sep 17 00:00:00 2001
From: Lorenzo Puliti <[email protected]>
Date: Mon, 16 Feb 2026 00:59:29 +0100
Subject: [PATCH 3/3] update changelog for 1.9.4-9.2

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 682a5ee..c624afe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nas (1.9.4-9.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add a systemd nas.service (Closes: #1029999)
+
+ -- Lorenzo Puliti <[email protected]>  Mon, 16 Feb 2026 00:56:36 +0100
+
 nas (1.9.4-9.1) unstable; urgency=medium
 
   * Non-maintainer upload.
-- 
2.51.0

diff -Nru nas-1.9.4/debian/changelog nas-1.9.4/debian/changelog
--- nas-1.9.4/debian/changelog	2026-01-05 14:00:18.000000000 +0100
+++ nas-1.9.4/debian/changelog	2026-02-16 00:56:36.000000000 +0100
@@ -1,3 +1,10 @@
+nas (1.9.4-9.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add a systemd nas.service (Closes: #1029999)
+
+ -- Lorenzo Puliti <[email protected]>  Mon, 16 Feb 2026 00:56:36 +0100
+
 nas (1.9.4-9.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru nas-1.9.4/debian/control nas-1.9.4/debian/control
--- nas-1.9.4/debian/control	2024-05-09 11:30:10.000000000 +0200
+++ nas-1.9.4/debian/control	2026-02-16 00:56:36.000000000 +0100
@@ -30,6 +30,7 @@
 Package: nas
 Architecture: any
 Depends: libaudio2 (>= ${binary:Version}), ${shlibs:Depends}, debconf | debconf-2.0, ${misc:Depends}
+Recommends: psmisc [linux-any]
 Suggests: audiooss
 Description: Network Audio System - local server
  The Network Audio System (NAS) was developed by NCD for playing,
diff -Nru nas-1.9.4/debian/nas.service nas-1.9.4/debian/nas.service
--- nas-1.9.4/debian/nas.service	1970-01-01 01:00:00.000000000 +0100
+++ nas-1.9.4/debian/nas.service	2026-02-16 00:56:36.000000000 +0100
@@ -0,0 +1,16 @@
+[Unit]
+Description=Network Audio System daemon
+After=syslog.target
+After=network.target
+
+[Service]
+Type=simple
+EnvironmentFile=-/etc/default/nas
+#NOTE nasd fails if the audio device is busy
+# maybe conflicts with all audio servers could help, but it fails also
+# with plain alsa.. so try with fuser for now
+ExecCondition=sh -c 'if fuser /dev/snd/* ; then exit 1; else exit 0; fi'
+ExecStart=/usr/bin/nasd $NASD_OPTS
+
+[Install]
+WantedBy=multi-user.target

Reply via email to