From fce472dd83dc87581fb6d1556f2a0b3c49a871de Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 12 Jan 2007 10:23:14 +0000 Subject: [PATCH] Pull in new spec files Update patches git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.0@3982 91ce42f0-d328-0410-95d8-f526ca767f89 --- .../{ => 1.38.x}/1.38.1-to-1.38.2.patch | 248 +++++++++--------- .../{ => 1.38.x}/1.38.10-dvd-eof.patch | 0 .../{ => 1.38.x}/1.38.10-scheduler.patch | 0 .../patches/{ => 1.38.x}/1.38.6-script.patch | 0 .../patches/{ => 1.38.x}/1.38.7-mysql.patch | 0 bacula/patches/testing/batch-insert.patch | 36 +-- bacula/patches/testing/media-stats.patch | 88 +++---- .../project-include-jobid-in-spool-name.patch | 9 +- bacula/patches/testing/scratch.patch | 67 +---- bacula/patches/testing/scratch.readme | 11 +- bacula/platforms/mandrake/bacula.spec.in | 8 +- bacula/platforms/redhat/bacula.spec.in | 8 +- bacula/platforms/suse/bacula.spec.in | 8 +- .../src/cats/grant_postgresql_privileges.in | 7 +- bacula/src/cats/update_mysql_tables.in | 4 +- bacula/src/cats/update_postgresql_tables.in | 4 +- bacula/src/cats/update_sqlite3_tables.in | 4 +- bacula/src/cats/update_sqlite_tables.in | 4 +- 18 files changed, 241 insertions(+), 265 deletions(-) rename bacula/patches/{ => 1.38.x}/1.38.1-to-1.38.2.patch (97%) rename bacula/patches/{ => 1.38.x}/1.38.10-dvd-eof.patch (100%) rename bacula/patches/{ => 1.38.x}/1.38.10-scheduler.patch (100%) rename bacula/patches/{ => 1.38.x}/1.38.6-script.patch (100%) rename bacula/patches/{ => 1.38.x}/1.38.7-mysql.patch (100%) diff --git a/bacula/patches/1.38.1-to-1.38.2.patch b/bacula/patches/1.38.x/1.38.1-to-1.38.2.patch similarity index 97% rename from bacula/patches/1.38.1-to-1.38.2.patch rename to bacula/patches/1.38.x/1.38.1-to-1.38.2.patch index a75062c69d..be37702df5 100644 --- a/bacula/patches/1.38.1-to-1.38.2.patch +++ b/bacula/patches/1.38.x/1.38.1-to-1.38.2.patch @@ -4297,8 +4297,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * Basic tasks done here: +++++++ * Handle Catalog services. +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2001-2005 Kern Sibbald @@ -4321,8 +4321,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Kern Sibbald, July MMII +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2002-2005 Kern Sibbald @@ -4361,8 +4361,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Kern Sibbald, October MMI +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2001-2005 Kern Sibbald @@ -4513,8 +4513,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Written by Preben 'Peppe' Guldberg, December MMIV +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2004-2005 Kern Sibbald @@ -4585,8 +4585,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Kern Sibbald, August MMII +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2002-2005 Kern Sibbald @@ -4617,8 +4617,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Nicolas Boichat, August MMIV +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ +++++++ /* @@ -4687,8 +4687,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * Basic tasks done here: ++++++ * Handle Catalog services. ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2001-2005 Kern Sibbald @@ -4711,8 +4711,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Kern Sibbald, July MMII ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2002-2005 Kern Sibbald @@ -4751,8 +4751,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Kern Sibbald, October MMI ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2001-2005 Kern Sibbald @@ -4903,8 +4903,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Written by Preben 'Peppe' Guldberg, December MMIV ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2004-2005 Kern Sibbald @@ -4975,8 +4975,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Kern Sibbald, August MMII ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2002-2005 Kern Sibbald @@ -5080,8 +5080,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Nicolas Boichat, August MMIV ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ ++++++ /* @@ -5150,8 +5150,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * Basic tasks done here: +++++ * Handle Catalog services. +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2001-2005 Kern Sibbald @@ -5174,8 +5174,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Kern Sibbald, July MMII +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2002-2005 Kern Sibbald @@ -5215,8 +5215,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Kern Sibbald, October MMI +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2001-2005 Kern Sibbald @@ -5367,8 +5367,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Written by Preben 'Peppe' Guldberg, December MMIV +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2004-2005 Kern Sibbald @@ -5439,8 +5439,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Kern Sibbald, August MMII +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2002-2005 Kern Sibbald @@ -5544,8 +5544,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Nicolas Boichat, August MMIV +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ +++++ /* @@ -5614,8 +5614,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * Basic tasks done here: ++++ * Handle Catalog services. ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2001-2005 Kern Sibbald @@ -5638,8 +5638,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Kern Sibbald, July MMII ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2002-2005 Kern Sibbald @@ -5679,8 +5679,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Kern Sibbald, October MMI ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2001-2005 Kern Sibbald @@ -5831,8 +5831,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Written by Preben 'Peppe' Guldberg, December MMIV ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2004-2005 Kern Sibbald @@ -5903,8 +5903,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Kern Sibbald, August MMII ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2002-2005 Kern Sibbald @@ -6008,8 +6008,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Nicolas Boichat, August MMIV ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ ++++ /* @@ -6078,8 +6078,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * Basic tasks done here: +++ * Handle Catalog services. +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2001-2005 Kern Sibbald @@ -6102,8 +6102,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Kern Sibbald, July MMII +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2002-2005 Kern Sibbald @@ -6143,8 +6143,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Kern Sibbald, October MMI +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2001-2005 Kern Sibbald @@ -6295,8 +6295,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Written by Preben 'Peppe' Guldberg, December MMIV +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2004-2005 Kern Sibbald @@ -6367,8 +6367,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Kern Sibbald, August MMII +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2002-2005 Kern Sibbald @@ -6472,8 +6472,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Nicolas Boichat, August MMIV +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ +++ /* @@ -6542,8 +6542,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * Basic tasks done here: ++ * Handle Catalog services. ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2001-2005 Kern Sibbald @@ -6566,8 +6566,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Kern Sibbald, July MMII ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2002-2005 Kern Sibbald @@ -6607,8 +6607,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Kern Sibbald, October MMI ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2001-2005 Kern Sibbald @@ -6759,8 +6759,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Written by Preben 'Peppe' Guldberg, December MMIV ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2004-2005 Kern Sibbald @@ -6831,8 +6831,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Kern Sibbald, August MMII ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2002-2005 Kern Sibbald @@ -6936,8 +6936,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Nicolas Boichat, August MMIV ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ ++ /* @@ -7011,8 +7011,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ src/version.h 22 Nov 2005 10:50:55 -0000 1.554.2.15 +@@ -1,11 +1,11 @@ + /* -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + + #undef VERSION @@ -7037,8 +7037,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * Basic tasks done here: + * Handle Catalog services. + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2001-2005 Kern Sibbald @@ -7062,8 +7062,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, July MMII + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2002-2005 Kern Sibbald @@ -7088,8 +7088,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, December MMI + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2001-2005 Kern Sibbald @@ -7114,8 +7114,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, October MMI + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2001-2005 Kern Sibbald @@ -7251,8 +7251,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, September MM + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2000-2005 Kern Sibbald @@ -7277,8 +7277,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Written by Preben 'Peppe' Guldberg, December MMIV + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2004-2005 Kern Sibbald @@ -7312,8 +7312,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, April MMIII + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + * + */ + /* @@ -7345,8 +7345,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * Originally written by Kern Sibbald for inclusion in apcupsd, + * but heavily modified for Bacula + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + + #include "bacula.h" @@ -7370,8 +7370,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, August MMII + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2002-2005 Kern Sibbald @@ -7403,8 +7403,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, May MMIII + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + * + */ + /* @@ -7458,8 +7458,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, March MM + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2000-2005 Kern Sibbald @@ -7496,8 +7496,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Nicolas Boichat, August MMIV + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + + /* @@ -7571,8 +7571,8 @@ diff -u -r1.554.2.14 -r1.554.2.15 +++ src/version.h 22 Nov 2005 10:50:55 -0000 1.554.2.15 @@ -1,11 +1,11 @@ /* -- * Version $Id: version.h,v 1.554.2.14 2005/11/14 14:21:58 kerns Exp $ -+ * Version $Id: version.h,v 1.554.2.15 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ #undef VERSION @@ -7597,8 +7597,8 @@ diff -u -r1.77.2.1 -r1.77.2.2 * Basic tasks done here: * Handle Catalog services. * -- * Version $Id: catreq.c,v 1.77.2.1 2005/10/26 14:02:04 kerns Exp $ -+ * Version $Id: catreq.c,v 1.77.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2001-2005 Kern Sibbald @@ -7622,8 +7622,8 @@ diff -u -r1.101.2.1 -r1.101.2.2 * * Kern Sibbald, July MMII * -- * Version $Id: ua_restore.c,v 1.101.2.1 2005/10/26 14:02:04 kerns Exp $ -+ * Version $Id: ua_restore.c,v 1.101.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2002-2005 Kern Sibbald @@ -7648,8 +7648,8 @@ diff -u -r1.71 -r1.71.2.1 * * Kern Sibbald, December MMI * -- * Version $Id: ua_run.c,v 1.71 2005/08/10 16:35:19 nboichat Exp $ -+ * Version $Id: ua_run.c,v 1.71.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2001-2005 Kern Sibbald @@ -7674,8 +7674,8 @@ diff -u -r1.65.2.1 -r1.65.2.2 * * Kern Sibbald, October MMI * -- * Version $Id: ua_select.c,v 1.65.2.1 2005/11/12 17:30:52 kerns Exp $ -+ * Version $Id: ua_select.c,v 1.65.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2001-2005 Kern Sibbald @@ -7811,8 +7811,8 @@ diff -u -r1.7 -r1.7.2.1 * * Kern Sibbald, September MM * -- * Version $Id: ua_update.c,v 1.7 2005/08/28 12:22:02 kerns Exp $ -+ * Version $Id: ua_update.c,v 1.7.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2000-2005 Kern Sibbald @@ -7837,8 +7837,8 @@ diff -u -r1.10.2.1 -r1.10.2.2 * * Written by Preben 'Peppe' Guldberg, December MMIV * -- * Version $Id: acl.c,v 1.10.2.1 2005/11/14 20:20:38 kerns Exp $ -+ * Version $Id: acl.c,v 1.10.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2004-2005 Kern Sibbald @@ -7872,8 +7872,8 @@ diff -u -r1.40 -r1.40.2.1 * * Kern Sibbald, April MMIII * -- * Version $Id: bfile.c,v 1.40 2005/08/10 16:35:19 nboichat Exp $ -+ * Version $Id: bfile.c,v 1.40.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ * */ /* @@ -7905,8 +7905,8 @@ diff -u -r1.39 -r1.39.2.1 * Originally written by Kern Sibbald for inclusion in apcupsd, * but heavily modified for Bacula * -- * Version $Id: bnet_server.c,v 1.39 2005/08/18 15:37:40 kerns Exp $ -+ * Version $Id: bnet_server.c,v 1.39.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ #include "bacula.h" @@ -7930,8 +7930,8 @@ diff -u -r1.47.2.3 -r1.47.2.4 * * Kern Sibbald, August MMII * -- * Version $Id: autochanger.c,v 1.47.2.3 2005/11/12 17:30:53 kerns Exp $ -+ * Version $Id: autochanger.c,v 1.47.2.4 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2002-2005 Kern Sibbald @@ -7963,8 +7963,8 @@ diff -u -r1.44.2.1 -r1.44.2.2 * * Kern Sibbald, May MMIII * -- * Version $Id: status.c,v 1.44.2.1 2005/10/06 07:04:13 kerns Exp $ -+ * Version $Id: status.c,v 1.44.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ * */ /* @@ -8018,8 +8018,8 @@ diff -u -r1.76 -r1.76.2.1 * * Kern Sibbald, March MM * -- * Version $Id: stored_conf.c,v 1.76 2005/09/09 09:40:04 kerns Exp $ -+ * Version $Id: stored_conf.c,v 1.76.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2000-2005 Kern Sibbald @@ -8056,8 +8056,8 @@ diff -u -r1.25.2.1 -r1.25.2.2 * * Nicolas Boichat, August MMIV * -- * Version $Id: tray-monitor.c,v 1.25.2.1 2005/10/01 10:20:18 kerns Exp $ -+ * Version $Id: tray-monitor.c,v 1.25.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* diff --git a/bacula/patches/1.38.10-dvd-eof.patch b/bacula/patches/1.38.x/1.38.10-dvd-eof.patch similarity index 100% rename from bacula/patches/1.38.10-dvd-eof.patch rename to bacula/patches/1.38.x/1.38.10-dvd-eof.patch diff --git a/bacula/patches/1.38.10-scheduler.patch b/bacula/patches/1.38.x/1.38.10-scheduler.patch similarity index 100% rename from bacula/patches/1.38.10-scheduler.patch rename to bacula/patches/1.38.x/1.38.10-scheduler.patch diff --git a/bacula/patches/1.38.6-script.patch b/bacula/patches/1.38.x/1.38.6-script.patch similarity index 100% rename from bacula/patches/1.38.6-script.patch rename to bacula/patches/1.38.x/1.38.6-script.patch diff --git a/bacula/patches/1.38.7-mysql.patch b/bacula/patches/1.38.x/1.38.7-mysql.patch similarity index 100% rename from bacula/patches/1.38.7-mysql.patch rename to bacula/patches/1.38.x/1.38.7-mysql.patch diff --git a/bacula/patches/testing/batch-insert.patch b/bacula/patches/testing/batch-insert.patch index 19c9fe911a..08fea2d7f7 100644 --- a/bacula/patches/testing/batch-insert.patch +++ b/bacula/patches/testing/batch-insert.patch @@ -1,6 +1,6 @@ diff -Naur cvs/src/cats/cats.h my/src/cats/cats.h --- cvs/src/cats/cats.h 2006-12-06 15:11:53.000000000 +0100 -+++ my/src/cats/cats.h 2006-12-14 21:11:40.000000000 +0100 ++++ my/src/cats/cats.h 2007-01-10 19:21:42.000000000 +0100 @@ -141,6 +141,7 @@ POOLMEM *fname; /* Filename only */ POOLMEM *path; /* Path only */ @@ -156,7 +156,7 @@ diff -Naur cvs/src/cats/cats.h my/src/cats/cats.h diff -Naur cvs/src/cats/mysql.c my/src/cats/mysql.c --- cvs/src/cats/mysql.c 2006-12-09 14:41:50.000000000 +0100 -+++ my/src/cats/mysql.c 2006-12-16 19:18:17.000000000 +0100 ++++ my/src/cats/mysql.c 2007-01-10 19:21:42.000000000 +0100 @@ -121,6 +121,7 @@ mdb->fname = get_pool_memory(PM_FNAME); mdb->path = get_pool_memory(PM_FNAME); @@ -210,7 +210,7 @@ diff -Naur cvs/src/cats/mysql.c my/src/cats/mysql.c + diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c --- cvs/src/cats/postgresql.c 2006-12-06 15:11:53.000000000 +0100 -+++ my/src/cats/postgresql.c 2006-12-14 20:28:28.000000000 +0100 ++++ my/src/cats/postgresql.c 2007-01-10 19:25:47.000000000 +0100 @@ -124,6 +124,7 @@ mdb->fname = get_pool_memory(PM_FNAME); mdb->path = get_pool_memory(PM_FNAME); @@ -227,7 +227,7 @@ diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c if (mdb->db_name) { free(mdb->db_name); } -@@ -538,5 +540,201 @@ +@@ -538,5 +540,202 @@ return id; } @@ -323,6 +323,7 @@ diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c + int count=30; + size_t len; + char *digest; ++ char ed1[50]; + + mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl*2+1); + my_postgresql_copy_escape(mdb->esc_name, mdb->fname, mdb->fnl); @@ -336,8 +337,8 @@ diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c + digest = ar->Digest; + } + -+ len = Mmsg(mdb->cmd, "%u\t%u\t%s\t%s\t%s\t%s\n", -+ ar->FileIndex, ar->JobId, mdb->path, ++ len = Mmsg(mdb->cmd, "%u\t%s\t%s\t%s\t%s\t%s\n", ++ ar->FileIndex, edit_int64(ar->JobId, ed1), mdb->path, + mdb->fname, ar->attr, digest); + + do { @@ -431,7 +432,7 @@ diff -Naur cvs/src/cats/postgresql.c my/src/cats/postgresql.c #endif /* HAVE_POSTGRESQL */ diff -Naur cvs/src/cats/protos.h my/src/cats/protos.h --- cvs/src/cats/protos.h 2006-12-06 15:11:53.000000000 +0100 -+++ my/src/cats/protos.h 2006-12-13 19:03:46.000000000 +0100 ++++ my/src/cats/protos.h 2007-01-10 19:21:42.000000000 +0100 @@ -67,6 +67,10 @@ bool db_create_device_record(JCR *jcr, B_DB *mdb, DEVICE_DBR *dr); bool db_create_storage_record(JCR *jcr, B_DB *mdb, STORAGE_DBR *sr); @@ -445,8 +446,8 @@ diff -Naur cvs/src/cats/protos.h my/src/cats/protos.h int db_delete_pool_record(JCR *jcr, B_DB *db, POOL_DBR *pool_dbr); diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c --- cvs/src/cats/sql_create.c 2006-12-06 15:11:53.000000000 +0100 -+++ my/src/cats/sql_create.c 2006-12-14 22:06:41.000000000 +0100 -@@ -664,9 +664,207 @@ ++++ my/src/cats/sql_create.c 2007-01-10 21:46:59.000000000 +0100 +@@ -664,9 +664,208 @@ * }; */ @@ -478,6 +479,7 @@ diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c +{ + size_t len; + char *digest; ++ char edi1[50]; + + mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl*2+1); + db_escape_string(mdb->esc_name, mdb->fname, mdb->fnl); @@ -491,8 +493,8 @@ diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c + digest = ar->Digest; + } + -+ len = Mmsg(mdb->cmd, "INSERT INTO batch VALUES (%u,%u,'%s','%s','%s','%s')", -+ ar->FileIndex, ar->JobId, mdb->path, ++ len = Mmsg(mdb->cmd, "INSERT INTO batch VALUES (%u,%s,'%s','%s','%s','%s')", ++ ar->FileIndex, edit_int64(ar->JobId,ed1), mdb->path, + mdb->fname, ar->attr, digest); + + sql_query(mdb, mdb->cmd); @@ -654,7 +656,7 @@ diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c * Create File record in B_DB * * In order to reduce database size, we store the File attributes, -@@ -721,6 +919,8 @@ +@@ -721,6 +920,8 @@ return 0; } @@ -665,7 +667,7 @@ diff -Naur cvs/src/cats/sql_create.c my/src/cats/sql_create.c * The filename and path records have already been created. diff -Naur cvs/src/cats/sqlite.c my/src/cats/sqlite.c --- cvs/src/cats/sqlite.c 2006-12-06 15:11:53.000000000 +0100 -+++ my/src/cats/sqlite.c 2006-12-14 22:30:35.000000000 +0100 ++++ my/src/cats/sqlite.c 2007-01-10 19:21:42.000000000 +0100 @@ -108,6 +108,7 @@ mdb->fname = get_pool_memory(PM_FNAME); mdb->path = get_pool_memory(PM_FNAME); @@ -701,7 +703,7 @@ diff -Naur cvs/src/cats/sqlite.c my/src/cats/sqlite.c #endif /* HAVE_SQLITE */ diff -Naur cvs/src/dird/backup.c my/src/dird/backup.c --- cvs/src/dird/backup.c 2006-12-13 11:57:52.000000000 +0100 -+++ my/src/dird/backup.c 2006-12-13 19:03:46.000000000 +0100 ++++ my/src/dird/backup.c 2007-01-10 19:21:42.000000000 +0100 @@ -233,6 +233,9 @@ /* Pickup Job termination data */ @@ -714,7 +716,7 @@ diff -Naur cvs/src/dird/backup.c my/src/dird/backup.c return true; diff -Naur cvs/src/dird/jobq.c my/src/dird/jobq.c --- cvs/src/dird/jobq.c 2006-11-24 11:29:37.000000000 +0100 -+++ my/src/dird/jobq.c 2006-12-13 19:03:46.000000000 +0100 ++++ my/src/dird/jobq.c 2007-01-10 19:21:42.000000000 +0100 @@ -563,6 +563,10 @@ db_close_database(jcr, jcr->db); jcr->db = NULL; @@ -727,8 +729,8 @@ diff -Naur cvs/src/dird/jobq.c my/src/dird/jobq.c jcr->SDJobStatus = 0; V(jq->mutex); /* release internal lock */ diff -Naur cvs/src/jcr.h my/src/jcr.h ---- cvs/src/jcr.h 2006-12-12 21:03:36.000000000 +0100 -+++ my/src/jcr.h 2006-12-13 19:03:46.000000000 +0100 +--- cvs/src/jcr.h 2006-12-19 21:57:38.000000000 +0100 ++++ my/src/jcr.h 2007-01-10 19:21:42.000000000 +0100 @@ -184,6 +184,7 @@ bool cached_attribute; /* set if attribute is cached */ POOLMEM *attr; /* Attribute string from SD */ diff --git a/bacula/patches/testing/media-stats.patch b/bacula/patches/testing/media-stats.patch index b192d86391..0b505e5cef 100644 --- a/bacula/patches/testing/media-stats.patch +++ b/bacula/patches/testing/media-stats.patch @@ -1,7 +1,7 @@ -diff -Naur new/bacula-1.39.30/src/baconfig.h bacula-1.39.30/src/baconfig.h ---- new/bacula-1.39.30/src/baconfig.h 2006-12-08 15:27:09.000000000 +0100 -+++ bacula-1.39.30/src/baconfig.h 2006-12-19 22:27:27.000000000 +0100 -@@ -107,8 +107,8 @@ +diff -Naur org/bacula-2.0.0/src/baconfig.h bacula-2.0.0/src/baconfig.h +--- org/bacula-2.0.0/src/baconfig.h 2006-12-17 14:36:35.000000000 +0100 ++++ bacula-2.0.0/src/baconfig.h 2007-01-09 16:10:02.000000000 +0100 +@@ -106,8 +106,8 @@ #define OSDependentInit() #define tape_open open #define tape_ioctl ioctl @@ -12,9 +12,9 @@ diff -Naur new/bacula-1.39.30/src/baconfig.h bacula-1.39.30/src/baconfig.h #define tape_close ::close #endif -diff -Naur new/bacula-1.39.30/src/cats/sql_find.c bacula-1.39.30/src/cats/sql_find.c ---- new/bacula-1.39.30/src/cats/sql_find.c 2006-11-27 11:02:59.000000000 +0100 -+++ bacula-1.39.30/src/cats/sql_find.c 2006-12-19 22:27:27.000000000 +0100 +diff -Naur org/bacula-2.0.0/src/cats/sql_find.c bacula-2.0.0/src/cats/sql_find.c +--- org/bacula-2.0.0/src/cats/sql_find.c 2006-11-27 11:02:59.000000000 +0100 ++++ bacula-2.0.0/src/cats/sql_find.c 2007-01-09 16:10:02.000000000 +0100 @@ -283,7 +283,7 @@ "VolBytes,VolMounts,VolErrors,VolWrites,MaxVolBytes,VolCapacityBytes," "VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles,Recycle,Slot," @@ -42,9 +42,9 @@ diff -Naur new/bacula-1.39.30/src/cats/sql_find.c bacula-1.39.30/src/cats/sql_fi mr->Enabled = 1; /* ensured via query */ sql_free_result(mdb); -diff -Naur new/bacula-1.39.30/src/cats/sql_get.c bacula-1.39.30/src/cats/sql_get.c ---- new/bacula-1.39.30/src/cats/sql_get.c 2006-11-27 11:02:59.000000000 +0100 -+++ bacula-1.39.30/src/cats/sql_get.c 2006-12-19 22:27:27.000000000 +0100 +diff -Naur org/bacula-2.0.0/src/cats/sql_get.c bacula-2.0.0/src/cats/sql_get.c +--- org/bacula-2.0.0/src/cats/sql_get.c 2006-11-27 11:02:59.000000000 +0100 ++++ bacula-2.0.0/src/cats/sql_get.c 2007-01-09 16:10:02.000000000 +0100 @@ -872,7 +872,7 @@ "MaxVolFiles,Recycle,Slot,FirstWritten,LastWritten,InChanger," "EndFile,EndBlock,VolParts,LabelType,LabelDate,StorageId," @@ -72,10 +72,10 @@ diff -Naur new/bacula-1.39.30/src/cats/sql_get.c bacula-1.39.30/src/cats/sql_get ok = true; } -diff -Naur new/bacula-1.39.30/src/dird/catreq.c bacula-1.39.30/src/dird/catreq.c ---- new/bacula-1.39.30/src/dird/catreq.c 2006-11-21 14:20:08.000000000 +0100 -+++ bacula-1.39.30/src/dird/catreq.c 2006-12-19 22:27:27.000000000 +0100 -@@ -277,7 +277,7 @@ +diff -Naur org/bacula-2.0.0/src/dird/catreq.c bacula-2.0.0/src/dird/catreq.c +--- org/bacula-2.0.0/src/dird/catreq.c 2006-12-23 17:33:52.000000000 +0100 ++++ bacula-2.0.0/src/dird/catreq.c 2007-01-09 16:10:02.000000000 +0100 +@@ -280,7 +280,7 @@ mr.VolWriteTime = sdmr.VolWriteTime; mr.VolParts = sdmr.VolParts; bstrncpy(mr.VolStatus, sdmr.VolStatus, sizeof(mr.VolStatus)); @@ -84,9 +84,9 @@ diff -Naur new/bacula-1.39.30/src/dird/catreq.c bacula-1.39.30/src/dird/catreq.c mr.StorageId = jcr->wstore->StorageId; } -diff -Naur new/bacula-1.39.30/src/dird/dird.c bacula-1.39.30/src/dird/dird.c ---- new/bacula-1.39.30/src/dird/dird.c 2006-11-27 11:02:59.000000000 +0100 -+++ bacula-1.39.30/src/dird/dird.c 2006-12-19 22:27:27.000000000 +0100 +diff -Naur org/bacula-2.0.0/src/dird/dird.c bacula-2.0.0/src/dird/dird.c +--- org/bacula-2.0.0/src/dird/dird.c 2006-12-22 16:01:05.000000000 +0100 ++++ bacula-2.0.0/src/dird/dird.c 2007-01-09 16:10:02.000000000 +0100 @@ -269,6 +269,8 @@ init_job_server(director->MaxConcurrentJobs); @@ -96,9 +96,9 @@ diff -Naur new/bacula-1.39.30/src/dird/dird.c bacula-1.39.30/src/dird/dird.c Dmsg0(200, "wait for next job\n"); /* Main loop -- call scheduler to get next job to run */ while ( (jcr = wait_for_next_job(runjob)) ) { -diff -Naur new/bacula-1.39.30/src/dird/getmsg.c bacula-1.39.30/src/dird/getmsg.c ---- new/bacula-1.39.30/src/dird/getmsg.c 2006-11-21 14:20:09.000000000 +0100 -+++ bacula-1.39.30/src/dird/getmsg.c 2006-12-19 22:27:27.000000000 +0100 +diff -Naur org/bacula-2.0.0/src/dird/getmsg.c bacula-2.0.0/src/dird/getmsg.c +--- org/bacula-2.0.0/src/dird/getmsg.c 2006-11-21 14:20:09.000000000 +0100 ++++ bacula-2.0.0/src/dird/getmsg.c 2007-01-09 16:10:02.000000000 +0100 @@ -62,7 +62,9 @@ "open=%d labeled=%d offline=%d " "reserved=%d max_writers=%d " @@ -140,9 +140,9 @@ diff -Naur new/bacula-1.39.30/src/dird/getmsg.c bacula-1.39.30/src/dird/getmsg.c } continue; } -diff -Naur new/bacula-1.39.30/src/stored/acquire.c bacula-1.39.30/src/stored/acquire.c ---- new/bacula-1.39.30/src/stored/acquire.c 2006-11-27 11:03:01.000000000 +0100 -+++ bacula-1.39.30/src/stored/acquire.c 2006-12-19 22:27:27.000000000 +0100 +diff -Naur org/bacula-2.0.0/src/stored/acquire.c bacula-2.0.0/src/stored/acquire.c +--- org/bacula-2.0.0/src/stored/acquire.c 2006-12-16 16:30:22.000000000 +0100 ++++ bacula-2.0.0/src/stored/acquire.c 2007-01-09 16:10:02.000000000 +0100 @@ -461,8 +461,8 @@ if (dev->can_read()) { @@ -154,9 +154,9 @@ diff -Naur new/bacula-1.39.30/src/stored/acquire.c bacula-1.39.30/src/stored/acq } else if (dev->num_writers > 0) { /* -diff -Naur new/bacula-1.39.30/src/stored/ansi_label.c bacula-1.39.30/src/stored/ansi_label.c ---- new/bacula-1.39.30/src/stored/ansi_label.c 2006-11-21 18:03:45.000000000 +0100 -+++ bacula-1.39.30/src/stored/ansi_label.c 2006-12-19 22:27:27.000000000 +0100 +diff -Naur org/bacula-2.0.0/src/stored/ansi_label.c bacula-2.0.0/src/stored/ansi_label.c +--- org/bacula-2.0.0/src/stored/ansi_label.c 2006-11-21 18:03:45.000000000 +0100 ++++ bacula-2.0.0/src/stored/ansi_label.c 2007-01-09 16:10:02.000000000 +0100 @@ -87,7 +87,7 @@ /* Read a maximum of 5 records VOL1, HDR1, ... HDR4 */ for (i=0; i < 6; i++) { @@ -193,9 +193,9 @@ diff -Naur new/bacula-1.39.30/src/stored/ansi_label.c bacula-1.39.30/src/stored/ if (stat != sizeof(label)) { berrno be; if (stat == -1) { -diff -Naur new/bacula-1.39.30/src/stored/askdir.c bacula-1.39.30/src/stored/askdir.c ---- new/bacula-1.39.30/src/stored/askdir.c 2006-12-08 15:27:10.000000000 +0100 -+++ bacula-1.39.30/src/stored/askdir.c 2006-12-19 22:27:27.000000000 +0100 +diff -Naur org/bacula-2.0.0/src/stored/askdir.c bacula-2.0.0/src/stored/askdir.c +--- org/bacula-2.0.0/src/stored/askdir.c 2006-12-08 15:27:10.000000000 +0100 ++++ bacula-2.0.0/src/stored/askdir.c 2007-01-09 16:10:02.000000000 +0100 @@ -308,11 +308,6 @@ Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); return false; @@ -208,9 +208,9 @@ diff -Naur new/bacula-1.39.30/src/stored/askdir.c bacula-1.39.30/src/stored/askd Dmsg1(100, "Update cat VolFiles=%d\n", dev->file); /* Just labeled or relabeled the tape */ -diff -Naur new/bacula-1.39.30/src/stored/block.c bacula-1.39.30/src/stored/block.c ---- new/bacula-1.39.30/src/stored/block.c 2006-12-08 15:27:10.000000000 +0100 -+++ bacula-1.39.30/src/stored/block.c 2006-12-19 22:27:27.000000000 +0100 +diff -Naur org/bacula-2.0.0/src/stored/block.c bacula-2.0.0/src/stored/block.c +--- org/bacula-2.0.0/src/stored/block.c 2006-12-16 12:10:17.000000000 +0100 ++++ bacula-2.0.0/src/stored/block.c 2007-01-09 16:10:02.000000000 +0100 @@ -537,11 +537,8 @@ bmicrosleep(5, 0); /* pause a bit if busy or lots of errors */ dev->clrerror(-1); @@ -239,10 +239,10 @@ diff -Naur new/bacula-1.39.30/src/stored/block.c bacula-1.39.30/src/stored/block } while (stat == -1 && (errno == EBUSY || errno == EINTR || errno == EIO) && retry++ < 3); if (stat < 0) { berrno be; -diff -Naur new/bacula-1.39.30/src/stored/dev.c bacula-1.39.30/src/stored/dev.c ---- new/bacula-1.39.30/src/stored/dev.c 2006-11-22 15:48:29.000000000 +0100 -+++ bacula-1.39.30/src/stored/dev.c 2006-12-19 22:27:27.000000000 +0100 -@@ -1326,7 +1326,7 @@ +diff -Naur org/bacula-2.0.0/src/stored/dev.c bacula-2.0.0/src/stored/dev.c +--- org/bacula-2.0.0/src/stored/dev.c 2006-12-22 16:01:05.000000000 +0100 ++++ bacula-2.0.0/src/stored/dev.c 2007-01-09 16:10:02.000000000 +0100 +@@ -1325,7 +1325,7 @@ mt_com.mt_count = 1; while (num-- && !at_eot()) { Dmsg0(100, "Doing read before fsf\n"); @@ -251,7 +251,7 @@ diff -Naur new/bacula-1.39.30/src/stored/dev.c bacula-1.39.30/src/stored/dev.c if (errno == ENOMEM) { /* tape record exceeds buf len */ stat = rbuf_len; /* This is OK */ /* -@@ -2193,6 +2193,68 @@ +@@ -2192,6 +2192,68 @@ } } @@ -320,10 +320,10 @@ diff -Naur new/bacula-1.39.30/src/stored/dev.c bacula-1.39.30/src/stored/dev.c /* Return the resource name for the device */ const char *DEVICE::name() const -diff -Naur new/bacula-1.39.30/src/stored/dev.h bacula-1.39.30/src/stored/dev.h ---- new/bacula-1.39.30/src/stored/dev.h 2006-11-21 18:03:46.000000000 +0100 -+++ bacula-1.39.30/src/stored/dev.h 2006-12-19 22:27:27.000000000 +0100 -@@ -283,7 +283,17 @@ +diff -Naur org/bacula-2.0.0/src/stored/dev.h bacula-2.0.0/src/stored/dev.h +--- org/bacula-2.0.0/src/stored/dev.h 2006-12-14 12:41:01.000000000 +0100 ++++ bacula-2.0.0/src/stored/dev.h 2007-01-09 16:10:02.000000000 +0100 +@@ -280,7 +280,17 @@ int rem_wait_sec; int num_wait; @@ -339,9 +339,9 @@ diff -Naur new/bacula-1.39.30/src/stored/dev.h bacula-1.39.30/src/stored/dev.h + int get_timer_count(); /* return the last timer interval (ms) */ + int has_cap(int cap) const { return capabilities & cap; } - int is_autochanger() const { return capabilities & CAP_AUTOCHANGER; } - int requires_mount() const { return capabilities & CAP_REQMOUNT; } -@@ -364,6 +374,8 @@ + void clear_cap(int cap) { capabilities &= ~cap; } + void set_cap(int cap) { capabilities |= cap; } +@@ -363,6 +373,8 @@ bool truncate(DCR *dcr); /* in dev.c */ int open(DCR *dcr, int mode); /* in dev.c */ void term(void); /* in dev.c */ diff --git a/bacula/patches/testing/project-include-jobid-in-spool-name.patch b/bacula/patches/testing/project-include-jobid-in-spool-name.patch index d19f13c052..e4c990ecc2 100644 --- a/bacula/patches/testing/project-include-jobid-in-spool-name.patch +++ b/bacula/patches/testing/project-include-jobid-in-spool-name.patch @@ -1,11 +1,14 @@ ---- my/src/stored/spool.c 2006-12-13 19:02:47.000000000 +0100 -+++ cvs/src/stored/spool.c 2006-12-30 10:24:31.000000000 +0100 +diff -Naur org/bacula-2.0.0/src/stored/spool.c bacula-2.0.0/src/stored/spool.c +--- org/bacula-2.0.0/src/stored/spool.c 2006-11-27 11:03:03.000000000 +0100 ++++ bacula-2.0.0/src/stored/spool.c 2007-01-09 16:15:02.000000000 +0100 @@ -154,8 +154,8 @@ } else { dir = working_directory; } -- Mmsg(name, "%s/%s.data.%s.%s.spool", dir, my_name, dcr->jcr->Job, +- Mmsg(name, "%s/%s.data.%s.%s.spool", dir, my_name, dcr->jcr->Job, - dcr->device->hdr.name); + Mmsg(name, "%s/%s.data.%u.%s.%s.spool", dir, my_name, dcr->jcr->JobId, + dcr->jcr->Job, dcr->device->hdr.name); } + + diff --git a/bacula/patches/testing/scratch.patch b/bacula/patches/testing/scratch.patch index 7dd9f8c88a..81166aa413 100644 --- a/bacula/patches/testing/scratch.patch +++ b/bacula/patches/testing/scratch.patch @@ -1,50 +1,7 @@ -diff -Naur cvs/src/dird/next_vol.c my/src/dird/next_vol.c ---- cvs/src/dird/next_vol.c 2006-11-15 22:16:02.000000000 +0100 -+++ my/src/dird/next_vol.c 2006-11-15 23:47:43.000000000 +0100 -@@ -313,6 +313,7 @@ - MEDIA_DBR smr; - POOL_DBR spr, pr; - bool ok = false; -+ bool found = false; - char ed1[50], ed2[50]; - - /* Only one thread at a time can pull from the scratch pool */ -@@ -328,9 +329,20 @@ - if (InChanger) { - smr.StorageId = mr->StorageId; /* want only Scratch Volumes in changer */ - } -- bstrncpy(smr.VolStatus, "Append", sizeof(smr.VolStatus)); /* want only appendable volumes */ - bstrncpy(smr.MediaType, mr->MediaType, sizeof(smr.MediaType)); -+ -+ /* first, try to get Append volume */ -+ bstrncpy(smr.VolStatus, "Append", sizeof(smr.VolStatus)); - if (db_find_next_volume(jcr, jcr->db, 1, InChanger, &smr)) { -+ found = true; -+ /* next, we can try to find an Recycled volume */ -+ } else if (find_recycled_volume(jcr, InChanger, &smr)) { -+ found = true; -+ /* finaly, we take a Purged volume */ -+ } else if (recycle_oldest_purged_volume(jcr, InChanger, &smr)) { -+ found = true; -+ } -+ if (found) { - POOL_MEM query(PM_MESSAGE); - - /* -@@ -369,6 +381,9 @@ - memcpy(mr, &smr, sizeof(MEDIA_DBR)); - /* Set default parameters from current pool */ - set_pool_dbr_defaults_in_media_dbr(mr, &pr); -+ /* set_pool_dbr_defaults_in_media_dbr set VolStatus to Append, -+ * we could have Recycled media */ -+ bstrncpy(mr->VolStatus, smr.VolStatus, sizeof(smr.VolStatus)); - if (!db_update_media_record(jcr, jcr->db, mr)) { - Jmsg(jcr, M_WARNING, 0, _("Unable to update Volume record: ERR=%s"), - db_strerror(jcr->db)); -diff -Naur cvs/src/dird/protos.h my/src/dird/protos.h ---- cvs/src/dird/protos.h 2006-11-15 22:16:02.000000000 +0100 -+++ my/src/dird/protos.h 2006-11-15 23:26:50.000000000 +0100 -@@ -178,6 +178,9 @@ +diff -Naur org/bacula-2.0.0/src/dird/protos.h bacula-2.0.0/src/dird/protos.h +--- org/bacula-2.0.0/src/dird/protos.h 2006-12-23 17:33:52.000000000 +0100 ++++ bacula-2.0.0/src/dird/protos.h 2007-01-09 16:12:18.000000000 +0100 +@@ -195,6 +195,9 @@ int get_num_drives_from_SD(UAContext *ua); void update_slots(UAContext *ua); @@ -54,10 +11,10 @@ diff -Naur cvs/src/dird/protos.h my/src/dird/protos.h /* ua_output.c */ void prtit(void *ctx, const char *msg); int complete_jcr_for_job(JCR *jcr, JOB *job, POOL *pool); -diff -Naur cvs/src/dird/ua_purge.c my/src/dird/ua_purge.c ---- cvs/src/dird/ua_purge.c 2006-11-15 22:16:03.000000000 +0100 -+++ my/src/dird/ua_purge.c 2006-11-15 23:55:14.000000000 +0100 -@@ -569,6 +569,18 @@ +diff -Naur org/bacula-2.0.0/src/dird/ua_purge.c bacula-2.0.0/src/dird/ua_purge.c +--- org/bacula-2.0.0/src/dird/ua_purge.c 2006-12-22 16:01:05.000000000 +0100 ++++ bacula-2.0.0/src/dird/ua_purge.c 2007-01-09 16:12:18.000000000 +0100 +@@ -605,6 +605,18 @@ } pm_strcpy(jcr->VolumeName, mr->VolumeName); generate_job_event(jcr, "VolumePurged"); @@ -76,10 +33,10 @@ diff -Naur cvs/src/dird/ua_purge.c my/src/dird/ua_purge.c /* Send message to Job report, if it is a *real* job */ if (jcr && jcr->JobId > 0) { Jmsg1(jcr, M_INFO, 0, _("All records pruned from Volume \"%s\"; marking it \"Purged\"\n"), -diff -Naur cvs/src/dird/ua_update.c my/src/dird/ua_update.c ---- cvs/src/dird/ua_update.c 2006-11-15 23:30:10.000000000 +0100 -+++ my/src/dird/ua_update.c 2006-11-15 23:56:30.000000000 +0100 -@@ -276,7 +276,7 @@ +diff -Naur org/bacula-2.0.0/src/dird/ua_update.c bacula-2.0.0/src/dird/ua_update.c +--- org/bacula-2.0.0/src/dird/ua_update.c 2006-12-23 17:33:52.000000000 +0100 ++++ bacula-2.0.0/src/dird/ua_update.c 2007-01-09 16:12:18.000000000 +0100 +@@ -290,7 +290,7 @@ } /* Modify the Pool in which this Volume is located */ diff --git a/bacula/patches/testing/scratch.readme b/bacula/patches/testing/scratch.readme index af2bddd4a8..6fff826513 100644 --- a/bacula/patches/testing/scratch.readme +++ b/bacula/patches/testing/scratch.readme @@ -1,13 +1,16 @@ From: Eric Bollengier This patch allow you to : - - use Purged media in Scratch (not only on Append mode) - move Purged media to there RecyclePool $Log$ +Revision 1.1.2.1 2007/01/12 10:23:14 kerns +Pull in new spec files +Update patches + +Revision 1.2 2007/01/09 15:18:20 ricozz +ebl works with 2.0.0 + Revision 1.1 2006/12/20 18:47:42 ricozz ebl works with 1.39.30 -Revision 1.1 2006/12/19 21:33:06 ricozz -ebl ok against 1.39.30 - diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index 759374edce..8027924522 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -1,13 +1,13 @@ # Bacula RPM spec file -# Copyright (C) 2000-2006 Free Software Foundation Europe e.V. +# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V. # Platform Build Configuration # basic defines for every build %define _version @VERSION@ %define _release 1 -%define depkgs_version 25Jun06 -%define _rescuever 1.8.6 +%define depkgs_version 04Jan07 +%define _rescuever 2.0.0 %define docs_version @VERSION@ # any patches for this release @@ -1686,6 +1686,8 @@ fi %endif %changelog +* Sat Jan 06 2007 D. Scott Barninger +- 2.0.0 release * Sun Oct 15 2006 D. Scott Barninger - 1.39.26 remove create_sqlite_database.in.patch * Sun Sep 24 2006 D. Scott Barninger diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index 759374edce..8027924522 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -1,13 +1,13 @@ # Bacula RPM spec file -# Copyright (C) 2000-2006 Free Software Foundation Europe e.V. +# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V. # Platform Build Configuration # basic defines for every build %define _version @VERSION@ %define _release 1 -%define depkgs_version 25Jun06 -%define _rescuever 1.8.6 +%define depkgs_version 04Jan07 +%define _rescuever 2.0.0 %define docs_version @VERSION@ # any patches for this release @@ -1686,6 +1686,8 @@ fi %endif %changelog +* Sat Jan 06 2007 D. Scott Barninger +- 2.0.0 release * Sun Oct 15 2006 D. Scott Barninger - 1.39.26 remove create_sqlite_database.in.patch * Sun Sep 24 2006 D. Scott Barninger diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index 759374edce..8027924522 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -1,13 +1,13 @@ # Bacula RPM spec file -# Copyright (C) 2000-2006 Free Software Foundation Europe e.V. +# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V. # Platform Build Configuration # basic defines for every build %define _version @VERSION@ %define _release 1 -%define depkgs_version 25Jun06 -%define _rescuever 1.8.6 +%define depkgs_version 04Jan07 +%define _rescuever 2.0.0 %define docs_version @VERSION@ # any patches for this release @@ -1686,6 +1686,8 @@ fi %endif %changelog +* Sat Jan 06 2007 D. Scott Barninger +- 2.0.0 release * Sun Oct 15 2006 D. Scott Barninger - 1.39.26 remove create_sqlite_database.in.patch * Sun Sep 24 2006 D. Scott Barninger diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in index 24e0cdce1e..2003911633 100644 --- a/bacula/src/cats/grant_postgresql_privileges.in +++ b/bacula/src/cats/grant_postgresql_privileges.in @@ -28,6 +28,9 @@ grant all on mediatype to ${USER}; grant all on storage to ${USER}; grant all on device to ${USER}; grant all on status to ${USER}; +grant all on location to ${USER}; +grant all on locationlog to ${USER}; +grant all on log to ${USER}; -- for sequences on those tables @@ -44,7 +47,9 @@ grant select, update on basefiles_baseid_seq to ${USER}; grant select, update on storage_storageid_seq to ${USER}; grant select, update on mediatype_mediatypeid_seq to ${USER}; grant select, update on device_deviceid_seq to ${USER}; - +grant select, update on location_locationid_seq to ${USER}; +grant select, update on locationlog_loclogid_seq to ${USER}; +grant select, update on log_logid_seq to ${USER}; END-OF-DATA then diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in index 1361514577..6ce5469c76 100755 --- a/bacula/src/cats/update_mysql_tables.in +++ b/bacula/src/cats/update_mysql_tables.in @@ -1,10 +1,10 @@ #!/bin/sh # -# Shell script to update MySQL tables from version 1.38 to 1.39 +# Shell script to update MySQL tables from version 1.38 to 2.0 # echo " " echo "This script will update a Bacula MySQL database from version 9 to 10" -echo " which is needed to convert from Bacula version 1.38.x to 1.39.x or higher" +echo " which is needed to convert from Bacula version 1.38.x to 2.0.x or higher" echo "Depending on the size of your database," echo "this script may take several minutes to run." echo " " diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in index a584543ee3..e6149ae54d 100755 --- a/bacula/src/cats/update_postgresql_tables.in +++ b/bacula/src/cats/update_postgresql_tables.in @@ -1,10 +1,10 @@ #!/bin/sh # -# Shell script to update PostgreSQL tables from version 1.38 to 1.39 +# Shell script to update PostgreSQL tables from version 1.38 to 2.0.0 or higher # echo " " echo "This script will update a Bacula PostgreSQL database from version 9 to 10" -echo " which is needed to convert from Bacula version 1.38.x to 1.39.x or higher" +echo " which is needed to convert from Bacula version 1.38.x to 2.0.0 or higher" echo "Depending on the size of your database," echo "this script may take several minutes to run." echo " " diff --git a/bacula/src/cats/update_sqlite3_tables.in b/bacula/src/cats/update_sqlite3_tables.in index efb79fb88a..7712d35a55 100755 --- a/bacula/src/cats/update_sqlite3_tables.in +++ b/bacula/src/cats/update_sqlite3_tables.in @@ -1,10 +1,10 @@ #!/bin/sh # -# shell script to update SQLite from version 1.38 to 1.39 +# shell script to update SQLite from version 1.38 to 2.0 # echo " " echo "This script will update a Bacula SQLite database from version 9 to 10" -echo " which is needed to convert from Bacula version 1.38.x to 1.39.x or higher" +echo " which is needed to convert from Bacula version 1.38.x to 2.0.x or higher" echo "Depending on the size of your database," echo "this script may take several minutes to run." echo " " diff --git a/bacula/src/cats/update_sqlite_tables.in b/bacula/src/cats/update_sqlite_tables.in index efb79fb88a..7712d35a55 100755 --- a/bacula/src/cats/update_sqlite_tables.in +++ b/bacula/src/cats/update_sqlite_tables.in @@ -1,10 +1,10 @@ #!/bin/sh # -# shell script to update SQLite from version 1.38 to 1.39 +# shell script to update SQLite from version 1.38 to 2.0 # echo " " echo "This script will update a Bacula SQLite database from version 9 to 10" -echo " which is needed to convert from Bacula version 1.38.x to 1.39.x or higher" +echo " which is needed to convert from Bacula version 1.38.x to 2.0.x or higher" echo "Depending on the size of your database," echo "this script may take several minutes to run." echo " " -- 2.39.5