[Pkg-swan-devel] [Git][debian/strongswan][debian/master] 2 commits: Fix FTBFS when systemd.pc changes systemdsystemunitdir

[Yves-Alexis Perez (@corsac)]

Yves-Alexis Perez pushed to branch debian/master at Debian / strongswan


Commits:
761367ba by Helmut Grohne at 2023-09-28T21:23:08+02:00
Fix FTBFS when systemd.pc changes systemdsystemunitdir

Closes: #1052718

- - - - -
e8330232 by Yves-Alexis Perez at 2023-09-28T21:27:47+02:00
update changelog

- - - - -


5 changed files:

- debian/changelog
- debian/charon-systemd.install
- debian/control
- debian/rules
- − debian/strongswan-starter.links


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+strongswan (5.9.11-2) UNRELEASED; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir (Closes: #1052718)
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 28 Sep 2023 21:27:43 +0200
+
 strongswan (5.9.11-1) unstable; urgency=medium
 
   * New upstream version 5.9.10


=====================================
debian/charon-systemd.install
=====================================
@@ -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/


=====================================
debian/control
=====================================
@@ -31,6 +31,7 @@ Build-Depends: bison,
                pkg-config,
                po-debconf,
                systemd [linux-any],
+               systemd-dev [linux-any],
                tzdata
 Homepage: http://www.strongswan.org
 


=====================================
debian/rules
=====================================
@@ -87,6 +87,8 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 		--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 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
 	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


=====================================
debian/strongswan-starter.links deleted
=====================================
@@ -1 +0,0 @@
-lib/systemd/system/strongswan-starter.service lib/systemd/system/ipsec.service



View it on GitLab: https://salsa.debian.org/debian/strongswan/-/compare/7468f3ab2dc02520a21bf9ee5ac418a506b48b29...e8330232567ca11175f9dc59b82b359374c01b35

-- 
View it on GitLab: https://salsa.debian.org/debian/strongswan/-/compare/7468f3ab2dc02520a21bf9ee5ac418a506b48b29...e8330232567ca11175f9dc59b82b359374c01b35
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-swan-devel/attachments/20230928/720cd701/attachment-0001.htm>