1.1 --- a/bacula/bacula.patch Wed Jan 07 00:25:41 2009 +0100
1.2 +++ b/bacula/bacula.patch Wed Jan 07 00:31:22 2009 +0100
1.3 @@ -1,6 +1,7 @@
1.4 Index: manpages/Makefile.in
1.5 ---- manpages/Makefile.in.orig 2007-04-24 17:47:01 +0200
1.6 -+++ manpages/Makefile.in 2008-07-09 07:45:59 +0200
1.7 +diff -Nau manpages/Makefile.in.orig manpages/Makefile.in
1.8 +--- manpages/Makefile.in.orig 2007-04-24 17:47:01.000000000 +0200
1.9 ++++ manpages/Makefile.in 2008-11-19 22:55:01.066689027 +0100
1.10 @@ -20,23 +20,21 @@
1.11 install:
1.12 $(MKDIR) $(DESTDIR)/$(mandir)/man8
1.13 @@ -32,25 +33,30 @@
1.14
1.15 clean: dummy
1.16 Index: scripts/bacula.in
1.17 ---- scripts/bacula.in.orig 2008-07-06 15:06:15 +0200
1.18 -+++ scripts/bacula.in 2008-07-09 07:53:22 +0200
1.19 -@@ -15,30 +15,36 @@
1.20 +diff -Nau scripts/bacula.in.orig scripts/bacula.in
1.21 +--- scripts/bacula.in.orig 2008-07-06 15:06:15.000000000 +0200
1.22 ++++ scripts/bacula.in 2008-11-19 23:08:15.438347068 +0100
1.23 +@@ -13,32 +13,38 @@
1.24 + # easier to "steal" this code for the development
1.25 + # environment where they are different.
1.26 #
1.27 - SCRIPTDIR=@scriptdir@
1.28 +-SCRIPTDIR=@scriptdir@
1.29 ++SCRIPTDIR=@libexecdir@
1.30
1.31 +-case "$1" in
1.32 +action=$1
1.33 +debug=$2
1.34 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes
1.35 +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes
1.36 +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes
1.37 -+
1.38 - case "$1" in
1.39 ++
1.40 ++case "$action" in
1.41 start)
1.42 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.43 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.44 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.45 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.46 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.47 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.48 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.49 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.50 ;;
1.51
1.52 @@ -59,8 +65,8 @@
1.53 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.54 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.55 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.56 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.57 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.58 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.59 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.60 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.61 ;;
1.62
1.63 @@ -76,15 +82,16 @@
1.64 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
1.65 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
1.66 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
1.67 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
1.68 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
1.69 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
1.70 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
1.71 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
1.72 ;;
1.73
1.74 *)
1.75 Index: scripts/btraceback.in
1.76 ---- scripts/btraceback.in.orig 2008-06-01 10:49:00 +0200
1.77 -+++ scripts/btraceback.in 2008-07-09 07:45:59 +0200
1.78 +diff -Nau scripts/btraceback.in.orig scripts/btraceback.in
1.79 +--- scripts/btraceback.in.orig 2008-06-01 10:49:00.000000000 +0200
1.80 ++++ scripts/btraceback.in 2008-11-19 23:09:44.305993544 +0100
1.81 @@ -12,6 +12,9 @@
1.82 PNAME="${PNAME} on `hostname`"
1.83 if test `uname -s` = SunOS ; then
1.84 @@ -96,8 +103,9 @@
1.85 | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
1.86 else
1.87 Index: src/dird/bacula-dir.conf.in
1.88 ---- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34 +0200
1.89 -+++ src/dird/bacula-dir.conf.in 2008-07-09 07:45:59 +0200
1.90 +diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
1.91 +--- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34.000000000 +0200
1.92 ++++ src/dird/bacula-dir.conf.in 2008-11-19 23:10:11.001069502 +0100
1.93 @@ -29,7 +29,8 @@
1.94 Level = Incremental
1.95 Client = @hostname@-fd
