[Debian-ha-maintainers] Bug#1052625: cluster-glue FTBFS when systemd.pc changes systemdsystemunitdir

[Helmut Grohne]

Source: cluster-glue
Version: 1.0.12-21
Severity: normal
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. cluster-glue's upstream build system consumes this
value but its packaging hard codes the current value. When we change it,
cluster-glue will FTBFS. Consider applying the attached patch to avoid
that.

Helmut
-------------- next part --------------
diff -Nru cluster-glue-1.0.12/debian/changelog cluster-glue-1.0.12/debian/changelog
--- cluster-glue-1.0.12/debian/changelog	2022-04-10 16:17:14.000000000 +0200
+++ cluster-glue-1.0.12/debian/changelog	2023-09-25 14:10:50.000000000 +0200
@@ -1,3 +1,10 @@
+cluster-glue (1.0.12-21.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 25 Sep 2023 14:10:50 +0200
+
 cluster-glue (1.0.12-21) unstable; urgency=medium
 
   [ Lucas Kanashiro ]
diff -Nru cluster-glue-1.0.12/debian/cluster-glue.install cluster-glue-1.0.12/debian/cluster-glue.install
--- cluster-glue-1.0.12/debian/cluster-glue.install	2020-04-05 16:32:52.000000000 +0200
+++ cluster-glue-1.0.12/debian/cluster-glue.install	2023-09-25 14:10:33.000000000 +0200
@@ -85,7 +85,7 @@
 usr/share/cluster-glue/openais_conf_support.sh
 usr/share/cluster-glue/ha_log.sh
 usr/lib/stonith/plugins/xen0-ha-dom0-stonith-helper
-lib/systemd/system/logd.service
+${env:systemdsystemunitdir}/logd.service
 usr/share/man/man8/meatclient.8 
 usr/share/man/man8/hb_report.8
 usr/share/man/man8/ha_logd.8
diff -Nru cluster-glue-1.0.12/debian/control cluster-glue-1.0.12/debian/control
--- cluster-glue-1.0.12/debian/control	2022-04-10 15:59:44.000000000 +0200
+++ cluster-glue-1.0.12/debian/control	2023-09-25 14:09:44.000000000 +0200
@@ -32,6 +32,7 @@
  libxml2-utils,
  openssh-client <!nocheck>,
  perl,
+ pkgconf,
  psmisc,
  python3,
  systemd [linux-any],
diff -Nru cluster-glue-1.0.12/debian/rules cluster-glue-1.0.12/debian/rules
--- cluster-glue-1.0.12/debian/rules	2020-06-27 12:54:34.000000000 +0200
+++ cluster-glue-1.0.12/debian/rules	2023-09-25 14:10:50.000000000 +0200
@@ -9,6 +9,8 @@
 # lib tool gets it's chance to do anything.
 # export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 
+export systemdsystemunitdir = $(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
 # main packaging script based on dh7 syntax
 %:
 	dh $@ --with python3