- setup $HOME in make_catalog_backup, so you could store passwords in file rather...

Changed files:
    bacula.spec -> 1.170
    make_catalog_backup-setup-home.patch -> 1.1

diff --git a/bacula.spec b/bacula.spec
index d11e35f53dac33045800fd6de8c1f9808b23369b..a96b185fa1b5d7a5b3c025b634e1b5e633b489e5 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -55,6 +55,7 @@ Patch9:               %{name}-openssl1.patch
 Patch10:       %{name}-dvd_rewind.patch
 Patch11:       qmake-bin.patch
 Patch12:       install-cats-no-fail.patch
+Patch13:       make_catalog_backup-setup-home.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -472,6 +473,7 @@ Nagios plugin to check bacula.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 

diff --git a/make_catalog_backup-setup-home.patch b/make_catalog_backup-setup-home.patch
new file mode 100644 (file)
index 0000000..524ff2d
--- /dev/null
+++ b/make_catalog_backup-setup-home.patch
@@ -0,0 +1,16 @@
+--- bacula-5.0.3/./src/cats/make_catalog_backup.in~    2010-10-22 17:51:14.000000000 +0300
++++ bacula-5.0.3/./src/cats/make_catalog_backup.in     2010-10-22 17:53:17.329321909 +0300
+@@ -13,11 +13,13 @@
+ #     line arguments and the environment using ps.  Please consult your
+ #     MySQL or PostgreSQL manual for secure methods of specifying the
+ #     password.
++#     In MySQL, you can create @working_dir@/.my.cnf and put password there in [client] section
+ #  $4 is the host on which the database is located
+ #     (default "")
+ #
+ #
+ BINDIR=@SQL_BINDIR@
++HOME=@working_dir@
+ 
+ cd @working_dir@
+ rm -f $1.sql