[shibboleth-sp2] 03/12: Use systemd on Linux only

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to branch debian/master
in repository shibboleth-sp2.

commit 2dabf1dc922dcfd4a9dccc4301e438aaa7ee8d64
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Thu Mar 10 21:47:43 2016 +0100

    Use systemd on Linux only
---
 debian/control                      | 3 ++-
 debian/rules                        | 8 +++++---
 debian/shibboleth-sp2-utils.install | 3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 2213f52..42f71b2 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
  debhelper (>= 9),
  dh-apache2,
  dh-autoreconf,
+ dh-exec,
  libboost-dev,
  libfcgi-dev,
  libkrb5-dev,
@@ -18,7 +19,7 @@ Build-Depends:
  libmemcached-dev (>= 1.0),
  libsaml2-dev (>= 2.5),
  libssl-dev,
- libsystemd-dev,
+ libsystemd-dev [linux-any],
  libxerces-c-dev,
  libxml-security-c-dev (>= 1.7),
  libxmltooling-dev (>= 1.5),
diff --git a/debian/rules b/debian/rules
index 749b178..dd648c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,10 @@ else
     DEBUG =
 endif
 
+ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),)
+enable-systemd=--enable-systemd
+endif
+
 # Download the upstream source and do the repackaging that we have to do for
 # DFSG reasons.  Depends on devscripts.  Mostly a reminder until devscripts
 # version 2.15.10 enables setting these options in the watch file.
@@ -29,7 +33,7 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	    --enable-apache-24 --with-apxs24=/usr/bin/apxs2 \
-	    --enable-systemd \
+	    $(enable-systemd) \
 	    --with-memcached --with-fastcgi --with-gssapi $(DEBUG)
 
 # Move supporting scripts from the configuration directory into /usr/sbin
@@ -54,8 +58,6 @@ override_dh_auto_install:
 	mv debian/tmp/etc/shibboleth/metagen.sh debian/tmp/usr/bin/shib-metagen
 	mv debian/tmp/etc/shibboleth/shibd-debian \
 	    debian/shibboleth-sp2-utils.shibd.init
-	mv debian/tmp/etc/shibboleth/shibd-systemd \
-	    debian/shibboleth-sp2-utils.shibd.service
 	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp
 	mv debian/tmp/usr/include/shibsp/paths.h \
 	    debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp/
diff --git a/debian/shibboleth-sp2-utils.install b/debian/shibboleth-sp2-utils.install
old mode 100644
new mode 100755
index c37f340..9228a83
--- a/debian/shibboleth-sp2-utils.install
+++ b/debian/shibboleth-sp2-utils.install
@@ -1,3 +1,6 @@
+#!/usr/bin/dh-exec
+
+etc/shibboleth/shibd-systemd => lib/systemd/system/shibd.service [linux-any]
 usr/bin
 usr/lib/*/shibboleth/shibauthorizer
 usr/lib/*/shibboleth/shibresponder

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git