From f398391a2c5ebdcce343cdc52b8f6ab571716dd8 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 19 Jan 2007 07:55:22 +0000
Subject: [PATCH] Create patches/2.0.1-restart.patch. Fixes bug #755.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.0@4020 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/CheckList              | 58 +++++++++++++++++++++++++++++------
 bacula/patches/patches-1.38.1 | 14 ---------
 bacula/src/dird/job.c         | 10 +++---
 bacula/technotes-2.0          |  5 +++
 4 files changed, 59 insertions(+), 28 deletions(-)
 delete mode 100644 bacula/patches/patches-1.38.1

diff --git a/bacula/CheckList b/bacula/CheckList
index ccc71d7e79..ab1d9d3650 100644
--- a/bacula/CheckList
+++ b/bacula/CheckList
@@ -1,18 +1,58 @@
 
              Release Check List
 
+Assume release is in bacula/base bacula/gui bacula/docs bacula/rescue
+
 - Build it on Win32
-- Build it on Sun
-- Build FD on Irix
-- Make new .pdf manual
+- Build it on Solaris and run regression tests
+- Build it on FreeBSD and run regression tests
 - Update ChangeLog (add release date)
+- Update ReleaeNotes
 - Do a cvs commit
-- Do a cvs -q export -D now -d bacula-1.nn bacula
+- Run ./makerel base 2.0.x
 - Run the regression tests on the new bacula
-- Write ReleaseNotes
+  directory that is created.  Run regression on
+  Linux, Solaris, and Sun.
+- Run the production version over night in production.
+- Manually test Win32 version
+  (with Robert's work, it is now possible to run the
+   Regression scripts).
+- Write final ReleaseNotes
 - If everything is good
-- cd bacula/k
-- cvs -q tag Release-1_nn
 - cd bacula
-- rm -rf bacula-1.nn
-- cvs -z3 export -r Release-1_nn -d bacula-1.nn bacula
+- Run    
+  cd base
+  cvs update
+  cd ../gui
+  cvs update
+  cd ../docs
+  cvs update
+     cd manual
+     make tex
+     latex bacula.tex
+     (make sure the above finishes.  If it stops and asks
+      what to do, correct the problem).
+      cd ..
+  cd ../rescue
+  cvs update
+  cd ..
+  ./makerel base 2.0.x
+  ./makeguirel gui 2.0.x
+  ./makedocsrel docs 2.0.x
+  ./makerescuerel rescue 2.0.x
+  cd base/win32
+  make
+  cp release/winbacula-2.0.x.exe $HOME/bacula
+  cd $HOME/bacula
+  ./sign winbacula-2.0.x.exe
+
+- Upload everything to appropriate part of Source Forge
+  and release it.  I use releaseforge 
+- After releasing everything.
+- Either download everything and compare the signatures,
+  or simply check the upload sizes of everything.
+- cd docs/manual
+  make
+- Upload new release doc to web site.
+  Upload bacula.pdf to web site.
+      
diff --git a/bacula/patches/patches-1.38.1 b/bacula/patches/patches-1.38.1
deleted file mode 100644
index 8e815b0886..0000000000
--- a/bacula/patches/patches-1.38.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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/src/dird/job.c b/bacula/src/dird/job.c
index f4eceadeb8..5063490ade 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -852,11 +852,6 @@ void dird_free_jcr_pointers(JCR *jcr)
       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 @@ void dird_free_jcr(JCR *jcr)
       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);
diff --git a/bacula/technotes-2.0 b/bacula/technotes-2.0
index 65f245c4d9..d199f779f2 100644
--- a/bacula/technotes-2.0
+++ b/bacula/technotes-2.0
@@ -1,6 +1,11 @@
               Technical notes on version 2.0
 
 General:
+kes  Create patches/2.0.1-restart.patch. Fixes bug #755.
+18Jan07
+kes  Fix Job restart on error bug that promotes an Inc to a Full
+     backup.  This should fix bug #755.
+
 Version 2.0.1
 12Jan07
 kes  Fix Bacula->Documentation link on Win32 to point to index.html
-- 
2.39.5