version bump

(Portage version: 2.2_rc8/cvs/Linux 2.6.24-gentoo-r5-1 i686)

13 files changed, 1037 insertions, 1 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 7b842cde33da..9e8549b2566c 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-backup/bacula
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.69 2008/08/11 17:26:35 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.70 2008/11/07 01:44:18 wschlich Exp $
+
+*bacula-2.4.3 (07 Nov 2008)
+
+  07 Nov 2008; Wolfram Schlich <wschlich@gentoo.org>
+  +files/2.4.3/2.4.3-cancel-after-network-outage.patch,
+  +files/2.4.3/2.4.3-orphaned-jobs.patch,
+  +files/2.4.3/2.4.3-update-slots.patch,
+  +files/2.4.3/bacula-default-configs.patch, +files/2.4.3/bacula-dir-conf,
+  +files/2.4.3/bacula-dir-init, +files/2.4.3/bacula-fd-conf,
+  +files/2.4.3/bacula-fd-init, +files/2.4.3/bacula-gnomesu2gksu.diff,
+  +files/2.4.3/bacula-sd-conf, +files/2.4.3/bacula-sd-init,
+  +bacula-2.4.3.ebuild:
+  version bump
 
   11 Aug 2008; Ben de Groot <yngwin@gentoo.org> bacula-2.4.1.ebuild,
   bacula-2.4.1-r1.ebuild, bacula-2.4.2.ebuild:
diff --git a/app-backup/bacula/bacula-2.4.3.ebuild b/app-backup/bacula/bacula-2.4.3.ebuild
new file mode 100644
index 000000000000..642ac052108c
--- /dev/null
+++ b/app-backup/bacula/bacula-2.4.3.ebuild
@@ -0,0 +1,502 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.3.ebuild,v 1.1 2008/11/07 01:44:18 wschlich Exp $
+
+#
+# TODO:
+# - install stuff from examples/:
+#	- examples/nagios/ + add nagios USE flag etc.
+#	  (see also example/reports/check_bacula_pools.sh which is newer
+#	  than examples/nagios/check_bacula_pools.sh)
+#   - examples/autochangers/
+#   - examples/devices/
+#   - examples/python/
+#   - examples/reports/baculareport.pl
+# - install stuff from bacula-gui package:
+#   - bweb
+#   - bacula-web
+#   - bimagemgr
+#   - brestore
+# - bacula >=2.4.0 supports --without-qwt -- reflect with USE=qwt?
+#
+
+EAPI="1"
+inherit eutils
+
+IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwindows X"
+# bacula-web bimagemgr brestore bweb
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+
+DOC_VER="${PV}"
+DOC_SRC_URI="mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.bz2"
+#GUI_VER="${PV}"
+#GUI_SRC_URI="mirror://sourceforge/bacula/${PN}-gui-${GUI_VER}.tar.gz"
+SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz
+		doc? ( ${DOC_SRC_URI} )"
+#		bacula-web? ( ${GUI_SRC_URI} )
+#		bimagemgr? ( ${GUI_SRC_URI} )
+#		brestore? ( ${GUI_SRC_URI} )
+#		bweb? ( ${GUI_SRC_URI} )
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="
+	>=sys-libs/zlib-1.1.4
+	dev-libs/gmp
+	!bacula-clientonly? (
+		postgres? ( >=virtual/postgresql-server-7.4 )
+		mysql? ( virtual/mysql )
+		sqlite? ( =dev-db/sqlite-2* )
+		sqlite3? ( >=dev-db/sqlite-3.0.0 )
+		virtual/mta
+	)
+	bacula-console? (
+		wxwindows? ( =x11-libs/wxGTK-2.6* )
+		qt4? (
+			|| ( x11-libs/qt-svg:4 =x11-libs/qt-4.3* )
+			>=x11-libs/qwt-5
+		)
+		gnome? (
+			>=gnome-base/libgnome-2
+			x11-libs/gksu
+		)
+	)
+	ssl? ( dev-libs/openssl )
+	logrotate? ( app-admin/logrotate )
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	readline? ( >=sys-libs/readline-4.1 )
+	doc? (
+		virtual/ghostscript
+		dev-tex/latex2html
+	)"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		sys-block/mtx
+		app-arch/mt-st
+	)"
+
+pkg_setup() {
+	local dbnum
+	declare -i dbnum=0
+	if ! useq bacula-clientonly; then
+		if useq mysql; then
+			export mydbtype='mysql'
+			let dbnum++
+		fi
+		if useq postgres; then
+			export mydbtype='postgresql'
+			let dbnum++
+		fi
+		if useq sqlite; then
+			export mydbtype='sqlite'
+			let dbnum++
+		fi
+		if useq sqlite3; then
+			export mydbtype='sqlite3'
+			let dbnum++
+		fi
+		if [[ "${dbnum}" -lt 1 ]]; then
+			eerror
+			eerror "To use ${P} it is required to set a database in the USE flags."
+			eerror "Supported databases are mysql, postgresql, sqlite, sqlite3"
+			eerror
+			die "No database type selected."
+		elif [[ "${dbnum}" -gt 1 ]]; then
+			eerror
+			eerror "You have set ${P} to use multiple database types."
+			eerror "I don't know which to set as the default!"
+			eerror "You can use /etc/portage/package.use to set per-package USE flags"
+			eerror "Set it so only one database type, mysql, postgres, sqlite, sqlite3"
+			eerror
+			die "Multiple database types selected."
+		fi
+	fi
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+	if ! useq bacula-clientonly; then
+		if [ -z "$(egetent passwd bacula)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src && epatch "${FILESDIR}/${PV}/${PN}"-default-configs.patch && popd
+
+	# replaces (deprecated) gnomesu with gksu in the gnome menu files
+	useq bacula-console && useq gnome && epatch "${FILESDIR}/${PV}/${PN}"-gnomesu2gksu.diff
+
+	# apply upstream patches
+	ls "${FILESDIR}"/${PV}/${PV}-*.patch &>/dev/null \
+		&& epatch "${FILESDIR}"/${PV}/${PV}-*.patch
+}
+
+src_compile() {
+	if useq doc && has_version dev-tex/latex2html && ! built_with_use dev-tex/latex2html png; then
+		eerror "${PN} needs the PNG support of latex2html"
+		eerror "Please re-emerge dev-tex/latex2html with USE=png"
+		die "need dev-tex/latex2html built with png USE flag"
+	fi
+
+	local myconf=''
+
+	if useq bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			--with-${mydbtype} \
+			$(use_enable static static-tools) \
+			$(use_enable static static-fd) \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		if ! useq bacula-nodir; then
+			myconf="${myconf} $(use_enable static static-dir)"
+		fi
+		if ! useq bacula-nosd; then
+			myconf="${myconf} $(use_enable static static-sd)"
+		fi
+
+	fi
+
+	if useq bacula-console; then
+		if useq qt4 && has_version '<x11-libs/qwt-5'; then
+			eerror "x11-libs/qwt found in a version < 5, thus the"
+			eerror "compilation of 'bat' would fail (see"
+			eerror "http://bugs.gentoo.org/188477#c11 for details)."
+			eerror "please either unmerge <x11-libs/qwt-5 or disable"
+			eerror "the qt4 USE flag to disable building 'bat'."
+			die "incompatible slotted qwt version found"
+		fi
+		myconf="${myconf} \
+			$(use_with X x) \
+			$(use_enable gnome) \
+			$(use_enable gnome tray-monitor) \
+			$(use_enable wxwindows bwx-console) \
+			$(use_enable qt4 bat) \
+			$(use_enable static static-cons)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with python) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_with tcpd tcp-wrappers)"
+
+	./configure \
+		--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/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--host=${CHOST} \
+		${myconf} \
+		|| die "configure failed"
+
+	emake || die "emake failed"
+
+	# build various GUIs from bacula-gui tarball
+#	if useq bacula-web || useq bimagemgr || useq brestore || useq bweb; then
+#		pushd "${WORKDIR}/${PN}-gui-${GUI_VER}"
+#		local myconf_gui=''
+#		if useq bimagemgr; then
+#			## TODO FIXME: webapp-config? !apache?
+#			myconf_gui="${myconf_gui} \
+#				--with-bimagemgr-cgidir=/var/www/localhost/cgi-bin \
+#				--with-bimagemgr-docdir=/var/www/localhost/htdocs \
+#				--with-bimagemgr-binowner=root \
+#				--with-bimagemgr-bingroup=root \
+#				--with-bimagemgr-dataowner=apache \
+#				--with-bimagemgr-datagroup=apache \
+#				"
+#		fi
+#		./configure \
+#			--with-bacula="${S}" \
+#			${myconf} \
+#			|| die "configure for bacula-gui failed"
+#		## TODO FIXME: install files (see bacula-gui.spec)
+#		if useq bacula-web; then
+#			: install
+#		fi
+#		if useq bimagemgr; then
+#			: install
+#		fi
+#		if useq brestore; then
+#			: install
+#		fi
+#		if useq bweb; then
+#			: install
+#		fi
+#		popd
+#	fi
+
+	# build docs from bacula-docs tarball
+	if useq doc; then
+		pushd "${WORKDIR}/${PN}-docs-${DOC_VER}"
+		./configure \
+			--with-bacula="${S}" \
+			|| die "configure for bacula-docs failed"
+		emake -j1 || die "emake for bacula-docs failed"
+		popd
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# install bat when enabled (for some reason ./configure doesn't pick this up)
+	if useq bacula-console && useq qt4; then
+		dosbin "${S}"/src/qt-console/bat
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if useq static; then
+		pushd "${D}"/usr/sbin
+		mv static-bacula-fd bacula-fd
+		mv static-bconsole bconsole
+		if ! useq bacula-clientonly; then
+			mv static-bacula-dir bacula-dir
+			mv static-bacula-sd bacula-sd
+		fi
+		if useq bacula-console && useq gnome; then
+			mv static-gnome-console gnome-console
+		fi
+		if useq bacula-console && useq qt4; then
+			mv static-bat bat
+		fi
+		popd
+	fi
+
+	# gnome-console menu entries using gksu
+	if useq bacula-console && useq gnome; then
+		emake DESTDIR="${D}" install-menu-xsu \
+			|| die "Failed to install gnome menu files"
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! useq bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		if useq logrotate; then
+			diropts -m0755
+			insinto /etc/logrotate.d
+			insopts -m0644
+			newins "${S}"/scripts/logrotate bacula
+		fi
+
+		# the logwatch scripts
+		if useq logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			cd "${S}"/scripts/logwatch
+			emake DESTDIR="${D}" install || die "Failed to install logwatch scripts"
+			cd "${S}"
+		fi
+	fi
+
+	# remove unwanted files
+	if ! use bacula-console; then
+		rm -vf "${D}"/etc/bacula/bconsole.conf
+		rm -vf "${D}"/usr/sbin/bconsole
+		rm -vf "${D}"/usr/libexec/bacula/bconsole
+	fi
+	if ! ( use bacula-console && use gnome ); then
+		rm -vf "${D}"/usr/share/man/man1/bacula-bgnome-console.1*
+		rm -vf "${D}"/usr/libexec/bacula/gconsole
+	fi
+	if ! ( use bacula-console && use wxwindows ); then
+		rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
+	fi
+	if use bacula-clientonly; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+		rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	fi
+	if use bacula-clientonly || use bacula-nodir; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	for d in "${S}"/{ChangeLog,LICENSE,README,ReleaseNotes,SUPPORT,kernstodo,projects}; do
+		dodoc "${d}"
+	done
+	if useq doc; then
+		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula.pdf
+		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers.pdf
+		#dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/bacula-web/bacula-web.pdf
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! useq bacula-clientonly; then
+		if ! useq bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! useq bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${PV}/${script}"-conf "${T}/${script}".conf || die "failed to copy ${script}-conf"
+		cp "${FILESDIR}/${PV}/${script}"-init "${T}/${script}".init || die "failed to copy ${script}-init"
+		# set database dependancy for the director init scripts
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite*)
+						# sqlite + sqlite3 databases don't have daemons
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".init
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".init
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+		# install init script and config
+		newinitd "${T}/${script}".init "${script}"
+		newconfd "${T}/${script}".conf "${script}"
+	done
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners root:bacula /usr/libexec/bacula/*
+}
+
+pkg_postinst() {
+	if useq bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! useq bacula-clientonly && ! useq bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+		einfo "If you're upgrading from a major release, you must upgrade your bacula catalog database."
+		einfo "Please read the manual chapter for how to upgrade your database."
+		einfo "You can find database upgrade scripts in /usr/libexec/bacula/updatedb."
+		einfo
+	fi
+
+	ewarn
+	ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
+	ewarn
+	ewarn "The bundled catalog backup script (/usr/libexec/bacula/make_catalog_backup)"
+	ewarn "is INSECURE. The script needs to be called with the database access password"
+	ewarn "as a command line parameter, thus, the password can be seen from any other"
+	ewarn "user on the system (if not using some non-default hardened/patched kernel"
+	ewarn "with /proc restrictions)!"
+	ewarn
+	ewarn "Our advice is to NOT USE the bundled script at all, but instead use something"
+	ewarn "like this in your catalog backup job definition (example using MySQL as the"
+	ewarn "catalog database):"
+	ewarn
+	ewarn "RunBeforeJob = \"mysqldump --defaults-file=/etc/bacula/my.cnf --opt -f -r /var/lib/bacula/bacula.sql bacula\""
+	ewarn "RunAfterJob  = \"rm -f /var/lib/bacula/bacula.sql\""
+	ewarn
+	ewarn "This requires you to put all database access parameters (like user, host and"
+	ewarn "password) into a dedicated file (/etc/bacula/my.cnf in this example) which"
+	ewarn "can (and should!) be secured by simple filesystem access permissions."
+	ewarn
+	ewarn "See also:"
+	ewarn "http://www.bacula.org/en/rel-manual/Bacula_Security_Issues.html"
+	ewarn "http://www.bacula.org/en/rel-manual/Catalog_Maintenance.html#BackingUpBaculaSecurityConsiderations"
+	ewarn
+	ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
+	ewarn
+	ebeep 10
+	epause 20
+
+	ewarn
+	ewarn "*** NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! ***"
+	ewarn
+	ewarn "Support for the bacula all-in-one init script has been removed from"
+	ewarn "this release -- if you were previously using the all-in-one init"
+	ewarn "script, please switch to using the individual init scripts now:"
+	ewarn
+	ewarn "- bacula-dir: bacula director       (for the central bacula server)"
+	ewarn "- bacula-fd:  bacula file daemon    (for hosts to be backed up)"
+	ewarn "- bacula-sd:  bacula storage daemon (for hosts storing the backup data)"
+	ewarn
+	ewarn "*** NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! ***"
+	ewarn
+	ebeep 5
+	epause 10
+}
diff --git a/app-backup/bacula/files/2.4.3/2.4.3-cancel-after-network-outage.patch b/app-backup/bacula/files/2.4.3/2.4.3-cancel-after-network-outage.patch
new file mode 100644
index 000000000000..321eaf9b27bc
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/2.4.3-cancel-after-network-outage.patch
@@ -0,0 +1,135 @@
+
+  This patch fixes a problem when canceling job if client looses 
+  connection while being backed up 
+  Apply the patch to version 2.4.3 (and previous versions) with:
+
+  cd <bacula-source>
+  patch -p0 <2.4.3-cancel-after-network-outage.patch
+  ./configure <your-options>
+  make
+  ...
+  make install
+
+
+Index: src/dird/backup.c
+===================================================================
+--- src/dird/backup.c	(révision 7772)
++++ src/dird/backup.c	(copie de travail)
+@@ -240,14 +240,16 @@
+    }     
+    return false;
+ 
+-/* Come here only after starting SD thread */
++/* Come here only after starting SD thread 
++ * and we don't expect any EndJob message because the
++ * the client don't have recieve the "backup" command.
++ */
+ bail_out:
+    set_jcr_job_status(jcr, JS_ErrorTerminated);
+-   Dmsg1(400, "wait for sd. use=%d\n", jcr->use_count());
+-   /* Cancel SD */
+-   cancel_storage_daemon_job(jcr);
+-   wait_for_storage_daemon_termination(jcr);
+-   Dmsg1(400, "after wait for sd. use=%d\n", jcr->use_count());
++   Dmsg1(400, "wait for sd and fd. use=%d\n", jcr->use_count());
++   /* Get status from SD and FD */
++   wait_for_job_termination(jcr, false /* don't expect EndJob message*/);
++   Dmsg1(400, "after wait for sd and fd. use=%d\n", jcr->use_count());
+    return false;
+ }
+ 
+@@ -258,7 +260,7 @@
+  *   are done, we return the job status.
+  * Also used by restore.c
+  */
+-int wait_for_job_termination(JCR *jcr)
++int wait_for_job_termination(JCR *jcr, bool expect_EndJob)
+ {
+    int32_t n = 0;
+    BSOCK *fd = jcr->file_bsock;
+@@ -270,30 +272,51 @@
+    int Encrypt = 0;
+ 
+    set_jcr_job_status(jcr, JS_Running);
+-   /* Wait for Client to terminate */
+-   while ((n = bget_dirmsg(fd)) >= 0) {
+-      if (!fd_ok && 
+-          (sscanf(fd->msg, EndJob, &jcr->FDJobStatus, &JobFiles,
+-              &ReadBytes, &JobBytes, &Errors, &VSS, &Encrypt) == 7 ||
+-           sscanf(fd->msg, OldEndJob, &jcr->FDJobStatus, &JobFiles,
+-                 &ReadBytes, &JobBytes, &Errors) == 5)) {
+-         fd_ok = true;
+-         set_jcr_job_status(jcr, jcr->FDJobStatus);
+-         Dmsg1(100, "FDStatus=%c\n", (char)jcr->JobStatus);
+-      } else {
+-         Jmsg(jcr, M_WARNING, 0, _("Unexpected Client Job message: %s\n"),
+-            fd->msg);
++
++
++   if (fd) {
++      /* Wait for Client to terminate 
++       * In some conditions, the client isn't able to send
++       * any messages and we should not wait for ages
++       */
++      int OK=true;
++      int ret;
++      while (OK && expect_EndJob) {
++
++         /* Even if the job is canceled, we let a chance to FD to 
++          * send EndJob message 
++          */
++         if (job_canceled(jcr)) { 
++            OK=false;
++         }
++         
++         /* wait for data few minutes */
++         ret = fd->wait_data_intr(3*60, 0); 
++         if (ret == 1) {       /* get data */
++            n = bget_dirmsg(fd);
++            if (n >= 0 && 
++                (sscanf(fd->msg, EndJob, &jcr->FDJobStatus, &JobFiles,
++                        &ReadBytes, &JobBytes, &Errors, &VSS, &Encrypt) == 7 ||
++                 sscanf(fd->msg, OldEndJob, &jcr->FDJobStatus, &JobFiles,
++                        &ReadBytes, &JobBytes, &Errors) == 5)) {
++               fd_ok = true;
++               set_jcr_job_status(jcr, jcr->FDJobStatus);
++               OK=false;        /* end of loop */
++            } else {
++               Jmsg(jcr, M_WARNING, 0, _("Unexpected Client Job message: %s\n"),
++                    fd->msg);
++            }
++         } /* else get timeout or network error */
++
++         if (is_bnet_error(fd)) {
++            Jmsg(jcr, M_FATAL, 0, _("Network error with FD during %s: ERR=%s\n"),
++                 job_type_to_str(jcr->JobType), fd->bstrerror());
++            OK=false;
++         }
+       }
+-      if (job_canceled(jcr)) {
+-         break;
+-      }
+-   }
+ 
+-   if (is_bnet_error(fd)) {
+-      Jmsg(jcr, M_FATAL, 0, _("Network error with FD during %s: ERR=%s\n"),
+-          job_type_to_str(jcr->JobType), fd->bstrerror());
++      fd->signal(BNET_TERMINATE);   /* tell Client we are terminating */
+    }
+-   fd->signal(BNET_TERMINATE);   /* tell Client we are terminating */
+ 
+    /* Force cancel in SD if failing */
+    if (job_canceled(jcr) || !fd_ok) {
+Index: src/dird/protos.h
+===================================================================
+--- src/dird/protos.h	(révision 7772)
++++ src/dird/protos.h	(copie de travail)
+@@ -52,7 +52,7 @@
+ extern bool find_recycled_volume(JCR *jcr, bool InChanger, MEDIA_DBR *mr);
+ 
+ /* backup.c */
+-extern int wait_for_job_termination(JCR *jcr);
++extern int wait_for_job_termination(JCR *jcr, bool expect_EndJob=true);
+ extern bool do_backup_init(JCR *jcr);
+ extern bool do_backup(JCR *jcr);
+ extern void backup_cleanup(JCR *jcr, int TermCode);
diff --git a/app-backup/bacula/files/2.4.3/2.4.3-orphaned-jobs.patch b/app-backup/bacula/files/2.4.3/2.4.3-orphaned-jobs.patch
new file mode 100644
index 000000000000..6162c9e95a1f
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/2.4.3-orphaned-jobs.patch
@@ -0,0 +1,24 @@
+
+ This patch fixes a case of orphaned jobs (and possible deadlock)
+ during pruning.
+ Apply it to Bacula 2.4.3 (possibly earlier versions) with:
+
+ cd <bacula-source>
+ patch -p0 <2.4.3-orphaned-jobs.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+Index: src/dird/ua_prune.c
+===================================================================
+--- src/dird/ua_prune.c	(revision 7949)
++++ src/dird/ua_prune.c	(working copy)
+@@ -468,6 +468,7 @@
+             break;
+          }
+       }
++      endeach_jcr(jcr);
+       if (skip) {
+          continue;
+       }
diff --git a/app-backup/bacula/files/2.4.3/2.4.3-update-slots.patch b/app-backup/bacula/files/2.4.3/2.4.3-update-slots.patch
new file mode 100644
index 000000000000..fb29cd6a6b99
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/2.4.3-update-slots.patch
@@ -0,0 +1,79 @@
+
+ This patch corrects a problem when removing a volume from
+ an autochanger and the slot is still empty when running
+ update slots command. #1175
+
+ Apply it to version 2.4.3 with:
+
+ cd <bacula-source>
+ patch -p0 <2.4.3-update-slots.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+Index: src/cats/sql_update.c
+===================================================================
+--- src/cats/sql_update.c	(revision 7854)
++++ src/cats/sql_update.c	(working copy)
+@@ -445,14 +445,28 @@
+ db_make_inchanger_unique(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
+ {
+    char ed1[50], ed2[50];
+-   if (mr->InChanger != 0 && mr->Slot != 0 && mr->StorageId != 0 &&
+-       mr->MediaId != 0) {
+-      Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0 WHERE "
+-           "Slot=%d AND StorageId=%s AND MediaId!=%s",
+-            mr->Slot, 
+-            edit_int64(mr->StorageId, ed1), edit_int64(mr->MediaId, ed2));
+-      Dmsg1(400, "%s\n", mdb->cmd);
+-      UPDATE_DB(jcr, mdb, mdb->cmd);
++   if (mr->InChanger != 0 && mr->Slot != 0 && mr->StorageId != 0) {
++
++       if (mr->MediaId != 0) {
++          Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0 WHERE "
++               "Slot=%d AND StorageId=%s AND MediaId!=%s",
++               mr->Slot, 
++               edit_int64(mr->StorageId, ed1), edit_int64(mr->MediaId, ed2));
++
++       } else if (mr->VolumeName[0]) { /* We have a volume name */
++          Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0 WHERE "
++               "Slot=%d AND StorageId=%s AND VolumeName!='%s'",
++               mr->Slot, 
++               edit_int64(mr->StorageId, ed1), mr->VolumeName);
++
++       } else {  /* used by ua_label to reset all volume with this slot */
++          Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0 WHERE "
++               "Slot=%d AND StorageId=%s",
++               mr->Slot, 
++               edit_int64(mr->StorageId, ed1), mr->VolumeName);          
++       }
++       Dmsg1(100, "%s\n", mdb->cmd);
++       UPDATE_DB(jcr, mdb, mdb->cmd);
+    }
+ }
+ 
+Index: src/cats/sql_create.c
+===================================================================
+--- src/cats/sql_create.c	(revision 7854)
++++ src/cats/sql_create.c	(working copy)
+@@ -459,14 +459,13 @@
+               "WHERE MediaId=%d", dt, mr->MediaId);
+          stat = UPDATE_DB(jcr, mdb, mdb->cmd);
+       }
++      /*
++       * Make sure that if InChanger is non-zero any other identical slot
++       *   has InChanger zero.
++       */
++      db_make_inchanger_unique(jcr, mdb, mr);
+    }
+ 
+-   /*
+-    * Make sure that if InChanger is non-zero any other identical slot
+-    *   has InChanger zero.
+-    */
+-   db_make_inchanger_unique(jcr, mdb, mr);
+-
+    db_unlock(mdb);
+    return stat;
+ }
diff --git a/app-backup/bacula/files/2.4.3/bacula-default-configs.patch b/app-backup/bacula/files/2.4.3/bacula-default-configs.patch
new file mode 100644
index 000000000000..f4f2c9cf7b7d
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/bacula-default-configs.patch
@@ -0,0 +1,132 @@
+--- console/console.c	2008-08-11 23:50:20.000000000 +0200
++++ console/console.c	2008-06-09 11:25:27.000000000 +0200
+@@ -105,7 +105,7 @@
+ static int execcmd(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()
+ {
+--- dird/dird.c	2008-08-11 23:49:40.000000000 +0200
++++ dird/dird.c	2008-06-07 16:46:43.000000000 +0200
+@@ -85,7 +85,7 @@
+ extern URES res_all;
+ #endif
+ 
+-#define CONFIG_FILE "bacula-dir.conf" /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
+ 
+ static void usage()
+ {
+--- filed/filed.c	2008-08-11 23:51:18.000000000 +0200
++++ filed/filed.c	2008-06-07 16:46:43.000000000 +0200
+@@ -50,7 +50,7 @@
+ void *start_heap;
+ 
+ 
+-#define CONFIG_FILE "bacula-fd.conf" /* default config file */
++#define CONFIG_FILE "/etc/bacula/bacula-fd.conf" /* default config file */
+ 
+ char *configfile = NULL;
+ static bool foreground = false;
+--- gnome2-console/console.c	2008-08-11 23:50:45.000000000 +0200
++++ gnome2-console/console.c	2008-06-07 16:46:43.000000000 +0200
+@@ -93,7 +93,7 @@
+ static guint initial;
+ static int numdir = 0;
+ 
+-#define CONFIG_FILE "./bgnome-console.conf"   /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bgnome-console.conf"   /* default configuration file */
+ 
+ static void usage()
+ {
+--- qt-console/main.cpp	2008-08-11 23:55:10.000000000 +0200
++++ qt-console/main.cpp	2008-06-07 16:46:43.000000000 +0200
+@@ -46,7 +46,7 @@
+ static void usage();
+ static int check_resources();
+ 
+-#define CONFIG_FILE "./bat.conf"   /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bat.conf"   /* default configuration file */
+ 
+ /* Static variables */
+ static char *configfile = NULL;
+--- stored/bcopy.c	2008-08-11 23:54:48.000000000 +0200
++++ stored/bcopy.c	2008-06-07 16:46:43.000000000 +0200
+@@ -57,7 +57,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 = NULL;
+ STORES *me = NULL;                    /* our Global resource */
+ bool forge_on = false;                /* proceed inspite of I/O errors */
+--- stored/bextract.c	2008-08-11 23:45:44.000000000 +0200
++++ stored/bextract.c	2008-06-07 16:46:43.000000000 +0200
+@@ -64,7 +64,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 = NULL;
+ STORES *me = NULL;                    /* our Global resource */
+ bool forge_on = false;
+--- stored/bls.c	2008-08-11 23:46:05.000000000 +0200
++++ stored/bls.c	2008-06-07 16:46:43.000000000 +0200
+@@ -59,7 +59,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 = NULL;
+ STORES *me = NULL;                    /* our Global resource */
+ bool forge_on = false;
+--- stored/bscan.c	2008-08-11 23:46:26.000000000 +0200
++++ stored/bscan.c	2008-06-18 21:29:26.000000000 +0200
+@@ -100,7 +100,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 = NULL;
+ STORES *me = NULL;                    /* our Global resource */
+ bool forge_on = false;                /* proceed inspite of I/O errors */
+--- stored/btape.c	2008-08-11 23:46:59.000000000 +0200
++++ stored/btape.c	2008-06-07 16:46:43.000000000 +0200
+@@ -98,7 +98,7 @@
+ 
+ 
+ /* Static variables */
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile = NULL;
+ 
+ #define MAX_CMD_ARGS 30
+--- stored/stored.c	2008-08-11 23:54:32.000000000 +0200
++++ stored/stored.c	2008-06-23 11:58:34.000000000 +0200
+@@ -52,7 +52,7 @@
+ 
+ extern "C" void *device_initialization(void *arg);
+ 
+-#define CONFIG_FILE "bacula-sd.conf"  /* Default config file */
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"  /* Default config file */
+ 
+ /* Global variables exported */
+ char OK_msg[]   = "3000 OK\n";
+--- tray-monitor/tray-monitor.c	2008-08-11 23:49:13.000000000 +0200
++++ tray-monitor/tray-monitor.c	2008-06-07 16:46:43.000000000 +0200
+@@ -104,7 +104,7 @@
+ 
+ PangoFontDescription *font_desc = NULL;
+ 
+-#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/2.4.3/bacula-dir-conf b/app-backup/bacula/files/2.4.3/bacula-dir-conf
new file mode 100644
index 000000000000..c99079e7caad
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/bacula-dir-conf
@@ -0,0 +1,15 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.3/bacula-dir-conf,v 1.1 2008/11/07 01:44:18 wschlich 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 the director daemon.
+# The DIR 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 root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/2.4.3/bacula-dir-init b/app-backup/bacula/files/2.4.3/bacula-dir-init
new file mode 100644
index 000000000000..4c3ae527f318
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/bacula-dir-init
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.3/bacula-dir-init,v 1.1 2008/11/07 01:44:18 wschlich Exp $
+
+depend() {
+	need net
+	if [ "${LOCAL_DB}" -eq 1 ]; then
+		need "%database%"
+	fi
+	use dns bacula-fd bacula-sd
+}
+
+start() {
+	ebegin "Starting bacula director"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
+		-- ${DIR_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bacula director"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
+	eend $?
+}
diff --git a/app-backup/bacula/files/2.4.3/bacula-fd-conf b/app-backup/bacula/files/2.4.3/bacula-fd-conf
new file mode 100644
index 000000000000..1792e507e6f3
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/bacula-fd-conf
@@ -0,0 +1,8 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.3/bacula-fd-conf,v 1.1 2008/11/07 01:44:18 wschlich Exp $
+
+# Config file for /etc/init.d/bacula-fd
+
+# Options for the file daemon.
+FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/2.4.3/bacula-fd-init b/app-backup/bacula/files/2.4.3/bacula-fd-init
new file mode 100644
index 000000000000..bb674a641b68
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/bacula-fd-init
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.3/bacula-fd-init,v 1.1 2008/11/07 01:44:18 wschlich Exp $
+
+depend() {
+	need net
+	use dns
+}
+
+start() {
+	ebegin "Starting bacula file daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
+		-- ${FD_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bacula file daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
+	eend $?
+}
diff --git a/app-backup/bacula/files/2.4.3/bacula-gnomesu2gksu.diff b/app-backup/bacula/files/2.4.3/bacula-gnomesu2gksu.diff
new file mode 100644
index 000000000000..8f17daa8db9b
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/bacula-gnomesu2gksu.diff
@@ -0,0 +1,48 @@
+diff -urN bacula-2.2.4.orig/scripts/bacula.desktop.gnome1.xsu.in bacula-2.2.4/scripts/bacula.desktop.gnome1.xsu.in
+--- bacula-2.2.4.orig/scripts/bacula.desktop.gnome1.xsu.in	2008-04-18 19:06:43.000000000 +0200
++++ bacula-2.2.4/scripts/bacula.desktop.gnome1.xsu.in	2008-10-10 23:34:42.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=Bacula Console
+ Comment=Bacula Director Console
+ Icon=/usr/share/pixmaps/bacula.png
+-Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
++Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf"
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
+diff -urN bacula-2.2.4.orig/scripts/bacula.desktop.gnome2.xsu.in bacula-2.2.4/scripts/bacula.desktop.gnome2.xsu.in
+--- bacula-2.2.4.orig/scripts/bacula.desktop.gnome2.xsu.in	2008-04-18 19:06:43.000000000 +0200
++++ bacula-2.2.4/scripts/bacula.desktop.gnome2.xsu.in	2008-10-10 23:32:44.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=Bacula Console
+ Comment=Bacula Director Console
+ Icon=/usr/share/pixmaps/bacula.png
+-Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
++Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf"
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
+diff -urN bacula-2.2.4.orig/scripts/bat.desktop.xsu.in bacula-2.2.4/scripts/bat.desktop.xsu.in
+--- bacula-2.2.4.orig/scripts/bat.desktop.xsu.in	2008-04-29 15:48:18.000000000 +0200
++++ bacula-2.2.4/scripts/bat.desktop.xsu.in	2008-10-10 23:33:57.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=Bacula Administration Tool
+ Comment=Bacula Director Console
+ Icon=/usr/share/pixmaps/bat_icon.png
+-Exec=gnomesu -t "Query" -c "@sbindir@/bat -c @sysconfdir@/bat.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
++Exec=gksu -u root -m 'Bacula Administration Tool needs to be run with superuser privileges' "@sbindir@/bat -c @sysconfdir@/bat.conf"
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
+diff -urN bacula-2.2.4.orig/scripts/wxconsole.desktop.xsu.in bacula-2.2.4/scripts/wxconsole.desktop.xsu.in
+--- bacula-2.2.4.orig/scripts/wxconsole.desktop.xsu.in	2008-04-29 15:11:37.000000000 +0200
++++ bacula-2.2.4/scripts/wxconsole.desktop.xsu.in	2008-10-10 23:34:06.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=Bacula WX Console
+ Comment=Bacula Director Console
+ Icon=/usr/share/pixmaps/wxwin16x16.xpm
+-Exec=gnomesu -t "Query" -c "@sbindir@/bwx-console -c @sysconfdir@/bwx-console.conf" -d -e -m "In order to run the bacula wx console as root, ^additional information is required."
++Exec=gksu -u root -m 'Bacula WX Console needs to be run with superuser privileges' "@sbindir@/bwx-console -c @sysconfdir@/bwx-console.conf"
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
diff --git a/app-backup/bacula/files/2.4.3/bacula-sd-conf b/app-backup/bacula/files/2.4.3/bacula-sd-conf
new file mode 100644
index 000000000000..96b84e950a13
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/bacula-sd-conf
@@ -0,0 +1,11 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.3/bacula-sd-conf,v 1.1 2008/11/07 01:44:18 wschlich Exp $
+
+# Config file for /etc/init.d/bacula-sd
+
+# Options for the storage daemon.
+# The 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/2.4.3/bacula-sd-init b/app-backup/bacula/files/2.4.3/bacula-sd-init
new file mode 100644
index 000000000000..9c684d42e5dc
--- /dev/null
+++ b/app-backup/bacula/files/2.4.3/bacula-sd-init
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.3/bacula-sd-init,v 1.1 2008/11/07 01:44:18 wschlich Exp $
+
+depend() {
+	need net
+	use dns
+}
+
+start() {
+	ebegin "Starting bacula storage daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
+		-- ${SD_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bacula storage daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
+	eend $?
+}