OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coolkey?expand=0&rev=5

coolkey-valgrind-error.patch

@@ -0,0 +1,12 @@
+diff -ruNp coolkey-1.1.0.orig/src/coolkey/slot.cpp coolkey-1.1.0/src/coolkey/slot.cpp
+--- coolkey-1.1.0.orig/src/coolkey/slot.cpp	2009-02-06 09:57:38.769657000 +0100
++++ coolkey-1.1.0/src/coolkey/slot.cpp	2009-02-06 09:57:47.440733391 +0100
+@@ -1456,7 +1456,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;

coolkey-wrong-delete.patch

@@ -0,0 +1,13 @@
+https://bugzilla.novell.com/show_bug.cgi?id=443369
+================================================================================
+--- src/coolkey/object.cpp
++++ src/coolkey/object.cpp
+@@ -398,7 +398,7 @@
+ {
+     // clean up old one
+     if (label) {
+-	delete label;
++	delete [] label;
+ 	label = NULL;
+     }
+     // find matching attribute

coolkey.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 14 18:37:02 CEST 2009 - sbrabec@suse.cz
+
+- Fixed wrong C++ delete (bnc#443369, Redhat#485032).
+
 -------------------------------------------------------------------
 Mon Oct 29 17:50:46 CET 2007 - sbrabec@suse.cz
 

coolkey.spec

@@ -1,29 +1,45 @@
 #
 # spec file for package coolkey (Version 1.1.0)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
+
 Name:           coolkey
 Version:        1.1.0
-Release:        22
+Release:        124
 Summary:        CoolKey PKCS #11 PKI Module for Smart Cards
 License:        LGPL v2.1 only
 Group:          Productivity/Security
 Url:            http://directory.fedoraproject.org/wiki/CoolKey
 Source:         %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM coolkey-configure-syntax-error.patch Redhat250738 sbrabec@suse.cz -- Fix configure syntax error.
 Patch:          coolkey-configure-syntax-error.patch
+# PATCH-FIX-UPSTREAM coolkey-string-literal-comparison.patch Redhat250738 sbrabec@suse.cz -- Fix wrong comparison.
 Patch1:         coolkey-string-literal-comparison.patch
+# PATCH-FIX-UPSTREAM coolkey-amflags.patch Redhat250738 sbrabec@suse.cz -- Remove reference to missing directory.
 Patch2:         coolkey-amflags.patch
 Patch3:         coolkey-1.1.0-evoandooo.patch
 Patch4:         coolkey-cache-dir-move.patch
 Patch5:         coolkey-null.patch
+# PATCH-FIX-UPSTREAM coolkey-implicit-declaration.patch Redhat sbrabec@suse.cz -- Fix wrong C++ delete.
 Patch6:         coolkey-implicit-declaration.patch
+# PATCH-FIX-UPSTREAM coolkey-wrong-delete.patch bnc443369 sbrabec@suse.cz -- Fix wrong C++ delete.
+Patch7:         coolkey-wrong-delete.patch
+# PATCH-FIX-UPSTREAM coolkey-valgrind-error.patch Redhat485032 sbrabec@suse.cz -- Fix wrong C++ delete.
+Patch8:         coolkey-valgrind-error.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++ mozilla-nss-devel pcsc-lite-devel pkg-config zlib-devel
 #Requires:       pcsc-lite
@@ -55,6 +71,7 @@ cards, which are available in both smart card and USB Fob form factors.
 
 
 %package devel
+License:        LGPL v2.1 only
 Summary:        CoolKey PKCS #11 PKI Module for Smart Cards
 Group:          Development/Libraries/C and C++
 
@@ -89,6 +106,8 @@ card and USB Fob form factors.
 %patch4
 %patch5
 %patch6
+%patch7
+%patch8 -p1
 
 %build
 autoreconf -f -i
@@ -125,14 +144,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libckyapplet.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/*.h
+
 %changelog
-* Mon Oct 29 2007 - sbrabec@suse.cz
+* Tue Apr 14 2009 sbrabec@suse.cz
+- Fixed wrong C++ delete (bnc#443369, Redhat#485032).
+* Mon Oct 29 2007 sbrabec@suse.cz
 - Fixed gcc 4.3 build errors.
-* Mon Sep 10 2007 - sbrabec@suse.cz
+* Mon Sep 10 2007 sbrabec@suse.cz
 - Fixed file and directory permission flaw (#304180,
   CVE-2007-4129).
-* Thu Sep 06 2007 - jberkman@novell.com
+* Thu Sep 06 2007 jberkman@novell.com
 - install pk11install
 - teach pk11install about evolution and openoffice
-* Fri Aug 03 2007 - sbrabec@suse.cz
+* Fri Aug 03 2007 sbrabec@suse.cz
 - New SuSE package, version 1.1.0.