fix fime namespace problems to make this compile with g++-4.5

12 files changed, 201 insertions, 2 deletions

diff --git a/sysutils/boxbackup-client/Makefile b/sysutils/boxbackup-client/Makefile
index e9823685e62..64c4ff74a00 100644
--- a/sysutils/boxbackup-client/Makefile
+++ b/sysutils/boxbackup-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/11/02 21:14:23 shattered Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/18 19:06:02 drochner Exp $
 #
 
 DISTNAME=	boxbackup-0.10
@@ -32,4 +32,5 @@ do-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+#.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/boxbackup-client/distinfo b/sysutils/boxbackup-client/distinfo
index 3d8ebb0a8b1..7ae57fe96f8 100644
--- a/sysutils/boxbackup-client/distinfo
+++ b/sysutils/boxbackup-client/distinfo
@@ -1,5 +1,15 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/06/21 15:05:13 drochner Exp $
+$NetBSD: distinfo,v 1.2 2011/07/18 19:06:02 drochner Exp $
 
 SHA1 (boxbackup-0.10.tgz) = 60bee707c6bb59f471546ae83ad0b89625228ded
 RMD160 (boxbackup-0.10.tgz) = 26f906f37a3b095026ddf12c9284e16515ceb752
 Size (boxbackup-0.10.tgz) = 842450 bytes
+SHA1 (patch-aa) = 65a0144403f79858bcfb4d66d7186cda26f63078
+SHA1 (patch-ab) = dfa44b4a6ad7b016794edc666b8a7e8fa9808af3
+SHA1 (patch-ac) = ddd8e76ad509901f067f63352323a22ce03f4b10
+SHA1 (patch-ad) = 96acb9c93f082078d9641fc32ac6865b99915028
+SHA1 (patch-ae) = f757fe795f9a82c74928b75eb53e9ee9093bcd34
+SHA1 (patch-af) = 2268c52473c12bd31b0bd1cf60849446d61b00a9
+SHA1 (patch-ag) = 9db7ff785d78fac5318c9b6f91aa2e42f1debf66
+SHA1 (patch-ah) = f010964a4d06a8f724fdf3695e8e854d845c6446
+SHA1 (patch-ai) = 106c5b57765e203b7a912e5c20341004ae4d6b67
+SHA1 (patch-aj) = 7b413d31d711492edad876d87897ded2fabde0d3
diff --git a/sysutils/boxbackup-client/patches/patch-aa b/sysutils/boxbackup-client/patches/patch-aa
new file mode 100644
index 00000000000..efa407b996e
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- lib/common/Configuration.cpp.orig	2006-02-23 20:47:35.000000000 +0000
++++ lib/common/Configuration.cpp
+@@ -49,6 +49,7 @@
+ 
+ #include <stdlib.h>
+ #include <limits.h>
++#include <string.h>
+ 
+ #include "Configuration.h"
+ #include "CommonException.h"
diff --git a/sysutils/boxbackup-client/patches/patch-ab b/sysutils/boxbackup-client/patches/patch-ab
new file mode 100644
index 00000000000..7f80949964d
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- lib/common/WaitForEvent.cpp.orig	2006-02-23 20:47:35.000000000 +0000
++++ lib/common/WaitForEvent.cpp
+@@ -53,6 +53,7 @@
+ 
+ #include <errno.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "WaitForEvent.h"
+ 
diff --git a/sysutils/boxbackup-client/patches/patch-ac b/sysutils/boxbackup-client/patches/patch-ac
new file mode 100644
index 00000000000..4c04d3703b2
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-ac
@@ -0,0 +1,76 @@
+$NetBSD: patch-ac,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- lib/backupclient/BackupClientFileAttributes.cpp.orig	2006-02-23 20:47:37.000000000 +0000
++++ lib/backupclient/BackupClientFileAttributes.cpp
+@@ -481,7 +481,7 @@ void BackupClientFileAttributes::FillAtt
+ 	char* buffer = static_cast<char*>(outputBlock.GetBuffer());
+ 
+ 	// Add the path name for the symbolic link, and add 0 termination
+-	std::memcpy(buffer+oldSize, linkedTo, linkedToSize);
++	::memcpy(buffer+oldSize, linkedTo, linkedToSize);
+ 	buffer[oldSize+linkedToSize] = '\0';
+ }
+ #endif
+@@ -549,9 +549,9 @@ void BackupClientFileAttributes::FillExt
+ 
+ 				// Store length and text for attibute name
+ 				u_int16_t keyLength = htons(attrKey.size()+1);
+-				std::memcpy(buffer+xattrSize, &keyLength, sizeof(u_int16_t));
++				::memcpy(buffer+xattrSize, &keyLength, sizeof(u_int16_t));
+ 				xattrSize += sizeof(u_int16_t);
+-				std::memcpy(buffer+xattrSize, attrKey.c_str(), attrKey.size()+1);
++				::memcpy(buffer+xattrSize, attrKey.c_str(), attrKey.size()+1);
+ 				xattrSize += attrKey.size()+1;
+ 
+ 				// Leave space for value size
+@@ -584,12 +584,12 @@ void BackupClientFileAttributes::FillExt
+ 
+ 				// Fill in value size
+ 				u_int32_t valueLength = htonl(valueSize);
+-				std::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(u_int32_t));
++				::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(u_int32_t));
+ 			}
+ 
+ 			// Fill in attribute block size
+ 			u_int32_t xattrBlockLength = htonl(xattrSize-xattrBlockSizeOffset-sizeof(u_int32_t));
+-			std::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(u_int32_t));
++			::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(u_int32_t));
+ 
+ 			outputBlock.ResizeBlock(xattrSize);
+ 		}
+@@ -676,7 +676,7 @@ void BackupClientFileAttributes::WriteAt
+ 		}
+ #endif
+ 
+-		xattrOffset += std::strlen(reinterpret_cast<char*>(pattr+1))+1;
++		xattrOffset += ::strlen(reinterpret_cast<char*>(pattr+1))+1;
+ 	}
+ 	
+ 	// If working as root, set user IDs
+@@ -817,7 +817,7 @@ void BackupClientFileAttributes::WriteEx
+ 	const char* buffer = static_cast<char*>(mpClearAttributes->GetBuffer());
+ 
+ 	u_int32_t xattrBlockLength = 0;
+-	std::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(u_int32_t));
++	::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(u_int32_t));
+ 	int xattrBlockSize = ntohl(xattrBlockLength);
+ 	xattrOffset += sizeof(u_int32_t);
+ 
+@@ -831,7 +831,7 @@ void BackupClientFileAttributes::WriteEx
+ 	while(xattrOffset<xattrEnd)
+ 	{
+ 		u_int16_t keyLength = 0;
+-		std::memcpy(&keyLength, buffer+xattrOffset, sizeof(u_int16_t));
++		::memcpy(&keyLength, buffer+xattrOffset, sizeof(u_int16_t));
+ 		int keySize = ntohs(keyLength);
+ 		xattrOffset += sizeof(u_int16_t);
+ 
+@@ -839,7 +839,7 @@ void BackupClientFileAttributes::WriteEx
+ 		xattrOffset += keySize;
+ 
+ 		u_int32_t valueLength = 0;
+-		std::memcpy(&valueLength, buffer+xattrOffset, sizeof(u_int32_t));
++		::memcpy(&valueLength, buffer+xattrOffset, sizeof(u_int32_t));
+ 		int valueSize = ntohl(valueLength);
+ 		xattrOffset += sizeof(u_int32_t);
+ 
diff --git a/sysutils/boxbackup-client/patches/patch-ad b/sysutils/boxbackup-client/patches/patch-ad
new file mode 100644
index 00000000000..6d449a9a724
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- lib/backupclient/BackupStoreFile.h.orig	2006-02-23 20:47:37.000000000 +0000
++++ lib/backupclient/BackupStoreFile.h
+@@ -53,6 +53,8 @@
+ #include "BackupStoreFilename.h"
+ 
+ #include <memory>
++#include <stdlib.h>
++#include <string.h>
+ 
+ typedef struct 
+ {
diff --git a/sysutils/boxbackup-client/patches/patch-ae b/sysutils/boxbackup-client/patches/patch-ae
new file mode 100644
index 00000000000..8e48e0b7ca8
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- bin/bbackupd/bbackupd.cpp.orig	2006-02-23 20:47:37.000000000 +0000
++++ bin/bbackupd/bbackupd.cpp
+@@ -59,6 +59,7 @@
+ 
+ 	extern Win32BackupService gDaemonService;
+ #endif
++#include <string.h>
+ 
+ int main(int argc, const char *argv[])
+ {
diff --git a/sysutils/boxbackup-client/patches/patch-af b/sysutils/boxbackup-client/patches/patch-af
new file mode 100644
index 00000000000..b00023e040a
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- bin/bbackupquery/bbackupquery.cpp.orig	2006-02-23 20:47:38.000000000 +0000
++++ bin/bbackupquery/bbackupquery.cpp
+@@ -52,6 +52,8 @@
+ #endif
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <string.h>
++#include <stdlib.h>
+ #ifdef HAVE_LIBREADLINE
+ 	#ifdef HAVE_READLINE_READLINE_H
+ 		#include <readline/readline.h>
diff --git a/sysutils/boxbackup-client/patches/patch-ag b/sysutils/boxbackup-client/patches/patch-ag
new file mode 100644
index 00000000000..2c3cf3ef5e0
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- bin/bbackupctl/bbackupctl.cpp.orig	2006-02-23 20:47:38.000000000 +0000
++++ bin/bbackupctl/bbackupctl.cpp
+@@ -52,6 +52,8 @@
+ #ifdef HAVE_UNISTD_H
+ 	#include <unistd.h>
+ #endif
++#include <string.h>
++#include <stdlib.h>
+ 
+ #include "MainHelper.h"
+ #include "BoxPortsAndFiles.h"
diff --git a/sysutils/boxbackup-client/patches/patch-ah b/sysutils/boxbackup-client/patches/patch-ah
new file mode 100644
index 00000000000..b37250b7cff
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- lib/raidfile/RaidFileRead.cpp.orig	2006-02-23 20:47:37.000000000 +0000
++++ lib/raidfile/RaidFileRead.cpp
+@@ -61,6 +61,7 @@
+ #include <string.h>
+ #include <memory>
+ #include <map>
++#include <stdlib.h>
+ 
+ #include "RaidFileRead.h"
+ #include "RaidFileException.h"
diff --git a/sysutils/boxbackup-client/patches/patch-ai b/sysutils/boxbackup-client/patches/patch-ai
new file mode 100644
index 00000000000..7f224a2afb2
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- bin/bbstored/bbstored.cpp.orig	2006-02-23 20:47:37.000000000 +0000
++++ bin/bbstored/bbstored.cpp
+@@ -51,6 +51,8 @@
+ 
+ #include "MemLeakFindOn.h"
+ 
++#include <string.h>
++
+ int main(int argc, const char *argv[])
+ {
+ 	MAINHELPER_START
diff --git a/sysutils/boxbackup-client/patches/patch-aj b/sysutils/boxbackup-client/patches/patch-aj
new file mode 100644
index 00000000000..c51a704e4df
--- /dev/null
+++ b/sysutils/boxbackup-client/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2011/07/18 19:06:02 drochner Exp $
+
+--- bin/bbstoreaccounts/bbstoreaccounts.cpp.orig	2006-02-23 20:47:37.000000000 +0000
++++ bin/bbstoreaccounts/bbstoreaccounts.cpp
+@@ -53,6 +53,7 @@
+ #include <limits.h>
+ #include <vector>
+ #include <algorithm>
++#include <string.h>
+ 
+ #include "BoxPortsAndFiles.h"
+ #include "BackupStoreConfigVerify.h"