From 3a059805669cdf5a28924f811b57505ac688fc06 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 3 Nov 2005 14:53:59 +0000 Subject: [PATCH] - Modify configure.in to add execute option to sqlite3 catalog scripts. - Create update_xxx_table_8_to_9 scripts for updatedb git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2526 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/aclocal.m4 | 2 +- bacula/autoconf/configure.in | 3 + bacula/configure | 5 +- bacula/src/cats/update_mysql_tables.in | 2 +- bacula/src/cats/update_postgresql_tables.in | 2 +- bacula/src/cats/update_sqlite3_tables.in | 2 +- bacula/src/cats/update_sqlite_tables.in | 2 +- bacula/updatedb/update_bacula_tables_8_to_9 | 17 + bacula/updatedb/update_bdb_tables_8_to_9 | 9 + bacula/updatedb/update_mysql_tables_8_to_9 | 99 +++++ .../updatedb/update_postgresql_tables_8_to_9 | 133 +++++++ bacula/updatedb/update_sqlite3_tables_8_to_9 | 338 ++++++++++++++++++ bacula/updatedb/update_sqlite_tables_8_to_9 | 338 ++++++++++++++++++ 13 files changed, 946 insertions(+), 6 deletions(-) create mode 100755 bacula/updatedb/update_bacula_tables_8_to_9 create mode 100755 bacula/updatedb/update_bdb_tables_8_to_9 create mode 100755 bacula/updatedb/update_mysql_tables_8_to_9 create mode 100755 bacula/updatedb/update_postgresql_tables_8_to_9 create mode 100755 bacula/updatedb/update_sqlite3_tables_8_to_9 create mode 100755 bacula/updatedb/update_sqlite_tables_8_to_9 diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4 index 8458af0159..94de0926c6 100644 --- a/bacula/autoconf/aclocal.m4 +++ b/bacula/autoconf/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.9.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index ea3e593d57..6413c03c81 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -2005,6 +2005,9 @@ chmod 755 $c/grant_mysql_privileges $c/drop_mysql_tables $c/drop_mysql_dat chmod 755 $c/create_sqlite_database $c/update_sqlite_tables $c/make_sqlite_tables chmod 755 $c/grant_sqlite_privileges $c/drop_sqlite_tables $c/drop_sqlite_database +chmod 755 $c/create_sqlite3_database $c/update_sqlite3_tables $c/make_sqlite3_tables +chmod 755 $c/grant_sqlite3_privileges $c/drop_sqlite3_tables $c/drop_sqlite3_database + chmod 755 $c/create_postgresql_database $c/update_postgresql_tables $c/make_postgresql_tables chmod 755 $c/grant_postgresql_privileges $c/drop_postgresql_tables $c/drop_postgresql_database diff --git a/bacula/configure b/bacula/configure index 7da6e4bb2a..29d8cce255 100755 --- a/bacula/configure +++ b/bacula/configure @@ -16683,7 +16683,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 if test $ac_cv_lib_crypt_crypt = yes; then - POSTGRESQL_LFLAGS="-lcrypt $POSTGRESQL_LFLAGS" + POSTGRESQL_LFLAGS="$POSTGRESQL_LFLAGS -lcrypt" fi fi @@ -31361,6 +31361,9 @@ chmod 755 $c/grant_mysql_privileges $c/drop_mysql_tables $c/drop_mysql_dat chmod 755 $c/create_sqlite_database $c/update_sqlite_tables $c/make_sqlite_tables chmod 755 $c/grant_sqlite_privileges $c/drop_sqlite_tables $c/drop_sqlite_database +chmod 755 $c/create_sqlite3_database $c/update_sqlite3_tables $c/make_sqlite3_tables +chmod 755 $c/grant_sqlite3_privileges $c/drop_sqlite3_tables $c/drop_sqlite3_database + chmod 755 $c/create_postgresql_database $c/update_postgresql_tables $c/make_postgresql_tables chmod 755 $c/grant_postgresql_privileges $c/drop_postgresql_tables $c/drop_postgresql_database diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in index 6ff024b481..6fcafa766d 100755 --- a/bacula/src/cats/update_mysql_tables.in +++ b/bacula/src/cats/update_mysql_tables.in @@ -1,6 +1,6 @@ #!/bin/sh # -# Shell script to update MySQL tables from version 1.36 to 1.37.12 +# Shell script to update MySQL tables from version 1.36 to 1.38 # echo " " echo "This script will update a Bacula MySQL database from version 8 to 9" diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in index 37870a5ef7..ea746d5835 100755 --- a/bacula/src/cats/update_postgresql_tables.in +++ b/bacula/src/cats/update_postgresql_tables.in @@ -1,6 +1,6 @@ #!/bin/sh # -# Shell script to update PostgreSQL tables from version 1.36 to 1.37.12 +# Shell script to update PostgreSQL tables from version 1.36 to 1.38 # echo " " echo "This script will update a Bacula PostgreSQL database from version 8 to 9" diff --git a/bacula/src/cats/update_sqlite3_tables.in b/bacula/src/cats/update_sqlite3_tables.in index d0d9e743d3..37be54689a 100755 --- a/bacula/src/cats/update_sqlite3_tables.in +++ b/bacula/src/cats/update_sqlite3_tables.in @@ -1,6 +1,6 @@ #!/bin/sh # -# shell script to update SQLite from version 1.36 to 1.37.12 +# shell script to update SQLite from version 1.36 to 1.38 # echo " " echo "This script will update a Bacula SQLite database from version 8 to 9" diff --git a/bacula/src/cats/update_sqlite_tables.in b/bacula/src/cats/update_sqlite_tables.in index d0d9e743d3..37be54689a 100755 --- a/bacula/src/cats/update_sqlite_tables.in +++ b/bacula/src/cats/update_sqlite_tables.in @@ -1,6 +1,6 @@ #!/bin/sh # -# shell script to update SQLite from version 1.36 to 1.37.12 +# shell script to update SQLite from version 1.36 to 1.38 # echo " " echo "This script will update a Bacula SQLite database from version 8 to 9" diff --git a/bacula/updatedb/update_bacula_tables_8_to_9 b/bacula/updatedb/update_bacula_tables_8_to_9 new file mode 100755 index 0000000000..b7f3ca0f6c --- /dev/null +++ b/bacula/updatedb/update_bacula_tables_8_to_9 @@ -0,0 +1,17 @@ +#!/bin/sh +# +# This routine alters the appropriately configured +# Bacula tables for PostgreSQL, MySQL, or SQLite. +# +if test xsqlite = xpostgresql -o xsqlite3 = xpostgresql ; then + echo "Altering SQLite tables" + /etc/bacula/update_postgresql_tables $* +fi +if test xmysql = xpostgresql ; then + echo "Altering MySQL tables" + /etc/bacula/update_mysql_tables $* +fi +if test xpostgresql = xpostgresql ; then + echo "Altering PostgreSQL tables" + /etc/bacula/update_postgresql_tables $* +fi diff --git a/bacula/updatedb/update_bdb_tables_8_to_9 b/bacula/updatedb/update_bdb_tables_8_to_9 new file mode 100755 index 0000000000..833f9d9c93 --- /dev/null +++ b/bacula/updatedb/update_bdb_tables_8_to_9 @@ -0,0 +1,9 @@ +#!/bin/sh +# +# Shell script to update bdb tables +# Nothing to do here. +# +echo " " +bindir=/usr/bin + +exit 0 diff --git a/bacula/updatedb/update_mysql_tables_8_to_9 b/bacula/updatedb/update_mysql_tables_8_to_9 new file mode 100755 index 0000000000..f43f2598ec --- /dev/null +++ b/bacula/updatedb/update_mysql_tables_8_to_9 @@ -0,0 +1,99 @@ +#!/bin/sh +# +# Shell script to update MySQL tables from version 1.36 to 1.38 +# +echo " " +echo "This script will update a Bacula MySQL database from version 8 to 9" +echo "Depending on the size of your database," +echo "this script may take several minutes to run." +echo " " +bindir=/usr/bin + +if $bindir/mysql $* -f <