Extended patch to change more references to /etc/box into /etc/boxbackup

(Portage version: 2.1_pre5-r1)

2 files changed, 63 insertions, 3 deletions

diff --git a/app-backup/boxbackup/Manifest b/app-backup/boxbackup/Manifest
index 13e1549c9137..68ff3f246593 100644
--- a/app-backup/boxbackup/Manifest
+++ b/app-backup/boxbackup/Manifest
@@ -19,9 +19,9 @@ SHA256 8063c7b0e26829ac7c58eaf87ecce92df77c9e4b189e2311555c40c29c7437d9 files/bo
 MD5 21a608266d776fcc9099d8d58418f8ed files/boxbackup-0.09-gentoo.patch 6695
 RMD160 698dd7b6d8dffc648a4ade458c8ffb0ba82397a4 files/boxbackup-0.09-gentoo.patch 6695
 SHA256 b5bbeefb639fcaa9658a20bc0e6ab6d839b1db36bca3386ec7cc47d9c04fed2d files/boxbackup-0.09-gentoo.patch 6695
-MD5 2f73db2211fd42f2cd394255b2e79672 files/boxbackup-0.10-gentoo.patch 4616
-RMD160 94a652d6b52fb71f8a6ce492a40179afa6ed5b12 files/boxbackup-0.10-gentoo.patch 4616
-SHA256 76b052551e5b8696a098defafea0016991254e82f32c5f9c12ba49c396b955c4 files/boxbackup-0.10-gentoo.patch 4616
+MD5 d863467fca83dc0f18e86d249610def4 files/boxbackup-0.10-gentoo.patch 7655
+RMD160 560f945af864ddd74faf74f74207b23d8443941a files/boxbackup-0.10-gentoo.patch 7655
+SHA256 5f96bde2e19dc001353a69cc177e0d224f5e98dc57b7b8cf99c1ea41a00cae53 files/boxbackup-0.10-gentoo.patch 7655
 MD5 62422da59467071552d61d58dfac89c3 files/digest-boxbackup-0.09-r1 506
 RMD160 411c3eb8e4c27b3057a982832ded434d25a68fe1 files/digest-boxbackup-0.09-r1 506
 SHA256 3fd085be1c5b39d3859dde094941be74e33a2e8430e1a19d6afee1aeaaee774f files/digest-boxbackup-0.09-r1 506
diff --git a/app-backup/boxbackup/files/boxbackup-0.10-gentoo.patch b/app-backup/boxbackup/files/boxbackup-0.10-gentoo.patch
index 1e925e85065c..afa7c567df70 100644
--- a/app-backup/boxbackup/files/boxbackup-0.10-gentoo.patch
+++ b/app-backup/boxbackup/files/boxbackup-0.10-gentoo.patch
@@ -135,3 +135,63 @@ grobian@gentoo.org:
  	}
  	
  	close SCRIPT;
+--- boxbackup-0.10/bin/bbstored/BackupConstants.h
++++ boxbackup-0.10/bin/bbstored/BackupConstants.h
+@@ -48,7 +48,7 @@
+ #ifndef BACKUPCONSTANTS__H
+ #define BACKUPCONSTANTS__H
+ 
+-#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/box/backupstoreaccounts"
++#define BACKUP_STORE_DEFAULT_ACCOUNT_DATABASE_FILE	"/etc/boxbackup/backupstoreaccounts"
+ 
+ // 15 minutes to timeout (milliseconds)
+ #define	BACKUP_STORE_TIMEOUT			(15*60*1000)
+--- boxbackup-0.10/lib/common/BoxPortsAndFiles.h
++++ boxbackup-0.10/lib/common/BoxPortsAndFiles.h
+@@ -53,7 +53,7 @@
+ 
+ // Backup store daemon
+ #define BOX_PORT_BBSTORED					(BOX_PORT_BASE+1)
+-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG	"/etc/box/bbstored.conf"
++#define BOX_FILE_BBSTORED_DEFAULT_CONFIG	"/etc/boxbackup/bbstored.conf"
+ // directory within the RAIDFILE root for the backup store daemon
+ #define BOX_RAIDFILE_ROOT_BBSTORED			"backup"
+ 
+@@ -61,11 +61,11 @@
+ #ifdef WIN32
+ #define BOX_FILE_BBACKUPD_DEFAULT_CONFIG	"C:\\Program Files\\Box Backup\\bbackupd.conf"
+ #else
+-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG	"/etc/box/bbackupd.conf"
++#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG	"/etc/boxbackup/bbackupd.conf"
+ #endif
+ 
+ // RaidFile conf location default
+-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG	"/etc/box/raidfile.conf"
++#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG	"/etc/boxbackup/raidfile.conf"
+ 
+ // Default name of the named pipe
+ #define BOX_NAMED_PIPE_NAME L"\\\\.\\pipe\\boxbackup"
+--- boxbackup-0.10/notes/backup_encryption.txt
++++ boxbackup-0.10/notes/backup_encryption.txt
+@@ -33,7 +33,8 @@
+ 
+ The file data is encrypted with AES in CBC mode, with a 256 bit key (max length). Blowfish is used elsewhere because the larger block size of AES, while more secure, would be terribly space inefficient. Note that Blowfish may also be used when older versions of OpenSSL are in use, and for backwards compatibility with older versions.
+ 
+-The keys are generated using "openssl rand", and a 1k file of key material is stored in /etc/box/bbackupd. The configuration scripts make this readable only by root.
++The keys are generated using "openssl rand", and a 1k file of key
++material is stored in /etc/boxbackup/bbackupd. The configuration scripts make this readable only by root.
+ 
+ Code for review: BackupClientCryptoKeys_Setup()
+ in lib/backupclient/BackupClientCryptoKeys.cpp
+--- boxbackup-0.10/notes/lib_raidfile.txt
++++ boxbackup-0.10/notes/lib_raidfile.txt
+@@ -11,7 +11,8 @@
+ 
+ SUBTITLE Controller
+ 
+-The raid disc sets are managed by RaidFileController. This reads the configuration file, /etc/box/raidfile.conf, and then stores the sets of discs for use by the other classes.
++The raid disc sets are managed by RaidFileController. This reads the
++configuration file, /etc/boxbackup/raidfile.conf, and then stores the sets of discs for use by the other classes.
+ 
+ In the code, files are referenced using an integer set number, and a filename within that set. For example, (0, "dir/subdir/filename.ext"). The RAID file controller turns this into actual physcial filenames transparently.
+