upgrading package: bacula 2.4.0 -> 2.4.1

bacula/bacula.patch

@@ -1,6 +1,6 @@
 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
++++ manpages/Makefile.in	2008-07-09 07:45:59 +0200
 @@ -20,23 +20,21 @@
  install:
  	$(MKDIR) $(DESTDIR)/$(mandir)/man8
@@ -32,63 +32,61 @@ Index: manpages/Makefile.in
  
  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@
+--- scripts/bacula.in.orig	2008-07-06 15:06:15 +0200
++++ scripts/bacula.in	2008-07-09 07:53:22 +0200
+@@ -15,30 +15,36 @@
+ #  
+ SCRIPTDIR=@scriptdir@
  
--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
++
+ case "$1" 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
+-      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
+-      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $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_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/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
+-      [ -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_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
        ;;
  
     restart)
 -      $0 stop
--      $0 start
 +      $0 stop  $debug $enable_dir $enable_sd $enable_fd
+       sleep 2
+-      $0 start
 +      $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}
+-      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
+-      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
+-      [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
++      [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
++      [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
++      [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
        ;;
  
     *)
 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`
+--- scripts/btraceback.in.orig	2008-06-01 10:49:00 +0200
++++ scripts/btraceback.in	2008-07-09 07:45:59 +0200
+@@ -12,6 +12,9 @@
+ PNAME="${PNAME} on `hostname`"
  if test `uname -s` = SunOS ; then
    gcore -o @working_dir@/${PNAME} $2
 +fi
@@ -98,8 +96,8 @@ Index: scripts/btraceback.in
     | @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
+--- src/dird/bacula-dir.conf.in.orig	2008-06-19 21:44:34 +0200
++++ src/dird/bacula-dir.conf.in	2008-07-09 07:45:59 +0200
 @@ -29,7 +29,8 @@
    Level = Incremental
    Client = @hostname@-fd 
@@ -110,7 +108,7 @@ Index: src/dird/bacula-dir.conf.in
    Storage = File
    Messages = Standard
    Pool = Default
-@@ -105,7 +106,7 @@
+@@ -109,7 +110,7 @@
  #    directory to give a reasonable FileSet to backup to
  #    disk storage during initial testing.
  #
@@ -119,7 +117,7 @@ Index: src/dird/bacula-dir.conf.in
    }
  
  #
-@@ -120,6 +121,11 @@
+@@ -124,6 +125,11 @@
    }
  }
  

bacula/bacula.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        PLUS
 Group:        System
 License:      GPL
-Version:      2.4.0
-Release:      20080607
+Version:      2.4.1
+Release:      20080709
 
 #   package options
 %option       with_server       yes