7 files changed, 32 insertions, 53 deletions
diff --git a/network/shibboleth-sp/README.SLACKWARE b/network/shibboleth-sp/README.SLACKWARE
index 68f032d04b..b62e830259 100644
--- a/network/shibboleth-sp/README.SLACKWARE
+++ b/network/shibboleth-sp/README.SLACKWARE
@@ -12,13 +12,13 @@ You will need to add the following line to /etc/httpd/httpd.conf:
 To start shibboleth automatically at system startup, add the following to
 your /etc/rc.d/rc.local:
 
-  if [ -x /etc/rc.d/rc.shibboleth ]; then
-    /etc/rc.d/rc.shibboleth start
+  if [ -x /etc/rc.d/rc.shibd ]; then
+    /etc/rc.d/rc.shibd start
   fi
 
 To stop shibboleth automatically at system shutdown, add the following to
 your /etc/rc.d/rc.local_shutdown:
 
-  if [ -x /etc/rc.d/rc.shibboleth ]; then
-    /etc/rc.d/rc.shibboleth stop
+  if [ -x /etc/rc.d/rc.shibd ]; then
+    /etc/rc.d/rc.shibd stop
   fi
diff --git a/network/shibboleth-sp/doinst.sh b/network/shibboleth-sp/doinst.sh
index 62214b7f2a..a7cb2d3911 100644
--- a/network/shibboleth-sp/doinst.sh
+++ b/network/shibboleth-sp/doinst.sh
@@ -22,7 +22,7 @@ preserve_perms() {
   config $NEW
 }
 
-preserve_perms etc/rc.d/rc.shibboleth.new
+preserve_perms etc/rc.d/rc.shibd.new
 config etc/httpd/extra/mod_shib.conf.new
 find etc/shibboleth/ -name *.html.new | while read cfg ; do config $cfg ; done
 find etc/shibboleth/ -name *.logger.new | while read cfg ; do config $cfg ; done
diff --git a/network/shibboleth-sp/mod_shib.conf b/network/shibboleth-sp/mod_shib.conf
deleted file mode 100644
index 815b2be7ac..0000000000
--- a/network/shibboleth-sp/mod_shib.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Load the Shibboleth module.
-#
-LoadModule mod_shib /usr/@baselibdir@/shibboleth/mod_shib_24.so
-
-#
-# Used for example style sheet in error templates.
-#
-<IfModule mod_alias.c>
-  <Location /shibboleth-sp>
-    Require all granted
-  </Location>
-  Alias /shibboleth-sp/main.css /usr/share/shibboleth/main.css
-</IfModule>
-
-#
-# Configure the module for content.
-#
-# You MUST enable AuthType shibboleth for the module to process
-# any requests, and there MUST be a require command as well. To
-# enable Shibboleth but not specify any session/access requirements
-# use "require shibboleth".
-#
-
-#<Location /secure>
-#  AuthType shibboleth
-#  ShibRequestSetting requireSession 1
-#  require valid-user
-#</Location>
-
diff --git a/network/shibboleth-sp/rc.shibboleth b/network/shibboleth-sp/rc.shibd
index 8854433a97..db154529fa 100644
--- a/network/shibboleth-sp/rc.shibboleth
+++ b/network/shibboleth-sp/rc.shibd
@@ -1,8 +1,18 @@
 #!/bin/sh
 
+SHIBD_USER=shibd
+SHIBD_WAIT=30
+SHIBD_PID=/var/run/shibboleth/shibd.pid
+
+DAEMON_OPTS="-f -u $SHIBD_USER -g $SHIBD_USER -w $SHIBD_WAIT -p $SHIBD_PID"
+
 shibd_start() {
-  echo "Starting the shibd service:  /usr/sbin/shibd"
-  /usr/sbin/shibd -f -u shibd -g shibd
+  if [ -f $SHIBD_PID ]; then
+    echo "The shibd service is already running"
+  else
+    echo "Starting the shibd service:  /usr/sbin/shibd"
+    /usr/sbin/shibd $DAEMON_OPTS -p $SHIBD_PID
+  fi
 }
 
 shibd_stop() {
diff --git a/network/shibboleth-sp/shibboleth-sp.SlackBuild b/network/shibboleth-sp/shibboleth-sp.SlackBuild
index d78d3e27b7..41b8197e79 100644
--- a/network/shibboleth-sp/shibboleth-sp.SlackBuild
+++ b/network/shibboleth-sp/shibboleth-sp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Shibboleth Service Provider.
 
-# Copyright 2013 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2013-2015 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shibboleth-sp
-VERSION=${VERSION:-2.5.2}
+VERSION=${VERSION:-2.5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,10 +71,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -89,13 +89,12 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/etc/httpd/extra
-sed "s%@baselibdir@%lib${LIBDIRSUFFIX}%" $CWD/mod_shib.conf > \
-  $PKG/etc/httpd/extra/mod_shib.conf.new
+install -m 644 configs/apache24.config $PKG/etc/httpd/extra/mod_shib.conf.new
 
 chown shibd:shibd $PKG/var/cache/shibboleth $PKG/var/log/shibboleth/ $PKG/var/run/shibboleth
 
 mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.shibboleth > $PKG/etc/rc.d/rc.shibboleth.new
+cat $CWD/rc.shibd > $PKG/etc/rc.d/rc.shibd.new
 
 # Remove useless stuffs
 rm -f $PKG/etc/shibboleth/shibd-* $PKG/etc/shibboleth/*.dist
diff --git a/network/shibboleth-sp/shibboleth-sp.info b/network/shibboleth-sp/shibboleth-sp.info
index b828b4f18e..6cf8244999 100644
--- a/network/shibboleth-sp/shibboleth-sp.info
+++ b/network/shibboleth-sp/shibboleth-sp.info
@@ -1,8 +1,8 @@
 PRGNAM="shibboleth-sp"
-VERSION="2.5.2"
+VERSION="2.5.5"
 HOMEPAGE="http://shibboleth.net/"
-DOWNLOAD="http://shibboleth.net/downloads/service-provider/2.5.2/shibboleth-sp-2.5.2.tar.gz"
-MD5SUM="ce1af8e3a9bf0b921fb04ac886870056"
+DOWNLOAD="http://shibboleth.net/downloads/service-provider/2.5.5/shibboleth-sp-2.5.5.tar.gz"
+MD5SUM="7dc27a9876a7cef281995075d62e16ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="opensaml"
diff --git a/network/shibboleth-sp/slack-desc b/network/shibboleth-sp/slack-desc
index 7cdcce7ae0..d2ecbd627d 100644
--- a/network/shibboleth-sp/slack-desc
+++ b/network/shibboleth-sp/slack-desc
@@ -9,11 +9,11 @@
 shibboleth-sp: shibboleth-sp (Shibboleth Service Provider)
 shibboleth-sp:
 shibboleth-sp: Shibboleth is a Web Single Sign-On implementations based on OpenSAML
-shibboleth-sp: that supports multiple protocols, federated identity, and the extensible
-shibboleth-sp: exchange of rich attributes subject to privacy controls.
+shibboleth-sp: that supports multiple protocols, federated identity, and the
+shibboleth-sp: extensible exchange of rich attributes subject to privacy controls.
 shibboleth-sp:
-shibboleth-sp: This package contains the Shibboleth Service Provider runtime libraries,
-shibboleth-sp: daemon, default plugins, and Apache module.
+shibboleth-sp: This package contains the Shibboleth Service Provider runtime
+shibboleth-sp: libraries, daemon, default plugins, and Apache module.
 shibboleth-sp:
 shibboleth-sp:
 shibboleth-sp: