Fix build with newer GCC

5 files changed, 57 insertions, 1 deletions

diff --git a/security/MyPasswordSafe/distinfo b/security/MyPasswordSafe/distinfo
index bbd993373c5..3b788a6d10c 100644
--- a/security/MyPasswordSafe/distinfo
+++ b/security/MyPasswordSafe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/08/02 17:09:21 joerg Exp $
+$NetBSD: distinfo,v 1.10 2011/11/22 20:05:25 joerg Exp $
 
 SHA1 (MyPasswordSafe-20061216.src.tgz) = 37bb3f7491b42c8aac5d71cc6546ced018a15119
 RMD160 (MyPasswordSafe-20061216.src.tgz) = b61f1525aed3160b88c1ef6c6922ff131ad2248c
@@ -8,3 +8,7 @@ SHA1 (patch-ab) = 41f42aa0fa4f9d97431a9a01807a0a2cc838a753
 SHA1 (patch-ac) = b6bd898a248da7052087a233e7aac215ad1196e2
 SHA1 (patch-ad) = 56179239b4ab92ee83f792432bc07c1501e1cdad
 SHA1 (patch-ae) = e5dca33f49895f5b30d757fd41dc58d6e8bb55a0
+SHA1 (patch-src-crypto-bfproxy.cpp) = cb84b4c5f474f057f0b702ff541d0587369a21e8
+SHA1 (patch-src-encryptedstring.cpp) = 715f7918fce45d3c4516acbcadd99e87f58a6492
+SHA1 (patch-src-pwsafe-Util.cpp) = 81b660bfbaa1472071c2ff6d859e5489b133596e
+SHA1 (patch-src-safeserializer.cpp) = e63997bc2ebb452056831bf5c147435a3edb2a14
diff --git a/security/MyPasswordSafe/patches/patch-src-crypto-bfproxy.cpp b/security/MyPasswordSafe/patches/patch-src-crypto-bfproxy.cpp
new file mode 100644
index 00000000000..817e94bdb8f
--- /dev/null
+++ b/security/MyPasswordSafe/patches/patch-src-crypto-bfproxy.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src-crypto-bfproxy.cpp,v 1.1 2011/11/22 20:05:25 joerg Exp $
+
+--- src/crypto/bfproxy.cpp.orig	2011-11-22 19:21:27.000000000 +0000
++++ src/crypto/bfproxy.cpp
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ #include "bfproxy.hpp"
++#include <string.h>
+ 
+ BFProxy::BFProxy(const unsigned char *key, int len)
+ {
diff --git a/security/MyPasswordSafe/patches/patch-src-encryptedstring.cpp b/security/MyPasswordSafe/patches/patch-src-encryptedstring.cpp
new file mode 100644
index 00000000000..720948503bd
--- /dev/null
+++ b/security/MyPasswordSafe/patches/patch-src-encryptedstring.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src-encryptedstring.cpp,v 1.1 2011/11/22 20:05:25 joerg Exp $
+
+--- src/encryptedstring.cpp.orig	2011-11-22 19:06:44.000000000 +0000
++++ src/encryptedstring.cpp
+@@ -15,6 +15,8 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
++#include <stdlib.h>
++#include <string.h>
+ #include <time.h>
+ #include <iostream>
+ #include "pwsafe/Util.h"
diff --git a/security/MyPasswordSafe/patches/patch-src-pwsafe-Util.cpp b/security/MyPasswordSafe/patches/patch-src-pwsafe-Util.cpp
new file mode 100644
index 00000000000..4a5ad94c73a
--- /dev/null
+++ b/security/MyPasswordSafe/patches/patch-src-pwsafe-Util.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src-pwsafe-Util.cpp,v 1.1 2011/11/22 20:05:25 joerg Exp $
+
+--- src/pwsafe/Util.cpp.orig	2011-11-22 19:15:04.000000000 +0000
++++ src/pwsafe/Util.cpp
+@@ -5,7 +5,10 @@
+ #include "PW_BlowFish.h"
+ //#include "PwsPlatform.h"
+ 
++#include <limits.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <iostream>
+ using std::cout;
+ using std::endl;
diff --git a/security/MyPasswordSafe/patches/patch-src-safeserializer.cpp b/security/MyPasswordSafe/patches/patch-src-safeserializer.cpp
new file mode 100644
index 00000000000..57167b1cd32
--- /dev/null
+++ b/security/MyPasswordSafe/patches/patch-src-safeserializer.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src-safeserializer.cpp,v 1.1 2011/11/22 20:05:25 joerg Exp $
+
+--- src/safeserializer.cpp.orig	2011-11-22 18:59:13.000000000 +0000
++++ src/safeserializer.cpp
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ #include <qstring.h>
++#include <algorithm>
+ #include "safe.hpp"
+ #include "safeserializer.hpp"
+ #include "plaintextlizer.hpp"