openpkg-packages/bacula/bacula.patch

Index: manpages/Makefile.in
--- manpages/Makefile.in.orig	2007-04-24 17:47:01 +0200
+++ manpages/Makefile.in	2007-05-18 17:50:22 +0200
@@ -20,23 +20,21 @@
 install:
 	$(MKDIR) $(DESTDIR)/$(mandir)/man8
 	for I in ${MAN8}; \
-	  do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
-	     $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \
-	     rm -f $$I.gz); \
+	  do \
+	     $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \
 	done
 	$(MKDIR) $(DESTDIR)/$(mandir)/man1
 	for I in ${MAN1}; \
-	  do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
-	     $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \
-	     rm -f $$I.gz); \
+	  do  \
+	     $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \
 	done
 
 uninstall:
 	for I in ${MAN8}; \
-	  do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \
+	  do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \
 	done
 	for I in ${MAN1}; \
-	  do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \
+	  do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \
 	done
 
 clean:	dummy
Index: scripts/bacula.in
--- scripts/bacula.in.orig	2006-04-07 10:22:17 +0200
+++ scripts/bacula.in	2007-05-18 17:50:22 +0200
@@ -17,31 +17,37 @@
 BACSDCFG=@sysconfdir@
 BACDIRCFG=@sysconfdir@
 
-case "$1" in
+action=$1
+debug=$2
+[ -n "$3" ] && enable_dir=$3 || enable_dir=yes
+[ -n "$4" ] && enable_sd=$4  || enable_sd=yes
+[ -n "$5" ] && enable_fd=$5  || enable_fd=yes
+ 
+case "$action" in
    start)
-      [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2
-      [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2
-      [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2
+      [ "$enable_sd" = "yes"  ] && [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2
+      [ "$enable_fd" = "yes"  ] && [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2
+      [ "$enable_dir" = "yes" ] && [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2
       ;;
 
    stop)
       # Stop the FD first so that SD will fail jobs and update catalog
-      [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2
-      [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2
-      [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2
+      [ "$enable_fd" = "yes"  ] && [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2
+      [ "$enable_sd" = "yes"  ] && [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2
+      [ "$enable_dir" = "yes" ] && [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2
       echo
       sleep 6
       ;;
 
    restart)
-      $0 stop
-      $0 start
+      $0 stop  $debug $enable_dir $enable_sd $enable_fd
+      $0 start $debug $enable_dir $enable_sd $enable_fd
       ;;
 
    status)
-      [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd status
-      [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd status
-      [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir status
+      [ "$enable_sd" = "yes"  ] && [ -x ${BACSDBIN}/bacula-sd   ] && status ${BACSDBIN}/bacula-sd  ${SD_PORT}
+      [ "$enable_fd" = "yes"  ] && [ -x ${BACFDBIN}/bacula-fd   ] && status ${BACFDBIN}/bacula-fd  ${FD_PORT}
+      [ "$enable_dir" = "yes" ] && [ -x ${BACDIRBIN}/bacula-dir ] && status ${BACDIRBIN}/bacula-dir ${DIR_PORT}
       ;;
 
    *)
Index: scripts/btraceback.in
--- scripts/btraceback.in.orig	2005-05-08 11:18:24 +0200
+++ scripts/btraceback.in	2007-05-18 17:50:22 +0200
@@ -11,6 +11,9 @@
 PNAME=`basename $1`
 if test `uname -s` = SunOS ; then
   gcore -o @working_dir@/${PNAME} $2
+fi
+if test `uname -s` = SunOS &&
+   test -n `which dbx 2>/dev/null` ; then
   dbx $1 $2 <@scriptdir@/btraceback.dbx 2>&1 \
    | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
 else
Index: src/dird/bacula-dir.conf.in
--- src/dird/bacula-dir.conf.in.orig	2007-03-30 23:46:04 +0200
+++ src/dird/bacula-dir.conf.in	2007-05-18 17:50:22 +0200
@@ -29,7 +29,8 @@
   Level = Incremental
   Client = @hostname@-fd 
   FileSet = "Full Set"
-  Schedule = "WeeklyCycle"
+ #Schedule = "WeeklyCycle"
+  Schedule = "NEVER"
   Storage = File
   Messages = Standard
   Pool = Default
@@ -105,7 +106,7 @@
 #    directory to give a reasonable FileSet to backup to
 #    disk storage during initial testing.
 #
-    File = @BUILD_DIR@
+    File = @scriptdir@
   }
 
 #
@@ -120,6 +121,11 @@
   }
 }
 
+# This schedule can be used to disable automatic scheduling
+Schedule {
+  Name = NEVER
+}
+
 #
 # When to do the backups, full backup on first sunday of the month,
 #  differential (i.e. incremental since full) every other sunday,