wok rev 3614

boxbackup-server: fix compilation failure
author Dominique Corbex <domcox@users.sourceforge.net>
date Tue Jun 30 00:16:12 2009 +0200 (2009-06-30)
parents 9f07b09ba895
children dce35081515c
files boxbackup-server/receipt boxbackup-server/stuff/boxbackup-0.10_gcc43.u
line diff
     1.1 --- a/boxbackup-server/receipt	Mon Jun 29 15:09:52 2009 +0200
     1.2 +++ b/boxbackup-server/receipt	Tue Jun 30 00:16:12 2009 +0200
     1.3 @@ -24,6 +24,17 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cd $src
     1.7 +    while read patch_file; do
     1.8 +        if [ -f done.$patch_file ]; then
     1.9 +            echo "Skipping $patch_file"
    1.10 +            continue
    1.11 +        fi
    1.12 +        echo "Apply $patch_file"
    1.13 +        patch -p1 < ../stuff/$patch_file || return 1
    1.14 +        touch done.$patch_file
    1.15 +    done <<EOF
    1.16 +boxbackup-0.10_gcc43.u
    1.17 +EOF
    1.18  	./configure --prefix=/usr $CONFIGURE_ARGS
    1.19  	make
    1.20  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/boxbackup-server/stuff/boxbackup-0.10_gcc43.u	Tue Jun 30 00:16:12 2009 +0200
     2.3 @@ -0,0 +1,177 @@
     2.4 +diff -ru boxbackup-0.10/bin/bbackupctl/bbackupctl.cpp boxbackup-0.10-slitaz/bin/bbackupctl/bbackupctl.cpp
     2.5 +--- boxbackup-0.10/bin/bbackupctl/bbackupctl.cpp	2006-02-23 21:47:38.000000000 +0100
     2.6 ++++ boxbackup-0.10-slitaz/bin/bbackupctl/bbackupctl.cpp	2009-06-29 23:49:34.000000000 +0200
     2.7 +@@ -48,6 +48,7 @@
     2.8 + #include "Box.h"
     2.9 + 
    2.10 + #include <stdio.h>
    2.11 ++#include <stdlib.h>
    2.12 + 
    2.13 + #ifdef HAVE_UNISTD_H
    2.14 + 	#include <unistd.h>
    2.15 +diff -ru boxbackup-0.10/bin/bbackupquery/bbackupquery.cpp boxbackup-0.10-slitaz/bin/bbackupquery/bbackupquery.cpp
    2.16 +--- boxbackup-0.10/bin/bbackupquery/bbackupquery.cpp	2006-02-23 21:47:38.000000000 +0100
    2.17 ++++ boxbackup-0.10-slitaz/bin/bbackupquery/bbackupquery.cpp	2009-06-29 23:49:34.000000000 +0200
    2.18 +@@ -51,6 +51,7 @@
    2.19 + 	#include <unistd.h>
    2.20 + #endif
    2.21 + #include <stdio.h>
    2.22 ++#include <stdlib.h>
    2.23 + #include <sys/types.h>
    2.24 + #ifdef HAVE_LIBREADLINE
    2.25 + 	#ifdef HAVE_READLINE_READLINE_H
    2.26 +diff -ru boxbackup-0.10/bin/bbstoreaccounts/bbstoreaccounts.cpp boxbackup-0.10-slitaz/bin/bbstoreaccounts/bbstoreaccounts.cpp
    2.27 +--- boxbackup-0.10/bin/bbstoreaccounts/bbstoreaccounts.cpp	2006-02-23 21:47:37.000000000 +0100
    2.28 ++++ boxbackup-0.10-slitaz/bin/bbstoreaccounts/bbstoreaccounts.cpp	2009-06-29 23:49:34.000000000 +0200
    2.29 +@@ -51,6 +51,7 @@
    2.30 + #include <stdio.h>
    2.31 + #include <sys/types.h>
    2.32 + #include <limits.h>
    2.33 ++#include <string.h>
    2.34 + #include <vector>
    2.35 + #include <algorithm>
    2.36 + 
    2.37 +diff -ru boxbackup-0.10/lib/backupclient/BackupClientFileAttributes.cpp boxbackup-0.10-slitaz/lib/backupclient/BackupClientFileAttributes.cpp
    2.38 +--- boxbackup-0.10/lib/backupclient/BackupClientFileAttributes.cpp	2006-02-23 21:47:37.000000000 +0100
    2.39 ++++ boxbackup-0.10-slitaz/lib/backupclient/BackupClientFileAttributes.cpp	2009-06-29 23:49:34.000000000 +0200
    2.40 +@@ -481,7 +481,7 @@
    2.41 + 	char* buffer = static_cast<char*>(outputBlock.GetBuffer());
    2.42 + 
    2.43 + 	// Add the path name for the symbolic link, and add 0 termination
    2.44 +-	std::memcpy(buffer+oldSize, linkedTo, linkedToSize);
    2.45 ++	::memcpy(buffer+oldSize, linkedTo, linkedToSize);
    2.46 + 	buffer[oldSize+linkedToSize] = '\0';
    2.47 + }
    2.48 + #endif
    2.49 +@@ -549,9 +549,9 @@
    2.50 + 
    2.51 + 				// Store length and text for attibute name
    2.52 + 				u_int16_t keyLength = htons(attrKey.size()+1);
    2.53 +-				std::memcpy(buffer+xattrSize, &keyLength, sizeof(u_int16_t));
    2.54 ++				::memcpy(buffer+xattrSize, &keyLength, sizeof(u_int16_t));
    2.55 + 				xattrSize += sizeof(u_int16_t);
    2.56 +-				std::memcpy(buffer+xattrSize, attrKey.c_str(), attrKey.size()+1);
    2.57 ++				::memcpy(buffer+xattrSize, attrKey.c_str(), attrKey.size()+1);
    2.58 + 				xattrSize += attrKey.size()+1;
    2.59 + 
    2.60 + 				// Leave space for value size
    2.61 +@@ -584,12 +584,12 @@
    2.62 + 
    2.63 + 				// Fill in value size
    2.64 + 				u_int32_t valueLength = htonl(valueSize);
    2.65 +-				std::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(u_int32_t));
    2.66 ++				::memcpy(buffer+valueSizeOffset, &valueLength, sizeof(u_int32_t));
    2.67 + 			}
    2.68 + 
    2.69 + 			// Fill in attribute block size
    2.70 + 			u_int32_t xattrBlockLength = htonl(xattrSize-xattrBlockSizeOffset-sizeof(u_int32_t));
    2.71 +-			std::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(u_int32_t));
    2.72 ++			::memcpy(buffer+xattrBlockSizeOffset, &xattrBlockLength, sizeof(u_int32_t));
    2.73 + 
    2.74 + 			outputBlock.ResizeBlock(xattrSize);
    2.75 + 		}
    2.76 +@@ -676,7 +676,7 @@
    2.77 + 		}
    2.78 + #endif
    2.79 + 
    2.80 +-		xattrOffset += std::strlen(reinterpret_cast<char*>(pattr+1))+1;
    2.81 ++		xattrOffset += ::strlen(reinterpret_cast<char*>(pattr+1))+1;
    2.82 + 	}
    2.83 + 	
    2.84 + 	// If working as root, set user IDs
    2.85 +@@ -817,7 +817,7 @@
    2.86 + 	const char* buffer = static_cast<char*>(mpClearAttributes->GetBuffer());
    2.87 + 
    2.88 + 	u_int32_t xattrBlockLength = 0;
    2.89 +-	std::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(u_int32_t));
    2.90 ++	::memcpy(&xattrBlockLength, buffer+xattrOffset, sizeof(u_int32_t));
    2.91 + 	int xattrBlockSize = ntohl(xattrBlockLength);
    2.92 + 	xattrOffset += sizeof(u_int32_t);
    2.93 + 
    2.94 +@@ -831,7 +831,7 @@
    2.95 + 	while(xattrOffset<xattrEnd)
    2.96 + 	{
    2.97 + 		u_int16_t keyLength = 0;
    2.98 +-		std::memcpy(&keyLength, buffer+xattrOffset, sizeof(u_int16_t));
    2.99 ++		::memcpy(&keyLength, buffer+xattrOffset, sizeof(u_int16_t));
   2.100 + 		int keySize = ntohs(keyLength);
   2.101 + 		xattrOffset += sizeof(u_int16_t);
   2.102 + 
   2.103 +@@ -839,7 +839,7 @@
   2.104 + 		xattrOffset += keySize;
   2.105 + 
   2.106 + 		u_int32_t valueLength = 0;
   2.107 +-		std::memcpy(&valueLength, buffer+xattrOffset, sizeof(u_int32_t));
   2.108 ++		::memcpy(&valueLength, buffer+xattrOffset, sizeof(u_int32_t));
   2.109 + 		int valueSize = ntohl(valueLength);
   2.110 + 		xattrOffset += sizeof(u_int32_t);
   2.111 + 
   2.112 +diff -ru boxbackup-0.10/lib/backupclient/BackupStoreFileDiff.cpp boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileDiff.cpp
   2.113 +--- boxbackup-0.10/lib/backupclient/BackupStoreFileDiff.cpp	2006-02-23 21:47:37.000000000 +0100
   2.114 ++++ boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileDiff.cpp	2009-06-29 23:49:34.000000000 +0200
   2.115 +@@ -70,6 +70,8 @@
   2.116 + 
   2.117 + #include "MemLeakFindOn.h"
   2.118 + 
   2.119 ++#include <string.h>
   2.120 ++
   2.121 + using namespace BackupStoreFileCryptVar;
   2.122 + using namespace BackupStoreFileCreation;
   2.123 + 
   2.124 +diff -ru boxbackup-0.10/lib/backupclient/BackupStoreFileEncodeStream.cpp boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileEncodeStream.cpp
   2.125 +--- boxbackup-0.10/lib/backupclient/BackupStoreFileEncodeStream.cpp	2006-02-23 21:47:37.000000000 +0100
   2.126 ++++ boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileEncodeStream.cpp	2009-06-29 23:49:34.000000000 +0200
   2.127 +@@ -62,6 +62,8 @@
   2.128 + 
   2.129 + #include "MemLeakFindOn.h"
   2.130 + 
   2.131 ++#include <string.h>
   2.132 ++
   2.133 + using namespace BackupStoreFileCryptVar;
   2.134 + 
   2.135 + 
   2.136 +diff -ru boxbackup-0.10/lib/backupclient/BackupStoreFile.h boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFile.h
   2.137 +--- boxbackup-0.10/lib/backupclient/BackupStoreFile.h	2006-02-23 21:47:37.000000000 +0100
   2.138 ++++ boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFile.h	2009-06-29 23:49:34.000000000 +0200
   2.139 +@@ -53,6 +53,7 @@
   2.140 + #include "BackupStoreFilename.h"
   2.141 + 
   2.142 + #include <memory>
   2.143 ++#include <malloc.h>
   2.144 + 
   2.145 + typedef struct 
   2.146 + {
   2.147 +diff -ru boxbackup-0.10/lib/common/Configuration.cpp boxbackup-0.10-slitaz/lib/common/Configuration.cpp
   2.148 +--- boxbackup-0.10/lib/common/Configuration.cpp	2006-02-23 21:47:35.000000000 +0100
   2.149 ++++ boxbackup-0.10-slitaz/lib/common/Configuration.cpp	2009-06-29 23:49:34.000000000 +0200
   2.150 +@@ -57,6 +57,8 @@
   2.151 + 
   2.152 + #include "MemLeakFindOn.h"
   2.153 + 
   2.154 ++#include <string.h>
   2.155 ++
   2.156 + // utility whitespace function
   2.157 + inline bool iw(int c)
   2.158 + {
   2.159 +diff -ru boxbackup-0.10/lib/common/WaitForEvent.cpp boxbackup-0.10-slitaz/lib/common/WaitForEvent.cpp
   2.160 +--- boxbackup-0.10/lib/common/WaitForEvent.cpp	2006-02-23 21:47:35.000000000 +0100
   2.161 ++++ boxbackup-0.10-slitaz/lib/common/WaitForEvent.cpp	2009-06-29 23:49:34.000000000 +0200
   2.162 +@@ -53,6 +53,7 @@
   2.163 + 
   2.164 + #include <errno.h>
   2.165 + #include <string.h>
   2.166 ++#include <malloc.h>
   2.167 + 
   2.168 + #include "WaitForEvent.h"
   2.169 + 
   2.170 +diff -ru boxbackup-0.10/lib/raidfile/RaidFileRead.cpp boxbackup-0.10-slitaz/lib/raidfile/RaidFileRead.cpp
   2.171 +--- boxbackup-0.10/lib/raidfile/RaidFileRead.cpp	2006-02-23 21:47:37.000000000 +0100
   2.172 ++++ boxbackup-0.10-slitaz/lib/raidfile/RaidFileRead.cpp	2009-06-29 23:49:34.000000000 +0200
   2.173 +@@ -59,6 +59,7 @@
   2.174 + 
   2.175 + #include <stdio.h>
   2.176 + #include <string.h>
   2.177 ++#include <malloc.h>
   2.178 + #include <memory>
   2.179 + #include <map>
   2.180 +