randpass insecure file creation - bug #104986. Old version cleanout.

(Portage version: 2.0.53_rc3)

19 files changed, 64 insertions, 1387 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index fd21c9004f90..b1b2c3fa26aa 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-backup/bacula
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.2 2005/07/04 07:20:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.3 2005/10/06 21:10:25 dragonheart Exp $
+
+*bacula-1.36.3-r2 (06 Oct 2005)
+
+  06 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/bacula-1.36.2-cdrecord-configure.patch,
+  -files/bacula-1.36.2-nocdrecord.patch,
+  -files/bacula-1.36.3-init-depends.patch,
+  -files/bacula-1.36.3-rescue-makefile.patch, +files/randpass-1.37.40,
+  -files/bacula-3.6.0-configure.diff, -files/bacula-init2,
+  -bacula-1.34.5.ebuild, -bacula-1.34.6.ebuild, -bacula-1.36.0.ebuild,
+  -bacula-1.36.3.ebuild, -bacula-1.36.3-r1.ebuild, +bacula-1.36.3-r2.ebuild:
+  randpass insecure file creation - bug #104986. Old version cleanout. Thanks
+  to Romang <zataz@zataz.net> for the bug report
 
   04 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
   +files/bacula-1.36.2-cdrecord-configure.patch,
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index e3e4c4e7ed74..e8e11e5cea44 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,34 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6e312fa1d1b9e59021235e7228de872f ChangeLog 8377
+MD5 8b1f7976358c3e115aa2bc37370d7d3c ChangeLog 9002
 MD5 9f1f576d172e849915f36c885efce3c3 bacula-1.34.4.ebuild 4245
-MD5 116d0950d857298fbda9f27717efec21 bacula-1.34.5.ebuild 4434
-MD5 18f9996c9629c9a5a8676ba61140bf3b bacula-1.34.6.ebuild 4434
-MD5 2d88576df5f0c3b9bed189529793d5f8 bacula-1.36.0.ebuild 9229
-MD5 c7e3e0ace7e4b531adfbb7afdd2ef757 bacula-1.36.3-r1.ebuild 5412
-MD5 f030f60784c96b85d809c8949f9a3532 bacula-1.36.3.ebuild 10126
-MD5 28a23cdcf8c8723f3f8cb0b87d110864 files/bacula-1.36.2-cdrecord-configure.patch 635
-MD5 43cfaaf0d0cd0cf963f005a524edddfa files/bacula-1.36.2-nocdrecord.patch 8874
+MD5 c368c93b8c90e76ffe9e96ddd3eb5a60 bacula-1.36.3-r2.ebuild 5499
 MD5 42374b055f69dd5eb5eebe2b17542c03 files/bacula-1.36.3-cdrecord-configure.patch 616
-MD5 8ff342665d696d0719491c33d744f294 files/bacula-1.36.3-init-depends.patch 1864
-MD5 618c837ccb4512095e8e3e274db54ce5 files/bacula-1.36.3-rescue-makefile.patch 1275
-MD5 2552434ccc44047b9b503045a9cff932 files/bacula-3.6.0-configure.diff 7578
 MD5 c8ead9a2d0974cccce147e7c1780dc60 files/bacula-conf 562
 MD5 4afbdd1c49e65b66baf46a935480a186 files/bacula-init 1916
-MD5 adaa5c336e2f7b57a17ad2a522fb9d2e files/bacula-init2 2575
 MD5 03ffd8d0949fd8fd22690ecfbadce1df files/bacula-init3 1479
 MD5 0b9309406bd6631e14ba47c132ef3b33 files/digest-bacula-1.34.4 66
-MD5 8e55a5f04a3cd9e096e9a5dfb46f1de7 files/digest-bacula-1.34.5 66
-MD5 551003183e612a958cc974532d004224 files/digest-bacula-1.34.6 66
-MD5 aad89729d5313c52d3b3b0b9246f8f47 files/digest-bacula-1.36.0 66
-MD5 100b7479b58ce6c2f62473914b12c02d files/digest-bacula-1.36.3 67
-MD5 100b7479b58ce6c2f62473914b12c02d files/digest-bacula-1.36.3-r1 67
+MD5 100b7479b58ce6c2f62473914b12c02d files/digest-bacula-1.36.3-r2 67
+MD5 48a955f044c868aefad5bf4ff3991deb files/randpass-1.37.40 682
 MD5 7ab3ac8b0c5f4bcb03495c99dcbec0b0 metadata.xml 290
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzIY7I1lqEGTUzyQRAkMzAKConRMnub0/QBTrLV9gxnwRSyJl6QCeKgpD
-4niN43LrpTsq3Zf4laP3o7A=
-=eK6Q
------END PGP SIGNATURE-----
diff --git a/app-backup/bacula/bacula-1.34.5.ebuild b/app-backup/bacula/bacula-1.34.5.ebuild
deleted file mode 100644
index 852228e32045..000000000000
--- a/app-backup/bacula/bacula-1.34.5.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.34.5.ebuild,v 1.1 2005/07/04 01:52:06 robbat2 Exp $
-
-DESCRIPTION="featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~hppa ~ppc ~sparc ~x86"
-IUSE="readline tcpd gnome mysql sqlite X static postgres wxwindows"
-
-#theres a local sqlite use flag. use it -OR- mysql, not both.
-#mysql is the reccomended choice ...
-DEPEND=">=sys-libs/zlib-1.1.4
-	readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	gnome? ( gnome-base/gnome-libs )
-	sqlite? ( =dev-db/sqlite-2* )
-	mysql? ( >=dev-db/mysql-3.23 )
-	postgres? ( >=dev-db/postgresql-7.4.0 )
-	X? ( virtual/x11 )
-	wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-	virtual/mta
-	dev-libs/gmp"
-RDEPEND="${DEPEND}
-	sys-block/mtx
-	app-arch/mt-st"
-
-src_compile() {
-	local myconf=""
-
-	sed -i -e "s:$bindir/mysql:$bindir/mysql -p:g" grant_mysql_privileges.in
-
-	#define this to skip building the other daemons ...
-	[ -n "$BUILD_CLIENT_ONLY" ] \
-		&& myconf="${myconf} --enable-client-only"
-
-	myconf="
-		`use_enable readline`
-		`use_enable gnome`
-		`use_enable tcpd tcp-wrappers`
-		`use_enable X x`"
-
-	[ -n "$BUILD_CLIENT_ONLY" ] \
-		 && myconf="${myconf} --enable-client-only"
-
-	# mysql is the reccomended choice ...
-	if use mysql
-	then
-		myconf="${myconf} --with-mysql=/usr"
-	elif use postgres
-	then
-		myconf="${myconf} --with-postgresql=/usr"
-	elif use sqlite
-	then
-		myconf="${myconf} --with-sqlite=/usr"
-	elif  use sqlite && use mysql
-	then
-		myconf="${myconf/--with-sqlite/}"
-	fi
-
-	if use wxwindows
-	then
-	   myconf="${myconf} --enable-wx-console"
-	 fi
-
-
-	./configure \
-		--enable-smartalloc \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--with-subsys-dir=/var/lib/bacula \
-		--with-working-dir=/var/lib/bacula \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-
-	if use static
-	then
-		cd ${S}/src/filed
-		make static-baula-fd
-		cd ${S}/src/console
-		make static-console
-		cd ${S}/src/dird
-		make static-bacula-dir
-		if use gnome
-		then
-		  cd ${S}/src/gnome-console
-		  make static-gnome-console
-		fi
-		if use wxwindows
-		then
-		  cd ${S}/src/wx-console
-		  make static-wx-console
-		fi
-		cd ${S}/src/stored
-		make static-bacula-sd
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	if use static
-	then
-		cd ${S}/src/filed
-		cp static-bacula-fd ${D}/usr/sbin/bacula-fd
-		cd ${S}/src/console
-		cp static-console ${D}/usr/sbin/console
-		cd ${S}/src/dird
-		cp static-bacula-dir ${D}/usr/sbin/bacula-dir
-		if use gnome
-		then
-			cd ${S}/src/gnome-console
-			cp static-gnome-console ${D}/usr/sbin/gnome-console
-		fi
-		if use wxwindows
-		then
-			cd ${S}/src/wx-console
-			cp static-wx-console ${D}/usr/sbin/wx-console
-		fi
-		cd ${S}/src/storge
-		cp static-bacula-sd ${D}/usr/sbin/bacula-sd
-	fi
-
-	rm -rf ${D}/var #empty dir
-
-	for a in ${S}/{Changelog,CheckList,INSTALL \
-			README,ReleaseNotes,kernstodo,doc/bacula.pdf}
-	do
-		dodoc $a
-	done
-
-	cp -a ${S}/examples ${D}/usr/share/doc/${PF}
-	chown -R root:root ${D}/usr/share/doc/${PF} #hrmph :\
-	dohtml -r ${S}/doc/html-manual doc/home-page
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bacula-init bacula
-}
-
-pkg_postinst() {
-	# empty dir ...
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/bacula
-	einfo
-	einfo "Please note either/or nature of database USE flags for"
-	einfo "Bacula.  If mysql is set, it will be used, else postgresql"
-	einfo "else finally SQLite.  If you wish to have multiple DBs on"
-	einfo "one system, you may wish to unset auxillary DBs for this"
-	einfo "build."
-	einfo
-	einfo "If this is a new install and you plan to use mysql for your"
-	einfo "catalog database, then you should now create it by doing"
-	einfo "these commands:"
-	einfo " sh /etc/bacula/grant_mysql_privileges"
-	einfo " sh /etc/bacula/create_mysql_database"
-	einfo " sh /etc/bacula/make_mysql_tables"
-	einfo
-	einfo "Then setup your configuration files in /etc/bacula and"
-	einfo "start the daemons:"
-	einfo " /etc/init.d/bacula start"
-	einfo
-	einfo "If upgrading from version 1.30 or below, please note that"
-	einfo "the database format has changed.  Please read the"
-	einfo "release notes for how to upgrade your database!!!"
-	einfo
-}
diff --git a/app-backup/bacula/bacula-1.34.6.ebuild b/app-backup/bacula/bacula-1.34.6.ebuild
deleted file mode 100644
index d8c3c2c67c53..000000000000
--- a/app-backup/bacula/bacula-1.34.6.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.34.6.ebuild,v 1.1 2005/07/04 01:52:06 robbat2 Exp $
-
-DESCRIPTION="featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~hppa ~ppc ~sparc ~x86"
-IUSE="readline tcpd gnome mysql sqlite X static postgres wxwindows"
-
-#theres a local sqlite use flag. use it -OR- mysql, not both.
-#mysql is the reccomended choice ...
-DEPEND=">=sys-libs/zlib-1.1.4
-	readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	gnome? ( gnome-base/gnome-libs )
-	sqlite? ( =dev-db/sqlite-2* )
-	mysql? ( >=dev-db/mysql-3.23 )
-	postgres? ( >=dev-db/postgresql-7.4.0 )
-	X? ( virtual/x11 )
-	wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-	virtual/mta
-	dev-libs/gmp"
-RDEPEND="${DEPEND}
-	sys-block/mtx
-	app-arch/mt-st"
-
-src_compile() {
-	local myconf=""
-
-	sed -i -e "s:$bindir/mysql:$bindir/mysql -p:g" grant_mysql_privileges.in
-
-	#define this to skip building the other daemons ...
-	[ -n "$BUILD_CLIENT_ONLY" ] \
-		&& myconf="${myconf} --enable-client-only"
-
-	myconf="
-		`use_enable readline`
-		`use_enable gnome`
-		`use_enable tcpd tcp-wrappers`
-		`use_enable X x`"
-
-	[ -n "$BUILD_CLIENT_ONLY" ] \
-		 && myconf="${myconf} --enable-client-only"
-
-	# mysql is the reccomended choice ...
-	if use mysql
-	then
-		myconf="${myconf} --with-mysql=/usr"
-	elif use postgres
-	then
-		myconf="${myconf} --with-postgresql=/usr"
-	elif use sqlite
-	then
-		myconf="${myconf} --with-sqlite=/usr"
-	elif  use sqlite && use mysql
-	then
-		myconf="${myconf/--with-sqlite/}"
-	fi
-
-	if use wxwindows
-	then
-	   myconf="${myconf} --enable-wx-console"
-	 fi
-
-
-	./configure \
-		--enable-smartalloc \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--with-subsys-dir=/var/lib/bacula \
-		--with-working-dir=/var/lib/bacula \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-
-	if use static
-	then
-		cd ${S}/src/filed
-		make static-baula-fd
-		cd ${S}/src/console
-		make static-console
-		cd ${S}/src/dird
-		make static-bacula-dir
-		if use gnome
-		then
-		  cd ${S}/src/gnome-console
-		  make static-gnome-console
-		fi
-		if use wxwindows
-		then
-		  cd ${S}/src/wx-console
-		  make static-wx-console
-		fi
-		cd ${S}/src/stored
-		make static-bacula-sd
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	if use static
-	then
-		cd ${S}/src/filed
-		cp static-bacula-fd ${D}/usr/sbin/bacula-fd
-		cd ${S}/src/console
-		cp static-console ${D}/usr/sbin/console
-		cd ${S}/src/dird
-		cp static-bacula-dir ${D}/usr/sbin/bacula-dir
-		if use gnome
-		then
-			cd ${S}/src/gnome-console
-			cp static-gnome-console ${D}/usr/sbin/gnome-console
-		fi
-		if use wxwindows
-		then
-			cd ${S}/src/wx-console
-			cp static-wx-console ${D}/usr/sbin/wx-console
-		fi
-		cd ${S}/src/storge
-		cp static-bacula-sd ${D}/usr/sbin/bacula-sd
-	fi
-
-	rm -rf ${D}/var #empty dir
-
-	for a in ${S}/{Changelog,CheckList,INSTALL \
-			README,ReleaseNotes,kernstodo,doc/bacula.pdf}
-	do
-		dodoc $a
-	done
-
-	cp -a ${S}/examples ${D}/usr/share/doc/${PF}
-	chown -R root:root ${D}/usr/share/doc/${PF} #hrmph :\
-	dohtml -r ${S}/doc/html-manual doc/home-page
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bacula-init bacula
-}
-
-pkg_postinst() {
-	# empty dir ...
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/bacula
-	einfo
-	einfo "Please note either/or nature of database USE flags for"
-	einfo "Bacula.  If mysql is set, it will be used, else postgresql"
-	einfo "else finally SQLite.  If you wish to have multiple DBs on"
-	einfo "one system, you may wish to unset auxillary DBs for this"
-	einfo "build."
-	einfo
-	einfo "If this is a new install and you plan to use mysql for your"
-	einfo "catalog database, then you should now create it by doing"
-	einfo "these commands:"
-	einfo " sh /etc/bacula/grant_mysql_privileges"
-	einfo " sh /etc/bacula/create_mysql_database"
-	einfo " sh /etc/bacula/make_mysql_tables"
-	einfo
-	einfo "Then setup your configuration files in /etc/bacula and"
-	einfo "start the daemons:"
-	einfo " /etc/init.d/bacula start"
-	einfo
-	einfo "If upgrading from version 1.30 or below, please note that"
-	einfo "the database format has changed.  Please read the"
-	einfo "release notes for how to upgrade your database!!!"
-	einfo
-}
diff --git a/app-backup/bacula/bacula-1.36.0.ebuild b/app-backup/bacula/bacula-1.36.0.ebuild
deleted file mode 100644
index 354702aa6a72..000000000000
--- a/app-backup/bacula/bacula-1.36.0.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.36.0.ebuild,v 1.3 2005/07/07 01:32:26 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~hppa ~ppc ~sparc ~x86"
-IUSE="X gnome mysql postgres readline sqlite static tcpd wxwindows"
-
-#theres a local sqlite use flag. use it -OR- mysql, not both.
-#mysql is the reccomended choice ...
-#may need sys-libs/libtermcap-compat but try without first
-DEPEND=">=sys-libs/zlib-1.1.4
-	sys-block/mtx
-	readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	gnome? ( gnome-base/libgnome )
-	gnome? ( app-admin/gnomesu )
-	sqlite? ( =dev-db/sqlite-2* )
-	mysql? ( >=dev-db/mysql-3.23 )
-	postgres? ( >=dev-db/postgresql-7.4.0 )
-	X? ( virtual/x11 )
-	wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-	virtual/mta
-	dev-libs/gmp"
-RDEPEND="${DEPEND}
-	sys-block/mtx
-	app-arch/mt-st"
-
-src_compile() {
-
-	# patch configure for scripts/bacula-tray-monitor.desktop
-	patch ${S}/configure ${FILESDIR}/${P}-configure.diff
-
-	local myconf=""
-
-	#sed -i -e "s:$bindir/mysql:$bindir/mysql -p:g" grant_mysql_privileges.in
-
-	#define this to skip building the other daemons ...
-	[ -n "$BUILD_CLIENT_ONLY" ] \
-		&& myconf="${myconf} --enable-client-only"
-
-	myconf="
-		`use_enable readline`
-		`use_enable gnome`
-		`use_enable tcpd tcp-wrappers`
-		`use_enable X x`"
-
-	[ -n "$BUILD_CLIENT_ONLY" ] \
-		 && myconf="${myconf} --enable-client-only"
-
-	# mysql is the reccomended choice ...
-	if use mysql
-	then
-		myconf="${myconf} --with-mysql=/usr"
-	elif use postgres
-	then
-		myconf="${myconf} --with-postgresql=/usr"
-	elif use sqlite
-	then
-		myconf="${myconf} --with-sqlite=/usr"
-	elif  use sqlite && use mysql
-	then
-		myconf="${myconf/--with-sqlite/}"
-	fi
-
-	if use wxwindows
-	then
-	   myconf="${myconf} --enable-wx-console"
-	fi
-
-	if use readline
-	then
-	   myconf="${myconf} --enable-readline"
-	fi
-
-	if use gnome
-	then
-	myconf="${myconf} --enable-tray-monitor"
-	fi
-
-
-	./configure \
-		--enable-smartalloc \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/bacula \
-		--with-scriptdir=/etc/bacula \
-		--with-dir-user=root \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-
-	if use static
-	then
-		cd ${S}/src/filed
-		make static-baula-fd
-		cd ${S}/src/console
-		make static-console
-		cd ${S}/src/dird
-		make static-bacula-dir
-		if use gnome
-		then
-		  cd ${S}/src/gnome-console
-		  make static-gnome-console
-		fi
-		if use wxwindows
-		then
-		  cd ${S}/src/wx-console
-		  make static-wx-console
-		fi
-		cd ${S}/src/stored
-		make static-bacula-sd
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	if use static
-	then
-		cd ${S}/src/filed
-		cp static-bacula-fd ${D}/usr/sbin/bacula-fd
-		cd ${S}/src/console
-		cp static-console ${D}/usr/sbin/console
-		cd ${S}/src/dird
-		cp static-bacula-dir ${D}/usr/sbin/bacula-dir
-		if use gnome
-		then
-			cd ${S}/src/gnome-console
-			cp static-gnome-console ${D}/usr/sbin/gnome-console
-		fi
-		if use wxwindows
-		then
-			cd ${S}/src/wx-console
-			cp static-wx-console ${D}/usr/sbin/wx-console
-		fi
-		cd ${S}/src/storge
-		cp static-bacula-sd ${D}/usr/sbin/bacula-sd
-	fi
-
-	# the menu stuff
-	if use gnome
-	then
-	mkdir -p ${D}/usr/share/pixmaps
-	mkdir -p ${D}/usr/share/applications
-	cp ${S}/scripts/bacula.png ${D}/usr/share/pixmaps/bacula.png
-	cp ${S}/scripts/bacula.desktop.gnome2.xsu ${D}/usr/share/applications/bacula.desktop
-	cp ${S}/src/tray-monitor/generic.xpm ${D}/usr/share/pixmaps/bacula-tray-monitor.xpm
-	cp ${S}/scripts/bacula-tray-monitor.desktop \
-		${D}/usr/share/applications/bacula-tray-monitor.desktop
-	chmod 755 ${D}/usr/sbin/bacula-tray-monitor
-	chmod 644 ${D}/etc/bacula/tray-monitor.conf
-	fi
-
-	# the database update scripts
-	mkdir -p ${D}/etc/bacula/updatedb
-	cp ${S}/updatedb/* ${D}/etc/bacula/updatedb/
-	chmod 754 ${D}/etc/bacula/updatedb/*
-
-	# documentation
-	for a in ${S}/{Changelog,README,ReleaseNotes,kernstodo,LICENSE,doc/bacula.pdf}
-	do
-		dodoc $a
-	done
-
-	dohtml -r ${S}/doc/html-manual doc/home-page
-	chown -R root:root ${D}/usr/share/doc/${PF}
-	chmod -R 644 ${D}/usr/share/doc/${PF}/*
-
-	# clean up permissions left broken by install
-	chmod o-r ${D}/etc/bacula/query.sql
-
-	# remove the working dir so we can add it postinst with group
-	rmdir ${D}/var/bacula
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bacula-init2 bacula
-}
-
-pkg_postinst() {
-	# create the daemon group
-	HAVE_BACULA=`cat /etc/group | grep bacula 2>/dev/null`
-	if [ -z $HAVE_BACULA ]; then
-	enewgroup bacula
-	einfo
-	einfo "The group bacula has been created. Any users you add to"
-	einfo "this group have access to files created by the daemons."
-	fi
-
-	# the working directory
-	install -m0750 -o root -g bacula -d ${ROOT}/var/bacula
-
-	einfo
-	einfo "Please note either/or nature of database USE flags for"
-	einfo "Bacula.  If mysql is set, it will be used, else postgresql"
-	einfo "else finally SQLite.  If you wish to have multiple DBs on"
-	einfo "one system, you may wish to unset auxillary DBs for this"
-	einfo "build."
-	einfo
-
-	if use mysql
-	then
-	# test for an existing database
-	# note: this ASSUMES no password has been set for bacula database
-	DB_VER=`mysql bacula -e 'select * from Version;'|tail -n 1 2>/dev/null`
-		if [ -z "$DB_VER" ]; then
-		einfo "This appears to be a new install and you plan to use mysql"
-		einfo "for your catalog database. You should now create it by doing"
-		einfo "these commands:"
-		einfo " sh /etc/bacula/grant_mysql_privileges"
-		einfo " sh /etc/bacula/create_mysql_database"
-		einfo " sh /etc/bacula/make_mysql_tables"
-		elif [ "$DB_VER" -lt "8" ]; then
-		elinfo "This release requires an upgrade to your bacula database"
-		einfo "as the database format has changed.  Please read the"
-		einfo "manual chapter for how to upgrade your database!!!"
-		einfo
-		einfo "Backup your database with the command:"
-		einfo " mysqldump -f --opt bacula | bzip2 > /var/bacula/bacula_backup.sql.bz"
-		einfo
-		einfo "Then update your database using the scripts found in"
-		einfo "/etc/bacula/updatedb/ from your current version $DB_VER to"
-		einfo "version 8. Note that scripts must be run in order from your"
-		einfo "version to the current version."
-		fi
-	fi
-
-	if use postgres
-	then
-	# test for an existing database
-	# note: this ASSUMES no password has been set for bacula database
-	DB_VER=`echo 'select * from Version;' | psql bacula | tail -3 | head -1 2>/dev/null`
-		if [ -z "$DB_VER" ]; then
-		einfo "This appears to be a new install and you plan to use postgresql"
-		einfo "for your catalog database. You should now create it by doing"
-		einfo "these commands:"
-		einfo " sh /etc/bacula/grant_postgresql_privileges"
-		einfo " sh /etc/bacula/create_postgresql_database"
-		einfo " sh /etc/bacula/make_postgresql_tables"
-		elif [ "$DB_VER" -lt "8" ]; then
-		elinfo "This release requires an upgrade to your bacula database"
-		einfo "as the database format has changed.  Please read the"
-		einfo "manual chapter for how to upgrade your database!!!"
-		einfo
-		einfo "Backup your database with the command:"
-		einfo " pg_dump bacula | bzip2 > /var/bacula/bacula_backup.sql.bz2"
-		einfo
-		einfo "Then update your database using the scripts found in"
-		einfo "/etc/bacula/updatedb/ from your current version $DB_VER to"
-		einfo "version 8. Note that scripts must be run in order from your"
-		einfo "version to the current version."
-		fi
-	fi
-
-	if use sqlite
-	then
-	# test for an existing database
-	# note: this ASSUMES no password has been set for bacula database
-	DB_VER=`echo "select * from Version;" | sqlite /var/bacula/bacula.db | tail -n 1 2>/dev/null`
-		if [ -z "$DB_VER" ]; then
-		einfo "This appears to be a new install and you plan to use sqlite"
-		einfo "for your catalog database. You should now create it by doing"
-		einfo "these commands:"
-		einfo " sh /etc/bacula/grant_sqlite_privileges"
-		einfo " sh /etc/bacula/create_sqlite_database"
-		einfo " sh /etc/bacula/make_sqlite_tables"
-		elif [ "$DB_VER" -lt "8" ]; then
-		elinfo "This release requires an upgrade to your bacula database"
-		einfo "as the database format has changed.  Please read the"
-		einfo "manual chapter for how to upgrade your database!!!"
-		einfo
-		einfo "Backup your database with the command:"
-		einfo " echo .dump | sqlite /var/bacula/bacula.db | bzip2 > \\"
-		einfo "   /var/bacula/bacula_backup.sql.bz2"
-		einfo
-		einfo "Then update your database using the scripts found in"
-		einfo "/etc/bacula/updatedb/ from your current version $DB_VER to"
-		einfo "version 8. Note that scripts must be run in order from your"
-		einfo "version to the current version."
-		fi
-	fi
-
-	einfo
-	einfo "Then setup your configuration files in /etc/bacula and"
-	einfo "start the daemons:"
-	einfo " /etc/init.d/bacula start"
-	einfo
-	einfo "You may also wish to:"
-	einfo " rc-update add bacula default"
-	einfo
-}
diff --git a/app-backup/bacula/bacula-1.36.3-r1.ebuild b/app-backup/bacula/bacula-1.36.3-r2.ebuild
index 851f31094be5..eafc82fc21a1 100644
--- a/app-backup/bacula/bacula-1.36.3-r1.ebuild
+++ b/app-backup/bacula/bacula-1.36.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.36.3-r1.ebuild,v 1.1 2005/07/04 01:52:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.36.3-r2.ebuild,v 1.1 2005/10/06 21:10:25 dragonheart Exp $
 
 inherit eutils
 
@@ -53,6 +53,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-cdrecord-configure.patch || die "Patch failed"
+	cp ${FILESDIR}/randpass-1.37.40 ${S}/autoconf/randpass
 
 	# This changes the default conf files to /etc/bacula files
 	sed -i -e 's:"./gnome-console.conf":"/etc/bacula/gnome-console.conf":' \
@@ -68,6 +69,7 @@ src_unpack() {
 }
 
 src_compile() {
+	echo $TMPDIR
 	econf --enable-smartalloc \
 		--with-dir-user=root \
 		--with-dir-group=bacula \
@@ -79,22 +81,22 @@ src_compile() {
 		--with-subsys-dir=/var/lock/subsys \
 		--with-working-dir=/var/bacula \
 		--with-scriptdir=/var/lib/bacula \
-		`use_enable readline` \
-		`use_enable gnome` \
-		`use_enable static static-tools` \
-		`use_enable static static-fd` \
-		`use_enable static static-sd` \
-		`use_enable static static-dir` \
-		`use_enable static static-cons` \
-		`use_enable gnome tray-monitor` \
-		`use_enable tcpd tcp-wrappers` \
-		`use_enable X x` \
-		`use_enable readline` \
-		`use_enable client-only` \
-		`use_with mysql` \
-		`use_with postgres postgresql` \
-		`use_with sqlite` \
-		`use_enable ncurses conio` \
+		$(use_enable readline) \
+		$(use_enable gnome) \
+		$(use_enable static static-tools) \
+		$(use_enable static static-fd) \
+		$(use_enable static static-sd) \
+		$(use_enable static static-dir) \
+		$(use_enable static static-cons) \
+		$(use_enable gnome tray-monitor) \
+		$(use_enable tcpd tcp-wrappers) \
+		$(use_enable X x) \
+		$(use_enable readline) \
+		$(use_enable client-only) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with sqlite) \
+		$(use_enable ncurses conio) \
 		|| die "configure failed"
 
 	emake || die "make failed"
@@ -181,4 +183,4 @@ pkg_postinst() {
 		einfo "You can find database upgrade scripts on /var/lib/bacula."
 		einfo
 	fi
-}
\ No newline at end of file
+}
diff --git a/app-backup/bacula/bacula-1.36.3.ebuild b/app-backup/bacula/bacula-1.36.3.ebuild
deleted file mode 100644
index 8086a730393e..000000000000
--- a/app-backup/bacula/bacula-1.36.3.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-1.36.3.ebuild,v 1.1 2005/07/04 01:52:06 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
-IUSE="bacula-clientonly bacula-console bacula-split doc gnome logrotate logwatch mysql postgres readline sqlite static tcpd wxwindows X"
-
-#theres a local sqlite use flag. use it -OR- mysql, not both.
-#mysql is the reccomended choice ...
-#may need sys-libs/libtermcap-compat but try without first
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		mysql? ( >=dev-db/mysql-3.23 )
-		postgres? ( >=dev-db/postgresql-7.4.0 )
-		sqlite? ( =dev-db/sqlite-2* )
-		!mysql? ( !postgres? ( !sqlite? ( >=dev-db/mysql-3.23 ) ) )
-		virtual/mta
-	)
-	bacula-console? (
-		X? ( virtual/x11 )
-		wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-		gnome? ( gnome-base/libgnome )
-		gnome? ( app-admin/gnomesu )
-	)
-	doc? (
-		app-text/tetex
-		dev-tex/latex2html
-	)
-	logrotate? ( app-admin/logrotate )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		sys-block/mtx
-		app-arch/mt-st
-	)"
-
-pkg_setup() {
-	if ( use mysql || use postgres ) && [ -z ${BACULA_DB_USER} ] && [ -z ${BACULA_DB_PASSWORD} ] && [ -z ${BACULA_DB_HOST} ]; then
-		# Display warning about DB query environment variables
-		einfo
-		einfo "If you are upgrading or rebuilding your bacula installation and"
-		einfo "your database requires you to specify user, password, or host"
-		einfo "you may do so with the environment variables BACULA_DB_USER,"
-		einfo "BACULA_DB_PASSWORD, and BACULA_DB_HOST respectively."
-		einfo
-		einfo "For example:"
-		einfo "# export BACULA_DB_USER=\"bacula\""
-		einfo "# export BACULA_DB_PASSWORD=\"mydbpassword\""
-		einfo "# export BACULA_DB_HOST=\"mydbhost.mydomain.net\""
-		einfo "# emerge bacula"
-		einfo
-		einfo "If you require these variables and have not set them yet, you"
-		einfo "may wish to abort now and do so.  If this is a new installation"
-		einfo "of bacula, this should not affect you."
-		einfo
-
-		ebeep 3
-		ewarn "Press Ctrl-C to abort.  Merge will resume in 10 seconds."
-		epause 10
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	# this resolves bacula bug #181
-	epatch ${FILESDIR}/${PN}-1.36.2-cdrecord-configure.patch
-	# fixes lack of depend() in split init scripts
-	epatch ${FILESDIR}/${PN}-1.36.3-init-depends.patch
-	# adds build/install capability to ${S}/rescue/linux/Makefile.in
-	epatch ${FILESDIR}/${PN}-1.36.3-rescue-makefile.patch
-	cd ${S}
-}
-
-src_compile() {
-	local myconf=""
-	if use bacula-clientonly ; then
-		myconf="${myconf}
-			`use_enable bacula-clientonly client-only`
-			`use_enable static static-fd`"
-	fi
-	if use bacula-console ; then
-		myconf="${myconf}
-			`use_enable X x`
-			`use_enable gnome tray-monitor`
-			`use_enable wxwindows wx-console`
-			`use_enable static static-cons`"
-	fi
-	myconf="${myconf}
-		`use_enable readline`
-		`use_enable tcpd tcp-wrappers`"
-
-	# select database support
-	if ! use bacula-clientonly; then
-		if ! use mysql && ! use postgres && ! use sqlite ; then
-			ewarn "No database enabled in USE."
-			ewarn "Using mysql database support by default."
-			myconf="${myconf}
-				`use_with mysql`"
-		elif use mysql ; then
-			if use postgres ; then
-				ewarn "Multiple databases enabled in USE."
-				ewarn "Using mysql database support by default."
-			elif use sqlite ; then
-				ewarn "Multiple databases enabled in USE."
-				ewarn "Using mysql database support by default."
-			fi
-			myconf="${myconf}
-				`use_with mysql`"
-		elif use postgres ; then
-			if use sqlite ; then
-				ewarn "Multiple databases enabled in USE."
-				ewarn "Using postgresql database support by default."
-			fi
-			myconf="${myconf}
-				`use_with postgres postgresql`"
-		else
-			myconf="${myconf}
-				`use_with sqlite`"
-		fi
-	fi
-	if ! use bacula-clientonly; then
-		if use static ; then
-			myconf="${myconf}
-				`use_enable static static-tools`
-				`use_enable static static-fd`
-				`use_enable static static-sd`
-				`use_enable static static-dir`"
-		fi
-	fi
-
-	./configure \
-		--prefix=/usr \
-		--enable-smartalloc \
-		--mandir=/usr/share/man \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--infodir=/usr/share/info \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/bacula \
-		--with-scriptdir=/etc/bacula \
-		--with-dir-user=root \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--host=${CHOST} ${myconf} || die "Configure failed!"
-
-	emake || die "Failed primary build!"
-
-	if use doc ; then
-		# make the docs
-		cd ${S}/doc/latex && emake || die "Failed to build tetx docs!" && cd ${S}
-	fi
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "Failed install to ${D} !"
-
-	if use gnome ; then
-		dodir /usr/bin
-		emake DESTDIR=${D} \
-			install-menu \
-			install-menu-xsu \
-			install-menu-consolehelper || die "Failed to install gnome menu files to ${D} !"
-
-		#chmod 755 ${D}/usr/sbin/bacula-tray-monitor
-		#chmod 644 ${D}/etc/bacula/tray-monitor.conf
-	fi
-	if ! use bacula-clientonly ; then
-		# the database update scripts
-		mkdir -p ${D}/etc/bacula/updatedb
-		cp ${S}/updatedb/* ${D}/etc/bacula/updatedb/
-		chmod 754 ${D}/etc/bacula/updatedb/*
-
-		# the logrotate configuration
-		if use logrotate ; then
-			mkdir -p ${D}/etc/logrotate.d
-			cp ${S}/scripts/logrotate ${D}/etc/logrotate.d/bacula
-			chmod 644 ${D}/etc/logrotate.d/bacula
-		fi
-
-		# the logwatch scripts
-		if use logwatch ; then
-			cd ${S}/scripts/logwatch
-			emake DESTDIR=${D} install || die "Failed to install logwatch scripts to ${D} !"
-			cd ${S}
-		fi
-	fi
-	# documentation
-	for a in ${S}/{Changelog,LICENSE,README,ReleaseNotes,kernstodo,doc/BaculaRoadMap_*.pdf}
-	do
-		dodoc ${a}
-	done
-	# clean up permissions left broken by install
-	chown -R root:root ${D}/usr/share/doc/${PF}
-	chmod -R 644 ${D}/usr/share/doc/${PF}/*
-	chmod o-r ${D}/etc/bacula/query.sql
-	# remove the working dir so we can add it postinst with group
-	rmdir ${D}/var/bacula
-
-	exeinto ${S}/etc/init.d
-	if use bacula-clientonly ; then
-		newexe ${S}/platforms/gentoo/bacula-fd bacula-fd
-	else
-		if use bacula-split ; then
-			newexe ${S}/platforms/gentoo/bacula-fd bacula-fd
-			newexe ${S}/platforms/gentoo/bacula-sd bacula-sd
-			newexe ${S}/platforms/gentoo/bacula-dir bacula-dir
-		else
-			newexe ${S}/platforms/gentoo/bacula-init bacula
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# create the daemon group
-	HAVE_BACULA=`cat /etc/group | grep bacula 2>/dev/null`
-	if [ -z ${HAVE_BACULA} ]; then
-		enewgroup bacula
-		einfo "The group bacula has been created. Any users you add to"
-		einfo "this group have access to files created by the daemons."
-		# the working directory
-		install -m0750 -o root -g bacula -d ${ROOT}/var/bacula
-	fi
-
-	einfo
-	einfo "The CD-ROM rescue disk package has been installed into the"
-	einfo "/etc/bacula/rescue/cdrom/ directory. Please examine the manual"
-	einfo "for information on creating a rescue CD."
-	einfo
-
-	if ! use bacula-clientonly ; then
-		# test for an existing database
-		if use mysql ; then
-			mydb="mysql"
-		elif use postgres ; then
-			mydb="postgresql"
-		elif use sqlite ; then
-			mydb="sqlite"
-		else
-			mydb="mysql"
-		fi
-
-		if [ ${mydb} == "sqlite" ]; then
-			DB_VER=`echo "select * from Version;" | sqlite /var/bacula/bacula.db | tail -n 1 2>/dev/null`
-		else
-			if [ -z ${BACULA_DB_USER} ] && [ -z ${BACULA_DB_PASSWORD} ] && [ -z ${BACULA_DB_HOST} ]; then
-				if [ ${mydb} == "mysql" ]; then
-					DB_VER=`mysql bacula -e 'select * from Version;' | tail -n 1 2>/dev/null`
-				elif [ ${mydb} == "postgresql" ]; then
-					DB_VER=`echo 'select * from Version;' | psql bacula | tail -3 | head -n 1 2>/dev/null`
-				fi
-			else
-				BACULA_DB_OPTS=""
-				if [ ${mydb} == "mysql" ]; then
-					if [ ! -z ${BACULA_DB_HOST} ]; then
-						BACULA_DB_OPTS="${BACULA_DB_OPTS} --host=${BACULA_DB_HOST}"
-					fi
-					if [ ! -z ${BACULA_DB_USER} ]; then
-						BACULA_DB_OPTS="${BACULA_DB_OPTS} --user=${BACULA_DB_USER}"
-					fi
-					if [ ! -z ${BACULA_DB_PASSWORD} ]; then
-						BACULA_DB_OPTS="${BACULA_DB_OPTS} --password=${BACULA_DB_PASSWORD}"
-					fi
-					DB_VER=`mysql ${BACULA_DB_OPTS} -e 'select * from Version' bacula | tail -n 1 2>/dev/null`
-				elif [ ${mydb} == "postgresql" ]; then
-					if [ ! -z ${BACULA_DB_HOST} ]; then
-						BACULA_DB_OPTS="${BACULA_DB_OPTS} --host ${BACULA_DB_HOST}"
-					fi
-					if [ ! -z ${BACULA_DB_USER} ]; then
-						BACULA_DB_OPTS="${BACULA_DB_OPTS} --username ${BACULA_DB_USER}"
-					fi
-					# psql prompts for password by default but we can force it.
-					# psql(1) does not seem to support --password=somepass
-					# NOTE: this is untested
-					if [ ! -z ${BACULA_DB_PASSWORD} ]; then
-						BACULA_DB_OPTS="${BACULA_DB_OPTS} --password"
-					fi
-					DB_VER=`echo 'select * from Version;' | psql ${BACULA_DB_OPTS} bacula | tail -3 | head -n 1 2>/dev/null`
-				fi
-			fi
-		fi
-		if [ -z "${DB_VER}" ]; then
-			einfo "This appears to be a new install and you plan to use ${mydb}"
-			einfo "for your catalog database. You should now create it with the"
-			einfo "following commands:"
-			einfo " sh /etc/bacula/grant_${mydb}_privileges"
-			einfo " sh /etc/bacula/create_${mydb}_database"
-			einfo " sh /etc/bacula/make_${mydb}_tables"
-		elif [ "${DB_VER}" -lt "8" ]; then
-			einfo "This release requires an upgrade to your bacula database"
-			einfo "as the database format has changed.  Please read the"
-			einfo "manual chapter for upgrading your database!"
-		fi
-	fi
-
-	einfo
-	einfo "Configuration files are installed in /etc/bacula and"
-	einfo "init script(s) are:"
-	if use bacula-clientonly ; then
-		einfo " /etc/init.d/bacula-fd"
-	else
-		if use bacula-split ; then
-			einfo " /etc/init.d/bacula-sd"
-			einfo " /etc/init.d/bacula-dir"
-			einfo " /etc/init.d/bacula-fd"
-			einfo " or /etc/bacula/bacula will start all three."
-		else
-			einfo " /etc/init.d/bacula"
-		fi
-	fi
-	einfo
-}
diff --git a/app-backup/bacula/files/bacula-1.36.2-cdrecord-configure.patch b/app-backup/bacula/files/bacula-1.36.2-cdrecord-configure.patch
deleted file mode 100644
index bd29540cb40a..000000000000
--- a/app-backup/bacula/files/bacula-1.36.2-cdrecord-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr bacula-1.36.2/configure bacula-1.36.2-fixed/configure

---- bacula-1.36.2/configure	2005-02-25 04:46:49.000000000 -0500

-+++ bacula-1.36.2-fixed/configure	2005-03-06 10:11:23.905848861 -0500

-@@ -7301,15 +7301,6 @@

- # get scsibus,target,lun

- # -------------------------------------------

- CDSTL="3,0,0"

--if test ! x$CDRECORD = x ; then

--   CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'`

--   if test x${CDSTL} = x ; then

--      CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'`

--   fi

--   if test x${CDSTL} = x ; then

--      CDSTL="3,0,0"

--   fi

--fi

- 

- 

- 

diff --git a/app-backup/bacula/files/bacula-1.36.2-nocdrecord.patch b/app-backup/bacula/files/bacula-1.36.2-nocdrecord.patch
deleted file mode 100644
index 95842c1955d3..000000000000
--- a/app-backup/bacula/files/bacula-1.36.2-nocdrecord.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -uNr bacula-1.36.2-original/autoconf/configure.in bacula-1.36.2-nocdrecord/autoconf/configure.in
---- bacula-1.36.2-original/autoconf/configure.in	2005-02-25 04:47:03.000000000 -0500
-+++ bacula-1.36.2-nocdrecord/autoconf/configure.in	2005-03-05 23:46:28.000000000 -0500
-@@ -63,7 +63,6 @@
- AC_PATH_PROG(MTX, mtx, mtx)
- AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config)
- AC_PATH_PROG(WXCONFIG, wx-config, wx-config)
--AC_PATH_PROG(CDRECORD, cdrecord, cdrecord)
- AC_PATH_PROG(PIDOF, pidof, pidof)
- AC_PROG_AWK
- # Some AWK programs fail, so test it and warn the user
-@@ -521,23 +520,6 @@
- # End of readline/conio stuff
- # -----------------------------------------------------------------------
- 
--# -------------------------------------------
--# check for cdrecord writer location
--# get scsibus,target,lun
--# -------------------------------------------
--CDSTL="3,0,0"
--if test ! x$CDRECORD = x ; then
--   CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'`
--   if test x${CDSTL} = x ; then
--      CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'`
--   fi
--   if test x${CDSTL} = x ; then
--      CDSTL="3,0,0"
--   fi
--fi
--AC_SUBST(CDSTL)
--
--
- # ---------------------------------------------------
- # Check for GMP support/directory
- # ---------------------------------------------------
-diff -uNr bacula-1.36.2-original/configure bacula-1.36.2-nocdrecord/configure
---- bacula-1.36.2-original/configure	2005-02-25 04:46:49.000000000 -0500
-+++ bacula-1.36.2-nocdrecord/configure	2005-03-05 23:42:12.000000000 -0500
-@@ -309,7 +309,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC CDSTL working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC CDSTL working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
- ac_subst_files='MCOMMON'
- 
- # Initialize some variables set by options.
-@@ -3830,46 +3830,6 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--# Extract the first word of "cdrecord", so it can be a program name with args.
--set dummy cdrecord; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_CDRECORD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $CDRECORD in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_CDRECORD="$CDRECORD" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_CDRECORD="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--  test -z "$ac_cv_path_CDRECORD" && ac_cv_path_CDRECORD="cdrecord"
--  ;;
--esac
--fi
--CDRECORD=$ac_cv_path_CDRECORD
--
--if test -n "$CDRECORD"; then
--  echo "$as_me:$LINENO: result: $CDRECORD" >&5
--echo "${ECHO_T}$CDRECORD" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
- # Extract the first word of "pidof", so it can be a program name with args.
- set dummy pidof; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -7296,22 +7256,6 @@
- # End of readline/conio stuff
- # -----------------------------------------------------------------------
- 
--# -------------------------------------------
--# check for cdrecord writer location
--# get scsibus,target,lun
--# -------------------------------------------
--CDSTL="3,0,0"
--if test ! x$CDRECORD = x ; then
--   CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'`
--   if test x${CDSTL} = x ; then
--      CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'`
--   fi
--   if test x${CDSTL} = x ; then
--      CDSTL="3,0,0"
--   fi
--fi
--
--
- 
- # ---------------------------------------------------
- # Check for GMP support/directory
-@@ -21984,7 +21928,6 @@
- s,@MTX@,$MTX,;t t
- s,@PKGCONFIG@,$PKGCONFIG,;t t
- s,@WXCONFIG@,$WXCONFIG,;t t
--s,@CDRECORD@,$CDRECORD,;t t
- s,@PIDOF@,$PIDOF,;t t
- s,@AWK@,$AWK,;t t
- s,@ARFLAGS@,$ARFLAGS,;t t
diff --git a/app-backup/bacula/files/bacula-1.36.3-init-depends.patch b/app-backup/bacula/files/bacula-1.36.3-init-depends.patch
deleted file mode 100644
index 95f01ef830ee..000000000000
--- a/app-backup/bacula/files/bacula-1.36.3-init-depends.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -uNr platforms/gentoo/bacula-dir.in platforms/gentoo-fixed/bacula-dir.in
---- platforms/gentoo/bacula-dir.in	2004-10-19 08:35:07.000000000 -0500
-+++ platforms/gentoo-fixed/bacula-dir.in	2005-06-08 09:58:21.000000000 -0500
-@@ -9,6 +9,11 @@
- #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
- #
- 
-+depend() {
-+	need net
-+	use dns @DB_NAME@
-+}
-+
- start() {
-        ebegin "Starting the Bacula Director"
-        start-stop-daemon --start --quiet --exec @sbindir@/bacula-dir -- $2 -c @sysconfdir@/bacula-dir.conf
-diff -uNr platforms/gentoo/bacula-fd.in platforms/gentoo-fixed/bacula-fd.in
---- platforms/gentoo/bacula-fd.in	2004-10-19 08:35:07.000000000 -0500
-+++ platforms/gentoo-fixed/bacula-fd.in	2005-06-08 09:58:56.000000000 -0500
-@@ -9,6 +9,11 @@
- #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
- #
- 
-+depend() {
-+	need net
-+	use dns
-+}
-+
- start() {
-        ebegin "Starting the Bacula File daemon"
-        start-stop-daemon --start --quiet --exec @sbindir@/bacula-fd -- $2 -c @sysconfdir@/bacula-fd.conf
-diff -uNr platforms/gentoo/bacula-init.in platforms/gentoo-fixed/bacula-init.in
---- platforms/gentoo/bacula-init.in	2004-10-24 08:58:25.000000000 -0500
-+++ platforms/gentoo-fixed/bacula-init.in	2005-06-08 09:54:23.000000000 -0500
-@@ -6,7 +6,7 @@
- 
- depend() {
- 	need net
--	use @DB_NAME@
-+	use dns @DB_NAME@
- }
- 
- opts="test"
-diff -uNr platforms/gentoo/bacula-sd.in platforms/gentoo-fixed/bacula-sd.in
---- platforms/gentoo/bacula-sd.in	2004-10-19 08:35:07.000000000 -0500
-+++ platforms/gentoo-fixed/bacula-sd.in	2005-06-08 10:00:33.000000000 -0500
-@@ -9,6 +9,11 @@
- #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
- #
- 
-+depend() {
-+	need net
-+	use dns @DB_NAME@
-+}
-+
- start() {
-        ebegin "Starting the Bacula Storage daemon"
-        start-stop-daemon --start --quiet --exec  @sbindir@/bacula-sd -- $2 -c @sysconfdir@/bacula-sd.conf
diff --git a/app-backup/bacula/files/bacula-1.36.3-rescue-makefile.patch b/app-backup/bacula/files/bacula-1.36.3-rescue-makefile.patch
deleted file mode 100644
index 0c5d975019ee..000000000000
--- a/app-backup/bacula/files/bacula-1.36.3-rescue-makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- rescue/linux/Makefile.in	2004-08-31 16:05:50.000000000 -0500
-+++ rescue/linux-fixed/Makefile.in	2005-06-20 08:07:50.000000000 -0500
-@@ -1,12 +1,41 @@
--
--all:
-+topdir = @BUILD_DIR@
-+thisdir = $(topdir)/rescue/linux
-+sysconfdir = @sysconfdir@
-+
-+MKDIR = $(topdir)/autoconf/mkinstalldirs
-+CP = @CP@
-+RM = @RM@
-+RMF = "$(RM) -f"
-+
-+all: Makefile
-+	(cd $(topdir)/src/filed; \
-+	$(MAKE) static-bacula-fd; \
-+	cd $(thisdir))
- 
- install:
-+	$(MKDIR) -m 750 $(DESTDIR)$(sysconfdir)/rescue/cdrom;
-+	$(CP) -R $(thisdir)/cdrom/* \
-+		$(DESTDIR)$(sysconfdir)/rescue/cdrom/
-+	$(MKDIR) -m 750 $(DESTDIR)$(sysconfdir)/rescue/cdrom/bin
-+	$(CP) -R $(topdir)/src/filed/static-bacula-fd \
-+		$(DESTDIR)$(sysconfdir)/rescue/cdrom/bin/bacula-fd
-+	$(MKDIR) $(DESTDIR)$(sysconfdir)/rescue/floppy
-+	$(CP) -R $(thisdir)/floppy/* \
-+		$(DESTDIR)$(sysconfdir)/rescue/floppy/
-+	$(CP) -R $(topdir)/src/filed/static-bacula-fd \
-+		$(DESTDIR)$(sysconfdir)/rescue/floppy/bacula-fd
-+	chmod 754 $(DESTDIR)$(sysconfdir)/rescue/cdrom/bin/bacula-fd \
-+		$(DESTDIR)$(sysconfdir)/rescue/floppy/bacula-fd
- 
- uninstall:
-+	$(RMF) -r $(DESTDIR)$(sysconfdir)/rescue
- 
- clean:
- 
- distclean:
- 
- depend:
-+
-+Makefile: Makefile.in
-+	cd $(topdir) \
-+		&& CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/app-backup/bacula/files/bacula-3.6.0-configure.diff b/app-backup/bacula/files/bacula-3.6.0-configure.diff
deleted file mode 100644
index 698492e52976..000000000000
--- a/app-backup/bacula/files/bacula-3.6.0-configure.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- bacula-1.36.0/configure	2004-10-19 08:35:02.000000000 -0500
-+++ bacula-1.36.0-patched/configure	2004-10-23 21:20:33.000000000 -0500
-@@ -19190,7 +19190,7 @@
-    exit 1
- fi
- 
--                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/linux/floppy/Makefile rescue/linux/cdrom/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf $PFILES"
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/linux/floppy/Makefile rescue/linux/cdrom/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/bacula-tray-monitor.desktop doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf $PFILES"
-           ac_config_commands="$ac_config_commands default"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -19746,6 +19746,7 @@
-   "scripts/bacula.desktop.gnome2.xsu" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2.xsu" ;;
-   "scripts/gnome-console.console_apps" ) CONFIG_FILES="$CONFIG_FILES scripts/gnome-console.console_apps" ;;
-   "scripts/mtx-changer" ) CONFIG_FILES="$CONFIG_FILES scripts/mtx-changer" ;;
-+  "scripts/bacula-tray-monitor.desktop" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula-tray-monitor.desktop" ;;
-   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-   "src/host.h" ) CONFIG_FILES="$CONFIG_FILES src/host.h" ;;
diff --git a/app-backup/bacula/files/bacula-init2 b/app-backup/bacula/files/bacula-init2
deleted file mode 100644
index 2e9d5f5ac295..000000000000
--- a/app-backup/bacula/files/bacula-init2
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/bacula-init2,v 1.1 2005/07/04 01:52:06 robbat2 Exp $
-
-depend() {
-	need net
-	use mysql
-}
-
-opts="test"
-
-DIR_USER=root
-DIR_GROUP=bacula
-SD_USER=root
-SD_GROUP=bacula
-FD_USER=root
-FD_GROUP=bacula
-
-# A client would only need to run the file daemon, so if thats the
-# case for this machine just comment the other two out below here...
-start() {
-	ebegin "Starting bacula storage daemon"
-	OPTIONS=''
-	if [ "${SD_USER}" != '' ]; then
-		OPTIONS="${OPTIONS} -u ${SD_USER}"
- 	fi
-										   
-	if [ "${SD_GROUP}" != '' ]; then
-		OPTIONS="${OPTIONS} -g ${SD_GROUP}"
-	fi
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
-		-- ${OPTIONS} -c /etc/bacula/bacula-sd.conf
-	result=$?
-
-	ebegin "Starting bacula file daemon"
-	OPTIONS=''
-	if [ "${FD_USER}" != '' ]; then
-		OPTIONS="${OPTIONS} -u ${FD_USER}"
- 	fi
-										   
-	if [ "${FD_GROUP}" != '' ]; then
-		OPTIONS="${OPTIONS} -g ${FD_GROUP}"
-	fi
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
-		-- ${OPTIONS} -c /etc/bacula/bacula-fd.conf
-	result=$(( $result + $? ))
-	sleep 2
-
-	ebegin "Starting bacula director"
-	OPTIONS=''
-	if [ "${DIR_USER}" != '' ]; then
-		OPTIONS="${OPTIONS} -u ${DIR_USER}"
- 	fi
-										   
-	if [ "${DIR_GROUP}" != '' ]; then
-		OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
-	fi
-	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
-		-- ${OPTIONS} -c /etc/bacula/bacula-dir.conf
-	result=$(( $result + $? ))
-
-	eend $result
-}
-
-# The default port numbers appear in the pidfile paths below.
-# Might wanna programmatically grab them from the config files
-# or something...
-stop() {
-	ebegin "Stopping bacula file daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.9102.pid
-	result=$?
-	ebegin "Stopping bacula storage daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.9103.pid
-	result=$(( $result + $? ))
-	ebegin "Stopping bacula director"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.9101.pid
-	result=$(( $result + $? ))
-	eend $result
-}
-
-test() {
-	ebegin "Testing bacula storage daemon configuration"
-	/usr/sbin/bacula-sd -t -c /etc/bacula/bacula-sd.conf
-	result=$?
-	ebegin "Testing bacula file daemon configuration"
-	/usr/sbin/bacula-fd -t -c /etc/bacula/bacula-fd.conf
-	result=$(( $result + $? ))
-	ebegin "Testing bacula director configuration"
-	/usr/sbin/bacula-dir -t -c /etc/bacula/bacula-dir.conf
-	result=$(( $result + $? ))
-	eend $result
-}
diff --git a/app-backup/bacula/files/digest-bacula-1.34.5 b/app-backup/bacula/files/digest-bacula-1.34.5
deleted file mode 100644
index 50642fab004c..000000000000
--- a/app-backup/bacula/files/digest-bacula-1.34.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3bdccf8c9ee7e794c0035afbc529a33a bacula-1.34.5.tar.gz 4628068
diff --git a/app-backup/bacula/files/digest-bacula-1.34.6 b/app-backup/bacula/files/digest-bacula-1.34.6
deleted file mode 100644
index 016a6388a4d0..000000000000
--- a/app-backup/bacula/files/digest-bacula-1.34.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9de593cb206df126a8e27774281c5bf6 bacula-1.34.6.tar.gz 4633962
diff --git a/app-backup/bacula/files/digest-bacula-1.36.0 b/app-backup/bacula/files/digest-bacula-1.36.0
deleted file mode 100644
index f332aa1861d1..000000000000
--- a/app-backup/bacula/files/digest-bacula-1.36.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 caa6b417b4fdd65caf714fb2baf5f385 bacula-1.36.0.tar.gz 6806740
diff --git a/app-backup/bacula/files/digest-bacula-1.36.3-r1 b/app-backup/bacula/files/digest-bacula-1.36.3-r1
deleted file mode 100644
index e744487479d1..000000000000
--- a/app-backup/bacula/files/digest-bacula-1.36.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9499d6277b8673ae7c24dcdbf89ee026 bacula-1.36.3.tar.gz 11153154
diff --git a/app-backup/bacula/files/digest-bacula-1.36.3 b/app-backup/bacula/files/digest-bacula-1.36.3-r2
index e744487479d1..e744487479d1 100644
--- a/app-backup/bacula/files/digest-bacula-1.36.3
+++ b/app-backup/bacula/files/digest-bacula-1.36.3-r2
diff --git a/app-backup/bacula/files/randpass-1.37.40 b/app-backup/bacula/files/randpass-1.37.40
new file mode 100644
index 000000000000..af30bfb929bb
--- /dev/null
+++ b/app-backup/bacula/files/randpass-1.37.40
@@ -0,0 +1,26 @@
+#! /bin/sh
+#
+#   Generate a random password, written to standard output
+#   By John Walker
+#
+if test "x$1" = "x" ; then
+   PWL=48      # Password length in characters
+else
+   PWL=$1
+fi 
+tmp=`mktemp randpass.XXXXXXXXXX`
+if test x$tmp = x; then
+   tmp=/tmp/p.tmp.$$    
+   if test -f $tmp; then
+      echo "Temp file security problem on: $tmp"
+      exit 1
+   fi
+fi
+cp autoconf/randpass.bc $tmp
+ps | sum | tr -d ':[:alpha:] ' | sed 's/^/k=/' >>$tmp
+date | tr -d ':[:alpha:] ' | sed 's/^/k=k*/' >>$tmp
+ls -l /tmp | sum | tr -d ':[:alpha:] ' | sed 's/^/k=k*/' >>$tmp
+echo "j=s(k); for (i = 0; i < $PWL; i++) r()" >>$tmp
+echo "quit" >>$tmp
+bc $tmp | awk -f autoconf/randpass.awk
+rm $tmp