From 9e51bfa71d0da33352ea97a4e74a671a0c15b113 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@91ce42f0-d328-0410-95d8-f526ca767f89>
Date: Fri, 19 Jan 2007 07:55:22 +0000
Subject: [PATCH] This commit was manufactured by cvs2svn to create branch
 'Branch-2.0'.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.0@4019 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/patches/1.38.x/patches-1.38.1 | 14 +++++++++
 bacula/patches/2.0.1-restart.patch   | 43 ++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 bacula/patches/1.38.x/patches-1.38.1
 create mode 100644 bacula/patches/2.0.1-restart.patch

diff --git a/bacula/patches/1.38.x/patches-1.38.1 b/bacula/patches/1.38.x/patches-1.38.1
new file mode 100644
index 0000000000..8e815b0886
--- /dev/null
+++ b/bacula/patches/1.38.x/patches-1.38.1
@@ -0,0 +1,14 @@
+20Nov05 1.38.1-to-1.38.2.patch
+ This patch fixes the following bugs:
+
+- Fix crash in tray-monitor when daemon disconnects. Bug #479.
+- Fix bnet-server bug found on OpenBSD. Bug #486 (bug originator
+  says this patch does not fix his problem)
+- Fix cancel failure bug. Bug #481
+- Fix failure when Pool name has spaces. Bug #487
+- Fix SD crash in autochanger code. Mutex failure. Bug #488
+- Fix a couple of free()s in src/filed/acl.c
+- Fix memory overrun in bfile.c in building OS X resource
+  fork filename. Bug #489
+                         
+  
diff --git a/bacula/patches/2.0.1-restart.patch b/bacula/patches/2.0.1-restart.patch
new file mode 100644
index 0000000000..80353b3539
--- /dev/null
+++ b/bacula/patches/2.0.1-restart.patch
@@ -0,0 +1,43 @@
+
+ This patch should fix the Job restart on error bug that promotes
+ an Incremental backup to a Full backup.
+
+ Apply it to version 2.0.1 (perhaps to 2.0.0) with:
+
+  cd <bacula-source>
+  patch -p0 <2.0.1-restart.patch
+  make
+  ...
+  make install
+
+Index: src/dird/job.c
+===================================================================
+RCS file: /cvsroot/bacula/bacula/src/dird/job.c,v
+retrieving revision 1.148.2.2
+diff -u -r1.148.2.2 job.c
+--- src/dird/job.c	12 Jan 2007 09:58:04 -0000	1.148.2.2
++++ src/dird/job.c	17 Jan 2007 15:29:25 -0000
+@@ -852,11 +852,6 @@
+       free_pool_memory(jcr->fname);
+       jcr->fname = NULL;
+    }
+-   if (jcr->stime) {
+-      Dmsg0(200, "Free JCR stime\n");
+-      free_pool_memory(jcr->stime);
+-      jcr->stime = NULL;
+-   }
+    if (jcr->RestoreBootstrap) {
+       free(jcr->RestoreBootstrap);
+       jcr->RestoreBootstrap = NULL;
+@@ -889,6 +884,11 @@
+       pthread_cond_destroy(&jcr->term_wait);
+       jcr->term_wait_inited = false;
+    }
++   if (jcr->stime) {
++      Dmsg0(200, "Free JCR stime\n");
++      free_pool_memory(jcr->stime);
++      jcr->stime = NULL;
++   }
+    if (jcr->fname) {
+       Dmsg0(200, "Free JCR fname\n");
+       free_pool_memory(jcr->fname);
-- 
2.39.5