system/bacula: Cherry-pick and fix the upgrading procedure.

Signed-off-by: Mario Preksavec <mario@slackware.hr>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 63 insertions, 84 deletions

diff --git a/system/bacula/README b/system/bacula/README
index aa0064216273..dc0da7f130c7 100644
--- a/system/bacula/README
+++ b/system/bacula/README
@@ -1,33 +1,18 @@
 Bacula (Manage backup, recovery) - Client and server
 
-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.
-
-This script comes with a few options that can be set at build time, one of
-which is DATABASE. Supported databases include postgresql, mysql and sqlite3.
-By default mysql is selected, to disable or select another database, run:
-
-  DATABASE="" ./bacula.SlackBuild
-
-Some say that having everything under /opt/bacula can be more backup friendly
-for disaster recovery situations, and since the official documentation also
-mentions this prefix in quite a few places, running the script with:
-
-  OPT_PREFIX=yes ./bacula.SlackBuild
-
-will put (almost) everything into /opt/bacula directory.
-
-Another option worth mentioning is Bat, which by default comes disabled, and
-if enabled with BAT=yes variable, creates a package with desktop entries.
-Additionally, smtp delivery agent is assumed running on localhost, and job
-announcements and core dumps are sent to root@localhost email address. Both
-can be changed with EMAIL and SMTPHOST variables.
-
-For more information on upgrading from previous version see README.SLACKWARE
-that came with this package (which is also installed with the documentation).
+Bacula is a set of Open Source, 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. Bacula is relatively
+easy to use and very efficient, while offering many advanced storage management
+features that make it easy to find and recover lost or damaged files. In
+technical terms, it is an Open Source, network based backup program.
+
+This script has a few build options:
+
+  DATABASE=auto|mysql|postgresql|sqlite - by default MySQL/MariaDB is selected
+  OPT_PREFIX=yes|no - install into /opt/bacula (disabled by default)
+  BAT=yes|no - build with GUI support (disabled by default)
+  EMAIL=root@localhost - destination for job announcements and core dumps
+  SMTPHOST=localhost - expects smtp daemon running on localhost
+
+More information about post-install/upgrading can be found in README.SLACKWARE
diff --git a/system/bacula/README.SLACKWARE b/system/bacula/README.SLACKWARE
index d32e7e64646d..eaf57eba4712 100644
--- a/system/bacula/README.SLACKWARE
+++ b/system/bacula/README.SLACKWARE
@@ -1,40 +1,34 @@
-This is an important excerpt from ReleaseNotes that came with bacula version
-5.2.1 which explains updating database from 5.0.x version to 5.2.x. If you
-are upgrading, it would be in your best interest to read and understand the
-following:
-
-New Catalog format in version 5.2.0 and greater
------------------------------------------------
-This release of Bacula uses a new catalog format. We provide a set of
-scripts that permit to convert a 5.0.x (version 12) catalog to 5.2.1 (version
-14).  The Bacula project rpm spec files have been modified to
-detect the database change and do the upgrade for you.  We strongly
-recommend that you save a copy of your existing database before upgrading
-using rpms.
-
-The simplest way to upgrade the database assuming you are building from
-source (i.e. manually):
-1. Stop any current version of Bacula from running.
-2. Save a copy of your existing database.
-3. Configure, build, and install the 5.2.1 version of Bacula
-   Note the new ./configure options in the manuals see the link
-   at the bottom of this file.
-4. cd <your-scripts-installation-directory>
-5. ./update_bacula_tables
-6. If you have multiple catalogs, edit the update_bacula_tables
-   script and put the name of another database, and then
-   execute the script again. Repeat this until all Bacula
-   catalogs have been updated.
-7. Start the new Bacula.  If everything worked, it should
-   not print any error messages.
-
-If you start from scratch, you don't need to run the update_bacula_tables
-script because the create_bacula_tables script automatically creates the new
-table format.  However, if you are using a version of Bacula older than 5.0.0
-(e.g.  3.0.3) then you need to run the update_bacula_tables script that will
-be found in the <bacula>/src/cats directory after you run the ./configure
-command.  As mentioned above, before running this script, please backup your
-catalog database, and when you do running it, be sure shutdown Bacula and be
-aware that running the script can take some time depending on your database
-size.
+Installing from scratch
+-----------------------
 
+You may wish to add these lines to /etc/rc.d/rc.local to start the service:
+
+  if [ -x /etc/rc.d/rc.bacula ]; then
+    /etc/rc.d/rc.bacula start
+  fi
+
+You may also add these lines to /etc/rc.d/rc.local_shutdown:
+
+  if [ -x /etc/rc.d/rc.bacula ]; then
+    /etc/rc.d/rc.bacula stop
+  fi
+
+Remember to give executable permission to /etc/rc.d/rc.local_shutdown:
+
+  chmod 0755 /etc/rc.d/rc.local_shutdown
+
+Upgrading from 5.2.13 to 9.0.6
+------------------------------
+
+Before installing the new package, make sure to:
+
+1. Stop the old version from running
+2. Save a copy of the old database for safe keeping
+
+Only after those two steps have been completed successfully:
+
+3. Upgrade to the new package
+4. Run the update script: /var/bacula/scripts/update_bacula_tables
+5. If you have multiple catalogs, edit and run the update script for each one
+
+If everything went well, starting Bacula should not print any error messages.
diff --git a/system/bacula/bacula.SlackBuild b/system/bacula/bacula.SlackBuild
index 0b927e27b512..a7e1856c7d35 100644
--- a/system/bacula/bacula.SlackBuild
+++ b/system/bacula/bacula.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Bacula
 
-# Copyright 2010, 2012, 2013  Mario Preksavec, Zagreb, HR
+# Copyright 2010, 2012, 2013, 2018  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bacula
-VERSION=${VERSION:-5.2.13}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-9.0.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -131,10 +131,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/bacula/bacula.info b/system/bacula/bacula.info
index 81393aab7d7d..4721c04f6d7d 100644
--- a/system/bacula/bacula.info
+++ b/system/bacula/bacula.info
@@ -1,8 +1,8 @@
 PRGNAM="bacula"
-VERSION="5.2.13"
+VERSION="9.0.6"
 HOMEPAGE="http://www.bacula.org"
-DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-5.2.13.tar.gz"
-MD5SUM="43417bae0c221afb1f30a581c9e0f2fe"
+DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.0.6.tar.gz"
+MD5SUM="9168e398808c42bf290515f60892f643"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/bacula/slack-desc b/system/bacula/slack-desc
index 9ec2b66e4d78..f1eb73a39ea6 100644
--- a/system/bacula/slack-desc
+++ b/system/bacula/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 bacula: bacula (managed backup and recovery)
 bacula:
-bacula: Bacula is a set of computer programs that permit you (or the system
-bacula: administrator) to manage backup, recovery, and verification of
-bacula: computer data across a network of computers of different kinds.
+bacula: Bacula is a set of Open Source, computer programs that permit you
+bacula: (or the system administrator) to manage backup, recovery, and
+bacula: verification of computer data across a network of computers of
+bacula: different kinds.
 bacula:
 bacula: Homepage: http://www.bacula.org
 bacula:
 bacula:
 bacula:
-bacula: