From ac56cf3b01410e09e62e17680dfd1dc57ab86ab5 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 30 Jul 2008 20:44:42 +0000 Subject: [PATCH] Fix Win32 build git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7457 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/ChangeLog | 109 ++++++++++++++++++++++++++++++++ bacula/src/win32/dird/Makefile | 1 + bacula/src/win32/dll/bacula.def | 7 +- bacula/technotes-2.5 | 1 + 4 files changed, 116 insertions(+), 2 deletions(-) diff --git a/bacula/ChangeLog b/bacula/ChangeLog index d7cc682e29..e65d42a68d 100644 --- a/bacula/ChangeLog +++ b/bacula/ChangeLog @@ -1,6 +1,115 @@ Technical notes on version 2.4.x General: +Release Version 2.4.2 +26Jul08 +kes When a migration job actually runs, re-check the Job record + and skip if the job is already migrated. This should + significantly reduce the problems with bug #1129. +24Jul08 +kes Break the do_swapping into do_unload, do_swapping, and + do_load. It is much more logical that way. +kes Implement a set_dcr_from_vol subroutine in acquire.c for + reading volumes. This allows the dcr to be refreshed after being + zapped when the wrong volume is mounted. + This should fix bug #1126 -- During multiple tape restore, bacula + does not ask for physical tape change, but rereads same tape +23Jul08 +kes Apply patch submitted for bug #1107 with a small modification. + This fixes a bug where bcopy copied too many records. +kes Make some tweaks to bsmtp based on patch submitted in bug #1124. + This fixes bug #1124. +kes Make the default bat restore Pool be Any. This fixes bug #1118. +22Jul08 +kes Minor cleanups. +kes Fix bug #1125 which reports a SD crash at the end of a tape + during restore. It was a debug statement that should not be + in a release. +20Jul08 +ebl fix #1034 by setting big timeout on mysql connections +19Jul08 +kes Do partial integration of the Win32 bat build created by Eric. +kes Fix bat not to block. +15Jul08 +kes Ensure that SD tried to mount a volume not in an autochanger + at least once before asking for operator intervention. +kes Fix a pthreads bug in the Win32 pthreads emulation code. + + +Release Version 2.4.1 +07Jul08 +kes Clear in-use bit on vol when unused while swapping. +06Jul08 +kes Remove sleep at end of ./bacula +kes Clear hash packet for hardlinked files correctly. This corrects + a long standing bug where hardlinked files selected individually + would occasionally not be restored. +05Jul08 +kes Apply Eric's patch to ensure that autoprune does not return + a Volume not in the autochanger unless requested to do so. +kes Correct bat restore display of multiple drives. This fixes + bug #1117. +kes Do find_a_volume() each time an unload is done. This + fixes the failure of maxvol2-test. + +Release Beta version 2.4.1-b2 +04Jul08 +kes Use Qmsg() in job.c watchdog callback. +03Jul08 +kes Release main control rwlock if ABORTing. +kes Make watchdog connect timeout queue messages rather than sending + directly to avoid lock conflicts with the real thread. +kes Remove const char that causes problems with Python, which has + older 'incorrect' headers. +kes Add const char in dbd.c to avoid compiler warnings. +02Jul08 +kes Fix mtx-changer to detect both versions of Ubuntu (Debian) + mt. This fixes bug #1116. +kes Fix failure of 2drive-concurrent-test. Always read label; + clear_unload() only after drive is defined in acquire_for_read(). + +Release Beta version 2.4.1-b1 +01Jul08 +kes Back out bad src/lib/base64.c change. +27Jun08 +kes Generally clean up the manual tape loading code. The main + conceptial change is that when a volume is marked to be unloaded, + its volume name is retained, and it is only marked as unloaded + when either the autoloader says it is unloaded or another tape + is read on that drive. +26Jun08 +kes Fix a recycling problem with two autochangers reported in bug + #1106. This may also (unlikely) fix a second recycling bug as + reported in #1103. +kes Fix a SD lock volumes deadlock problem reported in bug #1100. +25Jun08 +kes Fix format problem in bscan output reported in bug #1105. +22Jun08 +kes Copy more data when restarting a job so that run + overrides are kept. This should fix bug #1094. +kes Backport updates to jobq.c where possible. +20Jun08 +kes Fix bug where SD did not ask operator if the device could not + be opened. Reported by Eric. +19Jun08 +kes Add dbuser to DIR conf file (replaces user). +kes Add --with-db-password to ./configure +kes Fix regress to handle db_password. +kes Fix a couple of pedantic compiler warnings. +ebl Fix bug when starting a restore on a storage that doesn't + have the requested MediaType. +18Jun08 +kes More work on word alignments -- eliminate all ints from + the configuration routines. +17Jun08 +kes Fix bug reported by Scott Barninger where the bacula script + refers to scripts in the wrong directory. Needed to meet the + requirements of recent FHS location changes. +kes Fix word alignment problem on non-Intel 64 bit machines + such as Solaris. This should fix bug #1097 -- bus error in SD. +12Jun08 +kes Add missing win32/patches/wxWidgets.patch to 2.4 repository. + Release Version 2.4.0 04Jun08 kes Update version to reflect the magnitude of the SD changes. diff --git a/bacula/src/win32/dird/Makefile b/bacula/src/win32/dird/Makefile index 37acbb17ba..b7c75be29f 100644 --- a/bacula/src/win32/dird/Makefile +++ b/bacula/src/win32/dird/Makefile @@ -68,6 +68,7 @@ DIRD_OBJS = \ $(OBJDIR)/ua_status.o \ $(OBJDIR)/ua_tree.o \ $(OBJDIR)/ua_update.o \ + $(OBJDIR)/vbackup.o \ $(OBJDIR)/verify.o \ $(OBJDIR)/service.o \ $(OBJDIR)/main.o \ diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def index 1bff88d879..18feacbb94 100644 --- a/bacula/src/win32/dll/bacula.def +++ b/bacula/src/win32/dll/bacula.def @@ -289,7 +289,7 @@ _ZN5BSOCK11set_lockingEv _Z9new_bsockv _ZN5BSOCK10free_bsockEv _ZN5BSOCK12set_blockingEv -_ZN5BSOCK14wait_data_intrEi +_ZN5BSOCK14wait_data_intrEii _ZN5BSOCK15set_buffer_sizeEji _ZN5BSOCK15set_nonblockingEv _ZN5BSOCK16restore_blockingEi @@ -307,7 +307,7 @@ _ZN5BSOCK7destroyEv _ZN5BSOCK8fin_initEP3JCRiPKcS3_iP8sockaddr _ZN5BSOCK8get_peerEPci _ZN5BSOCK9bstrerrorEv -_ZN5BSOCK9wait_dataEi +_ZN5BSOCK9wait_dataEii ; bsys.o _Z10b_strerroriPcj @@ -509,6 +509,9 @@ _Z21unlock_last_jobs_listv _Z23get_jcr_by_partial_namePc _Z7new_jcriPFvP3JCRE _Z9lock_jobsv +_ZN3JCR11set_JobTypeEi +_ZN3JCR12set_JobLevelEi +_ZN3JCR8JobReadsEv timeout_handler diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index 7e32f6672c..05aa12047e 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -33,6 +33,7 @@ separator in console (!$%&'()*+,-/:;<>?[]^`{|}~) General: 30Jul08 +kes Fix Win32 build. kes Raise some restore debug levels. kes Replace off_t by boffset_t where ever I found it. 28Jul08 -- 2.39.5