[Pkg-utopia-maintainers] Bug#1053112: cockpit FTBFS when systemd.pc changes systemdsystemunitdir

[Helmut Grohne]

Source: cockpit
Version: 301-1
Tags: ftbfs patch
User: helmutg at debian.org
Usertags: dep17m2

We want to change the value of systemdsystemunitdir in systemd.pc to
point below /usr. cockpit's upstream build system consumes this variable
while the packaging hard codes its current value. When we change it,
cockpit will FTBFS. Consider applying the attached patch to avoid the
failure.

Helmut
-------------- next part --------------
diff -Nru cockpit-301/debian/changelog cockpit-301/debian/changelog
--- cockpit-301/debian/changelog	2023-09-21 07:20:37.000000000 +0200
+++ cockpit-301/debian/changelog	2023-09-27 12:16:09.000000000 +0200
@@ -1,3 +1,10 @@
+cockpit (301-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 27 Sep 2023 12:16:09 +0200
+
 cockpit (301-1) unstable; urgency=medium
 
   * New upstream release:
diff -Nru cockpit-301/debian/cockpit-tests.install cockpit-301/debian/cockpit-tests.install
--- cockpit-301/debian/cockpit-tests.install	2023-06-14 13:51:32.000000000 +0200
+++ cockpit-301/debian/cockpit-tests.install	2023-09-27 12:15:41.000000000 +0200
@@ -1,3 +1,3 @@
 usr/share/cockpit/playground
-lib/systemd/system/cockpit-session.socket
-lib/systemd/system/cockpit-session at .service
+${env:deb_systemdsystemunitdir}/cockpit-session.socket
+${env:deb_systemdsystemunitdir}/cockpit-session at .service
diff -Nru cockpit-301/debian/cockpit-ws.install cockpit-301/debian/cockpit-ws.install
--- cockpit-301/debian/cockpit-ws.install	2023-06-14 13:51:32.000000000 +0200
+++ cockpit-301/debian/cockpit-ws.install	2023-09-27 12:15:58.000000000 +0200
@@ -1,15 +1,15 @@
 etc/cockpit/ws-certs.d
 etc/pam.d/cockpit
-lib/systemd/system/cockpit.service
-lib/systemd/system/cockpit-motd.service
-lib/systemd/system/cockpit.socket
-lib/systemd/system/cockpit-wsinstance-http.service
-lib/systemd/system/cockpit-wsinstance-http.socket
-lib/systemd/system/cockpit-wsinstance-https-factory at .service
-lib/systemd/system/cockpit-wsinstance-https-factory.socket
-lib/systemd/system/cockpit-wsinstance-https at .service
-lib/systemd/system/cockpit-wsinstance-https at .socket
-lib/systemd/system/system-cockpithttps.slice
+${env:deb_systemdsystemunitdir}/cockpit.service
+${env:deb_systemdsystemunitdir}/cockpit-motd.service
+${env:deb_systemdsystemunitdir}/cockpit.socket
+${env:deb_systemdsystemunitdir}/cockpit-wsinstance-http.service
+${env:deb_systemdsystemunitdir}/cockpit-wsinstance-http.socket
+${env:deb_systemdsystemunitdir}/cockpit-wsinstance-https-factory at .service
+${env:deb_systemdsystemunitdir}/cockpit-wsinstance-https-factory.socket
+${env:deb_systemdsystemunitdir}/cockpit-wsinstance-https at .service
+${env:deb_systemdsystemunitdir}/cockpit-wsinstance-https at .socket
+${env:deb_systemdsystemunitdir}/system-cockpithttps.slice
 lib/*/security/pam_ssh_add.so
 lib/*/security/pam_cockpit_cert.so
 usr/lib/tmpfiles.d/cockpit-tempfiles.conf
diff -Nru cockpit-301/debian/control cockpit-301/debian/control
--- cockpit-301/debian/control	2023-07-26 12:21:11.000000000 +0200
+++ cockpit-301/debian/control	2023-09-27 12:14:32.000000000 +0200
@@ -21,7 +21,9 @@
                libpam0g-dev,
                libpcp-import1-dev,
                libpcp-pmda3-dev,
+               pkgconf,
                systemd,
+               systemd-dev,
                xsltproc,
                xmlto,
                docbook-xsl,
diff -Nru cockpit-301/debian/rules cockpit-301/debian/rules
--- cockpit-301/debian/rules	2023-09-21 07:20:21.000000000 +0200
+++ cockpit-301/debian/rules	2023-09-27 12:15:06.000000000 +0200
@@ -9,6 +9,8 @@
 	export COCKPIT_SKIP_SLOW_TESTS=1
 endif
 
+export deb_systemdsystemunitdir = $(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
 %:
 	dh $@ --buildsystem=autoconf --with=python3