rpms/coolkey/devel coolkey-simple-bugs.patch, NONE, 1.1 coolkey.spec, 1.31, 1.32

[Jack Magne]

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2229

Modified Files:
	coolkey.spec 
Added Files:
	coolkey-simple-bugs.patch 
Log Message:
Misc bug fixes. Resolves: #485032, #250738, #497758.

coolkey-simple-bugs.patch:
 Makefile.am            |    1 -
 configure.in           |    4 ++--
 src/coolkey/object.cpp |    2 +-
 src/coolkey/object.h   |    2 +-
 src/coolkey/slot.cpp   |    4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE coolkey-simple-bugs.patch ---
diff -up ./configure.in.coolkey-simple-bugs ./configure.in
--- ./configure.in.coolkey-simple-bugs	2009-09-16 11:21:55.621493844 -0700
+++ ./configure.in	2009-09-16 11:22:23.354492383 -0700
@@ -124,9 +124,9 @@ then
 if test $WINDOWS -ne 1; then
   PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ])
 fi
-  enable_pk11install = "yes"
+  enable_pk11install="yes"
 else
-  enable_pk11install = "no"
+  enable_pk11install="no"
   AC_MSG_WARN([skipping pk11install])
 fi
 
diff -up ./Makefile.am.coolkey-simple-bugs ./Makefile.am
--- ./Makefile.am.coolkey-simple-bugs	2009-09-16 11:23:18.715515063 -0700
+++ ./Makefile.am	2009-09-16 13:15:29.570492412 -0700
@@ -25,7 +25,6 @@ if BUILD_PK11INSTALL
 SUBDIRS += src/install
 endif
 
-ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = cookey.spec LICENSE
 
diff -up ./src/coolkey/object.cpp.coolkey-simple-bugs ./src/coolkey/object.cpp
--- ./src/coolkey/object.cpp.coolkey-simple-bugs	2009-09-16 10:36:29.300516245 -0700
+++ ./src/coolkey/object.cpp	2009-09-16 10:37:17.747492199 -0700
@@ -397,7 +397,7 @@ PKCS11Object::getLabel() 
 {
     // clean up old one
     if (label) {
-	delete label;
+	delete [] label;
 	label = NULL;
     }
     // find matching attribute
diff -up ./src/coolkey/object.h.coolkey-simple-bugs ./src/coolkey/object.h
--- ./src/coolkey/object.h.coolkey-simple-bugs	2009-09-16 16:05:27.233488140 -0700
+++ ./src/coolkey/object.h	2009-09-16 16:05:54.161492421 -0700
@@ -82,7 +82,7 @@ class PKCS11Object {
     PKCS11Object(unsigned long muscleObjID, CK_OBJECT_HANDLE handle);
     PKCS11Object(unsigned long muscleObjID, const CKYBuffer *data,
         CK_OBJECT_HANDLE handle);
-    ~PKCS11Object() { delete label; delete name; CKYBuffer_FreeData(&pubKey); }
+    ~PKCS11Object() { delete [] label; delete [] name; CKYBuffer_FreeData(&pubKey); }
 
     PKCS11Object(const PKCS11Object& cpy) :
         attributes(cpy.attributes), muscleObjID(cpy.muscleObjID),
diff -up ./src/coolkey/slot.cpp.coolkey-simple-bugs ./src/coolkey/slot.cpp
--- ./src/coolkey/slot.cpp.coolkey-simple-bugs	2009-09-16 10:28:15.412492201 -0700
+++ ./src/coolkey/slot.cpp	2009-09-16 10:57:27.692492487 -0700
@@ -979,7 +979,7 @@ Slot::makeLabelString(char *label, int m
 //
 #define COOLKEY "CoolKey"
 #define POSSESSION " for "
-    if (!personName || personName == "") {
+    if (!personName || personName[0] == '\0' ) {
 	const int coolKeySize = sizeof(COOLKEY) ;
 	memcpy(label, COOLKEY, coolKeySize-1);
 	makeSerialString(&label[coolKeySize], maxSize-coolKeySize, cuid);
@@ -1528,7 +1528,7 @@ SlotMemSegment::SlotMemSegment(const cha
     }
     sprintf(segName,SEGMENT_PREFIX"%s",readerName); 
     segment = SHMem::initSegment(segName, MAX_OBJECT_STORE_SIZE, needInit);
-    delete segName;
+    delete [] segName;
     if (!segment) {
 	// just run without shared memory
 	return;


Index: coolkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- coolkey.spec	15 Sep 2009 20:52:45 -0000	1.31
+++ coolkey.spec	17 Sep 2009 00:09:52 -0000	1.32
@@ -22,7 +22,7 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 10%{dist}
+Release: 11%{dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -30,6 +30,7 @@ Source: coolkey-%{version}.tar.gz
 Patch1: coolkey-cache-dir-move.patch
 Patch2: coolkey-gcc43.patch
 Patch3: coolkey-latest.patch
+Patch4: coolkey-simple-bugs.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -62,6 +63,7 @@ Linux Driver support to access the CoolK
 %patch1 -b .cache.dir.move
 %patch2 -b .coolkey-gcc43
 %patch3 -b .coolkey-latest
+%patch4 -b .coolkey-simple-bugs
 
 %build
 autoconf
@@ -110,6 +112,8 @@ fi
 
 
 %changelog
+* Wed Sep 16 2009 Jack magne <jmagne at redhat.com> - 1.1.0-11
+- Misc bug fixes. Resolves: 485032, #250738, #497758.
 * Fri Sep 11 2009 Jack Magne <jmagne at redhat.com> - 1.1.0-10
 - Include latest changes for Gemalto 64K and Safenet 330J.
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-9