[Pkg-swan-devel] Bug#1052718: strongswan FTBFS when systemd.pc changes systemdsystemunitdir

[Helmut Grohne]

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

Helmut
-------------- next part --------------
diff -Nru strongswan-5.9.11/debian/changelog strongswan-5.9.11/debian/changelog
--- strongswan-5.9.11/debian/changelog	2023-06-18 11:53:15.000000000 +0200
+++ strongswan-5.9.11/debian/changelog	2023-09-26 11:27:11.000000000 +0200
@@ -1,3 +1,10 @@
+strongswan (5.9.11-1.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 11:27:11 +0200
+
 strongswan (5.9.11-1) unstable; urgency=medium
 
   * New upstream version 5.9.10
diff -Nru strongswan-5.9.11/debian/charon-systemd.install strongswan-5.9.11/debian/charon-systemd.install
--- strongswan-5.9.11/debian/charon-systemd.install	2023-06-18 11:53:15.000000000 +0200
+++ strongswan-5.9.11/debian/charon-systemd.install	2023-09-26 11:25:33.000000000 +0200
@@ -1,5 +1,4 @@
 etc/strongswan.d/charon-systemd.conf
-lib/systemd/system/strongswan.service
 usr/sbin/charon-systemd
 usr/share/strongswan/templates/config/strongswan.d/charon-systemd.conf
 debian/usr.sbin.charon-systemd /etc/apparmor.d/
diff -Nru strongswan-5.9.11/debian/control strongswan-5.9.11/debian/control
--- strongswan-5.9.11/debian/control	2023-06-18 11:53:15.000000000 +0200
+++ strongswan-5.9.11/debian/control	2023-09-26 11:24:03.000000000 +0200
@@ -31,6 +31,7 @@
                pkg-config,
                po-debconf,
                systemd [linux-any],
+               systemd-dev [linux-any],
                tzdata
 Homepage: http://www.strongswan.org
 
diff -Nru strongswan-5.9.11/debian/rules strongswan-5.9.11/debian/rules
--- strongswan-5.9.11/debian/rules	2023-06-18 11:53:15.000000000 +0200
+++ strongswan-5.9.11/debian/rules	2023-09-26 11:27:11.000000000 +0200
@@ -87,6 +87,8 @@
 		--with-group=wheel
 endif
 
+deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
 override_dh_auto_configure:
 	dh_auto_configure -- $(CONFIGUREARGS)
 
@@ -133,7 +135,9 @@
 	dh_install -p libstrongswan-extra-plugins usr/share/strongswan/templates/config/plugins/af-alg.conf
 	dh_install -p libstrongswan-extra-plugins etc/strongswan.d/charon/af-alg.conf
 	# the systemd service file only gets generated on Linux
-	dh_install -p strongswan-starter lib/systemd/system/strongswan-starter.service
+	dh_install -p strongswan-starter "$(deb_systemdsystemunitdir)/strongswan-starter.service"
+	dh_link -p strongswan-starter "$(deb_systemdsystemunitdir)/strongswan-starter.service" "$(deb_systemdsystemunitdir)/ipsec.service"
+	dh_install -p charon-systemd "$(deb_systemdsystemunitdir)/strongswan.service"
 	# XFRM is Linux only
 	dh_install -p strongswan-libcharon usr/lib/ipsec/xfrmi
 endif
diff -Nru strongswan-5.9.11/debian/strongswan-starter.links strongswan-5.9.11/debian/strongswan-starter.links
--- strongswan-5.9.11/debian/strongswan-starter.links	2023-06-18 11:53:15.000000000 +0200
+++ strongswan-5.9.11/debian/strongswan-starter.links	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-lib/systemd/system/strongswan-starter.service lib/systemd/system/ipsec.service