4 files changed, 36 insertions, 38 deletions
diff --git a/system/bacula/README b/system/bacula/README
index 3f1f268a3b..855625d9d1 100644
--- a/system/bacula/README
+++ b/system/bacula/README
@@ -1,13 +1,10 @@
 Bacula (Manage backup, recovery) - Client and server
 
-Bacula is a set of computer programs that permit you (or the system
-administrator) to manage backup, recovery, and verification of
-computer data across a network of computers of different kinds. In
-technical terms, it is a network Client/Server based backup program.
-Bacula is relatively easy to use and efficient, while offering many
-advanced storage management features that make it easy to find and
-recover lost or damaged files. Due to its modular design, Bacula is
-scalable from small single computer systems to systems consisting of
-hundreds of computers located over a large network.
-
-More info on website: http://www.bacula.org
+Bacula is a set of computer programs that permit you (or the system admin) to 
+manage backup, recovery, and verification of computer data across a network 
+of computers of different kinds.  In technical terms, it is a network 
+Client/Server based backup program.  Bacula is relatively easy to use and 
+efficient, while offering many advanced storage management features that make 
+it easy to find and recover lost or damaged files. Due to its modular design, 
+Bacula is scalable from small single computer systems to systems consisting 
+of hundreds of computers located over a large network.
diff --git a/system/bacula/bacula.SlackBuild b/system/bacula/bacula.SlackBuild
index b72d6ad05f..c47f3d110e 100644
--- a/system/bacula/bacula.SlackBuild
+++ b/system/bacula/bacula.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bacula
-VERSION=${VERSION:-5.0.1}
+VERSION=${VERSION:-5.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,7 +57,7 @@ else
 fi
 
 # E-mail address for bacula to deliver job announcements and core dumps to
-EMAIL=${EMAIL:-backup@localhost}
+EMAIL=${EMAIL:-root@localhost}
 
 # SMTP host for mail delivery
 SMTPHOST=${SMTPHOST:-localhost}
@@ -110,31 +110,28 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ABOUT-NLS ChangeLog COPYING INSTALL README ReleaseNotes VERIFYING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
 # Copy logrotate script
 mkdir -p $PKG/etc/logrotate.d
 cat scripts/logrotate > $PKG/etc/logrotate.d/bacula.new
 
-# Copy rc script
+# Copy init script
 install -D -m0755 -oroot -groot scripts/bacula ${PKG}/etc/rc.d/rc.bacula.new
 
 # Append .new to config files
-cd $PKG/etc/bacula || exit 1
-for i in *.conf ; do mv $i $i.new ; done
+for i in $PKG/etc/bacula/*.conf ; do mv $i $i.new ; done
+
+# Remove useless tmp dir
+rm -rf $PKG/tmp
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ChangeLog COPYING INSTALL README ReleaseNotes VERIFYING \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Remove useless tmp dir
-if [ -d $PKG/tmp ]; then
- rm -rf $PKG/tmp
-fi
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/bacula/bacula.info b/system/bacula/bacula.info
index 2d1c75f6d9..77b396908a 100644
--- a/system/bacula/bacula.info
+++ b/system/bacula/bacula.info
@@ -1,10 +1,10 @@
 PRGNAM="bacula"
-VERSION="5.0.1"
+VERSION="5.0.2"
 HOMEPAGE="www.bacula.org"
-DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-5.0.1.tar.gz"
-MD5SUM="beb9f8da196b3c9ffb0356f087dbdb99"
+DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-5.0.2.tar.gz"
+MD5SUM="e9204d2e772f12662de28da3327853de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="mario"
 EMAIL="mario@slackverse.org"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/system/bacula/doinst.sh b/system/bacula/doinst.sh
index 7e77f15f03..d2acda4c49 100644
--- a/system/bacula/doinst.sh
+++ b/system/bacula/doinst.sh
@@ -11,17 +11,21 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# Keep same perms on rc.bacula.new:
-if [ -e etc/rc.d/rc.bacula ]; then
-  cp -a etc/rc.d/rc.bacula etc/rc.d/rc.bacula.new.incoming
-  cat etc/rc.d/rc.bacula.new > etc/rc.d/rc.bacula.new.incoming
-  mv etc/rc.d/rc.bacula.new.incoming etc/rc.d/rc.bacula.new
-fi
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
 
+preserve_perms etc/rc.d/rc.bacula.new
 config etc/bacula/bacula-dir.conf.new
 config etc/bacula/bacula-fd.conf.new
 config etc/bacula/bacula-sd.conf.new
 config etc/bacula/bconsole.conf.new
 config etc/logrotate.d/bacula.new
-config etc/rc.d/rc.bacula.new