Bug#1034229: wsdd2: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

[Cyril Brulebois]

Matteo F. Vescovi  (2023-04-26):
> LGTM. Please, go ahead with a DELAYED/0.
> Thanks for taking care of the issue for me.

My pleasure! Rescheduled.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#1034229: wsdd2: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

[Matteo F. Vescovi]

Hi Cyril!

On Tue, Apr 25, 2023 at 5:54 PM Cyril Brulebois  wrote:

[...]


> Maintainer: I'm uploading to DELAYED/5, it can be either rescheduled to
> DELAYED/0 if you're happy with the changes right now, or be superseded
> by an upload of yours if that happens before the delay is over.
>

LGTM. Please, go ahead with a DELAYED/0.
Thanks for taking care of the issue for me.

Cheers.

-- 
Matteo F. Vescovi || Debian Developer
GnuPG KeyID: 4096R/0x8062398983B2CF7A

Bug#1034229: wsdd2: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

[Cyril Brulebois]

Control: tag -1 patch pending

Hi,

Andreas Henriksson  (2023-04-11):
> The culprit seems to be the hard-coded path at:
> https://sources.debian.org/src/wsdd2/1.8.7%2Bdfsg-1/Makefile/#L31
> 
> As this path will change again in the future, please consider
> finding out the path from the proper source via:
> pkg-config --variable=systemdsystemunitdir systemd
> 
> (Note: you'll need to build-dep on pkg-config and systemd, for
> systemd.pc)

Or just patch it out now, and drop the patch later, as we're in hard
freeze.

Building with the attached patch leads to the following changes on the
binary side, as expected:

Files in second .deb but not in first
-
-rw-r--r--  root/root   /lib/systemd/system/wsdd2.service
-rwxr-xr-x  root/root   DEBIAN/postinst
-rwxr-xr-x  root/root   DEBIAN/postrm
-rwxr-xr-x  root/root   DEBIAN/prerm

Files in first .deb but not in second
-
-rw-r--r--  root/root   /usr/lib/systemd/system/wsdd2.service


Maintainer: I'm uploading to DELAYED/5, it can be either rescheduled to
DELAYED/0 if you're happy with the changes right now, or be superseded
by an upload of yours if that happens before the delay is over.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant
diff -Nru wsdd2-1.8.7+dfsg/debian/changelog wsdd2-1.8.7+dfsg/debian/changelog
--- wsdd2-1.8.7+dfsg/debian/changelog	2022-07-13 21:24:12.0 +
+++ wsdd2-1.8.7+dfsg/debian/changelog	2023-04-25 15:40:11.0 +
@@ -1,3 +1,11 @@
+wsdd2 (1.8.7+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Ship systemd unit under /lib/systemd/system so that it can get picked
+up by dh_installsystemd (Closes: #1034229)
+
+ -- Cyril Brulebois   Tue, 25 Apr 2023 15:40:11 +
+
 wsdd2 (1.8.7+dfsg-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru wsdd2-1.8.7+dfsg/debian/patches/0002-Fix-systemd-unit-directory.patch wsdd2-1.8.7+dfsg/debian/patches/0002-Fix-systemd-unit-directory.patch
--- wsdd2-1.8.7+dfsg/debian/patches/0002-Fix-systemd-unit-directory.patch	1970-01-01 00:00:00.0 +
+++ wsdd2-1.8.7+dfsg/debian/patches/0002-Fix-systemd-unit-directory.patch	2023-04-25 15:39:54.0 +
@@ -0,0 +1,22 @@
+From: Cyril Brulebois 
+Date: Tue, 25 Apr 2023 15:37:40 +
+Subject: Fix systemd unit directory
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/1034229
+
+For Bookworm, dh_installsystemd only looks at /lib/systemd/system (and
+doesn't look at /usr/lib/systemd/system).
+
+--- a/Makefile
 b/Makefile
+@@ -28,8 +28,8 @@ install: wsdd2
+ 	install wsdd2 $(DESTDIR)$(SBINDIR)
+ 	install -d $(DESTDIR)$(MANDIR)/man8
+ 	install -m 0644 wsdd2.8 $(DESTDIR)$(MANDIR)/man8
+-	install -d $(DESTDIR)$(LIBDIR)/systemd/system
+-	install -m 0644 wsdd2.service $(DESTDIR)$(LIBDIR)/systemd/system
++	install -d $(DESTDIR)/lib/systemd/system
++	install -m 0644 wsdd2.service $(DESTDIR)/lib/systemd/system
+ 
+ clean:
+ 	rm -f wsdd2 nl_debug $(OBJFILES)
diff -Nru wsdd2-1.8.7+dfsg/debian/patches/series wsdd2-1.8.7+dfsg/debian/patches/series
--- wsdd2-1.8.7+dfsg/debian/patches/series	2021-10-23 18:58:25.0 +
+++ wsdd2-1.8.7+dfsg/debian/patches/series	2023-04-25 15:36:45.0 +
@@ -1 +1,2 @@
 0001-Additional_parameters_in_unit_file.patch
+0002-Fix-systemd-unit-directory.patch


signature.asc
Description: PGP signature

Bug#1034229: wsdd2: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

[Andreas Henriksson]

On Tue, Apr 11, 2023 at 09:37:27AM +0200, bi...@debian.org wrote:
> Package: wsdd2
> Version: 1.8.7+dfsg-1  
> Severity: serious
> Tags: sid bookworm
> User: debhel...@packages.debian.org
> Usertags: systemd-files-in-usr-bookworm
> 
> Dear Maintainer,
> 
> It seems that your package wsdd2 is shipping files (.service, .socket or
> .timer) in /usr/lib/systemd/system.
[...]

The culprit seems to be the hard-coded path at:
https://sources.debian.org/src/wsdd2/1.8.7%2Bdfsg-1/Makefile/#L31

As this path will change again in the future, please consider
finding out the path from the proper source via:
pkg-config --variable=systemdsystemunitdir systemd

(Note: you'll need to build-dep on pkg-config and systemd, for
systemd.pc)

Regards,
Andreas Henriksson