Linefeed change

diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index 59fd66d..23a326a 100644 (file)
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -1,84 +1,84 @@
-#! /bin/sh\r
-### BEGIN INIT INFO\r
-# Provides: shibd\r
-# Required-Start: $local_fs $remote_fs $network\r
-# Required-Stop: $local_fs $remote_fs $network\r
-# Default-Start: 2 3 4 5\r
-# Default-Stop: S 0 1 6\r
-# Short-Description: Shibboleth 1.3 Service Provider Daemon\r
-# Description: Starts the separate daemon used by the Shibboleth\r
-# Apache module to manage sessions and to retrieve\r
-# attributes from Shibboleth Identity Providers.\r
-### END INIT INFO\r
-#\r
-# Written by Quanah Gibson-Mount <quanah@stanford.edu>\r
-# Modified by Lukas Haemmerle <lukas.haemmerle@switch.ch> for Shibboleth 2\r
-# Based on the dh-make template written by:\r
-#\r
-# Written by Miquel van Smoorenburg <miquels@cistron.nl>.\r
-# Modified for Debian\r
-# by Ian Murdock <imurdock@gnu.ai.mit.edu>.\r
-\r
-PATH=/sbin:/bin:/usr/sbin:/usr/bin\r
-DESC="Shibboleth 1.3 daemon"\r
-NAME=shibd\r
-SHIB_HOME=@-PREFIX-@\r
-SHIB_CONFIG=@-PKGSYSCONFDIR-@/shibboleth.xml\r
-LD_LIBRARY_PATH=@-PREFIX-@/lib\r
-DAEMON=@-PREFIX-@/sbin/$NAME\r
-SCRIPTNAME=/etc/init.d/$NAME\r
-PIDFILE=/var/run/$NAME.pid\r
-DAEMON_OPTS=""\r
-\r
-# Force removal of socket\r
-DAEMON_OPTS="$DAEMON_OPTS -f"\r
-\r
-# Use defined configuration file\r
-DAEMON_OPTS="$DAEMON_OPTS -c $SHIB_CONFIG"\r
-\r
-# Specify pid file to use\r
-DAEMON_OPTS="$DAEMON_OPTS -p $PIDFILE"\r
-\r
-# Exit if the package is not installed.\r
-[ -x "$DAEMON" ] || exit 0\r
-\r
-# Read configuration if it is present.\r
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME\r
-\r
-# Get the setting of VERBOSE and other rcS variables.\r
-[ -f /etc/default/rcS ] && . /etc/default/rcS\r
-\r
-case "$1" in\r
-start)\r
-    # Don't start shibd if NO_START is set.\r
-    if [ "$NO_START" = 1 ] ; then\r
-        echo "Not starting $DESC (see /etc/default/$NAME)"\r
-        exit 0\r
-    fi\r
-    echo -n "Starting $DESC: "\r
-    start-stop-daemon --background --start --quiet \\r
-        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS\r
-    echo "$NAME."\r
-    ;;\r
-stop)\r
-    echo -n "Stopping $DESC: "\r
-    start-stop-daemon --stop --quiet --pidfile $PIDFILE \\r
-        --exec $DAEMON\r
-    echo "$NAME."\r
-    ;;\r
-restart|force-reload)\r
-    echo -n "Restarting $DESC: "\r
-    start-stop-daemon --stop --quiet --pidfile $PIDFILE \\r
-        --exec $DAEMON\r
-    sleep 1\r
-    start-stop-daemon --background --start --quiet \\r
-        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS\r
-    echo "$NAME."\r
-    ;;\r
-*)\r
-    echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2\r
-    exit 1\r
-    ;;\r
-esac\r
-\r
-exit 0\r
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: shibd
+# Required-Start: $local_fs $remote_fs $network
+# Required-Stop: $local_fs $remote_fs $network
+# Default-Start: 2 3 4 5
+# Default-Stop: S 0 1 6
+# Short-Description: Shibboleth 1.3 Service Provider Daemon
+# Description: Starts the separate daemon used by the Shibboleth
+# Apache module to manage sessions and to retrieve
+# attributes from Shibboleth Identity Providers.
+### END INIT INFO
+#
+# Written by Quanah Gibson-Mount <quanah@stanford.edu>
+# Modified by Lukas Haemmerle <lukas.haemmerle@switch.ch> for Shibboleth 2
+# Based on the dh-make template written by:
+#
+# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
+# Modified for Debian
+# by Ian Murdock <imurdock@gnu.ai.mit.edu>.
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DESC="Shibboleth 1.3 daemon"
+NAME=shibd
+SHIB_HOME=@-PREFIX-@
+SHIB_CONFIG=@-PKGSYSCONFDIR-@/shibboleth.xml
+LD_LIBRARY_PATH=@-PREFIX-@/lib
+DAEMON=@-PREFIX-@/sbin/$NAME
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+DAEMON_OPTS=""
+
+# Force removal of socket
+DAEMON_OPTS="$DAEMON_OPTS -f"
+
+# Use defined configuration file
+DAEMON_OPTS="$DAEMON_OPTS -c $SHIB_CONFIG"
+
+# Specify pid file to use
+DAEMON_OPTS="$DAEMON_OPTS -p $PIDFILE"
+
+# Exit if the package is not installed.
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration if it is present.
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Get the setting of VERBOSE and other rcS variables.
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+case "$1" in
+start)
+    # Don't start shibd if NO_START is set.
+    if [ "$NO_START" = 1 ] ; then
+        echo "Not starting $DESC (see /etc/default/$NAME)"
+        exit 0
+    fi
+    echo -n "Starting $DESC: "
+    start-stop-daemon --background --start --quiet \
+        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
+    echo "$NAME."
+    ;;
+stop)
+    echo -n "Stopping $DESC: "
+    start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+        --exec $DAEMON
+    echo "$NAME."
+    ;;
+restart|force-reload)
+    echo -n "Restarting $DESC: "
+    start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+        --exec $DAEMON
+    sleep 1
+    start-stop-daemon --background --start --quiet \
+        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
+    echo "$NAME."
+    ;;
+*)
+    echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+    exit 1
+    ;;
+esac
+
+exit 0