incorporate upstream release patches

(Portage version: 2.1.5_rc4)

7 files changed, 673 insertions, 1 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index ec92de0e83a7..68580bb2abba 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,15 @@
 # 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.52 2008/03/22 18:05:17 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.53 2008/04/29 10:00:49 wschlich Exp $
+
+*bacula-2.2.8-r1 (29 Apr 2008)
+
+  29 Apr 2008; Wolfram Schlich <wschlich@gentoo.org>
+  +files/2.2.8/2.2.8-bacula-conf.patch, +files/2.2.8/2.2.8-jobmedia.patch,
+  +files/2.2.8/2.2.8-jobmedia-fix.patch,
+  +files/2.2.8/2.2.8-pool-source.patch, +files/2.2.8/2.2.8-strip-path.patch,
+  +bacula-2.2.8-r1.ebuild:
+  incorporate upstream release patches
 
   22 Mar 2008; Wolfram Schlich <wschlich@gentoo.org> bacula-2.2.8.ebuild:
   depend on latex2html emerged with USE=png (bug #200562)
diff --git a/app-backup/bacula/bacula-2.2.8-r1.ebuild b/app-backup/bacula/bacula-2.2.8-r1.ebuild
new file mode 100644
index 000000000000..e9188d24c938
--- /dev/null
+++ b/app-backup/bacula/bacula-2.2.8-r1.ebuild
@@ -0,0 +1,394 @@
+# 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.2.8-r1.ebuild,v 1.1 2008/04/29 10:00:49 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 bacula-web and/or bweb from bacula-gui package
+#
+
+inherit eutils
+
+IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd bacula-split-init doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwindows X"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+
+DOC_VER="${PV}"
+SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz
+		doc? ( mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="
+	>=sys-libs/zlib-1.1.4
+	dev-libs/gmp
+	!bacula-clientonly? (
+		postgres? ( >=dev-db/postgresql-7.4.0 )
+		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 patches from bacula-patches at
+	# http://sourceforge.net/project/showfiles.php?group_id=50727&package_id=93946
+	epatch "${FILESDIR}"/${PV}/${PV}-bacula-conf.patch
+	epatch "${FILESDIR}"/${PV}/${PV}-jobmedia.patch
+	epatch "${FILESDIR}"/${PV}/${PV}-jobmedia-fix.patch
+	epatch "${FILESDIR}"/${PV}/${PV}-pool-source.patch
+	epatch "${FILESDIR}"/${PV}/${PV}-strip-path.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 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"
+
+		# the main Makefile tries to build stuff in
+		# ./developer/ and ./bacula-web/, which is
+		# unfortunately broken in 2.0.3, so we only
+		# build stuff in ./manual/, which works.
+		pushd manual
+		emake -j1 || die "emake for bacula-docs failed"
+		popd
+
+		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
+
+	# documentation
+	for d in "${S}"/{ChangeLog,LICENSE,README,ReleaseNotes,SUPPORT,kernstodo,projects}; do
+		dodoc "${d}"
+	done
+	# TODO FIXME: developers and bacula-web documentation is broken with 2.0.3 :-(
+	if useq doc; then
+#!		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers.pdf
+		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula.pdf
+		diropts -m0755
+#!		dodir /usr/share/doc/"${PF}"/developers
+		dodir /usr/share/doc/"${PF}"/manual
+		insopts -m0644
+#!		insinto /usr/share/doc/"${PF}"/developers
+#!		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers/*
+		insinto /usr/share/doc/"${PF}"/manual
+		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula/*
+	fi
+
+	# setup init scripts
+	myservices="fd"
+	if ! useq bacula-clientonly; then
+		if ! useq bacula-nodir; then
+			myservices="${myservices} dir"
+		fi
+		if ! useq bacula-nosd; then
+			myservices="${myservices} sd"
+		fi
+	fi
+	if useq bacula-split-init; then
+		myscripts=""
+		for service in ${myservices}; do
+			myscripts="${myscripts} bacula-${service}"
+		done
+	else
+		myscripts="bacula-all"
+	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
+		cp "${FILESDIR}/${PV}/${script}"-init "${T}/${script}".init
+		# set database dependancy for the all-in-one and director init scripts
+		case "${mydbtype}" in
+			sqlite*)
+				# sqlite + sqlite3 databases don't have daemons
+				sed -i -e "s:%database%::" "${T}/${script}".init
+				;;
+			*)
+				# all other databases have daemons
+				sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".init
+				;;
+		esac
+		# set services for the all-in-one init script
+		sed -i -e "s:%services%:${myservices}:" "${T}/${script}".conf
+		# 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
+}
diff --git a/app-backup/bacula/files/2.2.8/2.2.8-bacula-conf.patch b/app-backup/bacula/files/2.2.8/2.2.8-bacula-conf.patch
new file mode 100644
index 000000000000..04387085433d
--- /dev/null
+++ b/app-backup/bacula/files/2.2.8/2.2.8-bacula-conf.patch
@@ -0,0 +1,32 @@
+
+ This patch automatically adds the Bacula database and user name to
+ the default make_catalog_backup Run script call line in the bacula-dir.conf
+ file.
+
+ Apply it to version 2.2.8 or earlier with:
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-bacula-conf.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/dird/bacula-dir.conf.in
+===================================================================
+--- src/dird/bacula-dir.conf.in	(revision 6327)
++++ src/dird/bacula-dir.conf.in	(working copy)
+@@ -61,7 +61,11 @@
+   FileSet="Catalog"
+   Schedule = "WeeklyCycleAfterBackup"
+   # This creates an ASCII copy of the catalog
+-  RunBeforeJob = "@scriptdir@/make_catalog_backup bacula bacula"
++  # WARNING!!! Passing the password via the command line is insecure.
++  # see comments in make_catalog_backup for details.
++  # Arguments to make_catalog_backup are:
++  #  make_catalog_backup <database-name> <user-name> <password> <host>
++  RunBeforeJob = "@scriptdir@/make_catalog_backup @db_name@ @db_user@"
+   # This deletes the copy of the catalog
+   RunAfterJob  = "@scriptdir@/delete_catalog_backup"
+   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
diff --git a/app-backup/bacula/files/2.2.8/2.2.8-jobmedia-fix.patch b/app-backup/bacula/files/2.2.8/2.2.8-jobmedia-fix.patch
new file mode 100644
index 000000000000..89807be4abe4
--- /dev/null
+++ b/app-backup/bacula/files/2.2.8/2.2.8-jobmedia-fix.patch
@@ -0,0 +1,40 @@
+
+ This patch fixes a bug that cause storage to create JOBMEDIA records 
+ for every block written to tape.
+
+ This Patch works with 2.2.8-jobmedia.patch
+
+ Apply this patch to Bacula 2.2.8 (and possibly any prior 2.2.x version) with:
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-jobmedia-fix.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/stored/block.c
+===================================================================
+--- src/stored/block.c  (revision 6531)
++++ src/stored/block.c  (working copy)
+@@ -374,7 +374,6 @@
+       if (dcr->NewVol) {
+          /* Note, setting a new volume also handles any pending new file */
+          set_new_volume_parameters(dcr);
+-         dcr->NewFile = false;        /* this handled for new file too */
+       } else {
+          set_new_file_parameters(dcr);
+       }
+Index: src/stored/device.c
+===================================================================
+--- src/stored/device.c (revision 6531)
++++ src/stored/device.c (working copy)
+@@ -226,6 +226,7 @@
+    }
+    set_new_file_parameters(dcr);
+    jcr->NumWriteVolumes++;
++   dcr->NewVol = false;
+ }
+
+ /*
diff --git a/app-backup/bacula/files/2.2.8/2.2.8-jobmedia.patch b/app-backup/bacula/files/2.2.8/2.2.8-jobmedia.patch
new file mode 100644
index 000000000000..b7bdb9be9013
--- /dev/null
+++ b/app-backup/bacula/files/2.2.8/2.2.8-jobmedia.patch
@@ -0,0 +1,111 @@
+
+ This patch fixes a migration bug that always has a zero index entry
+ (JobMedia record) as the first entry. This causes Bacula to search
+ for the first record during a restore rather than seek directly to
+ it.
+
+ You have to apply 2.2.8-jobmedia-fix.patch too.
+
+ Apply this patch to Bacula 2.2.8 (and possibly any prior 2.2.x version) with:
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-jobmedia.patch
+ patch -p0 <2.2.8-jobmedia-fix.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/stored/device.c
+===================================================================
+--- src/stored/device.c	(revision 6391)
++++ src/stored/device.c	(working copy)
+@@ -200,6 +200,19 @@
+    return ok;                               /* device locked */
+ }
+ 
++void set_start_vol_position(DCR *dcr)
++{
++   DEVICE *dev = dcr->dev;
++   /* Set new start position */
++   if (dev->is_tape()) {
++      dcr->StartBlock = dev->block_num;
++      dcr->StartFile = dev->file;
++   } else {
++      dcr->StartBlock = (uint32_t)dev->file_addr;
++      dcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
++   }
++}
++
+ /*
+  * We have a new Volume mounted, so reset the Volume parameters
+  *  concerning this job.  The global changes were made earlier
+@@ -208,24 +221,11 @@
+ void set_new_volume_parameters(DCR *dcr)
+ {
+    JCR *jcr = dcr->jcr;
+-   DEVICE *dev = dcr->dev;
+    if (dcr->NewVol && !dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) {
+       Jmsg1(jcr, M_ERROR, 0, "%s", jcr->errmsg);
+    }
+-   /* Set new start/end positions */
+-   if (dev->is_tape()) {
+-      dcr->StartBlock = dev->block_num;
+-      dcr->StartFile = dev->file;
+-   } else {
+-      dcr->StartBlock = (uint32_t)dev->file_addr;
+-      dcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
+-   }
+-   /* Reset indicies */
+-   dcr->VolFirstIndex = 0;
+-   dcr->VolLastIndex = 0;
++   set_new_file_parameters(dcr);
+    jcr->NumWriteVolumes++;
+-   dcr->NewVol = false;
+-   dcr->WroteVol = false;
+ }
+ 
+ /*
+@@ -235,16 +235,8 @@
+  */
+ void set_new_file_parameters(DCR *dcr)
+ {
+-   DEVICE *dev = dcr->dev;
++   set_start_vol_position(dcr);
+ 
+-   /* Set new start/end positions */
+-   if (dev->is_tape()) {
+-      dcr->StartBlock = dev->block_num;
+-      dcr->StartFile = dev->file;
+-   } else {
+-      dcr->StartBlock = (uint32_t)dev->file_addr;
+-      dcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
+-   }
+    /* Reset indicies */
+    dcr->VolFirstIndex = 0;
+    dcr->VolLastIndex = 0;
+Index: src/stored/mac.c
+===================================================================
+--- src/stored/mac.c	(revision 6391)
++++ src/stored/mac.c	(working copy)
+@@ -108,6 +108,7 @@
+ 
+    jcr->dcr->VolFirstIndex = jcr->dcr->VolLastIndex = 0;
+    jcr->run_time = time(NULL);
++   set_start_vol_position(jcr->dcr);
+ 
+    ok = read_records(jcr->read_dcr, record_cb, mount_next_read_volume);
+    goto ok_out;
+Index: src/stored/protos.h
+===================================================================
+--- src/stored/protos.h	(revision 6391)
++++ src/stored/protos.h	(working copy)
+@@ -126,6 +126,7 @@
+ bool     open_device(DCR *dcr);
+ bool     first_open_device(DCR *dcr);
+ bool     fixup_device_block_write_error(DCR *dcr);
++void     set_start_vol_position(DCR *dcr);
+ void     set_new_volume_parameters(DCR *dcr);
+ void     set_new_file_parameters(DCR *dcr);
+ bool     is_device_unmounted(DEVICE *dev);
diff --git a/app-backup/bacula/files/2.2.8/2.2.8-pool-source.patch b/app-backup/bacula/files/2.2.8/2.2.8-pool-source.patch
new file mode 100644
index 000000000000..347dcce12752
--- /dev/null
+++ b/app-backup/bacula/files/2.2.8/2.2.8-pool-source.patch
@@ -0,0 +1,29 @@
+
+ This patch fixes bug #1031 about wrong pool source information
+ in job report.
+
+ Apply the patch to 2.2.8 (and possibly any 2.2.x version with):
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-pool-source.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+
+Index: src/dird/ua_run.c
+===================================================================
+--- src/dird/ua_run.c	(révision 6388)
++++ src/dird/ua_run.c	(copie de travail)
+@@ -122,6 +122,9 @@
+    jcr->verify_job = rc.verify_job;
+    jcr->previous_job = rc.previous_job;
+    jcr->pool = rc.pool;
++   if (jcr->pool != jcr->job->pool) {
++      pm_strcpy(jcr->pool_source, _("User input"));
++   }
+    set_rwstorage(jcr, rc.store);
+    jcr->client = rc.client;
+    pm_strcpy(jcr->client_name, rc.client->name());
diff --git a/app-backup/bacula/files/2.2.8/2.2.8-strip-path.patch b/app-backup/bacula/files/2.2.8/2.2.8-strip-path.patch
new file mode 100644
index 000000000000..db75b85b698b
--- /dev/null
+++ b/app-backup/bacula/files/2.2.8/2.2.8-strip-path.patch
@@ -0,0 +1,57 @@
+
+ This patch should fix bug #1047 -- heap corruption when using
+ strippath on certain directories.
+
+ Apply it to 2.2.8 (probably prior versions) with:
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-strip-path.patch
+ ./configure <your-options>
+ make 
+ ...
+ make install
+
+
+Index: src/filed/backup.c
+===================================================================
+--- src/filed/backup.c	(revision 6390)
++++ src/filed/backup.c	(revision 6391)
+@@ -1146,20 +1146,21 @@
+    /* 
+     * Strip path.  If it doesn't succeed put it back.  If
+     *  it does, and there is a different link string,
+-    *  attempt to strip the link. If it fails, but them
++    *  attempt to strip the link. If it fails, back them
+     *  both back.
++    * Don't strip symlinks.
+     * I.e. if either stripping fails don't strip anything.
+     */
+    if (do_strip(ff_pkt->strip_path, ff_pkt->fname)) {
+-      if (ff_pkt->fname != ff_pkt->link) {
++      if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) {
+          pm_strcpy(ff_pkt->link_save, ff_pkt->link);
+          if (!do_strip(ff_pkt->strip_path, ff_pkt->link)) {
+-            strcpy(ff_pkt->link, ff_pkt->link_save);
+-            strcpy(ff_pkt->fname, ff_pkt->fname_save);
++            pm_strcpy(ff_pkt->link, ff_pkt->link_save);
++            pm_strcpy(ff_pkt->fname, ff_pkt->fname_save);
+          }
+       }
+    } else {
+-      strcpy(ff_pkt->fname, ff_pkt->fname_save);
++      pm_strcpy(ff_pkt->fname, ff_pkt->fname_save);
+    } 
+    Dmsg2(200, "fname=%s stripped=%s\n", ff_pkt->fname_save, ff_pkt->fname);
+ }
+@@ -1169,8 +1170,8 @@
+    if (!(ff_pkt->flags & FO_STRIPPATH) || ff_pkt->strip_path <= 0) {
+       return;
+    }
+-   strcpy(ff_pkt->fname, ff_pkt->fname_save);
+-   if (ff_pkt->fname != ff_pkt->link) {
+-      strcpy(ff_pkt->link, ff_pkt->link_save);
++   pm_strcpy(ff_pkt->fname, ff_pkt->fname_save);
++   if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) {
++      pm_strcpy(ff_pkt->link, ff_pkt->link_save);
+    }
+ }