summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Schlich <wschlich@gentoo.org>2007-10-12 08:49:36 +0000
committerWolfram Schlich <wschlich@gentoo.org>2007-10-12 08:49:36 +0000
commit492d425c2d9fa65a35c3eb71b5b8b29a6d356f6b (patch)
treea05b52a317c9c62a43e84d782412db04ec2550d6 /app-backup
parentdev-php5/php-gtk: update gtksourceview deps (see bug #195366) (diff)
downloadgentoo-2-492d425c2d9fa65a35c3eb71b5b8b29a6d356f6b.tar.gz
gentoo-2-492d425c2d9fa65a35c3eb71b5b8b29a6d356f6b.tar.bz2
gentoo-2-492d425c2d9fa65a35c3eb71b5b8b29a6d356f6b.zip
version bump
(Portage version: 2.1.3.7)
Diffstat (limited to 'app-backup')
-rw-r--r--app-backup/bacula/ChangeLog13
-rw-r--r--app-backup/bacula/bacula-2.2.5.ebuild380
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-all-conf23
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-all-init71
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-default-configs.patch132
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-dir-conf15
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-dir-init25
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-fd-conf8
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-fd-init22
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-gnomesu2gksu.diff48
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-sd-conf11
-rw-r--r--app-backup/bacula/files/2.2.5/bacula-sd-init22
-rw-r--r--app-backup/bacula/files/digest-bacula-2.2.56
13 files changed, 775 insertions, 1 deletions
diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 690e4ca4cc00..d38a69943fdb 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for app-backup/bacula
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.38 2007/10/11 00:12:59 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.39 2007/10/12 08:49:35 wschlich Exp $
+
+*bacula-2.2.5 (12 Oct 2007)
+
+ 12 Oct 2007; Wolfram Schlich <wschlich@gentoo.org>
+ +files/2.2.5/bacula-all-conf, +files/2.2.5/bacula-all-init,
+ +files/2.2.5/bacula-default-configs.patch, +files/2.2.5/bacula-dir-conf,
+ +files/2.2.5/bacula-dir-init, +files/2.2.5/bacula-fd-conf,
+ +files/2.2.5/bacula-fd-init, +files/2.2.5/bacula-gnomesu2gksu.diff,
+ +files/2.2.5/bacula-sd-conf, +files/2.2.5/bacula-sd-init,
+ +bacula-2.2.5.ebuild:
+ version bump
*bacula-2.2.4 (10 Oct 2007)
diff --git a/app-backup/bacula/bacula-2.2.5.ebuild b/app-backup/bacula/bacula-2.2.5.ebuild
new file mode 100644
index 000000000000..2c3e8be33c08
--- /dev/null
+++ b/app-backup/bacula/bacula-2.2.5.ebuild
@@ -0,0 +1,380 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.2.5.ebuild,v 1.1 2007/10/12 08:49:35 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 ~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
+}
+
+src_compile() {
+ 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.5/bacula-all-conf b/app-backup/bacula/files/2.2.5/bacula-all-conf
new file mode 100644
index 000000000000..ac944864641e
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-all-conf
@@ -0,0 +1,23 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.5/bacula-all-conf,v 1.1 2007/10/12 08:49:36 wschlich Exp $
+
+# Config file for /etc/init.d/bacula
+
+# Add the daemons you want to run:
+# dir - Director (Master Control Program)
+# fd - File Daemon (Client)
+# sd - Storage Daemon
+SERVICES="%services%"
+
+# If the database server where you store your bacula catalog
+# is on a different machine, please set this to 0.
+LOCAL_DB=1
+
+# Options for each daemon.
+# The DIR and SD can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
+FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
+DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/2.2.5/bacula-all-init b/app-backup/bacula/files/2.2.5/bacula-all-init
new file mode 100644
index 000000000000..d7b67dbf66ee
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-all-init
@@ -0,0 +1,71 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.5/bacula-all-init,v 1.1 2007/10/12 08:49:36 wschlich Exp $
+
+depend() {
+ need net
+ if [ ${LOCAL_DB} -eq 1 ]; then
+ need "%database%"
+ fi
+ use dns
+}
+
+start() {
+ local retval
+ declare -i retval=0
+ for s in ${SERVICES} ; do
+ case ${s} in
+ sd)
+ ebegin "Starting bacula storage daemon"
+ start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
+ -- ${SD_OPTIONS}
+ let retval+=$?
+ ;;
+ fd)
+ ebegin "Starting bacula file daemon"
+ start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
+ -- ${FD_OPTIONS}
+ let retval+=$?
+ ;;
+ dir)
+ ebegin "Starting bacula director"
+ start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
+ -- ${DIR_OPTIONS}
+ let retval+=$?
+ ;;
+ *)
+ eerror "Unrecognized service found in SERVICES: '${s}'"
+ ;;
+ esac
+ done
+ eend ${retval}
+}
+
+stop() {
+ local retval
+ declare -i retval=0
+ for s in ${SERVICES} ; do
+ case ${s} in
+ sd)
+ ebegin "Stopping bacula storage daemon"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid
+ let retval+=$?
+ ;;
+ fd)
+ ebegin "Stopping bacula file daemon"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
+ let retval+=$?
+ ;;
+ dir)
+ ebegin "Stopping bacula director"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
+ let retval+=$?
+ ;;
+ *)
+ eerror "Unrecognized service found in SERVICES: '${s}'"
+ ;;
+ esac
+ done
+ eend ${retval}
+}
diff --git a/app-backup/bacula/files/2.2.5/bacula-default-configs.patch b/app-backup/bacula/files/2.2.5/bacula-default-configs.patch
new file mode 100644
index 000000000000..ebf66ccd4ffe
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-default-configs.patch
@@ -0,0 +1,132 @@
+--- console/console.c 2007-08-11 23:50:20.000000000 +0200
++++ console/console.c 2007-06-09 11:25:27.000000000 +0200
+@@ -105,7 +105,7 @@
+ static int execcmd(FILE *input, BSOCK *UA_sock);
+
+
+-#define CONFIG_FILE "bconsole.conf" /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bconsole.conf" /* default configuration file */
+
+ static void usage()
+ {
+--- dird/dird.c 2007-08-11 23:49:40.000000000 +0200
++++ dird/dird.c 2007-06-07 16:46:43.000000000 +0200
+@@ -85,7 +85,7 @@
+ extern URES res_all;
+ #endif
+
+-#define CONFIG_FILE "bacula-dir.conf" /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
+
+ static void usage()
+ {
+--- filed/filed.c 2007-08-11 23:51:18.000000000 +0200
++++ filed/filed.c 2007-06-07 16:46:43.000000000 +0200
+@@ -50,7 +50,7 @@
+ void *start_heap;
+
+
+-#define CONFIG_FILE "bacula-fd.conf" /* default config file */
++#define CONFIG_FILE "/etc/bacula/bacula-fd.conf" /* default config file */
+
+ char *configfile = NULL;
+ static bool foreground = false;
+--- gnome2-console/console.c 2007-08-11 23:50:45.000000000 +0200
++++ gnome2-console/console.c 2007-06-07 16:46:43.000000000 +0200
+@@ -93,7 +93,7 @@
+ static guint initial;
+ static int numdir = 0;
+
+-#define CONFIG_FILE "./bgnome-console.conf" /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bgnome-console.conf" /* default configuration file */
+
+ static void usage()
+ {
+--- qt-console/main.cpp 2007-08-11 23:55:10.000000000 +0200
++++ qt-console/main.cpp 2007-06-07 16:46:43.000000000 +0200
+@@ -46,7 +46,7 @@
+ static void usage();
+ static int check_resources();
+
+-#define CONFIG_FILE "./bat.conf" /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bat.conf" /* default configuration file */
+
+ /* Static variables */
+ static char *configfile = NULL;
+--- stored/bcopy.c 2007-08-11 23:54:48.000000000 +0200
++++ stored/bcopy.c 2007-06-07 16:46:43.000000000 +0200
+@@ -57,7 +57,7 @@
+ static uint32_t jobs = 0;
+ static DEV_BLOCK *out_block;
+
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile = NULL;
+ STORES *me = NULL; /* our Global resource */
+ bool forge_on = false; /* proceed inspite of I/O errors */
+--- stored/bextract.c 2007-08-11 23:45:44.000000000 +0200
++++ stored/bextract.c 2007-06-07 16:46:43.000000000 +0200
+@@ -64,7 +64,7 @@
+ static uint32_t wsize; /* write size */
+ static uint64_t fileAddr = 0; /* file write address */
+
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile = NULL;
+ STORES *me = NULL; /* our Global resource */
+ bool forge_on = false;
+--- stored/bls.c 2007-08-11 23:46:05.000000000 +0200
++++ stored/bls.c 2007-06-07 16:46:43.000000000 +0200
+@@ -59,7 +59,7 @@
+ static uint32_t num_files = 0;
+ static ATTR *attr;
+
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile = NULL;
+ STORES *me = NULL; /* our Global resource */
+ bool forge_on = false;
+--- stored/bscan.c 2007-08-11 23:46:26.000000000 +0200
++++ stored/bscan.c 2007-06-18 21:29:26.000000000 +0200
+@@ -100,7 +100,7 @@
+ static int num_media = 0;
+ static int num_files = 0;
+
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile = NULL;
+ STORES *me = NULL; /* our Global resource */
+ bool forge_on = false; /* proceed inspite of I/O errors */
+--- stored/btape.c 2007-08-11 23:46:59.000000000 +0200
++++ stored/btape.c 2007-06-07 16:46:43.000000000 +0200
+@@ -98,7 +98,7 @@
+
+
+ /* Static variables */
+-#define CONFIG_FILE "bacula-sd.conf"
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
+ char *configfile = NULL;
+
+ #define MAX_CMD_ARGS 30
+--- stored/stored.c 2007-08-11 23:54:32.000000000 +0200
++++ stored/stored.c 2007-06-23 11:58:34.000000000 +0200
+@@ -52,7 +52,7 @@
+
+ extern "C" void *device_initialization(void *arg);
+
+-#define CONFIG_FILE "bacula-sd.conf" /* Default config file */
++#define CONFIG_FILE "/etc/bacula/bacula-sd.conf" /* Default config file */
+
+ /* Global variables exported */
+ char OK_msg[] = "3000 OK\n";
+--- tray-monitor/tray-monitor.c 2007-08-11 23:49:13.000000000 +0200
++++ tray-monitor/tray-monitor.c 2007-06-07 16:46:43.000000000 +0200
+@@ -104,7 +104,7 @@
+
+ PangoFontDescription *font_desc = NULL;
+
+-#define CONFIG_FILE "./tray-monitor.conf" /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/tray-monitor.conf" /* default configuration file */
+
+ static void usage()
+ {
diff --git a/app-backup/bacula/files/2.2.5/bacula-dir-conf b/app-backup/bacula/files/2.2.5/bacula-dir-conf
new file mode 100644
index 000000000000..e934fc4a45f1
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-dir-conf
@@ -0,0 +1,15 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.5/bacula-dir-conf,v 1.1 2007/10/12 08:49:36 wschlich Exp $
+
+# Config file for /etc/init.d/bacula-dir
+
+# If the database server where you store your bacula catalog
+# is on a different machine, please set this to 0.
+LOCAL_DB=1
+
+# Options for the director daemon.
+# The DIR can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/2.2.5/bacula-dir-init b/app-backup/bacula/files/2.2.5/bacula-dir-init
new file mode 100644
index 000000000000..65dc383974b1
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-dir-init
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.5/bacula-dir-init,v 1.1 2007/10/12 08:49:36 wschlich Exp $
+
+depend() {
+ need net
+ if [ ${LOCAL_DB} -eq 1 ]; then
+ need "%database%"
+ fi
+ use dns
+}
+
+start() {
+ ebegin "Starting bacula director"
+ start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
+ -- ${DIR_OPTIONS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping bacula director"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
+ eend $?
+}
diff --git a/app-backup/bacula/files/2.2.5/bacula-fd-conf b/app-backup/bacula/files/2.2.5/bacula-fd-conf
new file mode 100644
index 000000000000..8dd9fa229162
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-fd-conf
@@ -0,0 +1,8 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.5/bacula-fd-conf,v 1.1 2007/10/12 08:49:36 wschlich Exp $
+
+# Config file for /etc/init.d/bacula-fd
+
+# Options for the file director.
+FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/2.2.5/bacula-fd-init b/app-backup/bacula/files/2.2.5/bacula-fd-init
new file mode 100644
index 000000000000..eff4d14f21ac
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-fd-init
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.5/bacula-fd-init,v 1.1 2007/10/12 08:49:36 wschlich Exp $
+
+depend() {
+ need net
+ use dns
+}
+
+start() {
+ ebegin "Starting bacula file daemon"
+ start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
+ -- ${FD_OPTIONS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping bacula file daemon"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
+ eend $?
+}
diff --git a/app-backup/bacula/files/2.2.5/bacula-gnomesu2gksu.diff b/app-backup/bacula/files/2.2.5/bacula-gnomesu2gksu.diff
new file mode 100644
index 000000000000..cb08b8b8c44f
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-gnomesu2gksu.diff
@@ -0,0 +1,48 @@
+diff -urN bacula-2.2.4.orig/scripts/bacula.desktop.gnome1.xsu.in bacula-2.2.4/scripts/bacula.desktop.gnome1.xsu.in
+--- bacula-2.2.4.orig/scripts/bacula.desktop.gnome1.xsu.in 2007-04-18 19:06:43.000000000 +0200
++++ bacula-2.2.4/scripts/bacula.desktop.gnome1.xsu.in 2007-10-10 23:34:42.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=Bacula Console
+ Comment=Bacula Director Console
+ Icon=/usr/share/pixmaps/bacula.png
+-Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
++Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf"
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
+diff -urN bacula-2.2.4.orig/scripts/bacula.desktop.gnome2.xsu.in bacula-2.2.4/scripts/bacula.desktop.gnome2.xsu.in
+--- bacula-2.2.4.orig/scripts/bacula.desktop.gnome2.xsu.in 2007-04-18 19:06:43.000000000 +0200
++++ bacula-2.2.4/scripts/bacula.desktop.gnome2.xsu.in 2007-10-10 23:32:44.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=Bacula Console
+ Comment=Bacula Director Console
+ Icon=/usr/share/pixmaps/bacula.png
+-Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
++Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf"
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
+diff -urN bacula-2.2.4.orig/scripts/bat.desktop.xsu.in bacula-2.2.4/scripts/bat.desktop.xsu.in
+--- bacula-2.2.4.orig/scripts/bat.desktop.xsu.in 2007-04-29 15:48:18.000000000 +0200
++++ bacula-2.2.4/scripts/bat.desktop.xsu.in 2007-10-10 23:33:57.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=Bacula Administration Tool
+ Comment=Bacula Director Console
+ Icon=/usr/share/pixmaps/bat_icon.png
+-Exec=gnomesu -t "Query" -c "@sbindir@/bat -c @sysconfdir@/bat.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
++Exec=gksu -u root -m 'Bacula Administration Tool needs to be run with superuser privileges' "@sbindir@/bat -c @sysconfdir@/bat.conf"
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
+diff -urN bacula-2.2.4.orig/scripts/wxconsole.desktop.xsu.in bacula-2.2.4/scripts/wxconsole.desktop.xsu.in
+--- bacula-2.2.4.orig/scripts/wxconsole.desktop.xsu.in 2007-04-29 15:11:37.000000000 +0200
++++ bacula-2.2.4/scripts/wxconsole.desktop.xsu.in 2007-10-10 23:34:06.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=Bacula WX Console
+ Comment=Bacula Director Console
+ Icon=/usr/share/pixmaps/wxwin16x16.xpm
+-Exec=gnomesu -t "Query" -c "@sbindir@/bwx-console -c @sysconfdir@/bwx-console.conf" -d -e -m "In order to run the bacula wx console as root, ^additional information is required."
++Exec=gksu -u root -m 'Bacula WX Console needs to be run with superuser privileges' "@sbindir@/bwx-console -c @sysconfdir@/bwx-console.conf"
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
diff --git a/app-backup/bacula/files/2.2.5/bacula-sd-conf b/app-backup/bacula/files/2.2.5/bacula-sd-conf
new file mode 100644
index 000000000000..b96347f600f6
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-sd-conf
@@ -0,0 +1,11 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.5/bacula-sd-conf,v 1.1 2007/10/12 08:49:36 wschlich Exp $
+
+# Config file for /etc/init.d/bacula-sd
+
+# Options for the storage daemon.
+# The SD can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
diff --git a/app-backup/bacula/files/2.2.5/bacula-sd-init b/app-backup/bacula/files/2.2.5/bacula-sd-init
new file mode 100644
index 000000000000..cdc8b1765eb8
--- /dev/null
+++ b/app-backup/bacula/files/2.2.5/bacula-sd-init
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.5/bacula-sd-init,v 1.1 2007/10/12 08:49:36 wschlich Exp $
+
+depend() {
+ need net
+ use dns
+}
+
+start() {
+ ebegin "Starting bacula storage daemon"
+ start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
+ -- ${SD_OPTIONS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping bacula storage daemon"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid
+ eend $?
+}
diff --git a/app-backup/bacula/files/digest-bacula-2.2.5 b/app-backup/bacula/files/digest-bacula-2.2.5
new file mode 100644
index 000000000000..f07e563bed85
--- /dev/null
+++ b/app-backup/bacula/files/digest-bacula-2.2.5
@@ -0,0 +1,6 @@
+MD5 175a796b96c28fc28cbedb1dc881826f bacula-2.2.5.tar.gz 3015702
+RMD160 74f0c361218d6e008561585ccb2aa1496469d275 bacula-2.2.5.tar.gz 3015702
+SHA256 97807281bd0143c2584a11e4af6572b276933efe2829b863cd49fff26ce24160 bacula-2.2.5.tar.gz 3015702
+MD5 578e4221afd009d711f1430e392823d6 bacula-docs-2.2.5.tar.bz2 22859223
+RMD160 03d2b9a6a2f3dfff6524b4670027cb04a1a4d2fb bacula-docs-2.2.5.tar.bz2 22859223
+SHA256 7415d36ab4aa1324cc4cf1b7c587d5fcc9cc1a346f5ad3f73a1edf2f3a502882 bacula-docs-2.2.5.tar.bz2 22859223