diff -r fe49d631b225 -r a6cd892638c1 bacula/bacula.patch
--- a/bacula/bacula.patch	Sat Oct 03 16:15:32 2009 +0200
+++ b/bacula/bacula.patch	Sat Oct 03 16:18:52 2009 +0200
@@ -31,17 +31,22 @@
 +	  do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \
  	done
  
- clean:	dummy
+ clean:
 Index: scripts/bacula.in
 diff -Nau scripts/bacula.in.orig scripts/bacula.in
---- scripts/bacula.in.orig	2008-07-06 15:06:15.000000000 +0200
-+++ scripts/bacula.in	2008-11-19 23:08:15.438347068 +0100
-@@ -13,32 +13,38 @@
+--- scripts/bacula.in.orig	2008-07-24 17:02:06.000000000 +0200
++++ scripts/bacula.in	2009-09-17 00:40:53.423969596 +0200
+@@ -13,37 +13,43 @@
  #  easier to "steal" this code for the development 
  #  environment where they are different.
  #  
 -SCRIPTDIR=@scriptdir@
 +SCRIPTDIR=@libexecdir@
+ #
+ # Disable Glibc malloc checks, it doesn't help and it keeps from getting
+ #   good dumps
+ MALLOC_CHECK_=0
+ export MALLOC_CHECK_
  
 -case "$1" in
 +action=$1
@@ -65,8 +70,8 @@
 -      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
 -      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
 -      [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
++      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
 +      [ "$enable_fd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
-+      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
 +      [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
        ;;
  
@@ -104,11 +109,11 @@
     | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
 Index: src/dird/bacula-dir.conf.in
 diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
---- src/dird/bacula-dir.conf.in.orig	2008-06-19 21:44:34.000000000 +0200
-+++ src/dird/bacula-dir.conf.in	2008-11-19 23:10:11.001069502 +0100
+--- src/dird/bacula-dir.conf.in.orig	2009-07-15 19:05:40.000000000 +0200
++++ src/dird/bacula-dir.conf.in	2009-09-17 00:45:04.055970595 +0200
 @@ -29,7 +29,8 @@
    Level = Incremental
-   Client = @hostname@-fd 
+   Client = @basename@-fd 
    FileSet = "Full Set"
 -  Schedule = "WeeklyCycle"
 + #Schedule = "WeeklyCycle"
@@ -120,12 +125,12 @@
  #    directory to give a reasonable FileSet to backup to
  #    disk storage during initial testing.
  #
--    File = @BUILD_DIR@
+-    File = @sbindir@
 +    File = @scriptdir@
    }
  
  #
-@@ -124,6 +125,11 @@
+@@ -126,6 +127,11 @@
    }
  }