[Pkg-freeipa-devel] Bug#1052641: freeipa FTBFS when systemd.pc changes systemdsystemunitdir

[Helmut Grohne]

Source: freeipa
Version: 4.10.2-1
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. freeipa's upstream build system consumes this
variable, but the packaging hard codes the current value. Consequently,
freeipa will FTBFS when the value changes. Consider applying the
attached patch to avoid that scenario.

Helmut
-------------- next part --------------
diff -Nru freeipa-4.10.2/debian/changelog freeipa-4.10.2/debian/changelog
--- freeipa-4.10.2/debian/changelog	2023-08-10 10:16:37.000000000 +0200
+++ freeipa-4.10.2/debian/changelog	2023-09-25 15:01:03.000000000 +0200
@@ -1,3 +1,10 @@
+freeipa (4.10.2-1.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 15:01:03 +0200
+
 freeipa (4.10.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru freeipa-4.10.2/debian/control freeipa-4.10.2/debian/control
--- freeipa-4.10.2/debian/control	2023-08-10 10:16:37.000000000 +0200
+++ freeipa-4.10.2/debian/control	2023-09-25 14:58:24.000000000 +0200
@@ -25,6 +25,7 @@
  libsasl2-dev,
  libssl-dev,
  libtalloc-dev,
+ pkgconf,
  python3-all-dev,
  python3-cryptography,
  python3-dbus,
diff -Nru freeipa-4.10.2/debian/freeipa-client-epn.install freeipa-4.10.2/debian/freeipa-client-epn.install
--- freeipa-4.10.2/debian/freeipa-client-epn.install	2023-06-07 13:47:19.000000000 +0200
+++ freeipa-4.10.2/debian/freeipa-client-epn.install	2023-09-25 15:01:03.000000000 +0200
@@ -1,7 +1,7 @@
 etc/ipa/epn.conf
 etc/ipa/epn/expire_msg.template
-lib/systemd/system/ipa-epn.service
-lib/systemd/system/ipa-epn.timer
+${env:systemdsystemunitdir}/ipa-epn.service
+${env:systemdsystemunitdir}/ipa-epn.timer
 usr/sbin/ipa-epn
 usr/share/man/man1/ipa-epn.1
 usr/share/man/man5/epn.conf.5
diff -Nru freeipa-4.10.2/debian/freeipa-server.install freeipa-4.10.2/debian/freeipa-server.install
--- freeipa-4.10.2/debian/freeipa-server.install	2023-06-07 13:47:19.000000000 +0200
+++ freeipa-4.10.2/debian/freeipa-server.install	2023-09-25 15:01:03.000000000 +0200
@@ -4,15 +4,15 @@
 etc/ipa/kdcproxy
 etc/dbus-1/system.d/org.freeipa.server.conf
 etc/oddjobd.conf.d/ipa-server.conf
-lib/systemd/system/ipa-ccache-sweep.service
-lib/systemd/system/ipa-ccache-sweep.timer
-lib/systemd/system/ipa-custodia.service
-lib/systemd/system/ipa-dnskeysyncd.service
-lib/systemd/system/ipa-ods-exporter.service
-lib/systemd/system/ipa-ods-exporter.socket
-lib/systemd/system/ipa-otpd.socket
-lib/systemd/system/ipa-otpd at .service
-lib/systemd/system/ipa.service
+${env:systemdsystemunitdir}/ipa-ccache-sweep.service
+${env:systemdsystemunitdir}/ipa-ccache-sweep.timer
+${env:systemdsystemunitdir}/ipa-custodia.service
+${env:systemdsystemunitdir}/ipa-dnskeysyncd.service
+${env:systemdsystemunitdir}/ipa-ods-exporter.service
+${env:systemdsystemunitdir}/ipa-ods-exporter.socket
+${env:systemdsystemunitdir}/ipa-otpd.socket
+${env:systemdsystemunitdir}/ipa-otpd at .service
+${env:systemdsystemunitdir}/ipa.service
 usr/lib/*/dirsrv/plugins/libipa_cldap.so
 usr/lib/*/dirsrv/plugins/libipa_dns.so
 usr/lib/*/dirsrv/plugins/libipa_enrollment_extop.so
diff -Nru freeipa-4.10.2/debian/rules freeipa-4.10.2/debian/rules
--- freeipa-4.10.2/debian/rules	2023-08-10 10:13:34.000000000 +0200
+++ freeipa-4.10.2/debian/rules	2023-09-25 15:01:03.000000000 +0200
@@ -20,6 +20,7 @@
 export PYTHON=python3
 export am_cv_python_pythondir=/usr/lib/python3/dist-packages
 export am_cv_python_pyexecdir=/usr/lib/python3/dist-packages
+export systemdsystemunitdir=$(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
 
 confflags = \
 	--libexecdir=/usr/lib/ \