Fix build with modern GCC

5 files changed, 60 insertions, 10 deletions

diff --git a/security/CoolKey/distinfo b/security/CoolKey/distinfo
index 0c28a895f99..463f47a24c4 100644
--- a/security/CoolKey/distinfo
+++ b/security/CoolKey/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/04 11:33:02 shannonjr Exp $
+$NetBSD: distinfo,v 1.2 2011/11/25 22:17:48 joerg Exp $
 
 SHA1 (coolkey-1.1.0.tar.gz) = 54136decf9dfd091c8b231cb77dac97db95e1866
 RMD160 (coolkey-1.1.0.tar.gz) = 1873e85aecb30c5311444c76fd85ba79633dce23
 Size (coolkey-1.1.0.tar.gz) = 432808 bytes
 SHA1 (patch-aa) = f91d804c54540f45e7791b3ca9a1fb987bde0a72
-SHA1 (patch-ab) = 6a597a0b6b0400fee83264ee73c9755819ada630
+SHA1 (patch-ab) = 6aed241ec856b7b826e7c9953e286088d8960feb
 SHA1 (patch-ac) = 8b7604ea677471a7ee5c1d7c9f4f6f4c03468350
+SHA1 (patch-src_coolkey_log.cpp) = 2e9fe538236496a924eb3a12a43a4336e814aabb
+SHA1 (patch-src_coolkey_object.cpp) = a28c9a56e4a184bcdf73be9d64ef133b691ccf0e
+SHA1 (patch-src_coolkey_slot.cpp) = a797e9e2dcc04598fb3e322fe7f78326c9ea1de6
diff --git a/security/CoolKey/patches/patch-ab b/security/CoolKey/patches/patch-ab
index b146679d5d4..963cebfa87b 100644
--- a/security/CoolKey/patches/patch-ab
+++ b/security/CoolKey/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:33:02 shannonjr Exp $
+$NetBSD: patch-ab,v 1.2 2011/11/25 22:17:49 joerg Exp $
 
---- src/coolkey/machdep.cpp.orig	2007-02-13 17:46:28.000000000 -0700
+--- src/coolkey/machdep.cpp.orig	2007-02-14 00:46:28.000000000 +0000
 +++ src/coolkey/machdep.cpp
 @@ -17,6 +17,8 @@
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -11,7 +11,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:33:02 shannonjr Exp $
  #include "machdep.h"
  #include "mypkcs11.h"
  #include "PKCS11Exception.h"
-@@ -185,12 +187,20 @@ void OSSleep(int time) 
+@@ -32,6 +34,8 @@
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <pthread.h>
+ #endif
+ 
+@@ -185,12 +189,20 @@ void OSSleep(int time) 
  #define MAP_INHERIT 0
  #endif
  
@@ -34,7 +43,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:33:02 shannonjr Exp $
  #endif
  
  struct SHMemData {
-@@ -208,11 +218,6 @@ SHMemData::~SHMemData() { 
+@@ -208,11 +220,6 @@ SHMemData::~SHMemData() { 
  #ifdef FULL_CLEANUP
  	flock(fd,LOCK_EX);
  	unsigned long ref = --(*(unsigned long *)addr); 
@@ -46,7 +55,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:33:02 shannonjr Exp $
  	flock(fd, LOCK_UN);
  #endif
  	munmap(addr,size+RESERVED_OFFSET);
-@@ -225,6 +230,73 @@ SHMemData::~SHMemData() { 
+@@ -225,6 +232,73 @@ SHMemData::~SHMemData() { 
      }
  }
  
@@ -120,7 +129,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:33:02 shannonjr Exp $
  SHMem::SHMem(): shmemData(0) {}
  
  SHMem *
-@@ -248,7 +320,7 @@ SHMem::initSegment(const char *name, int
+@@ -248,7 +322,7 @@ SHMem::initSegment(const char *name, int
  	return NULL;
      }
      int mask = umask(0);
@@ -129,7 +138,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:33:02 shannonjr Exp $
      umask(mask);
      if ((ret == -1) && (errno != EEXIST)) {
  	delete shmemData;
-@@ -264,21 +336,16 @@ SHMem::initSegment(const char *name, int
+@@ -264,21 +338,16 @@ SHMem::initSegment(const char *name, int
      shmemData->path[sizeof(MEMSEGPATH)-1] = '/';
      strcpy(&shmemData->path[sizeof(MEMSEGPATH)],name);
  
@@ -157,7 +166,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:33:02 shannonjr Exp $
  
  	buf = (char *)calloc(1,len);
  	if (!buf) {
-@@ -289,8 +356,22 @@ SHMem::initSegment(const char *name, int
+@@ -289,8 +358,22 @@ SHMem::initSegment(const char *name, int
  	    delete shmemData;
  	    return NULL;
  	}
diff --git a/security/CoolKey/patches/patch-src_coolkey_log.cpp b/security/CoolKey/patches/patch-src_coolkey_log.cpp
new file mode 100644
index 00000000000..79ebbd12e25
--- /dev/null
+++ b/security/CoolKey/patches/patch-src_coolkey_log.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_coolkey_log.cpp,v 1.1 2011/11/25 22:17:49 joerg Exp $
+
+--- src/coolkey/log.cpp.orig	2011-11-25 17:05:01.000000000 +0000
++++ src/coolkey/log.cpp
+@@ -21,6 +21,8 @@
+ #include "mypkcs11.h"
+ #include <assert.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <strings.h>
+ #include "log.h"
+ #include <cstdarg>
+ #include "PKCS11Exception.h"
diff --git a/security/CoolKey/patches/patch-src_coolkey_object.cpp b/security/CoolKey/patches/patch-src_coolkey_object.cpp
new file mode 100644
index 00000000000..3a70b6e5143
--- /dev/null
+++ b/security/CoolKey/patches/patch-src_coolkey_object.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_coolkey_object.cpp,v 1.1 2011/11/25 22:17:49 joerg Exp $
+
+--- src/coolkey/object.cpp.orig	2011-11-25 17:09:14.000000000 +0000
++++ src/coolkey/object.cpp
+@@ -21,6 +21,7 @@
+ #include "PKCS11Exception.h"
+ #include "object.h"
+ #include <algorithm>
++#include <cstring>
+ 
+ using std::find_if;
+ 
diff --git a/security/CoolKey/patches/patch-src_coolkey_slot.cpp b/security/CoolKey/patches/patch-src_coolkey_slot.cpp
new file mode 100644
index 00000000000..cc5342eb935
--- /dev/null
+++ b/security/CoolKey/patches/patch-src_coolkey_slot.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_coolkey_slot.cpp,v 1.1 2011/11/25 22:17:49 joerg Exp $
+
+--- src/coolkey/slot.cpp.orig	2011-11-25 17:09:33.000000000 +0000
++++ src/coolkey/slot.cpp
+@@ -31,6 +31,8 @@
+ 
+ #include "machdep.h"
+ 
++#include <memory>
++
+ #define MIN(x, y) ((x) < (y) ? (x) : (y))
+ 
+ using std::auto_ptr;