Hello community,
here is the log from the commit of package openCryptoki
checked in at Wed Apr 12 10:15:52 CEST 2006.
--------
--- openCryptoki/openCryptoki.changes 2006-04-10 13:32:11.000000000 +0200
+++ STABLE/openCryptoki/openCryptoki.changes 2006-04-11 13:29:26.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 11 13:29:07 CEST 2006 - uli@suse.de
+
+- added 64-bit patches from IBM (bug #145666)
+
+-------------------------------------------------------------------
New:
----
ock_64_bit_fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openCryptoki.spec ++++++
--- /var/tmp/diff_new_pack.6TH6fu/_old 2006-04-12 10:15:22.000000000 +0200
+++ /var/tmp/diff_new_pack.6TH6fu/_new 2006-04-12 10:15:22.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: 15
+Release: 17
License: IBM Public License, Other License(s), see package
Group: Productivity/Security
# :pserver:anonymous@cvs.sourceforge.net:/cvsroot/opencryptoki
@@ -32,6 +32,7 @@
Patch8: ock_head_ptr_to_null_20060308.diff
Patch9: ock_222_proc_struct_cmd_20060309.diff
Patch10: ock_222_cmd_fix_ptr_to_arr.diff
+Patch11: ock_64_bit_fixes.diff
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
@@ -129,6 +130,7 @@
%patch8 -p1
%patch9
%patch10 -p1
+%patch11 -p2
cp %{SOURCE2} .
#find -name CVS -type d -print0 | xargs -0 rm -rfv
@@ -215,7 +217,7 @@
%post 64bit
# Old library name for 64bit libs were under /usr/lib/pkcs11. For migration purposes only.
test -d /usr/lib/pkcs11 || mkdir -p /usr/lib/pkcs11
-cd %{_libdir}/opencryptoki && ln -sf ./libopencryptoki.so /usr/lib/pkcs11/PKCS11_API.so64
+ln -sf %{_libdir}/opencryptoki/libopencryptoki.so /usr/lib/pkcs11/PKCS11_API.so64
%endif
%post
@@ -290,6 +292,8 @@
%endif
%changelog -n openCryptoki
+* Tue Apr 11 2006 - uli@suse.de
+- added 64-bit patches from IBM (bug #145666)
* Mon Apr 10 2006 - uli@suse.de
- added small change missing from patch for bug #156651
* Mon Apr 03 2006 - uli@suse.de
++++++ ock_64_bit_fixes.diff ++++++
diff -Naur ./openCryptoki-2.2.2-rc2/usr/lib/pkcs11/api/apiutil.c ./openCryptoki-2.2.2-rc2-64_bit_fixes/usr/lib/pkcs11/api/apiutil.c
--- ./openCryptoki-2.2.2-rc2/usr/lib/pkcs11/api/apiutil.c 2006-04-10 22:22:16.000000000 +0200
+++ ./openCryptoki-2.2.2-rc2-64_bit_fixes/usr/lib/pkcs11/api/apiutil.c 2006-04-10 22:23:07.000000000 +0200
@@ -1026,16 +1026,17 @@
// Check for the name specified to be corre
sprintf(path,"%s",sinfp->dll_location); // make a copy since dir name can change the memory
- sprintf(path2,"%s/stdll",LIBLOCATION); // make a copy since dir name can change the memory
dname = dirname(path);
+ sprintf(path2,"%s/stdll%s",LIBLOCATION,&(sinfp->dll_location[strlen(dname)])); // make a copy since dir name can change the memory
+ /*
if (strcmp(dname,path2) != 0 ) {
// Not in the location we expect
sltp->dlop_p = NULL;
return 0;
}
-
- dllload[i].dlop_p = dlopen(sinfp->dll_location,RTLD_NOW);
+ */
+ dllload[i].dlop_p = dlopen(path2,RTLD_NOW);
if (dllload[i].dlop_p != NULL ){
sltp->dlop_p = dllload[i].dlop_p;
diff -Naur ./openCryptoki-2.2.2-rc2/usr/lib/pkcs11/common/utility.c ./openCryptoki-2.2.2-rc2-64_bit_fixes/usr/lib/pkcs11/common/utility.c
--- ./openCryptoki-2.2.2-rc2/usr/lib/pkcs11/common/utility.c 2006-04-10 22:22:16.000000000 +0200
+++ ./openCryptoki-2.2.2-rc2-64_bit_fixes/usr/lib/pkcs11/common/utility.c 2006-04-10 22:22:53.000000000 +0200
@@ -294,6 +294,7 @@
#include