Revision bump for 1.36.3 to include docs, use separate init scripts per bacula-split-init USE flag, and port to modular-x compatibility. Added 1.38.5 ebuild.

(Portage version: 2.0.51.22-r2)

20 files changed, 587 insertions, 0 deletions

diff --git a/app-backup/bacula/files/1.36.3/bacula-all-conf b/app-backup/bacula/files/1.36.3/bacula-all-conf
new file mode 100644
index 000000000000..8f918c3206a5
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-all-conf
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.36.3/bacula-all-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+# Config file for /etc/init.d/bacula
+
+# Add on SERVICES the daemons you want to run
+# sd -
+# fd -
+# dir - 
+SERVICES="%services%"
+
+# If the database server where you store your bacula catalog
+# is on a different machine, please set this to 0.
+LOCAL_DB=1
+
+# Options for each daemon
+#  The DIR and SD can be run as a non-root user, however
+#  please ensure that this user has proper permissions to
+#  access your backup devices.
+SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
+FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
+DIR_OPTIONS="-u bacula -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/1.36.3/bacula-all-init b/app-backup/bacula/files/1.36.3/bacula-all-init
new file mode 100644
index 000000000000..f7489cfd0b0c
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-all-init
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.36.3/bacula-all-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+depend() {
+	need net
+	if [ ${LOCAL_DB} -eq 1 ]; then
+		need "%database%"
+	fi
+	use dns
+}
+
+start() {
+	local retval=0
+	for s in ${SERVICES} ; do
+		case ${s} in
+			sd)
+				ebegin "Starting bacula storage daemon"
+				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
+					-- ${SD_OPTIONS}
+				retval=$(( $retval + $? ))
+				;;
+			fd)
+				ebegin "Starting bacula file daemon"
+				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
+					-- ${FD_OPTIONS}
+				retval=$(( $retval + $? ))
+				;;
+			dir)
+				ebegin "Starting bacula director"
+				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
+					-- ${DIR_OPTIONS}
+				retval=$(( $retval + $? ))
+				;;		
+		esac
+	done
+	eend $retval
+}
+
+stop() {
+	local retval=0
+	for s in ${SERVICES} ; do
+		case ${s} in
+			sd)
+				ebegin "Stopping bacula storage daemon"
+				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
+				retval=$(( $retval + $? ))
+				;;
+			fd)
+				ebegin "Stopping bacula file daemon"
+				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
+				retval=$(( $retval + $? ))
+				;;
+			dir)
+				ebegin "Stopping bacula director"
+				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
+				retval=$(( $retval + $? ))
+				;;		
+		esac
+	done
+	eend $retval
+}
diff --git a/app-backup/bacula/files/1.36.3/bacula-dir-conf b/app-backup/bacula/files/1.36.3/bacula-dir-conf
new file mode 100644
index 000000000000..f931ec7649dc
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-dir-conf
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.36.3/bacula-dir-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+# Config file for /etc/init.d/bacula-dir
+
+# If the database server where you store your bacula catalog
+# is on a different machine, please set this to 0.
+LOCAL_DB=1
+
+# Options for each daemon
+#  The DIR and SD can be run as a non-root user, however
+#  please ensure that this user has proper permissions to
+#  access your backup devices.
+DIR_OPTIONS="-u bacula -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/1.36.3/bacula-dir-init b/app-backup/bacula/files/1.36.3/bacula-dir-init
new file mode 100644
index 000000000000..d45152eac630
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-dir-init
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.36.3/bacula-dir-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+depend() {
+	need net
+	if [ ${LOCAL_DB} -eq 1 ]; then
+		need "%database%"
+	fi
+	use dns
+}
+
+start() {
+	local retval=0
+	ebegin "Starting bacula director"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
+		-- ${DIR_OPTIONS}
+	retval=$(( $retval + $? ))
+	eend $retval
+}
+
+stop() {
+	local retval=0
+	ebegin "Stopping bacula director"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
+	retval=$(( $retval + $? ))
+	eend $retval
+}
diff --git a/app-backup/bacula/files/1.36.3/bacula-fd-conf b/app-backup/bacula/files/1.36.3/bacula-fd-conf
new file mode 100644
index 000000000000..651b0dff81cf
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-fd-conf
@@ -0,0 +1,8 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.36.3/bacula-fd-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+# Config file for /etc/init.d/bacula-fd
+
+# Options for each daemon
+FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/1.36.3/bacula-fd-init b/app-backup/bacula/files/1.36.3/bacula-fd-init
new file mode 100644
index 000000000000..74d25ec9770f
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-fd-init
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.36.3/bacula-fd-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+depend() {
+	need net
+	use dns
+}
+
+start() {
+	local retval=0
+	ebegin "Starting bacula file daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
+		-- ${FD_OPTIONS}
+	retval=$(( $retval + $? ))
+	eend $retval
+}
+
+stop() {
+	local retval=0
+	ebegin "Stopping bacula file daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
+	retval=$(( $retval + $? ))
+	eend $retval
+}
diff --git a/app-backup/bacula/files/1.36.3/bacula-sd-conf b/app-backup/bacula/files/1.36.3/bacula-sd-conf
new file mode 100644
index 000000000000..5820942e7c06
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-sd-conf
@@ -0,0 +1,11 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.36.3/bacula-sd-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+# Config file for /etc/init.d/bacula-sd
+
+# Options for each daemon
+#  The DIR and SD can be run as a non-root user, however
+#  please ensure that this user has proper permissions to
+#  access your backup devices.
+SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
diff --git a/app-backup/bacula/files/1.36.3/bacula-sd-init b/app-backup/bacula/files/1.36.3/bacula-sd-init
new file mode 100644
index 000000000000..63c9982cb9ba
--- /dev/null
+++ b/app-backup/bacula/files/1.36.3/bacula-sd-init
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.36.3/bacula-sd-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+depend() {
+	need net
+	use dns
+}
+
+start() {
+	local retval=0
+	ebegin "Starting bacula storage daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
+		-- ${SD_OPTIONS}
+	retval=$(( $retval + $? ))
+	eend $retval
+}
+
+stop() {
+	local retval=0
+	ebegin "Stopping bacula storage daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
+	retval=$(( $retval + $? ))
+	eend $retval
+}
diff --git a/app-backup/bacula/files/1.38.5/bacula-all-conf b/app-backup/bacula/files/1.38.5/bacula-all-conf
new file mode 100644
index 000000000000..2ebd110f174e
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-all-conf
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-all-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+# Config file for /etc/init.d/bacula
+
+# Add on SERVICES the daemons you want to run
+# sd -
+# fd -
+# dir - 
+SERVICES="%services%"
+
+# If the database server where you store your bacula catalog
+# is on a different machine, please set this to 0.
+LOCAL_DB=1
+
+# Options for each daemon
+#  The DIR and SD can be run as a non-root user, however
+#  please ensure that this user has proper permissions to
+#  access your backup devices.
+SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
+FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
+DIR_OPTIONS="-u bacula -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/1.38.5/bacula-all-init b/app-backup/bacula/files/1.38.5/bacula-all-init
new file mode 100644
index 000000000000..5f1a2b5b928b
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-all-init
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-all-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+depend() {
+	need net
+	if [ ${LOCAL_DB} -eq 1 ]; then
+		need "%database%"
+	fi
+	use dns
+}
+
+start() {
+	local retval=0
+	for s in ${SERVICES} ; do
+		case ${s} in
+			sd)
+				ebegin "Starting bacula storage daemon"
+				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
+					-- ${SD_OPTIONS}
+				retval=$(( $retval + $? ))
+				;;
+			fd)
+				ebegin "Starting bacula file daemon"
+				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
+					-- ${FD_OPTIONS}
+				retval=$(( $retval + $? ))
+				;;
+			dir)
+				ebegin "Starting bacula director"
+				start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
+					-- ${DIR_OPTIONS}
+				retval=$(( $retval + $? ))
+				;;		
+		esac
+	done
+	eend $retval
+}
+
+stop() {
+	local retval=0
+	for s in ${SERVICES} ; do
+		case ${s} in
+			sd)
+				ebegin "Stopping bacula storage daemon"
+				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
+				retval=$(( $retval + $? ))
+				;;
+			fd)
+				ebegin "Stopping bacula file daemon"
+				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
+				retval=$(( $retval + $? ))
+				;;
+			dir)
+				ebegin "Stopping bacula director"
+				start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
+				retval=$(( $retval + $? ))
+				;;		
+		esac
+	done
+	eend $retval
+}
diff --git a/app-backup/bacula/files/1.38.5/bacula-dir-conf b/app-backup/bacula/files/1.38.5/bacula-dir-conf
new file mode 100644
index 000000000000..2280a838a649
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-dir-conf
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-dir-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+# Config file for /etc/init.d/bacula-dir
+
+# If the database server where you store your bacula catalog
+# is on a different machine, please set this to 0.
+LOCAL_DB=1
+
+# Options for each daemon
+#  The DIR and SD can be run as a non-root user, however
+#  please ensure that this user has proper permissions to
+#  access your backup devices.
+DIR_OPTIONS="-u bacula -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/1.38.5/bacula-dir-init b/app-backup/bacula/files/1.38.5/bacula-dir-init
new file mode 100644
index 000000000000..2cd905e9a249
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-dir-init
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-dir-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+depend() {
+	need net
+	if [ ${LOCAL_DB} -eq 1 ]; then
+		need "%database%"
+	fi
+	use dns
+}
+
+start() {
+	local retval=0
+	ebegin "Starting bacula director"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
+		-- ${DIR_OPTIONS}
+	retval=$(( $retval + $? ))
+	eend $retval
+}
+
+stop() {
+	local retval=0
+	ebegin "Stopping bacula director"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
+	retval=$(( $retval + $? ))
+	eend $retval
+}
diff --git a/app-backup/bacula/files/1.38.5/bacula-fd-conf b/app-backup/bacula/files/1.38.5/bacula-fd-conf
new file mode 100644
index 000000000000..f857b932b312
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-fd-conf
@@ -0,0 +1,8 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-fd-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+# Config file for /etc/init.d/bacula-fd
+
+# Options for each daemon
+FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/1.38.5/bacula-fd-init b/app-backup/bacula/files/1.38.5/bacula-fd-init
new file mode 100644
index 000000000000..73046f427c5e
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-fd-init
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-fd-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+depend() {
+	need net
+	use dns
+}
+
+start() {
+	local retval=0
+	ebegin "Starting bacula file daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
+		-- ${FD_OPTIONS}
+	retval=$(( $retval + $? ))
+	eend $retval
+}
+
+stop() {
+	local retval=0
+	ebegin "Stopping bacula file daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
+	retval=$(( $retval + $? ))
+	eend $retval
+}
diff --git a/app-backup/bacula/files/1.38.5/bacula-sd-conf b/app-backup/bacula/files/1.38.5/bacula-sd-conf
new file mode 100644
index 000000000000..fbfc0fa162f1
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-sd-conf
@@ -0,0 +1,11 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-sd-conf,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+# Config file for /etc/init.d/bacula-sd
+
+# Options for each daemon
+#  The DIR and SD can be run as a non-root user, however
+#  please ensure that this user has proper permissions to
+#  access your backup devices.
+SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
diff --git a/app-backup/bacula/files/1.38.5/bacula-sd-init b/app-backup/bacula/files/1.38.5/bacula-sd-init
new file mode 100644
index 000000000000..ee2bbc3deaca
--- /dev/null
+++ b/app-backup/bacula/files/1.38.5/bacula-sd-init
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/1.38.5/bacula-sd-init,v 1.1 2006/02/17 04:20:48 labmonkey Exp $
+
+depend() {
+	need net
+	use dns
+}
+
+start() {
+	local retval=0
+	ebegin "Starting bacula storage daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
+		-- ${SD_OPTIONS}
+	retval=$(( $retval + $? ))
+	eend $retval
+}
+
+stop() {
+	local retval=0
+	ebegin "Stopping bacula storage daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
+	retval=$(( $retval + $? ))
+	eend $retval
+}
diff --git a/app-backup/bacula/files/bacula-1.36.3-default-configs.patch b/app-backup/bacula/files/bacula-1.36.3-default-configs.patch
new file mode 100644
index 000000000000..ad1f84f0fd1b
--- /dev/null
+++ b/app-backup/bacula/files/bacula-1.36.3-default-configs.patch
@@ -0,0 +1,144 @@
+diff -uNr ../bacula-1.36.3/src/console/console.c ./src/console/console.c
+--- ../bacula-1.36.3/src/console/console.c	2005-04-05 12:23:51.000000000 -0500
++++ ./src/console/console.c	2005-08-05 00:01:57.000000000 -0500
+@@ -97,7 +97,7 @@
+ static int sleepcmd(FILE *input, BSOCK *UA_sock);
+ 
+ 
+-#define CONFIG_FILE "./bconsole.conf"   /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bconsole.conf"   /* default configuration file */
+ 
+ static void usage()
+ {
+diff -uNr ../bacula-1.36.3/src/dird/dird.c ./src/dird/dird.c
+--- ../bacula-1.36.3/src/dird/dird.c	2005-02-14 04:02:19.000000000 -0600
++++ ./src/dird/dird.c	2005-08-05 00:01:32.000000000 -0500
+@@ -69,7 +69,7 @@
+ extern URES res_all;
+ 
+ 
+-#define CONFIG_FILE "./bacula-dir.conf" /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
+ 
+ static void usage()
+ {
+diff -uNr ../bacula-1.36.3/src/filed/filed.c ./src/filed/filed.c
+--- ../bacula-1.36.3/src/filed/filed.c	2005-02-14 04:02:23.000000000 -0600
++++ ./src/filed/filed.c	2005-08-05 00:01:06.000000000 -0500
+@@ -51,7 +51,7 @@
+ #endif
+ 
+ 
+-#define CONFIG_FILE "./bacula-fd.conf" /* default config file */
++#define CONFIG_FILE "/etc/bacula/bacula-fd.conf" /* default config file */
+ 
+ static char *configfile = NULL;
+ static bool foreground = false;
+diff -uNr ../bacula-1.36.3/src/gnome-console/console.c ./src/gnome-console/console.c
+--- ../bacula-1.36.3/src/gnome-console/console.c	2004-07-28 04:42:49.000000000 -0500
++++ ./src/gnome-console/console.c	2005-08-04 23:55:32.000000000 -0500
+@@ -75,7 +75,7 @@
+ static bool quit = FALSE;
+ static guint initial;
+ 
+-#define CONFIG_FILE "./gnome-console.conf"   /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/gnome-console.conf"   /* default configuration file */
+ 
+ static void usage()
+ {
+diff -uNr ../bacula-1.36.3/src/gnome2-console/console.c ./src/gnome2-console/console.c
+--- ../bacula-1.36.3/src/gnome2-console/console.c	2005-02-25 03:47:07.000000000 -0600
++++ ./src/gnome2-console/console.c	2005-08-04 23:56:00.000000000 -0500
+@@ -80,7 +80,7 @@
+ static bool quit = false;
+ static guint initial;
+ 
+-#define CONFIG_FILE "./gnome-console.conf"   /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/gnome-console.conf"   /* default configuration file */
+ 
+ static void usage()
+ {
+diff -uNr ../bacula-1.36.3/src/stored/bcopy.c ./src/stored/bcopy.c
+--- ../bacula-1.36.3/src/stored/bcopy.c	2004-09-19 13:56:27.000000000 -0500
++++ ./src/stored/bcopy.c	2005-08-04 23:58:40.000000000 -0500
+@@ -46,7 +46,7 @@
+ static uint32_t jobs = 0;
+ static DEV_BLOCK *out_block;
+ 
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile;
+ bool forge_on = true;
+ 
+diff -uNr ../bacula-1.36.3/src/stored/bextract.c ./src/stored/bextract.c
+--- ../bacula-1.36.3/src/stored/bextract.c	2005-02-15 05:51:04.000000000 -0600
++++ ./src/stored/bextract.c	2005-08-04 23:57:57.000000000 -0500
+@@ -63,7 +63,7 @@
+ static uint32_t wsize;		      /* write size */
+ static uint64_t fileAddr = 0;	      /* file write address */
+ 
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile;
+ bool forge_on = false;
+ 
+diff -uNr ../bacula-1.36.3/src/stored/bls.c ./src/stored/bls.c
+--- ../bacula-1.36.3/src/stored/bls.c	2005-02-15 05:51:04.000000000 -0600
++++ ./src/stored/bls.c	2005-08-04 23:57:32.000000000 -0500
+@@ -53,7 +53,7 @@
+ static uint32_t num_files = 0;
+ static ATTR *attr;
+ 
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile;
+ bool forge_on = false;
+ 
+diff -uNr ../bacula-1.36.3/src/stored/bscan.c ./src/stored/bscan.c
+--- ../bacula-1.36.3/src/stored/bscan.c	2005-02-14 04:02:27.000000000 -0600
++++ ./src/stored/bscan.c	2005-08-04 23:58:58.000000000 -0500
+@@ -98,7 +98,7 @@
+ static int num_media = 0;
+ static int num_files = 0;
+ 
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile;
+ bool forge_on = false;
+ 
+diff -uNr ../bacula-1.36.3/src/stored/btape.c ./src/stored/btape.c
+--- ../bacula-1.36.3/src/stored/btape.c	2005-02-27 15:53:29.000000000 -0600
++++ ./src/stored/btape.c	2005-08-04 23:59:58.000000000 -0500
+@@ -85,7 +85,7 @@
+ 
+ 
+ /* Static variables */
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile;
+ 
+ #define MAX_CMD_ARGS 30
+diff -uNr ../bacula-1.36.3/src/stored/stored.c ./src/stored/stored.c
+--- ../bacula-1.36.3/src/stored/stored.c	2005-02-27 15:53:29.000000000 -0600
++++ ./src/stored/stored.c	2005-08-05 00:00:19.000000000 -0500
+@@ -43,7 +43,7 @@
+ 
+ 
+ 
+-#define CONFIG_FILE "bacula-sd.conf"  /* Default config file */
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"  /* Default config file */
+ 
+ 
+ /* Global variables exported */
+diff -uNr ../bacula-1.36.3/src/tray-monitor/tray-monitor.c ./src/tray-monitor/tray-monitor.c
+--- ../bacula-1.36.3/src/tray-monitor/tray-monitor.c	2005-03-28 07:33:27.000000000 -0600
++++ ./src/tray-monitor/tray-monitor.c	2005-08-04 23:56:37.000000000 -0500
+@@ -91,7 +91,7 @@
+ char** xpm_generic_var;
+ static gboolean blinkstate = TRUE;
+ 
+-#define CONFIG_FILE "./tray-monitor.conf"   /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/tray-monitor.conf"   /* default configuration file */
+ 
+ static void usage()
+ {
diff --git a/app-backup/bacula/files/bacula-doc-1.36.3-latex-icons.patch b/app-backup/bacula/files/bacula-doc-1.36.3-latex-icons.patch
new file mode 100644
index 000000000000..254c89ba9f8a
--- /dev/null
+++ b/app-backup/bacula/files/bacula-doc-1.36.3-latex-icons.patch
@@ -0,0 +1,37 @@
+--- html-manual/bacula.html.orig	2005-10-24 14:11:08.000000000 -0500
++++ html-manual/bacula.html	2005-10-24 14:35:53.000000000 -0500
+@@ -24,18 +24,9 @@
+ </HEAD>
+ 
+ <BODY >
+-<!--Navigation Panel-->
+-<IMG WIDTH="81" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next_inactive"
+- SRC="file:/usr/share/latex2html/icons/nx_grp_g.png"> 
+-<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
+- SRC="file:/usr/share/latex2html/icons/up_g.png"> 
+-<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
+- SRC="file:/usr/share/latex2html/icons/prev_g.png">   
+ <BR>
+ <BR>
+ <BR>
+-<!--End of Navigation Panel-->
+-
+ <P>
+ 
+ <P>
+@@ -36405,15 +36396,7 @@
+  <STRONG>latex2html</STRONG> <TT>-white -no_subdir -split 0 -toc_stars -white -notransparent bacula</TT>
+ <P>
+ The translation was initiated by  on 2005-04-26<HR>
+-<!--Navigation Panel-->
+-<IMG WIDTH="81" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next_inactive"
+- SRC="file:/usr/share/latex2html/icons/nx_grp_g.png"> 
+-<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up"
+- SRC="file:/usr/share/latex2html/icons/up_g.png"> 
+-<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous"
+- SRC="file:/usr/share/latex2html/icons/prev_g.png">   
+ <BR>
+-<!--End of Navigation Panel-->
+ <ADDRESS>
+ 
+ 2005-04-26
diff --git a/app-backup/bacula/files/digest-bacula-1.36.3-r3 b/app-backup/bacula/files/digest-bacula-1.36.3-r3
new file mode 100644
index 000000000000..b45ff07e65b4
--- /dev/null
+++ b/app-backup/bacula/files/digest-bacula-1.36.3-r3
@@ -0,0 +1,2 @@
+MD5 9499d6277b8673ae7c24dcdbf89ee026 bacula-1.36.3.tar.gz 11153154
+MD5 db08859bc193e777c76bcbf5e60f0c7e bacula-doc-1.36.3.tar.gz 4506465
diff --git a/app-backup/bacula/files/digest-bacula-1.38.5 b/app-backup/bacula/files/digest-bacula-1.38.5
new file mode 100644
index 000000000000..d9fbab663c1d
--- /dev/null
+++ b/app-backup/bacula/files/digest-bacula-1.38.5
@@ -0,0 +1,2 @@
+MD5 7f8f0f642b22dc2089ef7b42eb08f826 bacula-1.38.5.tar.gz 1911024
+MD5 11035d75fdd9d10801f0b3dda1f09440 bacula-docs-1.38.5.tar.gz 23183760