Resolve hash ambiguity for C++11 STL. Add missing includes. Add missing

RCS id.

8 files changed, 132 insertions, 9 deletions

diff --git a/benchmarks/postal/distinfo b/benchmarks/postal/distinfo
index d32e072b07d..9f90958ac16 100644
--- a/benchmarks/postal/distinfo
+++ b/benchmarks/postal/distinfo
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.6 2011/11/24 01:15:41 marino Exp $
+$NetBSD: distinfo,v 1.7 2013/05/23 14:59:13 joerg Exp $
 
 SHA1 (postal-0.70.tgz) = d02dc900eb645aa993c5747fa434a0af4b0fb7e0
 RMD160 (postal-0.70.tgz) = 2b23ab0d60abfeaad32adf7ba65134d0f267294a
 Size (postal-0.70.tgz) = 99965 bytes
-SHA1 (patch-aa) = d280c32d86451d2abee8ec95e7a22f91c752ae60
-SHA1 (patch-ab) = bc67f3c2d609f1aeb0969467cdc170e2f6ac08b8
+SHA1 (patch-aa) = 0d85ec46202e0077d7f435547158eff65eab8a69
+SHA1 (patch-ab) = 38ed0b1ad550b31e8d46639e43b243e0e2b99cf5
 SHA1 (patch-ad) = 3707f465c6a69c94fd862fb7863a3c8cb6519366
 SHA1 (patch-ae) = 094165c454fb87c9cbacfae6e9ab2bb38f4d15a2
-SHA1 (patch-af) = ddc0280be05d7fac510ac9204146023d9ad58a00
+SHA1 (patch-af) = ce387f94ff18a9a6b67dfe5a07740cc8340e6cfb
+SHA1 (patch-bhmusers.cpp) = 4cdbb026eb8da5bc42aae304e35869542e19ac60
+SHA1 (patch-bhmusers.h) = 430fdea85b33a331442b67d988b203715171dcad
+SHA1 (patch-smtp.cpp) = a91db5779f1ef8cf6d514c1304d20d01a4548772
+SHA1 (patch-smtp.h) = 876ece300ee53085b61bb1d16efffa907e733a43
diff --git a/benchmarks/postal/patches/patch-aa b/benchmarks/postal/patches/patch-aa
index 6c4826d4d67..2e8e693ab1a 100644
--- a/benchmarks/postal/patches/patch-aa
+++ b/benchmarks/postal/patches/patch-aa
@@ -1,8 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2011/11/24 01:15:41 marino Exp $
+$NetBSD: patch-aa,v 1.3 2013/05/23 14:59:13 joerg Exp $
 
 --- postal.cpp.orig	2007-01-14 04:40:23.000000000 +0000
 +++ postal.cpp
-@@ -16,6 +16,15 @@
+@@ -10,12 +10,22 @@
+ #include <stdio.h>
+ #include "postal.h"
+ #include "logit.h"
++#include <cstdlib>
+ #ifdef USE_GNUTLS
+ #include <errno.h>
+ #include <gcrypt.h>
  GCRY_THREAD_OPTION_PTHREAD_IMPL;
  #endif
  
@@ -18,7 +25,7 @@ $NetBSD: patch-aa,v 1.2 2011/11/24 01:15:41 marino Exp $
  void usage()
  {
    printf("Usage: postal [-m maximum-message-size] [-M minimum-message-size] [-t threads]\n"
-@@ -152,7 +161,9 @@ int main(int argc, char **argv)
+@@ -152,7 +162,9 @@ int main(int argc, char **argv)
    struct sigaction sa;
    sa.sa_sigaction = NULL;
    sa.sa_handler = SIG_IGN;
diff --git a/benchmarks/postal/patches/patch-ab b/benchmarks/postal/patches/patch-ab
index 5ec5bfb78dd..91be0f6d041 100644
--- a/benchmarks/postal/patches/patch-ab
+++ b/benchmarks/postal/patches/patch-ab
@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.3 2013/05/23 14:59:13 joerg Exp $
+
 --- rabid.cpp.orig	2008-05-26 11:40:30.000000000 +0200
 +++ rabid.cpp	2011-11-24 01:18:38.758256000 +0100
 @@ -18,6 +18,15 @@
diff --git a/benchmarks/postal/patches/patch-af b/benchmarks/postal/patches/patch-af
index 9253aba0c1f..303bff0b52c 100644
--- a/benchmarks/postal/patches/patch-af
+++ b/benchmarks/postal/patches/patch-af
@@ -1,8 +1,13 @@
-$NetBSD: patch-af,v 1.1 2011/11/24 01:15:41 marino Exp $
+$NetBSD: patch-af,v 1.2 2013/05/23 14:59:13 joerg Exp $
 
 --- bhm.cpp.orig	2008-05-26 09:43:52.000000000 +0000
 +++ bhm.cpp
-@@ -13,6 +13,9 @@
+@@ -9,10 +9,14 @@
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/poll.h>
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <arpa/inet.h>
@@ -12,3 +17,30 @@ $NetBSD: patch-af,v 1.1 2011/11/24 01:15:41 marino Exp $
  #include <netinet/ip.h>
  
  #include "postal.h"
+@@ -47,7 +51,7 @@ void usage(CPCCHAR msg = NULL)
+ 
+ int maxMsgSize = 10240;
+ results res;
+-Logit *log;
++Logit *my_log;
+ 
+ int exitCount = 0;
+ 
+@@ -261,7 +265,7 @@ int readCommand(base_tcp &t, char *buf, 
+ 
+ void do_work(thread_data *td)
+ {
+-  base_tcp t(td->fd, log, td->debug, &res
++  base_tcp t(td->fd, my_log, td->debug, &res
+ #ifdef USE_SSL
+     , td->ssl
+ #endif
+@@ -405,7 +409,7 @@ int main(int argc, char **argv)
+ #endif
+     "\n");
+ 
+-  log = new Logit("bhm.log", allLog, false, 0);
++  my_log = new Logit("bhm.log", allLog, false, 0);
+   Logit *debug = NULL;
+ 
+   if(debugName)
diff --git a/benchmarks/postal/patches/patch-bhmusers.cpp b/benchmarks/postal/patches/patch-bhmusers.cpp
new file mode 100644
index 00000000000..147f8b66743
--- /dev/null
+++ b/benchmarks/postal/patches/patch-bhmusers.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-bhmusers.cpp,v 1.1 2013/05/23 14:59:13 joerg Exp $
+
+--- bhmusers.cpp.orig	2013-05-23 13:33:38.000000000 +0000
++++ bhmusers.cpp
+@@ -1,6 +1,7 @@
+ #include "bhmusers.h"
+ #include <stdio.h>
+ #include <cstring>
++#include <cstdlib>
+ #include "expand.h"
+ 
+ BHMUsers::BHMUsers(const char *userListFile)
diff --git a/benchmarks/postal/patches/patch-bhmusers.h b/benchmarks/postal/patches/patch-bhmusers.h
new file mode 100644
index 00000000000..d4128dcde36
--- /dev/null
+++ b/benchmarks/postal/patches/patch-bhmusers.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-bhmusers.h,v 1.1 2013/05/23 14:59:13 joerg Exp $
+
+--- bhmusers.h.orig	2013-05-23 13:33:27.000000000 +0000
++++ bhmusers.h
+@@ -7,10 +7,12 @@ using namespace std;
+ #include "conf.h"
+ 
+ #ifdef HAVE_EXT_HASH_MAP
+-using namespace __gnu_cxx;
+ #include <ext/hash_map>
++using namespace __gnu_cxx;
++#define HASH_NS __gnu_cxx
+ #else
+ #include <hash_map.h>
++#define HASH_NS std
+ #endif
+ 
+ #include "postal.h"
+@@ -34,7 +36,7 @@ namespace __gnu_cxx
+   };
+ }
+ 
+-typedef hash_map<string, BHM_DATA , hash<string> > NAME_MAP;
++typedef hash_map<string, BHM_DATA , HASH_NS::hash<string> > NAME_MAP;
+ 
+ class BHMUsers
+ {
diff --git a/benchmarks/postal/patches/patch-smtp.cpp b/benchmarks/postal/patches/patch-smtp.cpp
new file mode 100644
index 00000000000..da409257e1b
--- /dev/null
+++ b/benchmarks/postal/patches/patch-smtp.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-smtp.cpp,v 1.1 2013/05/23 14:59:13 joerg Exp $
+
+--- smtp.cpp.orig	2013-05-23 13:32:40.000000000 +0000
++++ smtp.cpp
+@@ -9,6 +9,7 @@
+ #include "logit.h"
+ #include "results.h"
+ #include <cstring>
++#include <cstdlib>
+ 
+ smtpData::smtpData()
+  : m_quit("QUIT\r\n")
diff --git a/benchmarks/postal/patches/patch-smtp.h b/benchmarks/postal/patches/patch-smtp.h
new file mode 100644
index 00000000000..1161b063f6e
--- /dev/null
+++ b/benchmarks/postal/patches/patch-smtp.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-smtp.h,v 1.1 2013/05/23 14:59:13 joerg Exp $
+
+--- smtp.h.orig	2013-05-23 13:31:35.000000000 +0000
++++ smtp.h
+@@ -7,10 +7,12 @@ using namespace std;
+ #include <time.h>
+ #include "conf.h"
+ #ifdef HAVE_EXT_HASH_MAP
+-using namespace __gnu_cxx;
+ #include <ext/hash_map>
++using namespace __gnu_cxx;
++#define HASH_NS __gnu_cxx
+ #else
+ #include <hash_map.h>
++#define HASH_NS std
+ #endif
+ #include "tcp.h"
+ #include "mutex.h"
+@@ -30,7 +32,7 @@ struct eqlng
+   }
+ };
+ 
+-typedef hash_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
++typedef hash_map<unsigned long, string *, HASH_NS::hash<unsigned long>, eqlng> NAME_MAP;
+ 
+ class smtpData
+ {