Correct and apply 2.2.7-jobdefs-migtype.patch

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6184 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/patches/2.2.7-jobdefs-migtype.patch b/bacula/patches/2.2.7-jobdefs-migtype.patch
index b793aaeb7b75f69693ebf6afbed8bb792fe09f3a..c636dd68ba002b7431607b5c330fff7401f42a6b 100644 (file)
--- a/bacula/patches/2.2.7-jobdefs-migtype.patch
+++ b/bacula/patches/2.2.7-jobdefs-migtype.patch
@@ -13,8 +13,8 @@
 
 Index: src/dird/dird.c
 ===================================================================
---- src/dird/dird.c    (révision 6160)
-+++ src/dird/dird.c    (copie de travail)
+--- src/dird/dird.c    (revision 6183)
++++ src/dird/dird.c    (working copy)
 @@ -58,6 +58,7 @@
  void store_jobtype(LEX *lc, RES_ITEM *item, int index, int pass);
  void store_level(LEX *lc, RES_ITEM *item, int index, int pass);
@@ -23,7 +23,7 @@ Index: src/dird/dird.c
  void init_device_resources();
  
  static char *runjob = NULL;
-@@ -707,6 +708,7 @@
+@@ -698,6 +699,7 @@
                            job_items[i].handler == store_jobtype ||
                            job_items[i].handler == store_level   ||
                            job_items[i].handler == store_pint    ||
@@ -33,8 +33,8 @@ Index: src/dird/dird.c
                    Dmsg5(400, "Job \"%s\", field \"%s\" def_ivalue=%d item %d offset=%u\n",
 Index: src/dird/dird_conf.c
 ===================================================================
---- src/dird/dird_conf.c       (révision 6160)
-+++ src/dird/dird_conf.c       (copie de travail)
+--- src/dird/dird_conf.c       (revision 6183)
++++ src/dird/dird_conf.c       (working copy)
 @@ -74,8 +74,8 @@
  void store_level(LEX *lc, RES_ITEM *item, int index, int pass);
  void store_replace(LEX *lc, RES_ITEM *item, int index, int pass);
@@ -45,7 +45,7 @@ Index: src/dird/dird_conf.c
  static void store_runscript(LEX *lc, RES_ITEM *item, int index, int pass);
  static void store_runscript_when(LEX *lc, RES_ITEM *item, int index, int pass);
  static void store_runscript_cmd(LEX *lc, RES_ITEM *item, int index, int pass);
-@@ -1559,7 +1559,7 @@
+@@ -1548,7 +1548,7 @@
   * Store JobType (backup, verify, restore)
   *
   */

diff --git a/bacula/patches/2.2.7-old-postgresql.patch b/bacula/patches/2.2.7-old-postgresql.patch
new file mode 100644 (file)
index 0000000..d13b118
--- /dev/null
+++ b/bacula/patches/2.2.7-old-postgresql.patch
@@ -0,0 +1,26 @@
+
+ If you have an old version of PostgreSQL, for example,
+ version 7.3 or older, it may not properly build with the current
+ Bacula release due to incompatible changes in the PostgreSQL
+ header files between version.  Only in the case that build fails,
+ you might try applying this patch with:
+
+ cd <bacula-2.2.7-source>
+ patch -p1 <2.2.7-old-postgresql.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+diff -uNr bacula-2.2.7/src/cats/postgresql.c bacula-2.2.7-fixed/src/cats/postgresql.c
+--- bacula-2.2.7/src/cats/postgresql.c 2007-12-08 04:54:55.000000000 -0500
++++ bacula-2.2.7-fixed/src/cats/postgresql.c   2007-12-29 08:34:10.000000000 -0500
+@@ -47,7 +47,6 @@
+ #ifdef HAVE_POSTGRESQL
+ 
+ #include "postgres_ext.h"       /* needed for NAMEDATALEN */
+-#include "pg_config_manual.h"   /* get NAMEDATALEN on version 8.3 or later */
+ 
+ /* -----------------------------------------------------------------------
+  *

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 45ae5a68184278bcb5c0f00e057da302cd722ca2..ba93ce9a1d4f9161c6a2898262f1abb96fb6bf85 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -58,6 +58,7 @@ void term_job_server();
 void store_jobtype(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_level(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_replace(LEX *lc, RES_ITEM *item, int index, int pass);
+void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass);
 void init_device_resources();
 
 static char *runjob = NULL;
@@ -698,6 +699,7 @@ static bool check_resources()
                           job_items[i].handler == store_jobtype ||
                           job_items[i].handler == store_level   ||
                           job_items[i].handler == store_pint    ||
+                          job_items[i].handler == store_migtype ||
                           job_items[i].handler == store_replace) {
                   def_ivalue = (int *)((char *)(job->jobdefs) + offset);
                   Dmsg5(400, "Job \"%s\", field \"%s\" def_ivalue=%d item %d offset=%u\n",

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index 03e129fbe376e7b10023e70b0a3b65c67446e424..107ed51b820cf255c5d939dcf05f4bb4a34c6bd1 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -74,8 +74,8 @@ void store_jobtype(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_level(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_replace(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_acl(LEX *lc, RES_ITEM *item, int index, int pass);
+void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass);
 static void store_device(LEX *lc, RES_ITEM *item, int index, int pass);
-static void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass);
 static void store_runscript(LEX *lc, RES_ITEM *item, int index, int pass);
 static void store_runscript_when(LEX *lc, RES_ITEM *item, int index, int pass);
 static void store_runscript_cmd(LEX *lc, RES_ITEM *item, int index, int pass);
@@ -1548,7 +1548,7 @@ static void store_device(LEX *lc, RES_ITEM *item, int index, int pass)
  * Store JobType (backup, verify, restore)
  *
  */
-static void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass)
+void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass)
 {
    int token, i;