[cpp-sp] 21/37: Upstream added systemd support, enable it

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/2.5.5+dfsg1-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=9d9dc638a35d9ee84279a0af9493561a17dfd957

commit 9d9dc638a35d9ee84279a0af9493561a17dfd957
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jan 21 23:02:50 2016 +0100

    Upstream added systemd support, enable it
---
 debian/control                                     |  1 +
 ...bianize-the-systemd-service-file-of-shibd.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  3 +++
 debian/shibboleth-sp2-utils.shibd.tmpfile          |  1 +
 5 files changed, 33 insertions(+)

diff --git a/debian/control b/debian/control
index 7abb415..692e726 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends:
  libmemcached-dev (>= 1.0),
  libsaml2-dev (>= 2.5),
  libssl-dev,
+ libsystemd-daemon-dev,
  libxerces-c-dev,
  libxml-security-c-dev (>= 1.7),
  libxmltooling-dev (>= 1.5),
diff --git a/debian/patches/Debianize-the-systemd-service-file-of-shibd.patch b/debian/patches/Debianize-the-systemd-service-file-of-shibd.patch
new file mode 100644
index 0000000..b282035
--- /dev/null
+++ b/debian/patches/Debianize-the-systemd-service-file-of-shibd.patch
@@ -0,0 +1,27 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 24 Jan 2016 12:41:00 +0100
+Subject: Debianize the systemd service file of shibd
+
+---
+ configs/shibd-systemd.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configs/shibd-systemd.in b/configs/shibd-systemd.in
+index a2b1998..d01470e 100644
+--- a/configs/shibd-systemd.in
++++ b/configs/shibd-systemd.in
+@@ -1,12 +1,12 @@
+ [Unit]
+ Description=Shibboleth Service Provider Daemon
+ After=network.target
+-Before=httpd.service
++Before=apache2.service
+ 
+ [Service]
+ Type=notify
+ NotifyAccess=main
+-User=shibd
++User=_shibd
+ #Environment=LD_LIBRARY_PATH=/opt/shibboleth/lib
+ ExecStart=@-PREFIX-@/sbin/shibd -f -F
+ StandardInput=null
diff --git a/debian/patches/series b/debian/patches/series
index aafe62f..fadf745 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Improve-shibd-init-script.patch
 keygen-improvements-for-Debian.patch
 Avoid-libtool-silent-flag.patch
 Remove-WSTrust-schema-references.patch
+Debianize-the-systemd-service-file-of-shibd.patch
diff --git a/debian/rules b/debian/rules
index 6d3246d..9072f7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,7 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	    --enable-apache-24 --with-apxs24=/usr/bin/apxs2 \
+	    --enable-systemd \
 	    --with-memcached --with-fastcgi --with-gssapi $(DEBUG)
 
 # Move supporting scripts from the configuration directory into /usr/sbin
@@ -67,6 +68,8 @@ 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.shibd.tmpfile b/debian/shibboleth-sp2-utils.shibd.tmpfile
new file mode 100644
index 0000000..7093ea6
--- /dev/null
+++ b/debian/shibboleth-sp2-utils.shibd.tmpfile
@@ -0,0 +1 @@
+d /var/run/shibboleth 755 _shibd _shibd

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.