Hello community, here is the log from the commit of package openCryptoki checked in at Sat Apr 22 01:27:10 CEST 2006. -------- --- openCryptoki/openCryptoki.changes 2006-04-11 13:29:26.000000000 +0200 +++ STABLE/openCryptoki/openCryptoki.changes 2006-04-21 13:06:47.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 21 13:06:00 CEST 2006 - uli@suse.de + +- pkcsslotd: create PID file in the right place, delete it on + exit (bug #164664) + +------------------------------------------------------------------- New: ---- openCryptoki-pkcsslotd-removepidfile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openCryptoki.spec ++++++ --- /var/tmp/diff_new_pack.AMPZBx/_old 2006-04-22 01:27:02.000000000 +0200 +++ /var/tmp/diff_new_pack.AMPZBx/_new 2006-04-22 01:27:02.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: gcc-c++ libica openssl-devel Summary: An Implementation of PKCS#11 (Cryptoki) v2.01 for IBM Cryptographic Hardware Version: 2.2.2 -Release: 17 +Release: 21 License: IBM Public License, Other License(s), see package Group: Productivity/Security # :pserver:anonymous@cvs.sourceforge.net:/cvsroot/opencryptoki @@ -33,6 +33,7 @@ Patch9: ock_222_proc_struct_cmd_20060309.diff Patch10: ock_222_cmd_fix_ptr_to_arr.diff Patch11: ock_64_bit_fixes.diff +Patch12: openCryptoki-pkcsslotd-removepidfile.patch URL: http://oss.software.ibm.com/developerworks/opensource/opencryptoki BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/sbin/groupadd /usr/bin/id /usr/sbin/usermod /bin/sed @@ -131,6 +132,7 @@ %patch9 %patch10 -p1 %patch11 -p2 +%patch12 cp %{SOURCE2} . #find -name CVS -type d -print0 | xargs -0 rm -rfv @@ -292,6 +294,9 @@ %endif %changelog -n openCryptoki +* Fri Apr 21 2006 - uli@suse.de +- pkcsslotd: create PID file in the right place, delete it on + exit (bug #164664) * Tue Apr 11 2006 - uli@suse.de - added 64-bit patches from IBM (bug #145666) * Mon Apr 10 2006 - uli@suse.de ++++++ openCryptoki-pkcsslotd-removepidfile.patch ++++++ --- usr/include/pkcs11/slotmgr.h +++ usr/include/pkcs11/slotmgr.h @@ -325,7 +325,7 @@ #endif -#define PID_FILE_PATH CONFIG_PATH "/.slotpid" +#define PID_FILE_PATH "/var/run/pkcsslotd.pid" #ifndef CK_BOOL #define CK_BOOL CK_BBOOL --- usr/sbin/pkcsslotd/slotmgr.c +++ usr/sbin/pkcsslotd/slotmgr.c @@ -314,6 +314,10 @@ void DumpSharedMemory ( void ); +void unlink_pidfile(void) +{ + unlink(PID_FILE_PATH); +} /***************************************** * main() - @@ -575,6 +579,7 @@ fprintf(pidfile,"%d",getpid()); fclose(pidfile); } + atexit(unlink_pidfile); } #pragma info(none) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...