Last commit neglected to add bacula-1.38.5-default-configs.patch

(Portage version: 2.0.54)

3 files changed, 156 insertions, 19 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index c34d10c2afd8..b0f15d5575f4 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-backup/bacula
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.9 2006/02/17 04:20:48 labmonkey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.10 2006/02/17 18:03:51 labmonkey Exp $
+
+  17 Feb 2006; Chris Lee <labmonkey@gentoo.org>
+  +files/bacula-1.38.5-default-configs.patch:
+  Last commit neglected to add bacula-1.38.5-default-configs.patch
 
 *bacula-1.38.5 (17 Feb 2006)
 *bacula-1.36.3-r3 (17 Feb 2006)
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index d3dddafa04a7..d9cd3fe8c48f 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,31 +1,32 @@
 MD5 7fb18796a519c8c25ab214e83a4de9a1 ChangeLog 10574
 MD5 2cd99c3b1d7596e5df18f6e81403bfda bacula-1.36.3-r2.ebuild 5516
-MD5 60588f35f6dd9ba53f0b06f43e6a069b metadata.xml 231
 MD5 c41450dcbc4563d5414242b558984aad bacula-1.36.3-r3.ebuild 8154
 MD5 a238ff7072b4b7a6ffc90046e3cb85d7 bacula-1.38.5.ebuild 8031
-MD5 42374b055f69dd5eb5eebe2b17542c03 files/bacula-1.36.3-cdrecord-configure.patch 616
-MD5 fb24badd7d80c46f5bdb1dd2c8ee249b files/bacula-1.36.3-mtxtmpfile.patch 3994
-MD5 c8ead9a2d0974cccce147e7c1780dc60 files/bacula-conf 562
-MD5 03ffd8d0949fd8fd22690ecfbadce1df files/bacula-init3 1479
-MD5 100b7479b58ce6c2f62473914b12c02d files/digest-bacula-1.36.3-r2 67
-MD5 48a955f044c868aefad5bf4ff3991deb files/randpass-1.37.40 682
-MD5 4d5de2bae25b3042d9e9fe5586376b6e files/bacula-1.36.3-default-configs.patch 5373
-MD5 de819ab74a17fa1a652ab8dcae49f9d2 files/bacula-doc-1.36.3-latex-icons.patch 1284
-MD5 b3e61980cda1b1be28c8544ffbc72e68 files/digest-bacula-1.36.3-r3 137
-MD5 b0fe858eafc10d730f3c7e7971875b87 files/digest-bacula-1.38.5 138
+MD5 8aeb126baf57b2829748c84a252c4c3d files/1.36.3/bacula-all-conf 845
 MD5 0fb1f0e62884ac14b5cc4a1169f55e9e files/1.36.3/bacula-all-init 1542
+MD5 b10bc5151115f4f1944bbb1e86429c11 files/1.36.3/bacula-dir-conf 635
 MD5 54b16944ec06a6954354d4bf64286695 files/1.36.3/bacula-dir-init 704
+MD5 fcf0749a0e5515fa80ef83b569989105 files/1.36.3/bacula-fd-conf 359
 MD5 1d736c811c0089e39327609b47bcdca5 files/1.36.3/bacula-fd-init 650
 MD5 4515de369eb098c801d7420a623cd52a files/1.36.3/bacula-sd-conf 505
 MD5 8bc1773c7e6176c8810fe91752855228 files/1.36.3/bacula-sd-init 657
-MD5 b10bc5151115f4f1944bbb1e86429c11 files/1.36.3/bacula-dir-conf 635
-MD5 fcf0749a0e5515fa80ef83b569989105 files/1.36.3/bacula-fd-conf 359
-MD5 8aeb126baf57b2829748c84a252c4c3d files/1.36.3/bacula-all-conf 845
+MD5 1f84ab55db4bb289a3640d8aaab2cce7 files/1.38.5/bacula-all-conf 845
+MD5 c5eddef5dcc078a2aa5c7a33156006c3 files/1.38.5/bacula-all-init 1542
 MD5 45b53d15d0dbfac277e319f65b31ad26 files/1.38.5/bacula-dir-conf 635
+MD5 cea987f7358b00f2feafb8bd749dbaa9 files/1.38.5/bacula-dir-init 704
 MD5 9d560ce34efa76c8ef14edb2a75c6b38 files/1.38.5/bacula-fd-conf 359
+MD5 9514030cfb59d3117b59b99dcbdce75d files/1.38.5/bacula-fd-init 650
 MD5 6f6ff995409fde9ed06a7958c1dbd1d8 files/1.38.5/bacula-sd-conf 505
 MD5 4eacdd9655d27c138e17f0e7821540be files/1.38.5/bacula-sd-init 657
-MD5 cea987f7358b00f2feafb8bd749dbaa9 files/1.38.5/bacula-dir-init 704
-MD5 9514030cfb59d3117b59b99dcbdce75d files/1.38.5/bacula-fd-init 650
-MD5 1f84ab55db4bb289a3640d8aaab2cce7 files/1.38.5/bacula-all-conf 845
-MD5 c5eddef5dcc078a2aa5c7a33156006c3 files/1.38.5/bacula-all-init 1542
+MD5 42374b055f69dd5eb5eebe2b17542c03 files/bacula-1.36.3-cdrecord-configure.patch 616
+MD5 4d5de2bae25b3042d9e9fe5586376b6e files/bacula-1.36.3-default-configs.patch 5373
+MD5 fb24badd7d80c46f5bdb1dd2c8ee249b files/bacula-1.36.3-mtxtmpfile.patch 3994
+MD5 d7bebba8761a1a2c72c370bf25cfbf71 files/bacula-1.38.5-default-configs.patch 5350
+MD5 c8ead9a2d0974cccce147e7c1780dc60 files/bacula-conf 562
+MD5 de819ab74a17fa1a652ab8dcae49f9d2 files/bacula-doc-1.36.3-latex-icons.patch 1284
+MD5 03ffd8d0949fd8fd22690ecfbadce1df files/bacula-init3 1479
+MD5 100b7479b58ce6c2f62473914b12c02d files/digest-bacula-1.36.3-r2 67
+MD5 b3e61980cda1b1be28c8544ffbc72e68 files/digest-bacula-1.36.3-r3 137
+MD5 b0fe858eafc10d730f3c7e7971875b87 files/digest-bacula-1.38.5 138
+MD5 48a955f044c868aefad5bf4ff3991deb files/randpass-1.37.40 682
+MD5 60588f35f6dd9ba53f0b06f43e6a069b metadata.xml 231
diff --git a/app-backup/bacula/files/bacula-1.38.5-default-configs.patch b/app-backup/bacula/files/bacula-1.38.5-default-configs.patch
new file mode 100644
index 000000000000..6a50f12fade6
--- /dev/null
+++ b/app-backup/bacula/files/bacula-1.38.5-default-configs.patch
@@ -0,0 +1,132 @@
+diff -Naru ../bacula-1.38.5/src/console/console.c ./src/console/console.c
+--- ../bacula-1.38.5/src/console/console.c	2005-08-10 11:35:19.000000000 -0500
++++ ./src/console/console.c	2006-01-31 21:07:50.000000000 -0600
+@@ -94,7 +94,7 @@
+ static int sleepcmd(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()
+ {
+diff -Naru ../bacula-1.38.5/src/dird/dird.c ./src/dird/dird.c
+--- ../bacula-1.38.5/src/dird/dird.c	2006-01-06 11:15:42.000000000 -0600
++++ ./src/dird/dird.c	2006-01-31 21:08:13.000000000 -0600
+@@ -63,7 +63,7 @@
+ extern URES res_all;
+ 
+ 
+-#define CONFIG_FILE "./bacula-dir.conf" /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
+ 
+ static void usage()
+ {
+diff -Naru ../bacula-1.38.5/src/filed/filed.c ./src/filed/filed.c
+--- ../bacula-1.38.5/src/filed/filed.c	2006-01-15 04:11:59.000000000 -0600
++++ ./src/filed/filed.c	2006-01-31 21:08:35.000000000 -0600
+@@ -47,7 +47,7 @@
+ #endif
+ 
+ 
+-#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;
+diff -Naru ../bacula-1.38.5/src/gnome2-console/console.c ./src/gnome2-console/console.c
+--- ../bacula-1.38.5/src/gnome2-console/console.c	2005-12-10 07:18:03.000000000 -0600
++++ ./src/gnome2-console/console.c	2006-01-31 21:09:09.000000000 -0600
+@@ -80,7 +80,7 @@
+ static guint initial;
+ static int numdir = 0;
+ 
+-#define CONFIG_FILE "./gnome-console.conf"   /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/gnome-console.conf"   /* default configuration file */
+ 
+ static void usage()
+ {
+diff -Naru ../bacula-1.38.5/src/stored/bcopy.c ./src/stored/bcopy.c
+--- ../bacula-1.38.5/src/stored/bcopy.c	2005-08-10 11:35:37.000000000 -0500
++++ ./src/stored/bcopy.c	2006-01-31 21:09:27.000000000 -0600
+@@ -44,7 +44,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 */
+diff -Naru ../bacula-1.38.5/src/stored/bextract.c ./src/stored/bextract.c
+--- ../bacula-1.38.5/src/stored/bextract.c	2006-01-09 14:42:55.000000000 -0600
++++ ./src/stored/bextract.c	2006-01-31 21:09:49.000000000 -0600
+@@ -57,7 +57,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;
+diff -Naru ../bacula-1.38.5/src/stored/bls.c ./src/stored/bls.c
+--- ../bacula-1.38.5/src/stored/bls.c	2005-10-26 09:02:05.000000000 -0500
++++ ./src/stored/bls.c	2006-01-31 21:10:06.000000000 -0600
+@@ -51,7 +51,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;
+diff -Naru ../bacula-1.38.5/src/stored/bscan.c ./src/stored/bscan.c
+--- ../bacula-1.38.5/src/stored/bscan.c	2005-12-14 15:43:16.000000000 -0600
++++ ./src/stored/bscan.c	2006-01-31 21:10:20.000000000 -0600
+@@ -95,7 +95,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 */
+diff -Naru ../bacula-1.38.5/src/stored/btape.c ./src/stored/btape.c
+--- ../bacula-1.38.5/src/stored/btape.c	2006-01-09 16:34:33.000000000 -0600
++++ ./src/stored/btape.c	2006-01-31 21:10:36.000000000 -0600
+@@ -85,7 +85,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
+diff -Naru ../bacula-1.38.5/src/stored/stored.c ./src/stored/stored.c
+--- ../bacula-1.38.5/src/stored/stored.c	2005-12-19 08:06:41.000000000 -0600
++++ ./src/stored/stored.c	2006-01-31 21:10:54.000000000 -0600
+@@ -37,7 +37,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";
+diff -Naru ../bacula-1.38.5/src/tray-monitor/tray-monitor.c ./src/tray-monitor/tray-monitor.c
+--- ../bacula-1.38.5/src/tray-monitor/tray-monitor.c	2005-11-22 04:50:55.000000000 -0600
++++ ./src/tray-monitor/tray-monitor.c	2006-01-31 21:11:29.000000000 -0600
+@@ -94,7 +94,7 @@
+ char** xpm_generic_var;
+ static gboolean blinkstate = TRUE;
+ 
+-#define CONFIG_FILE "./tray-monitor.conf"   /* default configuration file */
++#define CONFIG_FILE "/etc/bacula/tray-monitor.conf"   /* default configuration file */
+ 
+ static void usage()
+ {