[Debian-ha-maintainers] Bug#1052699: resource-agents FTBFS when systemd.pc changes systemdsystemunitdir

[Helmut Grohne]

Source: resource-agents
Version: 1:4.12.0-2
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. resource-agents' upstream build system consumes this
variable while the packaging hard codes its current value. As we change
it, resource-agents will FTBFS. Consider applying the attached patch to
avoid this failure.

Helmut
-------------- next part --------------
diff -Nru resource-agents-4.12.0/debian/changelog resource-agents-4.12.0/debian/changelog
--- resource-agents-4.12.0/debian/changelog	2023-04-13 21:43:52.000000000 +0200
+++ resource-agents-4.12.0/debian/changelog	2023-09-26 10:59:48.000000000 +0200
@@ -1,3 +1,10 @@
+resource-agents (1:4.12.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 26 Sep 2023 10:59:48 +0200
+
 resource-agents (1:4.12.0-2) unstable; urgency=medium
 
   * debian/patches: add IPv6addr-delay.patch (Closes: #1034280)
diff -Nru resource-agents-4.12.0/debian/ldirectord.install resource-agents-4.12.0/debian/ldirectord.install
--- resource-agents-4.12.0/debian/ldirectord.install	2020-12-14 15:52:50.000000000 +0100
+++ resource-agents-4.12.0/debian/ldirectord.install	2023-09-26 10:59:33.000000000 +0200
@@ -4,6 +4,6 @@
 etc/ha.d/resource.d/ldirectord
 etc/init.d/ldirectord
 etc/logrotate.d/ldirectord
-lib/systemd/system/ldirectord.service [linux-any]
+${deb_systemdsystemunitdir}/ldirectord.service [linux-any]
 usr/sbin/ldirectord
 usr/share/man/man8/ldirectord.8
diff -Nru resource-agents-4.12.0/debian/resource-agents.install resource-agents-4.12.0/debian/resource-agents.install
--- resource-agents-4.12.0/debian/resource-agents.install	2022-04-03 13:30:26.000000000 +0200
+++ resource-agents-4.12.0/debian/resource-agents.install	2023-09-26 10:59:43.000000000 +0200
@@ -1,6 +1,6 @@
 #!/usr/bin/dh-exec
 etc/ha.d/shellfuncs
-lib/systemd/system/resource-agents-deps.target [linux-any]
+${deb_systemdsystemunitdir}/resource-agents-deps.target [linux-any]
 usr/include
 usr/lib/ocf
 usr/lib/tmpfiles.d/resource-agents.conf [linux-any]
diff -Nru resource-agents-4.12.0/debian/rules resource-agents-4.12.0/debian/rules
--- resource-agents-4.12.0/debian/rules	2022-04-03 13:29:56.000000000 +0200
+++ resource-agents-4.12.0/debian/rules	2023-09-26 10:59:19.000000000 +0200
@@ -4,6 +4,7 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/pkg-info.mk
+export deb_systemdsystemunitdir=$(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
 
 %:
 	dh $@ --with python3