# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1271872348 -7200
# Node ID a0456fbef2d102a5b0e2b28eccb748a1b9f9a5ca
# Parent  d511eee1a7fc580545ae9689dc8a49e22d31d8dd
Up: boxbackup-server (0.11rc7)

diff -r d511eee1a7fc -r a0456fbef2d1 boxbackup-server/receipt
--- a/boxbackup-server/receipt	Wed Apr 21 19:09:52 2010 +0200
+++ b/boxbackup-server/receipt	Wed Apr 21 19:52:28 2010 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="boxbackup-server"
-VERSION="0.10"
+VERSION="0.11rc7"
 CATEGORY="network"
 SHORT_DESC="Server for the BoxBackup on-line backup system"
 MAINTAINER="domcox@users.sourceforge.net"
@@ -10,7 +10,9 @@
 SOURCE="boxbackup"
 TARBALL="$SOURCE-$VERSION.tgz"
 WEB_SITE="http://www.boxbackup.org/"
-WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
+# stable
+# WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
+WGET_URL="http://www.boxbackup.org/svn/box/packages/$TARBALL"
 TAGS="backup automatic server network"
 
 # Configuration variables
@@ -24,17 +26,17 @@
 compile_rules()
 {
 	cd $src
-    while read patch_file; do
-        if [ -f done.$patch_file ]; then
-            echo "Skipping $patch_file"
-            continue
-        fi
-        echo "Apply $patch_file"
-        patch -p1 < ../stuff/$patch_file || return 1
-        touch done.$patch_file
-    done <<EOF
-boxbackup-0.10_gcc43.u
-EOF
+#    while read patch_file; do
+#        if [ -f done.$patch_file ]; then
+#            echo "Skipping $patch_file"
+#            continue
+#        fi
+#        echo "Apply $patch_file"
+#        patch -p1 < ../stuff/$patch_file || return 1
+#        touch done.$patch_file
+#    done <<EOF
+#boxbackup-0.10_gcc43.u
+#EOF
 	./configure --prefix=/usr $CONFIGURE_ARGS &&
 	make
 }
diff -r d511eee1a7fc -r a0456fbef2d1 boxbackup-server/stuff/boxbackup-0.10_gcc43.u
--- a/boxbackup-server/stuff/boxbackup-0.10_gcc43.u	Wed Apr 21 19:09:52 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-diff -ru boxbackup-0.10/bin/bbackupctl/bbackupctl.cpp boxbackup-0.10-slitaz/bin/bbackupctl/bbackupctl.cpp
---- boxbackup-0.10/bin/bbackupctl/bbackupctl.cpp	2006-02-23 21:47:38.000000000 +0100
-+++ boxbackup-0.10-slitaz/bin/bbackupctl/bbackupctl.cpp	2009-06-29 23:49:34.000000000 +0200
-@@ -48,6 +48,7 @@
- #include "Box.h"
- 
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #ifdef HAVE_UNISTD_H
- 	#include <unistd.h>
-diff -ru boxbackup-0.10/bin/bbackupquery/bbackupquery.cpp boxbackup-0.10-slitaz/bin/bbackupquery/bbackupquery.cpp
---- boxbackup-0.10/bin/bbackupquery/bbackupquery.cpp	2006-02-23 21:47:38.000000000 +0100
-+++ boxbackup-0.10-slitaz/bin/bbackupquery/bbackupquery.cpp	2009-06-29 23:49:34.000000000 +0200
-@@ -51,6 +51,7 @@
- 	#include <unistd.h>
- #endif
- #include <stdio.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #ifdef HAVE_LIBREADLINE
- 	#ifdef HAVE_READLINE_READLINE_H
-diff -ru boxbackup-0.10/bin/bbstoreaccounts/bbstoreaccounts.cpp boxbackup-0.10-slitaz/bin/bbstoreaccounts/bbstoreaccounts.cpp
---- boxbackup-0.10/bin/bbstoreaccounts/bbstoreaccounts.cpp	2006-02-23 21:47:37.000000000 +0100
-+++ boxbackup-0.10-slitaz/bin/bbstoreaccounts/bbstoreaccounts.cpp	2009-06-29 23:49:34.000000000 +0200
-@@ -51,6 +51,7 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <limits.h>
-+#include <string.h>
- #include <vector>
- #include <algorithm>
- 
-diff -ru boxbackup-0.10/lib/backupclient/BackupClientFileAttributes.cpp boxbackup-0.10-slitaz/lib/backupclient/BackupClientFileAttributes.cpp
---- boxbackup-0.10/lib/backupclient/BackupClientFileAttributes.cpp	2006-02-23 21:47:37.000000000 +0100
-+++ boxbackup-0.10-slitaz/lib/backupclient/BackupClientFileAttributes.cpp	2009-06-29 23:49:34.000000000 +0200
-@@ -481,7 +481,7 @@
- 	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 @@
- 
- 				// 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 @@
- 
- 				// 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 @@
- 		}
- #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 @@
- 	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 @@
- 	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 @@
- 		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 -ru boxbackup-0.10/lib/backupclient/BackupStoreFileDiff.cpp boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileDiff.cpp
---- boxbackup-0.10/lib/backupclient/BackupStoreFileDiff.cpp	2006-02-23 21:47:37.000000000 +0100
-+++ boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileDiff.cpp	2009-06-29 23:49:34.000000000 +0200
-@@ -70,6 +70,8 @@
- 
- #include "MemLeakFindOn.h"
- 
-+#include <string.h>
-+
- using namespace BackupStoreFileCryptVar;
- using namespace BackupStoreFileCreation;
- 
-diff -ru boxbackup-0.10/lib/backupclient/BackupStoreFileEncodeStream.cpp boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileEncodeStream.cpp
---- boxbackup-0.10/lib/backupclient/BackupStoreFileEncodeStream.cpp	2006-02-23 21:47:37.000000000 +0100
-+++ boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFileEncodeStream.cpp	2009-06-29 23:49:34.000000000 +0200
-@@ -62,6 +62,8 @@
- 
- #include "MemLeakFindOn.h"
- 
-+#include <string.h>
-+
- using namespace BackupStoreFileCryptVar;
- 
- 
-diff -ru boxbackup-0.10/lib/backupclient/BackupStoreFile.h boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFile.h
---- boxbackup-0.10/lib/backupclient/BackupStoreFile.h	2006-02-23 21:47:37.000000000 +0100
-+++ boxbackup-0.10-slitaz/lib/backupclient/BackupStoreFile.h	2009-06-29 23:49:34.000000000 +0200
-@@ -53,6 +53,7 @@
- #include "BackupStoreFilename.h"
- 
- #include <memory>
-+#include <malloc.h>
- 
- typedef struct 
- {
-diff -ru boxbackup-0.10/lib/common/Configuration.cpp boxbackup-0.10-slitaz/lib/common/Configuration.cpp
---- boxbackup-0.10/lib/common/Configuration.cpp	2006-02-23 21:47:35.000000000 +0100
-+++ boxbackup-0.10-slitaz/lib/common/Configuration.cpp	2009-06-29 23:49:34.000000000 +0200
-@@ -57,6 +57,8 @@
- 
- #include "MemLeakFindOn.h"
- 
-+#include <string.h>
-+
- // utility whitespace function
- inline bool iw(int c)
- {
-diff -ru boxbackup-0.10/lib/common/WaitForEvent.cpp boxbackup-0.10-slitaz/lib/common/WaitForEvent.cpp
---- boxbackup-0.10/lib/common/WaitForEvent.cpp	2006-02-23 21:47:35.000000000 +0100
-+++ boxbackup-0.10-slitaz/lib/common/WaitForEvent.cpp	2009-06-29 23:49:34.000000000 +0200
-@@ -53,6 +53,7 @@
- 
- #include <errno.h>
- #include <string.h>
-+#include <malloc.h>
- 
- #include "WaitForEvent.h"
- 
-diff -ru boxbackup-0.10/lib/raidfile/RaidFileRead.cpp boxbackup-0.10-slitaz/lib/raidfile/RaidFileRead.cpp
---- boxbackup-0.10/lib/raidfile/RaidFileRead.cpp	2006-02-23 21:47:37.000000000 +0100
-+++ boxbackup-0.10-slitaz/lib/raidfile/RaidFileRead.cpp	2009-06-29 23:49:34.000000000 +0200
-@@ -59,6 +59,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <malloc.h>
- #include <memory>
- #include <map>
-