bacula-dbi_fixes.patch

   1 --- bacula-3.0.0.orig/Makefile.in       2009-04-22 11:34:25.143705345 +0200
   2 +++ bacula-3.0.0/Makefile.in    2009-04-22 11:46:51.634779414 +0200
   3 @@ -191,8 +191,8 @@
   4         (cd src/cats; \
   5          chmod 755 create_bacula_database      update_bacula_tables     make_bacula_tables; \
   6          chmod 755 grant_bacula_privileges     drop_bacula_tables       drop_bacula_database; \
   7 -        chmod 755 create_@DB_TYPE@_database   update_@DB_TYPE@_tables  make_@DB_TYPE@_tables; \
   8 -        chmod 755 grant_@DB_TYPE@_privileges  drop_@DB_TYPE@_tables    drop_@DB_TYPE@_database; \
   9 +        chmod 755 create_*_database   update_*_tables  make_*_tables fix_*_tables; \
  10 +        chmod 755 grant_*_privileges  drop_*_tables    drop_*_database; \
  11          chmod 755 make_catalog_backup delete_catalog_backup)
  12         (cd src/qt-console; \
  13          chmod 755 install_conf_file build-depkgs-qt-console)
  14 --- bacula-3.0.0.orig/src/cats/Makefile.in      2009-04-22 11:34:25.204854395 +0200
  15 +++ bacula-3.0.0/src/cats/Makefile.in   2009-04-22 12:05:18.107024138 +0200
  16 @@ -125,19 +125,16 @@
  17         $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la
  18
  19  install: @LIBTOOL_INSTALL_TARGET@ @INCLUDE_INSTALL_TARGET@
  20 -       $(INSTALL_SCRIPT) create_@DB_TYPE@_database $(DESTDIR)$(scriptdir)/create_@DB_TYPE@_database
  21 -       $(INSTALL_SCRIPT) update_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/update_@DB_TYPE@_tables
  22 -       $(INSTALL_SCRIPT) make_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/make_@DB_TYPE@_tables
  23 -       $(INSTALL_SCRIPT) grant_@DB_TYPE@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_TYPE@_privileges
  24 -       $(INSTALL_SCRIPT) drop_@DB_TYPE@_tables $(DESTDIR)$(scriptdir)/drop_@DB_TYPE@_tables
  25 -       $(INSTALL_SCRIPT) drop_@DB_TYPE@_database $(DESTDIR)$(scriptdir)/drop_@DB_TYPE@_database
  26 -
  27 -       $(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database
  28 -       $(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables
  29 -       $(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
  30 -       $(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(scriptdir)/grant_bacula_privileges
  31 -       $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
  32 -       $(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database
  33 +       for dbtype in bdb mysql postgresql sqlite3 sqlite; do \
  34 +               [ ! -f create_$${dbtype}_database ] || $(INSTALL_SCRIPT) create_$${dbtype}_database $(DESTDIR)$(scriptdir)/create_$${dbtype}_database; \
  35 +               [ ! -f update_$${dbtype}_tables ] || $(INSTALL_SCRIPT) update_$${dbtype}_tables $(DESTDIR)$(scriptdir)/update_$${dbtype}_tables; \
  36 +               [ ! -f make_$${dbtype}_tables ] || $(INSTALL_SCRIPT) make_$${dbtype}_tables $(DESTDIR)$(scriptdir)/make_$${dbtype}_tables; \
  37 +               [ ! -f grant_$${dbtype}_privileges ] || $(INSTALL_SCRIPT) grant_$${dbtype}_privileges $(DESTDIR)$(scriptdir)/grant_$${dbtype}_privileges; \
  38 +               [ ! -f drop_$${dbtype}_tables ] || $(INSTALL_SCRIPT) drop_$${dbtype}_tables $(DESTDIR)$(scriptdir)/drop_$${dbtype}_tables; \
  39 +               [ ! -f drop_$${dbtype}_database ] || $(INSTALL_SCRIPT) drop_$${dbtype}_database $(DESTDIR)$(scriptdir)/drop_$${dbtype}_database; \
  40 +       done
  41 +
  42 +               $(INSTALL_SCRIPT) fix_postgresql_tables $(DESTDIR)$(scriptdir)/fix_postgresql_tables
  43
  44         @filename=make_catalog_backup; \
  45            if  test -f $(DESTDIR)$(scriptdir)/$$filename; then \