From 7f9b98ee21b9afc9b15a5d553e75eebc410a799c Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sat, 5 Aug 2006 14:27:18 +0000 Subject: [PATCH] Re-enable and update sqlite script patches. Bug 648. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3242 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/platforms/mandrake/bacula.spec.in | 9 ++-- bacula/platforms/redhat/bacula.spec.in | 9 ++-- bacula/platforms/suse/bacula.spec.in | 9 ++-- bacula/src/cats/make_catalog_backup.in.patch | 45 ++++++++++++------- bacula/src/cats/update_sqlite_tables.in.patch | 15 +++++-- 5 files changed, 55 insertions(+), 32 deletions(-) diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index ef63417119..0c9aff2be6 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -806,16 +806,15 @@ make mtx cd ${cwd} # patches for the bundled sqlite scripts -# as of 1.38.0 first 3 patches no longer needed # patch the make_sqlite_tables script for installation bindir -# patch src/cats/make_sqlite_tables.in src/cats/make_sqlite_tables.in.patch +patch src/cats/make_sqlite_tables.in src/cats/make_sqlite_tables.in.patch # patch the create_sqlite_database script for installation bindir -#patch src/cats/create_sqlite_database.in src/cats/create_sqlite_database.in.patch +patch src/cats/create_sqlite_database.in src/cats/create_sqlite_database.in.patch # patch the make_catalog_backup script for installation bindir -#patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch +patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch # patch the update_sqlite_tables script for installation bindir patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch @@ -1621,6 +1620,8 @@ fi %endif %changelog +* Sat Aug 05 2006 D. Scott Barninger +- bug 648 renable and update sqlite patches * Mon Jul 17 2006 D. Scott Barninger - move pango-devel BuildRequires into gconsole only build * Sat Jul 15 2006 D. Scott Barninger diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index ef63417119..0c9aff2be6 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -806,16 +806,15 @@ make mtx cd ${cwd} # patches for the bundled sqlite scripts -# as of 1.38.0 first 3 patches no longer needed # patch the make_sqlite_tables script for installation bindir -# patch src/cats/make_sqlite_tables.in src/cats/make_sqlite_tables.in.patch +patch src/cats/make_sqlite_tables.in src/cats/make_sqlite_tables.in.patch # patch the create_sqlite_database script for installation bindir -#patch src/cats/create_sqlite_database.in src/cats/create_sqlite_database.in.patch +patch src/cats/create_sqlite_database.in src/cats/create_sqlite_database.in.patch # patch the make_catalog_backup script for installation bindir -#patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch +patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch # patch the update_sqlite_tables script for installation bindir patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch @@ -1621,6 +1620,8 @@ fi %endif %changelog +* Sat Aug 05 2006 D. Scott Barninger +- bug 648 renable and update sqlite patches * Mon Jul 17 2006 D. Scott Barninger - move pango-devel BuildRequires into gconsole only build * Sat Jul 15 2006 D. Scott Barninger diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index ef63417119..0c9aff2be6 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -806,16 +806,15 @@ make mtx cd ${cwd} # patches for the bundled sqlite scripts -# as of 1.38.0 first 3 patches no longer needed # patch the make_sqlite_tables script for installation bindir -# patch src/cats/make_sqlite_tables.in src/cats/make_sqlite_tables.in.patch +patch src/cats/make_sqlite_tables.in src/cats/make_sqlite_tables.in.patch # patch the create_sqlite_database script for installation bindir -#patch src/cats/create_sqlite_database.in src/cats/create_sqlite_database.in.patch +patch src/cats/create_sqlite_database.in src/cats/create_sqlite_database.in.patch # patch the make_catalog_backup script for installation bindir -#patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch +patch src/cats/make_catalog_backup.in src/cats/make_catalog_backup.in.patch # patch the update_sqlite_tables script for installation bindir patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch @@ -1621,6 +1620,8 @@ fi %endif %changelog +* Sat Aug 05 2006 D. Scott Barninger +- bug 648 renable and update sqlite patches * Mon Jul 17 2006 D. Scott Barninger - move pango-devel BuildRequires into gconsole only build * Sat Jul 15 2006 D. Scott Barninger diff --git a/bacula/src/cats/make_catalog_backup.in.patch b/bacula/src/cats/make_catalog_backup.in.patch index 68e12c51c9..ae4e765b47 100644 --- a/bacula/src/cats/make_catalog_backup.in.patch +++ b/bacula/src/cats/make_catalog_backup.in.patch @@ -1,16 +1,29 @@ -15c15 -< echo ".dump" | @SQL_BINDIR@/sqlite $1.db >$1.sql ---- -> echo ".dump" | /usr/lib/bacula/sqlite/sqlite $1.db >$1.sql -18c18 -< @SQL_BINDIR@/mysqldump -u $2 -f --opt $1 >$1.sql ---- -> /usr/bin/mysqldump -u $2 -f --opt $1 >$1.sql -20c20 -< @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql ---- -> /usr/bin/pg_dump -U $2 $1 >$1.sql -26c26 -< # rm -f @SQL_BINDIR@/../var/bacula/* ---- -> # rm -f /var/lib/mysql/bacula/* +--- make_catalog_backup.in 2006-08-05 10:05:11.000000000 -0400 ++++ make_catalog_backup.in.fixed 2006-08-05 10:11:53.000000000 -0400 +@@ -14,7 +14,7 @@ + cd @working_dir@ + rm -f bacula.sql + if test xsqlite = x@DB_NAME@ ; then +- echo ".dump" | @SQL_BINDIR@/sqlite $1.db >$1.sql ++ echo ".dump" | /usr/lib/bacula/sqlite/sqlite $1.db >$1.sql + else + if test xmysql = x@DB_NAME@ ; then + if test $# -gt 2; then +@@ -31,7 +31,7 @@ + fi + exec @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql + else +- echo ".dump" | @SQL_BINDIR@/sqlite3 $1.db >$1.sql ++ echo ".dump" | /usr/lib/bacula/sqlite/sqlite3 $1.db >$1.sql + fi + fi + fi +@@ -44,7 +44,7 @@ + # To read back a SQLite database use: + # cd @working_dir@ + # rm -f bacula.db +-# sqlite bacula.db bindir=/usr/lib/bacula/sqlite +--- update_sqlite_tables.in 2006-08-05 10:20:06.000000000 -0400 ++++ update_sqlite_tables.in.fixed 2006-08-05 10:18:23.000000000 -0400 +@@ -9,7 +9,7 @@ + echo "this script may take several minutes to run." + echo " " + +-bindir=@SQL_BINDIR@ ++bindir=/usr/lib/bacula/sqlite + cd @working_dir@ + sqlite=@DB_NAME@ + -- 2.39.5