Bug#1034228: zcfan: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

[Cyril Brulebois]

Hi,

Michel Alexandre Salim  (2023-04-28):
> Apologies for the delay, but I've uploaded a -2 that works around
> dh_installsystemd not recognizing files in /usr/lib/systemd by moving it
> to /lib/systemd, invoking dh_installsystemd, and moving it back to
> /usr/lib/systemd
> 
> Let me know if that is acceptable - otherwise the changes in -1+b1 looks
> fine too.

I'll let Laurent comment on this, as the person who came up with the
plan and the bug reports: I was merely giving a hand to limit the amount
of RC bugs at this very late stage of the release cycle, by providing
patches.


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


signature.asc
Description: PGP signature

Bug#1034228: zcfan: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

[Michel Alexandre Salim]

Hi Cyril,

On Tue, Apr 25, 2023 at 06:05:04PM +0200, Cyril Brulebois wrote:
> Control: tag -1 patch pending
> 
> Andreas Henriksson  (2023-04-11):
> > The culprit seems to be the wrong path hardcoded at:
> > https://sources.debian.org/src/zcfan/1.2.1-1/Makefile/#L44
> > 
> > Preferably you would find out this path by querying systemd.pc for it,
> > ie. pkg-config --variable=systemdsystemunitdir systemd
> > 
> > (Note: You'll also need to build-dep on pkg-config and systemd, for
> > systemd.pc)
> 
> Let's… not do that during the hard freeze.
> 
> With the attached patch, the resulting binary debdiff looks like this:
> 
> [The following lists of changes regard files as different if they have
> different names, permissions or owners.]
> 
> Files in second .deb but not in first
> -
> -rw-r--r--  root/root   /lib/systemd/system/zcfan.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/zcfan.service
> (*) -rw-r--r--  root/root   /usr/share/doc/zcfan/changelog.Debian.amd64.gz
> 
> Control files: lines which differ (wdiff format)
> 
> Installed-Size: [-36-] {+39+}
> (*) [-Source: zcfan (1.2.1-1)-]
> Version: [-1.2.1-1+b1-] {+1.2.1-2+}
> 
> There's a bit of extra noise in there, due to the fact we're comparing a
> binNMU against a normal upload, I've prefixed relevant lines with an
> asterisk.
> 
> 
> 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.
>
Apologies for the delay, but I've uploaded a -2 that works around
dh_installsystemd not recognizing files in /usr/lib/systemd by moving it
to /lib/systemd, invoking dh_installsystemd, and moving it back to
/usr/lib/systemd

Let me know if that is acceptable - otherwise the changes in -1+b1 looks
fine too.

Thanks,

-- 
Michel Alexandre Salim
identities: https://keyoxide.org/5dce2e7e9c3b1cffd335c1d78b229d2f7ccc04f2


signature.asc
Description: PGP signature

Bug#1034228: zcfan: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

[Cyril Brulebois]

Cyril Brulebois  (2023-04-25):
> 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.

Sorry, I've used `dch -i` instead of `dch -n` so it's not obvious this
is an NMU. Fixed source debdiff attached, and that's what I've just
uploaded to DELAYED/5.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant
diff -Nru zcfan-1.2.1/debian/changelog zcfan-1.2.1/debian/changelog
--- zcfan-1.2.1/debian/changelog	2022-08-12 21:27:28.0 +
+++ zcfan-1.2.1/debian/changelog	2023-04-25 16:01:08.0 +
@@ -1,3 +1,11 @@
+zcfan (1.2.1-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: #1034228)
+
+ -- Cyril Brulebois   Tue, 25 Apr 2023 16:01:08 +
+
 zcfan (1.2.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #1016908)
diff -Nru zcfan-1.2.1/debian/patches/fix-systemd-unit-location.diff zcfan-1.2.1/debian/patches/fix-systemd-unit-location.diff
--- zcfan-1.2.1/debian/patches/fix-systemd-unit-location.diff	1970-01-01 00:00:00.0 +
+++ zcfan-1.2.1/debian/patches/fix-systemd-unit-location.diff	2023-04-25 15:59:48.0 +
@@ -0,0 +1,15 @@
+Description: Ship systemd unit where dh_installsystemd can find it.
+Author: Cyril Brulebois 
+Forwarded: not-needed
+Last-Update: 2023-04-24
+--- a/Makefile
 b/Makefile
+@@ -41,7 +41,7 @@ clang-tidy:
+ install: all
+ 	mkdir -p $(DESTDIR)$(bindir)/
+ 	$(INSTALL) -pt $(DESTDIR)$(bindir)/ $(EXECUTABLES)
+-	$(INSTALL) -Dp -m 644 zcfan.service $(DESTDIR)$(prefix)/lib/systemd/system/zcfan.service
++	$(INSTALL) -Dp -m 644 zcfan.service $(DESTDIR)/lib/systemd/system/zcfan.service
+ 	$(INSTALL) -Dp -m 644 zcfan.1 $(DESTDIR)$(mandir)/man1/zcfan.1
+ 
+ clean:
diff -Nru zcfan-1.2.1/debian/patches/series zcfan-1.2.1/debian/patches/series
--- zcfan-1.2.1/debian/patches/series	2022-08-12 21:15:44.0 +
+++ zcfan-1.2.1/debian/patches/series	2023-04-25 15:57:28.0 +
@@ -1 +1,2 @@
 add-cppflags.diff
+fix-systemd-unit-location.diff


signature.asc
Description: PGP signature

Bug#1034228: zcfan: dh_installsystemd doesn't handle files in /usr/lib/systemd/system

[Cyril Brulebois]

Control: tag -1 patch pending

Andreas Henriksson  (2023-04-11):
> The culprit seems to be the wrong path hardcoded at:
> https://sources.debian.org/src/zcfan/1.2.1-1/Makefile/#L44
> 
> Preferably you would find out this path by querying systemd.pc for it,
> ie. pkg-config --variable=systemdsystemunitdir systemd
> 
> (Note: You'll also need to build-dep on pkg-config and systemd, for
> systemd.pc)

Let's… not do that during the hard freeze.

With the attached patch, the resulting binary debdiff looks like this:

[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-
-rw-r--r--  root/root   /lib/systemd/system/zcfan.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/zcfan.service
(*) -rw-r--r--  root/root   /usr/share/doc/zcfan/changelog.Debian.amd64.gz

Control files: lines which differ (wdiff format)

Installed-Size: [-36-] {+39+}
(*) [-Source: zcfan (1.2.1-1)-]
Version: [-1.2.1-1+b1-] {+1.2.1-2+}

There's a bit of extra noise in there, due to the fact we're comparing a
binNMU against a normal upload, I've prefixed relevant lines with an
asterisk.


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 zcfan-1.2.1/debian/changelog zcfan-1.2.1/debian/changelog
--- zcfan-1.2.1/debian/changelog	2022-08-12 21:27:28.0 +
+++ zcfan-1.2.1/debian/changelog	2023-04-25 16:01:08.0 +
@@ -1,3 +1,10 @@
+zcfan (1.2.1-2) unstable; urgency=medium
+
+  * Ship systemd unit under /lib/systemd/system so that it can get picked
+up by dh_installsystemd. (Closes: #1034228)
+
+ -- Cyril Brulebois   Tue, 25 Apr 2023 16:01:08 +
+
 zcfan (1.2.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #1016908)
diff -Nru zcfan-1.2.1/debian/patches/fix-systemd-unit-location.diff zcfan-1.2.1/debian/patches/fix-systemd-unit-location.diff
--- zcfan-1.2.1/debian/patches/fix-systemd-unit-location.diff	1970-01-01 00:00:00.0 +
+++ zcfan-1.2.1/debian/patches/fix-systemd-unit-location.diff	2023-04-25 15:59:48.0 +
@@ -0,0 +1,15 @@
+Description: Ship systemd unit where dh_installsystemd can find it.
+Author: Cyril Brulebois 
+Forwarded: not-needed
+Last-Update: 2023-04-24
+--- a/Makefile
 b/Makefile
+@@ -41,7 +41,7 @@ clang-tidy:
+ install: all
+ 	mkdir -p $(DESTDIR)$(bindir)/
+ 	$(INSTALL) -pt $(DESTDIR)$(bindir)/ $(EXECUTABLES)
+-	$(INSTALL) -Dp -m 644 zcfan.service $(DESTDIR)$(prefix)/lib/systemd/system/zcfan.service
++	$(INSTALL) -Dp -m 644 zcfan.service $(DESTDIR)/lib/systemd/system/zcfan.service
+ 	$(INSTALL) -Dp -m 644 zcfan.1 $(DESTDIR)$(mandir)/man1/zcfan.1
+ 
+ clean:
diff -Nru zcfan-1.2.1/debian/patches/series zcfan-1.2.1/debian/patches/series
--- zcfan-1.2.1/debian/patches/series	2022-08-12 21:15:44.0 +
+++ zcfan-1.2.1/debian/patches/series	2023-04-25 15:57:28.0 +
@@ -1 +1,2 @@
 add-cppflags.diff
+fix-systemd-unit-location.diff


signature.asc
Description: PGP signature

Bug#1034228: zcfan: 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: zcfan
> Version: 1.2.1-1
> Severity: serious
> Tags: sid bookworm
> User: debhel...@packages.debian.org
> Usertags: systemd-files-in-usr-bookworm
> 
> Dear Maintainer,
> 
> It seems that your package zcfan is shipping files (.service, .socket or
> .timer) in /usr/lib/systemd/system.
[...]

The culprit seems to be the wrong path hardcoded at:
https://sources.debian.org/src/zcfan/1.2.1-1/Makefile/#L44

Preferably you would find out this path by querying systemd.pc for it,
ie. pkg-config --variable=systemdsystemunitdir systemd

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

Regards,
Andreas Henriksson