Version bumped.

6 files changed, 434 insertions, 2 deletions

diff --git a/app-admin/bacula/ChangeLog b/app-admin/bacula/ChangeLog
index 294060b5a6b5..6faf1755a9df 100644
--- a/app-admin/bacula/ChangeLog
+++ b/app-admin/bacula/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/bacula
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.42 2004/11/27 13:39:35 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.43 2004/12/18 14:33:02 mholzer Exp $
+
+*bacula-1.36.0 (18 Dec 2004)
+
+  18 Dec 2004; Martin Holzer <mholzer@gentoo.org>
+  +files/bacula-3.6.0-configure.diff, +files/bacula-init2,
+  +bacula-1.36.0.ebuild:
+  Version bumped. Ebuild submitted by D. Scott Barninger
+  <barninger@fairfieldcomputers.com> in #68707.
 
 *bacula-1.34.6 (27 Nov 2004)
 
diff --git a/app-admin/bacula/Manifest b/app-admin/bacula/Manifest
index 386f3b5de663..e07a36d4e794 100644
--- a/app-admin/bacula/Manifest
+++ b/app-admin/bacula/Manifest
@@ -2,10 +2,11 @@ MD5 b7afa1ce2b52c103bd93d453a636cb45 bacula-1.34.1.ebuild 3602
 MD5 688745cdf10527823bdd0c2b71a6e33a bacula-1.32f.ebuild 3862
 MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
 MD5 86a94177d19b5e67aea59d73a89d64b7 bacula-1.34.4.ebuild 4242
-MD5 94b7a90cda2dfb5d86996fa3edcf5148 ChangeLog 6038
+MD5 bf8ea019d9eed3f912acae9ac4453437 ChangeLog 6308
 MD5 b006aa694189a2ed5b8c66696c0c8166 bacula-1.34.5.ebuild 4431
 MD5 90bb2459c037add7da9680e2d858a64c bacula-1.32f-r5.ebuild 3844
 MD5 7112ddd07bdd4d073d2b63317afc9314 bacula-1.34.6.ebuild 4432
+MD5 352098dc32341415e6f00f04ddcaca9d bacula-1.36.0.ebuild 9281
 MD5 c453d7375a93ff187e5bc03ede9417b8 files/digest-bacula-1.32f-r5 67
 MD5 f444bcaac48e16af2fd6fb2e247bf8b6 files/digest-bacula-1.34.1 66
 MD5 5ae33205251ec6fc552b97d578ae0aa7 files/digest-bacula-1.32f 65
@@ -13,5 +14,8 @@ MD5 0b9309406bd6631e14ba47c132ef3b33 files/digest-bacula-1.34.4 66
 MD5 8e55a5f04a3cd9e096e9a5dfb46f1de7 files/digest-bacula-1.34.5 66
 MD5 d12f73af10ee40c23d29afc62f9a02b2 files/bacula-init 1916
 MD5 551003183e612a958cc974532d004224 files/digest-bacula-1.34.6 66
+MD5 aad89729d5313c52d3b3b0b9246f8f47 files/digest-bacula-1.36.0 66
+MD5 42503887b40dfafb5b2965f53105acb6 files/bacula-init2 2476
+MD5 2552434ccc44047b9b503045a9cff932 files/bacula-3.6.0-configure.diff 7578
 MD5 13dd37747df7f32ec471e6bdf7eadec2 files/1.32f/1.32f-2-eom-nextvol.patch 9992
 MD5 aba3c0108a7b301c99c8aa4f59a04081 files/1.32f/1.32f-1-weekofmonth.patch 1879
diff --git a/app-admin/bacula/bacula-1.36.0.ebuild b/app-admin/bacula/bacula-1.36.0.ebuild
new file mode 100644
index 000000000000..8126ad7764e3
--- /dev/null
+++ b/app-admin/bacula/bacula-1.36.0.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.36.0.ebuild,v 1.1 2004/12/18 14:33:02 mholzer Exp $
+
+DESCRIPTION="featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~hppa ~ppc ~sparc ~x86"
+IUSE="readline tcpd gnome mysql sqlite X static postgres wxwindows"
+
+inherit eutils
+
+#theres a local sqlite use flag. use it -OR- mysql, not both.
+#mysql is the reccomended choice ...
+#may need sys-libs/libtermcap-compat but try without first
+DEPEND=">=sys-libs/zlib-1.1.4
+	sys-apps/mtx
+	readline? ( >=sys-libs/readline-4.1 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	gnome? ( gnome-base/libgnome )
+	gnome? ( app-admin/gnomesu )
+	sqlite? ( =dev-db/sqlite-2* )
+	mysql? ( >=dev-db/mysql-3.23 )
+	postgres? ( >=dev-db/postgresql-7.4.0 )
+	X? ( virtual/x11 )
+	wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
+	virtual/mta
+	dev-libs/gmp"
+RDEPEND="${DEPEND}
+	sys-apps/mtx
+	app-arch/mt-st"
+
+src_compile() {
+
+	# patch configure for scripts/bacula-tray-monitor.desktop
+	patch ${S}/configure ${FILESDIR}/${P}-configure.diff
+
+	local myconf=""
+
+	#sed -i -e "s:$bindir/mysql:$bindir/mysql -p:g" grant_mysql_privileges.in
+
+	#define this to skip building the other daemons ...
+	[ -n "$BUILD_CLIENT_ONLY" ] \
+		&& myconf="${myconf} --enable-client-only"
+
+	myconf="
+		`use_enable readline`
+		`use_enable gnome`
+		`use_enable tcpd tcp-wrappers`
+		`use_enable X x`"
+
+	[ -n "$BUILD_CLIENT_ONLY" ] \
+		 && myconf="${myconf} --enable-client-only"
+
+	# mysql is the reccomended choice ...
+	if use mysql
+	then
+		myconf="${myconf} --with-mysql=/usr"
+	elif use postgres
+	then
+		myconf="${myconf} --with-postgresql=/usr"
+	elif use sqlite
+	then
+		myconf="${myconf} --with-sqlite=/usr"
+	elif  use sqlite && use mysql
+	then
+		myconf="${myconf/--with-sqlite/}"
+	fi
+
+	if use wxwindows
+	then
+	   myconf="${myconf} --enable-wx-console"
+	fi
+
+	if use readline
+	then
+	   myconf="${myconf} --enable-readline"
+	fi
+
+	if use gnome
+	then
+	myconf="${myconf} --enable-tray-monitor"
+	fi
+
+
+	./configure \
+		--enable-smartalloc \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--infodir=/usr/share/info \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/bacula \
+		--with-scriptdir=/etc/bacula \
+		--with-dir-user=root \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+
+	if use static
+	then
+		cd ${S}/src/filed
+		make static-baula-fd
+		cd ${S}/src/console
+		make static-console
+		cd ${S}/src/dird
+		make static-bacula-dir
+		if use gnome
+		then
+		  cd ${S}/src/gnome-console
+		  make static-gnome-console
+		fi
+		if use wxwindows
+		then
+		  cd ${S}/src/wx-console
+		  make static-wx-console
+		fi
+		cd ${S}/src/stored
+		make static-bacula-sd
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	if use static
+	then
+		cd ${S}/src/filed
+		cp static-bacula-fd ${D}/usr/sbin/bacula-fd
+		cd ${S}/src/console
+		cp static-console ${D}/usr/sbin/console
+		cd ${S}/src/dird
+		cp static-bacula-dir ${D}/usr/sbin/bacula-dir
+		if use gnome
+		then
+			cd ${S}/src/gnome-console
+			cp static-gnome-console ${D}/usr/sbin/gnome-console
+		fi
+		if use wxwindows
+		then
+			cd ${S}/src/wx-console
+			cp static-wx-console ${D}/usr/sbin/wx-console
+		fi
+		cd ${S}/src/storge
+		cp static-bacula-sd ${D}/usr/sbin/bacula-sd
+	fi
+
+	# the menu stuff
+	if use gnome
+	then
+	mkdir -p ${D}/usr/share/pixmaps
+	mkdir -p ${D}/usr/share/applications
+	cp ${S}/scripts/bacula.png ${D}/usr/share/pixmaps/bacula.png
+	cp ${S}/scripts/bacula.desktop.gnome2.xsu ${D}/usr/share/applications/bacula.desktop
+	cp ${S}/src/tray-monitor/generic.xpm ${D}/usr/share/pixmaps/bacula-tray-monitor.xpm
+	cp ${S}/scripts/bacula-tray-monitor.desktop \
+		${D}/usr/share/applications/bacula-tray-monitor.desktop
+	chmod 755 ${D}/usr/sbin/bacula-tray-monitor
+	chmod 644 ${D}/etc/bacula/tray-monitor.conf
+	fi
+
+	# the database update scripts
+	mkdir -p ${D}/etc/bacula/updatedb
+	cp ${S}/updatedb/* ${D}/etc/bacula/updatedb/
+	chmod 754 ${D}/etc/bacula/updatedb/*
+
+	# documentation
+	for a in ${S}/{Changelog,README,ReleaseNotes,kernstodo,LICENSE,doc/bacula.pdf}
+	do
+		dodoc $a
+	done
+
+	dohtml -r ${S}/doc/html-manual doc/home-page
+	chown -R root:root ${D}/usr/share/doc/${PF}
+	chmod -R 644 ${D}/usr/share/doc/${PF}/*
+
+	# clean up permissions left broken by install
+	chmod o-r ${D}/etc/bacula/query.sql
+
+	# remove the working dir so we can add it postinst with group
+	rmdir ${D}/var/bacula
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bacula-init2 bacula
+}
+
+pkg_postinst() {
+	# create the daemon group
+	HAVE_BACULA=`cat /etc/group | grep bacula 2>/dev/null`
+	if [ -z $HAVE_BACULA ]; then
+	enewgroup bacula
+	einfo
+	einfo "The group bacula has been created. Any users you add to"
+	einfo "this group have access to files created by the daemons."
+	fi
+
+	# the working directory
+	install -m0750 -o root -g bacula -d ${ROOT}/var/bacula
+
+	einfo
+	einfo "Please note either/or nature of database USE flags for"
+	einfo "Bacula.  If mysql is set, it will be used, else postgresql"
+	einfo "else finally SQLite.  If you wish to have multiple DBs on"
+	einfo "one system, you may wish to unset auxillary DBs for this"
+	einfo "build."
+	einfo
+
+	if use mysql
+	then
+	# test for an existing database
+	# note: this ASSUMES no password has been set for bacula database
+	DB_VER=`mysql bacula -e 'select * from Version;'|tail -n 1 2>/dev/null`
+		if [ -z "$DB_VER" ]; then
+		einfo "This appears to be a new install and you plan to use mysql"
+		einfo "for your catalog database. You should now create it by doing"
+		einfo "these commands:"
+		einfo " sh /etc/bacula/grant_mysql_privileges"
+		einfo " sh /etc/bacula/create_mysql_database"
+		einfo " sh /etc/bacula/make_mysql_tables"
+		elif [ "$DB_VER" -lt "8" ]; then
+		elinfo "This release requires an upgrade to your bacula database"
+		einfo "as the database format has changed.  Please read the"
+		einfo "manual chapter for how to upgrade your database!!!"
+		einfo
+		einfo "Backup your database with the command:"
+		einfo " mysqldump -f --opt bacula | bzip2 > /var/bacula/bacula_backup.sql.bz"
+		einfo
+		einfo "Then update your database using the scripts found in"
+		einfo "/etc/bacula/updatedb/ from your current version $DB_VER to"
+		einfo "version 8. Note that scripts must be run in order from your"
+		einfo "version to the current version."
+		fi
+	fi
+
+	if use postgresql
+	then
+	# test for an existing database
+	# note: this ASSUMES no password has been set for bacula database
+	DB_VER=`echo 'select * from Version;' | psql bacula | tail -3 | head -1 2>/dev/null`
+		if [ -z "$DB_VER" ]; then
+		einfo "This appears to be a new install and you plan to use postgresql"
+		einfo "for your catalog database. You should now create it by doing"
+		einfo "these commands:"
+		einfo " sh /etc/bacula/grant_postgresql_privileges"
+		einfo " sh /etc/bacula/create_postgresql_database"
+		einfo " sh /etc/bacula/make_postgresql_tables"
+		elif [ "$DB_VER" -lt "8" ]; then
+		elinfo "This release requires an upgrade to your bacula database"
+		einfo "as the database format has changed.  Please read the"
+		einfo "manual chapter for how to upgrade your database!!!"
+		einfo
+		einfo "Backup your database with the command:"
+		einfo " pg_dump bacula | bzip2 > /var/bacula/bacula_backup.sql.bz2"
+		einfo
+		einfo "Then update your database using the scripts found in"
+		einfo "/etc/bacula/updatedb/ from your current version $DB_VER to"
+		einfo "version 8. Note that scripts must be run in order from your"
+		einfo "version to the current version."
+		fi
+	fi
+
+	if use sqlite
+	then
+	# test for an existing database
+	# note: this ASSUMES no password has been set for bacula database
+	DB_VER=`echo "select * from Version;" | sqlite /var/bacula/bacula.db | tail -n 1 2>/dev/null`
+		if [ -z "$DB_VER" ]; then
+		einfo "This appears to be a new install and you plan to use sqlite"
+		einfo "for your catalog database. You should now create it by doing"
+		einfo "these commands:"
+		einfo " sh /etc/bacula/grant_sqlite_privileges"
+		einfo " sh /etc/bacula/create_sqlite_database"
+		einfo " sh /etc/bacula/make_sqlite_tables"
+		elif [ "$DB_VER" -lt "8" ]; then
+		elinfo "This release requires an upgrade to your bacula database"
+		einfo "as the database format has changed.  Please read the"
+		einfo "manual chapter for how to upgrade your database!!!"
+		einfo
+		einfo "Backup your database with the command:"
+		einfo " echo .dump | sqlite /var/bacula/bacula.db | bzip2 > \\"
+		einfo "   /var/bacula/bacula_backup.sql.bz2"
+		einfo
+		einfo "Then update your database using the scripts found in"
+		einfo "/etc/bacula/updatedb/ from your current version $DB_VER to"
+		einfo "version 8. Note that scripts must be run in order from your"
+		einfo "version to the current version."
+		fi
+	fi
+
+	einfo
+	einfo "Then setup your configuration files in /etc/bacula and"
+	einfo "start the daemons:"
+	einfo " /etc/init.d/bacula start"
+	einfo
+	einfo "You may also wish to:"
+	einfo " rc-update add bacula default"
+	einfo
+}
diff --git a/app-admin/bacula/files/bacula-3.6.0-configure.diff b/app-admin/bacula/files/bacula-3.6.0-configure.diff
new file mode 100644
index 000000000000..698492e52976
--- /dev/null
+++ b/app-admin/bacula/files/bacula-3.6.0-configure.diff
@@ -0,0 +1,19 @@
+--- bacula-1.36.0/configure	2004-10-19 08:35:02.000000000 -0500
++++ bacula-1.36.0-patched/configure	2004-10-23 21:20:33.000000000 -0500
+@@ -19190,7 +19190,7 @@
+    exit 1
+ fi
+ 
+-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/linux/floppy/Makefile rescue/linux/cdrom/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf $PFILES"
++                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/linux/floppy/Makefile rescue/linux/cdrom/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/bacula-tray-monitor.desktop doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf $PFILES"
+           ac_config_commands="$ac_config_commands default"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -19746,6 +19746,7 @@
+   "scripts/bacula.desktop.gnome2.xsu" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2.xsu" ;;
+   "scripts/gnome-console.console_apps" ) CONFIG_FILES="$CONFIG_FILES scripts/gnome-console.console_apps" ;;
+   "scripts/mtx-changer" ) CONFIG_FILES="$CONFIG_FILES scripts/mtx-changer" ;;
++  "scripts/bacula-tray-monitor.desktop" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula-tray-monitor.desktop" ;;
+   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+   "src/host.h" ) CONFIG_FILES="$CONFIG_FILES src/host.h" ;;
diff --git a/app-admin/bacula/files/bacula-init2 b/app-admin/bacula/files/bacula-init2
new file mode 100644
index 000000000000..bb05e0bfe683
--- /dev/null
+++ b/app-admin/bacula/files/bacula-init2
@@ -0,0 +1,93 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/files/bacula-init2,v 1.1 2004/12/18 14:33:03 mholzer Exp $
+
+depend() {
+	need net
+	use mysql
+}
+
+opts="test"
+
+DIR_USER=root
+DIR_GROUP=bacula
+SD_USER=root
+SD_GROUP=bacula
+FD_USER=root
+FD_GROUP=bacula
+
+# A client would only need to run the file daemon, so if thats the
+# case for this machine just comment the other two out below here...
+start() {
+	ebegin "Starting bacula storage daemon"
+	OPTIONS=''
+	if [ "${SD_USER}" != '' ]; then
+		OPTIONS="${OPTIONS} -u ${SD_USER}"
+ 	fi
+										   
+	if [ "${SD_GROUP}" != '' ]; then
+		OPTIONS="${OPTIONS} -g ${SD_GROUP}"
+	fi
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
+		-- ${OPTIONS} -c /etc/bacula/bacula-sd.conf
+	result=$?
+
+	ebegin "Starting bacula file daemon"
+	OPTIONS=''
+	if [ "${FD_USER}" != '' ]; then
+		OPTIONS="${OPTIONS} -u ${FD_USER}"
+ 	fi
+										   
+	if [ "${FD_GROUP}" != '' ]; then
+		OPTIONS="${OPTIONS} -g ${FD_GROUP}"
+	fi
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
+		-- ${OPTIONS} -c /etc/bacula/bacula-fd.conf
+	result=$(( $result + $? ))
+	sleep 2
+
+	ebegin "Starting bacula director"
+	OPTIONS=''
+	if [ "${DIR_USER}" != '' ]; then
+		OPTIONS="${OPTIONS} -u ${DIR_USER}"
+ 	fi
+										   
+	if [ "${DIR_GROUP}" != '' ]; then
+		OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
+	fi
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
+		-- ${OPTIONS} -c /etc/bacula/bacula-dir.conf
+	result=$(( $result + $? ))
+
+	eend $result
+}
+
+# The default port numbers appear in the pidfile paths below.
+# Might wanna programmatically grab them from the config files
+# or something...
+stop() {
+	ebegin "Stopping bacula file daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.9102.pid
+	result=$?
+	ebegin "Stopping bacula storage daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.9103.pid
+	result=$(( $result + $? ))
+	ebegin "Stopping bacula director"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.9101.pid
+	result=$(( $result + $? ))
+	eend $result
+}
+
+test() {
+	ebegin "Testing bacula storage daemon configuration"
+	/usr/sbin/bacula-sd -t -c /etc/bacula/bacula-sd.conf
+	result=$?
+	ebegin "Testing bacula file daemon configuration"
+	/usr/sbin/bacula-fd -t -c /etc/bacula/bacula-fd.conf
+	result=$(( $result + $? ))
+	ebegin "Testing bacula director configuration"
+	/usr/sbin/bacula-dir -t -c /etc/bacula/bacula-dir.conf
+	result=$(( $result + $? ))
+	eend $result
+}
diff --git a/app-admin/bacula/files/digest-bacula-1.36.0 b/app-admin/bacula/files/digest-bacula-1.36.0
new file mode 100644
index 000000000000..f332aa1861d1
--- /dev/null
+++ b/app-admin/bacula/files/digest-bacula-1.36.0
@@ -0,0 +1 @@
+MD5 caa6b417b4fdd65caf714fb2baf5f385 bacula-1.36.0.tar.gz 6806740