From 7af27b09986903a92cd99c8ef4415214526cf4e5d9a7edb1510e6cf0fbd396c9 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 20 Feb 2009 20:29:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openCryptoki?expand=0&rev=9 --- openCryptoki.changes | 5 +++++ openCryptoki.pkcsslotd | 21 +++++++++++---------- openCryptoki.spec | 4 +++- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/openCryptoki.changes b/openCryptoki.changes index 119856b..776f701 100644 --- a/openCryptoki.changes +++ b/openCryptoki.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 20 06:01:56 CET 2009 - jjolly@suse.de + +- pkcsslotd: Updated to use new pidfile location (bnc#475800) + ------------------------------------------------------------------- Fri Jan 23 23:02:19 CET 2009 - jjolly@suse.de diff --git a/openCryptoki.pkcsslotd b/openCryptoki.pkcsslotd index 7eb3e15..35d918e 100644 --- a/openCryptoki.pkcsslotd +++ b/openCryptoki.pkcsslotd @@ -22,6 +22,7 @@ . /etc/rc.status +PKCSSLOTD_PID_FILE=/var/lib/opencryptoki/.slotpid # Check for missing binaries (stale symlinks should not happen) PKCSSLOTD_BIN=/usr/sbin/pkcsslotd test -x $PKCSSLOTD_BIN || exit 5 @@ -61,12 +62,12 @@ case "$1" in ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. - if [ ! -f /var/run/pkcsslotd.pid ]; then - # /var/run/pkcsslotd.pid does not exist + if [ ! -f $PKCSSLOTD_PID_FILE ]; then + # $PKCSSLOTD_PID_FILE does not exist startproc -f $PKCSSLOTD_BIN - elif ! ps -h --pid `cat /var/run/pkcsslotd.pid` | grep "$PKCSSLOTD_BIN" 2>&1 >/dev/null; then - # /var/run/pkcsslotd.pid exists but named pid not - rm -f /var/run/pkcsslotd.pid + elif ! ps -h --pid `cat $PKCSSLOTD_PID_FILE` | grep "$PKCSSLOTD_BIN" 2>&1 >/dev/null; then + # $PKCSSLOTD_PID_FILE exists but named pid not + rm -f $PKCSSLOTD_PID_FILE startproc -f $PKCSSLOTD_BIN else # just to have "failed" message @@ -81,7 +82,7 @@ case "$1" in ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. - killproc -p /var/run/pkcsslotd.pid -TERM $PKCSSLOTD_BIN + killproc -p $PKCSSLOTD_PID_FILE -TERM $PKCSSLOTD_BIN # Remember status and be verbose rc_status -v @@ -110,8 +111,8 @@ case "$1" in echo -n "Reload service pkcsslotd" ## if it supports it: - killproc -p /var/run/pkcsslotd.pid -HUP $PKCSSLOTD_BIN - #touch /var/run/pkcsslotd.pid + killproc -p $PKCSSLOTD_PID_FILE -HUP $PKCSSLOTD_BIN + #touch $PKCSSLOTD_PID_FILE rc_status -v ;; @@ -121,8 +122,8 @@ case "$1" in # If it supports signalling: echo -n "Reload service pkcsslotd" - killproc -p /var/run/pkcsslotd.pid -HUP $PKCSSLOTD_BIN - #touch /var/run/pkcsslotd.pid + killproc -p $PKCSSLOTD_PID_FILE -HUP $PKCSSLOTD_BIN + #touch $PKCSSLOTD_PID_FILE rc_status -v # If it does not support reload: diff --git a/openCryptoki.spec b/openCryptoki.spec index 088ed8f..fc624d3 100644 --- a/openCryptoki.spec +++ b/openCryptoki.spec @@ -30,7 +30,7 @@ Name: openCryptoki BuildRequires: gcc-c++ libica openssl-devel pwdutils Summary: An Implementation of PKCS#11 (Cryptoki) v2.11 for IBM Cryptographic Hardware Version: 2.2.6 -Release: 6 +Release: 9 License: IBM Public License Group: Productivity/Security # :pserver:anonymous@cvs.sourceforge.net:/cvsroot/opencryptoki @@ -261,6 +261,8 @@ ln -sf %{_libdir}/opencryptoki/libopencryptoki.so /usr/lib/pkcs11/PKCS11_API.so6 %endif %changelog +* Fri Feb 20 2009 jjolly@suse.de +- pkcsslotd: Updated to use new pidfile location (bnc#475800) * Fri Jan 23 2009 jjolly@suse.de - Added fix to allow backspacing during PIN entry (bnc#448089) * Fri Jan 23 2009 olh@suse.de