From d0f5a3a253050abcd652d420723d45f72325719e Mon Sep 17 00:00:00 2001 From: "siretart@tauware.de" <> Date: Wed, 10 Nov 2010 11:11:02 +0100 Subject: remove unapplied patches from branch --- debian/patches/01-adjust_config_basedir.diff | 87 ---------- debian/patches/02-gcc-4.4-fixes.diff | 250 --------------------------- debian/patches/04-revert_cross_compile.diff | 85 --------- 3 files changed, 422 deletions(-) delete mode 100644 debian/patches/01-adjust_config_basedir.diff delete mode 100644 debian/patches/02-gcc-4.4-fixes.diff delete mode 100644 debian/patches/04-revert_cross_compile.diff (limited to 'debian') diff --git a/debian/patches/01-adjust_config_basedir.diff b/debian/patches/01-adjust_config_basedir.diff deleted file mode 100644 index 885bc5ca..00000000 --- a/debian/patches/01-adjust_config_basedir.diff +++ /dev/null @@ -1,87 +0,0 @@ -Adjust the config basedir from /etc/box to /etc/boxbackup for the debian -package. - ---- a/contrib/debian/bbackupd.in -+++ b/contrib/debian/bbackupd.in -@@ -7,7 +7,7 @@ - NAME=bbackupd - LONGNAME="Box Backup Client daemon" - BINARY=@sbindir_expanded@/$NAME --CONFIG=@sysconfdir_expanded@/box/$NAME.conf -+CONFIG=@sysconfdir_expanded@/boxbackup/$NAME.conf - PIDFILE=@localstatedir_expanded@/bbackupd/$NAME.pid - - test -x $BINARY || exit 0 ---- a/contrib/debian/bbstored.in -+++ b/contrib/debian/bbstored.in -@@ -7,7 +7,7 @@ - NAME=bbstored - LONGNAME="Box Backup Server daemon" - BINARY=@sbindir_expanded@/$NAME --CONFIG=@sysconfdir_expanded@/box/$NAME.conf -+CONFIG=@sysconfdir_expanded@/boxbackup/$NAME.conf - PIDFILE=@localstatedir_expanded@/run/$NAME.pid - - test -x $BINARY || exit 0 ---- a/bin/bbstored/bbstored-config.in -+++ b/bin/bbstored/bbstored-config.in -@@ -19,7 +19,7 @@ Usage: - bbstored-config config-dir server-hostname username [raidfile-config] - - Parameters: -- config-dir is usually @sysconfdir_expanded@/box -+ config-dir is usually @sysconfdir_expanded@/boxbackup - server-hostname is the hostname that clients will use to connect to - this server - username is the user to run the server under -@@ -47,7 +47,7 @@ __E - } - - # default locations --my $default_config_location = '@sysconfdir_expanded@/box/bbstored.conf'; -+my $default_config_location = '@sysconfdir_expanded@/boxbackup/bbstored.conf'; - - # command line parameters - my ($config_dir,$server,$username,$raidfile_config) = @ARGV; ---- a/bin/bbackupd/bbackupd-config.in -+++ b/bin/bbackupd/bbackupd-config.in -@@ -19,7 +19,7 @@ Usage: - working-dir [backup directories] - - Parameters: -- config-dir is usually @sysconfdir_expanded@/box -+ config-dir is usually @sysconfdir_expanded@/boxbackup - backup-mode is lazy or snapshot: - lazy mode runs continously, uploading files over a specified age - snapshot mode uploads a snapshot of the filesystem when instructed -@@ -57,7 +57,7 @@ __E - } - - # default locations --my $default_config_location = '@sysconfdir_expanded@/box/bbackupd.conf'; -+my $default_config_location = '@sysconfdir_expanded@/boxbackup/bbackupd.conf'; - - # command line parameters - my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV; ---- a/lib/raidfile/raidfile-config.in -+++ b/lib/raidfile/raidfile-config.in -@@ -19,7 +19,7 @@ Usage: - raidfile-config config-dir block-size dir0 [dir1 dir2] - - Parameters: -- config-dir is usually @sysconfdir_expanded@/box -+ config-dir is usually @sysconfdir_expanded@/boxbackup - block-size must be a power of two, and usually the block or - fragment size of your file system - dir0, dir1, dir2 are the directories used as the root of the raid ---- a/lib/raidfile/RaidFileController.h -+++ b/lib/raidfile/RaidFileController.h -@@ -82,7 +82,7 @@ public: - - public: - void Initialise(const std::string& rConfigFilename = -- "/etc/box/raidfile.conf"); -+ "/etc/boxbackup/raidfile.conf"); - int GetNumDiscSets() {return mSetList.size();} - - // -------------------------------------------------------------------------- diff --git a/debian/patches/02-gcc-4.4-fixes.diff b/debian/patches/02-gcc-4.4-fixes.diff deleted file mode 100644 index cab6c212..00000000 --- a/debian/patches/02-gcc-4.4-fixes.diff +++ /dev/null @@ -1,250 +0,0 @@ -In order to compile with recent versions of gcc, some includes needs to be adjusted. - -Some of the patches in this diff are required for gcc-4.3, some others -for gcc-4.4. I haven't disentagled which patch is required for what -exact version of gcc, but all of them are rather obvious and probably be -applied upstream. - ---- a/bin/bbackupobjdump/bbackupobjdump.cpp -+++ b/bin/bbackupobjdump/bbackupobjdump.cpp -@@ -9,7 +9,8 @@ - - #include "Box.h" - --#include -+#include -+#include - - #include "MainHelper.h" - #include "FileStream.h" ---- a/bin/bbackupquery/bbackupquery.cpp -+++ b/bin/bbackupquery/bbackupquery.cpp -@@ -14,7 +14,8 @@ - #endif - - #include --#include -+#include -+#include - - #ifdef HAVE_SYS_TYPES_H - #include ---- a/bin/bbstoreaccounts/bbstoreaccounts.cpp -+++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp -@@ -36,6 +36,8 @@ - - #include "MemLeakFindOn.h" - -+#include -+ - // max size of soft limit as percent of hard limit - #define MAX_SOFT_LIMIT_SIZE 97 - ---- a/lib/backupclient/BackupClientFileAttributes.cpp -+++ b/lib/backupclient/BackupClientFileAttributes.cpp -@@ -28,6 +28,8 @@ - #include - #endif - -+#include -+ - #include "BackupClientFileAttributes.h" - #include "CommonException.h" - #include "FileModificationTime.h" ---- a/lib/backupclient/BackupStoreFile.h -+++ b/lib/backupclient/BackupStoreFile.h -@@ -12,6 +12,7 @@ - - #include - #include -+#include - - #include "BackupClientFileAttributes.h" - #include "BackupStoreFilename.h" ---- a/lib/backupclient/BackupStoreFileDiff.cpp -+++ b/lib/backupclient/BackupStoreFileDiff.cpp -@@ -35,6 +35,8 @@ - - #include "MemLeakFindOn.h" - -+#include -+ - using namespace BackupStoreFileCryptVar; - using namespace BackupStoreFileCreation; - ---- a/lib/backupclient/BackupStoreFileEncodeStream.cpp -+++ b/lib/backupclient/BackupStoreFileEncodeStream.cpp -@@ -26,6 +26,8 @@ - - #include "MemLeakFindOn.h" - -+#include -+ - using namespace BackupStoreFileCryptVar; - - ---- a/lib/common/Configuration.cpp -+++ b/lib/common/Configuration.cpp -@@ -22,6 +22,8 @@ - - #include "MemLeakFindOn.h" - -+#include -+ - // utility whitespace function - inline bool iw(int c) - { ---- a/lib/common/DebugMemLeakFinder.cpp -+++ b/lib/common/DebugMemLeakFinder.cpp -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include // for std::atexit - - #include "MemLeakFinder.h" - -@@ -130,7 +131,7 @@ void *memleakfinder_malloc(size_t size, - { - InternalAllocGuard guard; - -- void *b = ::malloc(size); -+ void *b = std::malloc(size); - if(!memleakfinder_global_enable) return b; - if(!memleakfinder_initialised) return b; - -@@ -146,7 +147,7 @@ void *memleakfinder_realloc(void *ptr, s - - if(!memleakfinder_global_enable || !memleakfinder_initialised) - { -- return ::realloc(ptr, size); -+ return std::realloc(ptr, size); - } - - // Check it's been allocated -@@ -158,7 +159,7 @@ void *memleakfinder_realloc(void *ptr, s - "objects?"); - } - -- void *b = ::realloc(ptr, size); -+ void *b = std::realloc(ptr, size); - - if(ptr && i!=sMallocBlocks.end()) - { -@@ -215,7 +216,7 @@ void memleakfinder_free(void *ptr) - } - - //TRACE1("free(), %08x\n", ptr); -- ::free(ptr); -+ std::free(ptr); - } - - -@@ -426,7 +427,7 @@ void memleakfinder_setup_exit_report(con - atexit_markertext[sizeof(atexit_markertext)-1] = 0; - if(!atexit_registered) - { -- atexit(memleakfinder_atexit); -+ std::atexit(memleakfinder_atexit); - atexit_registered = true; - } - } -@@ -490,7 +491,7 @@ static void *internal_new(size_t size, c - - { - InternalAllocGuard guard; -- r = ::malloc(size); -+ r = std::malloc(size); - } - - if (sInternalAllocDepth == 0) -@@ -533,7 +534,7 @@ void internal_delete(void *ptr) - { - InternalAllocGuard guard; - -- ::free(ptr); -+ std::free(ptr); - remove_object_block(ptr); - //TRACE1("delete[]() called, %08x\n", ptr); - } ---- a/lib/common/MemLeakFinder.h -+++ b/lib/common/MemLeakFinder.h -@@ -12,7 +12,7 @@ - - #ifdef MEMLEAKFINDER_FULL_MALLOC_MONITORING - // include stdlib now, to avoid problems with having the macros defined already -- #include -+ #include - #endif - - // global enable flag ---- a/lib/common/StreamableMemBlock.cpp -+++ b/lib/common/StreamableMemBlock.cpp -@@ -10,7 +10,7 @@ - #include "Box.h" - - #include --#include -+#include - #include - - #include "StreamableMemBlock.h" ---- a/lib/common/Test.h -+++ b/lib/common/Test.h -@@ -10,7 +10,7 @@ - #ifndef TEST__H - #define TEST__H - --#include -+#include - - #ifdef WIN32 - #define BBACKUPCTL "..\\..\\bin\\bbackupctl\\bbackupctl.exe" ---- a/lib/common/WaitForEvent.h -+++ b/lib/common/WaitForEvent.h -@@ -22,6 +22,8 @@ - #endif - #endif - -+#include -+ - #include "CommonException.h" - - #include "MemLeakFindOn.h" ---- a/lib/raidfile/RaidFileRead.h -+++ b/lib/raidfile/RaidFileRead.h -@@ -10,7 +10,8 @@ - #ifndef RAIDFILEREAD__H - #define RAIDFILEREAD__H - --#include -+#include -+#include - #include - #include - ---- a/lib/common/Logging.cpp -+++ b/lib/common/Logging.cpp -@@ -11,6 +11,10 @@ - - #include - #include -+#include // for stderror -+ -+// c.f. http://bugs.debian.org/512510 -+#include - - #ifdef HAVE_SYSLOG_H - #include ---- a/bin/bbackupctl/bbackupctl.cpp -+++ b/bin/bbackupctl/bbackupctl.cpp -@@ -9,7 +9,8 @@ - - #include "Box.h" - --#include -+#include -+#include - - #ifdef HAVE_UNISTD_H - #include diff --git a/debian/patches/04-revert_cross_compile.diff b/debian/patches/04-revert_cross_compile.diff deleted file mode 100644 index 00922950..00000000 --- a/debian/patches/04-revert_cross_compile.diff +++ /dev/null @@ -1,85 +0,0 @@ -remove cross compiling relevant commits - -the combination of the following svn revisions is causing trouble when -trying to compile boxbackup on debian systems: - - - 2485 - - 2484 - - 2483 - -reverting 2483 alone doesn't help, I had to revert all of them. - ---- old/configure.ac 2009-04-02 11:58:11 +0000 -+++ new/configure.ac 2009-04-02 13:29:39 +0000 -@@ -160,6 +160,7 @@ AC_CHECK_TYPES([uint8_t, uint16_t, uint3 - AC_HEADER_STDBOOL - AC_C_CONST - AC_C_BIGENDIAN -+AX_CHECK_NONALIGNED_ACCESS - AC_TYPE_UID_T - AC_TYPE_MODE_T - AC_TYPE_OFF_T -@@ -242,12 +243,10 @@ AC_CHECK_DECLS([XATTR_NOFOLLOW],,, [[#in - ## Check for large file support active. AC_SYS_LARGEFILE has already worked - ## out how to enable it if necessary, we just use this to report to the user - AC_CACHE_CHECK([if we have large file support enabled], [box_cv_have_large_file_support], -- [AC_TRY_RUN([AC_LANG_PROGRAM([[$ac_includes_default]], [[ -+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([[$ac_includes_default]], [[ - return sizeof(off_t)==4; - ]])], -- [box_cv_have_large_file_support=yes], -- [box_cv_have_large_file_support=no], -- [box_cv_have_large_file_support=no # safe for cross-compile] -+ [box_cv_have_large_file_support=yes], [box_cv_have_large_file_support=no] - )]) - - if test "x$box_cv_have_large_file_support" = "xyes"; then - -diff --git a/infrastructure/m4/ax_check_dirent_d_type.m4 b/infrastructure/m4/ax_check_dirent_d_type.m4 -index 9c08d39..8351f13 100644 ---- a/infrastructure/m4/ax_check_dirent_d_type.m4 -+++ b/infrastructure/m4/ax_check_dirent_d_type.m4 -@@ -16,7 +16,7 @@ AC_DEFUN([AX_CHECK_DIRENT_D_TYPE], [ - AC_CHECK_MEMBERS([struct dirent.d_type],,, [[#include ]]) - if test "x$ac_cv_member_struct_dirent_d_type" = "xyes"; then - AC_CACHE_CHECK([[whether struct dirent.d_type is valid]], [box_cv_have_valid_dirent_d_type], -- [AC_TRY_RUN( -+ [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[ - $ac_includes_default - #include -@@ -26,9 +26,7 @@ AC_DEFUN([AX_CHECK_DIRENT_D_TYPE], [ - if(dir) res = readdir(dir); - return res ? (res->d_type != DT_FILE && res->d_type != DT_DIR) : 1; - ]])], -- [box_cv_have_valid_dirent_d_type=yes], -- [box_cv_have_valid_dirent_d_type=no], -- [box_cv_have_valid_dirent_d_type=cross] -+ [box_cv_have_valid_dirent_d_type=yes], [box_cv_have_valid_dirent_d_type=no] - )]) - if test "x$box_cv_have_valid_dirent_d_type" = "xyes"; then - AC_DEFINE([HAVE_VALID_DIRENT_D_TYPE], 1, [Define to 1 if struct dirent.d_type is valid]) -diff --git a/infrastructure/m4/ax_check_syscall_lseek.m4 b/infrastructure/m4/ax_check_syscall_lseek.m4 -index 6c26e02..7d22c4b 100644 ---- a/infrastructure/m4/ax_check_syscall_lseek.m4 -+++ b/infrastructure/m4/ax_check_syscall_lseek.m4 -@@ -16,7 +16,7 @@ AC_DEFUN([AX_CHECK_SYSCALL_LSEEK], [ - AC_REQUIRE([AX_FUNC_SYSCALL])dnl - if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then - AC_CACHE_CHECK([[whether syscall lseek requires dummy parameter]], [box_cv_have_lseek_dummy_param], -- [AC_TRY_RUN( -+ [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[ - $ac_includes_default - #include -@@ -50,9 +50,7 @@ AC_DEFUN([AX_CHECK_SYSCALL_LSEEK], [ - unlink("lseektest"); - return res!=-1; - ]])], -- [box_cv_have_lseek_dummy_param=yes], -- [box_cv_have_lseek_dummy_param=no], -- [box_cv_have_lseek_dummy_param=no # assume not for cross-compiling] -+ [box_cv_have_lseek_dummy_param=yes], [box_cv_have_lseek_dummy_param=no] - )]) - if test "x$box_cv_have_lseek_dummy_param" = "xyes"; then - AC_DEFINE([HAVE_LSEEK_DUMMY_PARAM], 1, -- cgit v1.2.3