rpms/coolkey/devel coolkey-gcc43.patch, NONE, 1.1 coolkey.spec, 1.26, 1.27

[Jack Magne (jmagne)]

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4749

Modified Files:
	coolkey.spec 
Added Files:
	coolkey-gcc43.patch 
Log Message:
Fix for gcc 4.3, bug#427666, rev. rrelyea.

coolkey-gcc43.patch:

--- NEW FILE coolkey-gcc43.patch ---
diff -up ./src/coolkey/slot.cpp.coolkey-gcc43 ./src/coolkey/slot.cpp
--- ./src/coolkey/slot.cpp.coolkey-gcc43	2008-02-13 18:01:45.000000000 -0800
+++ ./src/coolkey/slot.cpp	2008-02-13 18:03:05.000000000 -0800
@@ -25,7 +25,6 @@
 #include "PKCS11Exception.h"
 #include <winscard.h>
 #include "slot.h"
-#include <memory.h>
 #include "zlib.h"
 #include "params.h"
 
@@ -33,7 +32,6 @@
 
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 
-using std::auto_ptr;
 
 
 #ifdef DEBUG
diff -up ./src/coolkey/machdep.cpp.coolkey-gcc43 ./src/coolkey/machdep.cpp
--- ./src/coolkey/machdep.cpp.coolkey-gcc43	2008-02-13 18:02:06.000000000 -0800
+++ ./src/coolkey/machdep.cpp	2008-02-13 18:04:04.000000000 -0800
@@ -33,6 +33,8 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <pthread.h>
+#include <string.h>
+#include <stdlib.h>
 #endif
 
 #ifdef _WIN32
diff -up ./src/coolkey/log.cpp.coolkey-gcc43 ./src/coolkey/log.cpp
--- ./src/coolkey/log.cpp.coolkey-gcc43	2008-02-13 18:01:55.000000000 -0800
+++ ./src/coolkey/log.cpp	2008-02-13 18:03:37.000000000 -0800
@@ -18,6 +18,8 @@
  * ***** END COPYRIGHT BLOCK *****/
 
 #include <string>
+#include <string.h>
+#include <stdlib.h>
 #include "mypkcs11.h"
 #include <assert.h>
 #include <stdio.h>
diff -up ./src/coolkey/object.cpp.coolkey-gcc43 ./src/coolkey/object.cpp
--- ./src/coolkey/object.cpp.coolkey-gcc43	2008-02-13 18:02:20.000000000 -0800
+++ ./src/coolkey/object.cpp	2008-02-13 18:04:22.000000000 -0800
@@ -21,6 +21,7 @@
 #include "PKCS11Exception.h"
 #include "object.h"
 #include <algorithm>
+#include <string.h>
 
 using std::find_if;
 


Index: coolkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- coolkey.spec	27 Sep 2007 23:43:05 -0000	1.26
+++ coolkey.spec	14 Feb 2008 23:51:04 -0000	1.27
@@ -22,12 +22,13 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 5%{dist}
+Release: 6%{dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
 Source: coolkey-%{version}.tar.gz
 Patch1: coolkey-cache-dir-move.patch
+Patch2: coolkey-gcc43.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -58,6 +59,7 @@
 %prep
 %setup -q
 %patch1 -b .cache.dir.move
+%patch2 -b .coolkey-gcc43
 
 %build
 autoconf
@@ -106,6 +108,8 @@
 
 
 %changelog
+* Wed Feb 13 2008 Jack magne <jmagne at redhat.com>  - 1.1.0-6
+- Clean up building with gcc 4.3.
 * Thu Sep 27 2007 Jack Magne <jmagne at redhat.com>  - 1.1.0-5
 - Include patch for moving the cache directory to a safe location. 
 - Bug #299481.