add missing files subdir for 2.2.6, remove unsuitable patch

(Portage version: 2.1.3.19)

12 files changed, 388 insertions, 5 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 0bfe6f3f1ceb..258ae5377642 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,15 @@
 # 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.44 2007/11/14 10:18:36 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.45 2007/11/15 13:26:52 wschlich Exp $
+
+  15 Nov 2007; Wolfram Schlich <wschlich@gentoo.org>
+  +files/2.2.6/bacula-all-conf, +files/2.2.6/bacula-all-init,
+  +files/2.2.6/bacula-default-configs.patch, +files/2.2.6/bacula-dir-conf,
+  +files/2.2.6/bacula-dir-init, +files/2.2.6/bacula-fd-conf,
+  +files/2.2.6/bacula-fd-init, +files/2.2.6/bacula-gnomesu2gksu.diff,
+  +files/2.2.6/bacula-sd-conf, +files/2.2.6/bacula-sd-init,
+  bacula-2.2.6.ebuild:
+  add missing files subdir for 2.2.6, remove unsuitable patch
 
 *bacula-2.2.6 (14 Nov 2007)
 
diff --git a/app-backup/bacula/bacula-2.2.6.ebuild b/app-backup/bacula/bacula-2.2.6.ebuild
index faee2e736f74..a0134fd0f51b 100644
--- a/app-backup/bacula/bacula-2.2.6.ebuild
+++ b/app-backup/bacula/bacula-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2007/11/14 10:18:36 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.2.6.ebuild,v 1.2 2007/11/15 13:26:52 wschlich Exp $
 
 #
 # TODO:
@@ -134,9 +134,6 @@ src_unpack() {
 
 	# replaces (deprecated) gnomesu with gksu in the gnome menu files
 	useq bacula-console && useq gnome && epatch "${FILESDIR}/${PV}/${PN}"-gnomesu2gksu.diff
-
-	# fix bug #195794
-	epatch "${FILESDIR}/${PV}"/fix-nextvol.patch
 }
 
 src_compile() {
diff --git a/app-backup/bacula/files/2.2.6/bacula-all-conf b/app-backup/bacula/files/2.2.6/bacula-all-conf
new file mode 100644
index 000000000000..070e0381a4b5
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-all-conf,v 1.1 2007/11/15 13:26:52 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.6/bacula-all-init b/app-backup/bacula/files/2.2.6/bacula-all-init
new file mode 100644
index 000000000000..f53744edb0ae
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-all-init,v 1.1 2007/11/15 13:26:52 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.6/bacula-default-configs.patch b/app-backup/bacula/files/2.2.6/bacula-default-configs.patch
new file mode 100644
index 000000000000..ebf66ccd4ffe
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-dir-conf b/app-backup/bacula/files/2.2.6/bacula-dir-conf
new file mode 100644
index 000000000000..5cc088b3e11f
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-dir-conf,v 1.1 2007/11/15 13:26:52 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.6/bacula-dir-init b/app-backup/bacula/files/2.2.6/bacula-dir-init
new file mode 100644
index 000000000000..f033ee29dbbf
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-dir-init,v 1.1 2007/11/15 13:26:52 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.6/bacula-fd-conf b/app-backup/bacula/files/2.2.6/bacula-fd-conf
new file mode 100644
index 000000000000..0cb405b00345
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-fd-conf,v 1.1 2007/11/15 13:26:52 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.6/bacula-fd-init b/app-backup/bacula/files/2.2.6/bacula-fd-init
new file mode 100644
index 000000000000..586e544df5ac
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-fd-init,v 1.1 2007/11/15 13:26:52 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.6/bacula-gnomesu2gksu.diff b/app-backup/bacula/files/2.2.6/bacula-gnomesu2gksu.diff
new file mode 100644
index 000000000000..cb08b8b8c44f
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-sd-conf b/app-backup/bacula/files/2.2.6/bacula-sd-conf
new file mode 100644
index 000000000000..4080d5dfc240
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-sd-conf,v 1.1 2007/11/15 13:26:52 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.6/bacula-sd-init b/app-backup/bacula/files/2.2.6/bacula-sd-init
new file mode 100644
index 000000000000..830ab49b9309
--- /dev/null
+++ b/app-backup/bacula/files/2.2.6/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.6/bacula-sd-init,v 1.1 2007/11/15 13:26:52 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 $?
+}