- from upstream

Changed files:
    bacula-mount.patch -> 1.1
    bacula-mysql-timeout.patch -> 1.1
    bacula-sd-crash.patch -> 1.1

diff --git a/bacula-mount.patch b/bacula-mount.patch
new file mode 100644 (file)
index 0000000..c48302d
--- /dev/null
+++ b/bacula-mount.patch
@@ -0,0 +1,29 @@
+
+ This patch causes the SD to try at least once to mount a Volume
+ that is not in an Autochanger before asking the operator to
+ intervene. Without it, the user must issue a mount command for
+ every File based volume that is needed.
+
+ Apply to 2.4.1 with the following:
+
+ cd <bacula-source>
+ patch -p0 <2.4.1-mount.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/stored/mount.c
+===================================================================
+--- src/stored/mount.c (revision 7378)
++++ src/stored/mount.c (working copy)
+@@ -142,7 +142,7 @@
+    } else {
+       autochanger = false;
+       VolCatInfo.Slot = 0;
+-      ask = true;
++      ask = retry >= 2;
+    }
+    Dmsg1(150, "autoload_dev returns %d\n", autochanger);
+    /*

diff --git a/bacula-mysql-timeout.patch b/bacula-mysql-timeout.patch
new file mode 100644 (file)
index 0000000..2885e46
--- /dev/null
+++ b/bacula-mysql-timeout.patch
@@ -0,0 +1,27 @@
+ This patch fixes #1034 by setting big timeout on mysql connections
+
+ Apply this patch to version 2.4.1 with:
+
+ cd <bacula-source>
+ patch -p0 < patches/2.4.1-mysql-timeout.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/cats/mysql.c
+===================================================================
+--- src/cats/mysql.c    (révision 7401)
++++ src/cats/mysql.c    (copie de travail)
+@@ -205,6 +205,10 @@
+    Dmsg3(100, "opendb ref=%d connected=%d db=%p\n", mdb->ref_count,
+          mdb->connected, mdb->db);
+
++   /* Set connection timeout to 8 days specialy for batch mode */
++   sql_query(mdb, "SET wait_timeout=691200");
++   sql_query(mdb, "SET interactive_timeout=691200");
++
+    V(mutex);
+    return 1;
+ }

diff --git a/bacula-sd-crash.patch b/bacula-sd-crash.patch
new file mode 100644 (file)
index 0000000..6ac2e4c
--- /dev/null
+++ b/bacula-sd-crash.patch
@@ -0,0 +1,30 @@
+
+ This patch removes an unfortunate piece of debug code that crept into
+ the 2.4.1 release and causes it to purposely, but incorrectly seg fault
+ whenever a volume name error occurs.  Typically this may happen if a
+ non-bacula tape is mounted at startup or at the end of volume during
+ restore.
+
+ Apply the patch with:
+
+ cd <bacula-source>
+ patch -p0 <2.4.1-sd-crash.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+
+Index: src/stored/acquire.c
+===================================================================
+--- src/stored/acquire.c       (revision 7405)
++++ src/stored/acquire.c       (working copy)
+@@ -266,7 +266,6 @@
+             dev->close();                                                          
+          }
+          dev->set_load();
+-         ASSERT(0);
+          /* Fall through */
+       default:
+          Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg);