[pkg-opensc-commit] [SCM] OpenCT packaging branch, master, updated. 7d92c167700ba63c732c2ff9713c6e527f2f834c

[Eric Dorland]

The following commit has been merged in the master branch:
commit e0bc6837e46bc78c660af123edada6bb67179311
Merge: 4fd021ac093fe3775160db2c9a5a3c0dba5cfc0e 9a968e7a902e56547a12982af5b5776ab163999b
Author: Eric Dorland <eric at debian.org>
Date:   Mon Mar 9 00:50:03 2009 -0400

    Merge branch 'upstream'
    
    Conflicts:
    	etc/init-script.in

diff --combined etc/init-script.in
index 8db6fed,411e74d..3439034
--- a/etc/init-script.in
+++ b/etc/init-script.in
@@@ -1,22 -1,8 +1,20 @@@
  #! /bin/sh
 -#
 +
 +### BEGIN INIT INFO
 +# Provides:          openct
 +# Required-Start:    $syslog
 +# Required-Stop:     $syslog
 +# Should-Start:      $local_fs
 +# Should-Stop:       $local_fs
 +# Default-Start:     2 3 4 5
 +# Default-Stop:      0 1 6
 +# Short-Description: smart card terminal framework
 +# Description:       Initialize the OpenCT smart card terminal
 +#                    framework.
 +### END INIT INFO
  
  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
- DAEMON=SBINDIR/openct-control
- STATUS_DIR=/var/run/openct
- STATUS_FILE="$STATUS_DIR/status"
+ DAEMON=@sbindir@/openct-control
  NAME=OpenCT
  DESC="smart card terminal framework"
  
@@@ -24,16 -10,16 +22,16 @@@ test -x $DAEMON || exit 
  
  # create the directory for our status and socket files,
  # if it does not exist.
- if ! test -e $STATUS_DIR
+ if ! test -e "@OPENCT_SOCKET_PATH@"
  then
- 	mkdir $STATUS_DIR
+ 	mkdir "@OPENCT_SOCKET_PATH@"
  
  	# maybe you also want to set owner ship and permissions here.
  	# this example would assign the directory to a group "scard"
  	# and set permissions so only users in that group can access
  	# smart card readers via openct.
- 	chown root:scard $STATUS_DIR
- 	chmod 0750 $STATUS_DIR
 -	#chown root:scard "@OPENCT_SOCKET_PATH@"
 -	#chmod 0750 "@OPENCT_SOCKET_PATH@"
++	chown root:scard "@OPENCT_SOCKET_PATH@"
++	chmod 0750 "@OPENCT_SOCKET_PATH@"
  fi
  
  set -e
@@@ -46,10 -32,7 +44,7 @@@ case "$1" i
  	;;
    stop)
  	echo -n "Stopping $DESC: $NAME "
- 	if [ -f $STATUS_FILE ]; then
- 	        $DAEMON shutdown
- 	        rm -f $STATUS_FILE
-         fi
+ 	$DAEMON shutdown
  	echo "."
  	;;
    #reload)
@@@ -62,7 -45,7 +57,7 @@@
  	#
  	# echo -n "Reloading $DESC configuration..."
  	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
- 	#	/var/run/$NAME.pid --exec $DAEMON
+ 	#	@localstatedir@/run/$NAME.pid --exec $DAEMON
  	# echo "done."
    #;;
    restart|force-reload)
@@@ -72,10 -55,7 +67,10 @@@
  	#	just the same as "restart".
  	#
  	echo -n "Restarting $DESC: $NAME"
 -	$DAEMON shutdown
 +	if [ -f $STATUS_FILE ]; then
 +		$DAEMON shutdown
 +		rm -f $STATUS_FILE
 +	fi
  	sleep 0.1
  	$DAEMON init
  	echo "."

-- 
OpenCT packaging