add (critical) upstream patches

(Portage version: 2.1.5.6)

5 files changed, 598 insertions, 1 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 9c2c1ce20bd3..0751f5ef6cb3 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2008/07/23 21:39:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.63 2008/07/24 10:06:10 wschlich Exp $
+
+*bacula-2.4.1-r1 (24 Jul 2008)
+
+  24 Jul 2008; Wolfram Schlich <wschlich@gentoo.org>
+  +files/2.4.1/2.4.1-mount.patch, +files/2.4.1/2.4.1-mysql-timeout.patch,
+  +files/2.4.1/2.4.1-sd-crash.patch, +bacula-2.4.1-r1.ebuild:
+  add (critical) upstream patches
 
   23 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-backup/bacula/bacula-2.4.1-r1.ebuild b/app-backup/bacula/bacula-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..4e4be2dad64b
--- /dev/null
+++ b/app-backup/bacula/bacula-2.4.1-r1.ebuild
@@ -0,0 +1,504 @@
+# 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.1-r1.ebuild,v 1.1 2008/07/24 10:06:10 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
+# - correctly filter unneeded /usr/libexec/bacula/ stuff depending
+#   on selected USE flags, e.g. bacula-clientonly
+# - install stuff from bacula-gui package:
+#   - bweb
+#   - bacula-web
+#   - bimagemgr
+#   - brestore
+# - bacula >=2.4.0 supports --without-qwt -- reflect with USE=qwt?
+#
+
+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-4*
+			>=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
+	epatch "${FILESDIR}"/${PV}/${PV}-mount.patch
+	epatch "${FILESDIR}"/${PV}/${PV}-mysql-timeout.patch
+	epatch "${FILESDIR}"/${PV}/${PV}-sd-crash.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.1/2.4.1-mount.patch b/app-backup/bacula/files/2.4.1/2.4.1-mount.patch
new file mode 100644
index 000000000000..c48302d871aa
--- /dev/null
+++ b/app-backup/bacula/files/2.4.1/2.4.1-mount.patch
@@ -0,0 +1,29 @@
+
+ This patch causes the SD to try at least once to mount a Volume
+ that is not in an Autochanger before asking the operator to
+ intervene. Without it, the user must issue a mount command for
+ every File based volume that is needed.
+
+ Apply to 2.4.1 with the following:
+
+ cd <bacula-source>
+ patch -p0 <2.4.1-mount.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/stored/mount.c
+===================================================================
+--- src/stored/mount.c	(revision 7378)
++++ src/stored/mount.c	(working copy)
+@@ -142,7 +142,7 @@
+    } else {
+       autochanger = false;
+       VolCatInfo.Slot = 0;
+-      ask = true;
++      ask = retry >= 2;
+    }
+    Dmsg1(150, "autoload_dev returns %d\n", autochanger);
+    /*
diff --git a/app-backup/bacula/files/2.4.1/2.4.1-mysql-timeout.patch b/app-backup/bacula/files/2.4.1/2.4.1-mysql-timeout.patch
new file mode 100644
index 000000000000..2885e462d92e
--- /dev/null
+++ b/app-backup/bacula/files/2.4.1/2.4.1-mysql-timeout.patch
@@ -0,0 +1,27 @@
+ This patch fixes #1034 by setting big timeout on mysql connections
+
+ Apply this patch to version 2.4.1 with:
+
+ cd <bacula-source>
+ patch -p0 < patches/2.4.1-mysql-timeout.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/cats/mysql.c
+===================================================================
+--- src/cats/mysql.c    (révision 7401)
++++ src/cats/mysql.c    (copie de travail)
+@@ -205,6 +205,10 @@
+    Dmsg3(100, "opendb ref=%d connected=%d db=%p\n", mdb->ref_count,
+          mdb->connected, mdb->db);
+
++   /* Set connection timeout to 8 days specialy for batch mode */
++   sql_query(mdb, "SET wait_timeout=691200");
++   sql_query(mdb, "SET interactive_timeout=691200");
++
+    V(mutex);
+    return 1;
+ }
diff --git a/app-backup/bacula/files/2.4.1/2.4.1-sd-crash.patch b/app-backup/bacula/files/2.4.1/2.4.1-sd-crash.patch
new file mode 100644
index 000000000000..6ac2e4c95a48
--- /dev/null
+++ b/app-backup/bacula/files/2.4.1/2.4.1-sd-crash.patch
@@ -0,0 +1,30 @@
+
+ This patch removes an unfortunate piece of debug code that crept into
+ the 2.4.1 release and causes it to purposely, but incorrectly seg fault
+ whenever a volume name error occurs.  Typically this may happen if a
+ non-bacula tape is mounted at startup or at the end of volume during
+ restore.
+
+ Apply the patch with:
+
+ cd <bacula-source>
+ patch -p0 <2.4.1-sd-crash.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+
+Index: src/stored/acquire.c
+===================================================================
+--- src/stored/acquire.c	(revision 7405)
++++ src/stored/acquire.c	(working copy)
+@@ -266,7 +266,6 @@
+             dev->close();                                                          
+          }
+          dev->set_load();
+-         ASSERT(0);
+          /* Fall through */
+       default:
+          Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg);