[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-6-gab5fc63

[Luca Capello]

The following commit has been merged in the master branch:
commit aa1107b34df32a5307206ec6b2b3effff50f9eea
Author: Jan Hauke Rahm <jhr at debian.org>
Date:   Wed Apr 13 16:52:29 2011 +0200

    Revert changes made without using patch system

diff --git a/configure b/configure
index e3c4e35..1c24d95 100755
--- a/configure
+++ b/configure
@@ -27993,7 +27993,7 @@ echo "$as_me: error: \"You can configure for only one database.\"" >&2;}
           if test -n "$PG_CONFIG";then
               POSTGRESQL_INCDIR=`"$PG_CONFIG" --includedir`
               POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir`
-              POSTGRESQL_BINDIR=/usr/bin
+              POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir`
           elif test -f /usr/local/include/libpq-fe.h; then
               POSTGRESQL_INCDIR=/usr/local/include
               if test -d /usr/local/lib64; then
@@ -28880,7 +28880,7 @@ echo "$as_me: error: Unable to find mysql in standard locations" >&2;}
            db_prog="postgresql"
            PG_CONFIG=`which pg_config`
            if test -n "$PG_CONFIG"; then
-              SQL_BINDIR=/usr/bin
+              SQL_BINDIR=`"$PG_CONFIG" --bindir`
               SQL_LIBDIR=`"$PG_CONFIG" --libdir`
            elif test -f /usr/local/bin/psql; then
               SQL_BINDIR=/usr/local/bin
diff --git a/scripts/logwatch/logfile.bacula.conf b/scripts/logwatch/logfile.bacula.conf
deleted file mode 100644
index c50b328..0000000
--- a/scripts/logwatch/logfile.bacula.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# What actual file?  Defaults to LogPath if not absolute path....
-LogFile = /var/lib/bacula/log
-
diff --git a/src/cats/update_mysql_tables.in b/src/cats/update_mysql_tables.in
index f14ebe9..2f85347 100644
--- a/src/cats/update_mysql_tables.in
+++ b/src/cats/update_mysql_tables.in
@@ -15,6 +15,7 @@ db_name=@db_name@
 if mysql $* -f <<END-OF-DATA
 USE ${db_name};
 
+ALTER TABLE JobMedia DROP Stripe ;
 ALTER TABLE JobMedia DROP Copy ;
 ALTER TABLE Job ADD COLUMN HasCache tinyint default 0 after HasBase;
 ALTER TABLE Job ADD COLUMN Reviewed tinyint default 0 after HasCache;
diff --git a/src/cats/update_postgresql_tables.in b/src/cats/update_postgresql_tables.in
index 7978e04..f99fd08 100644
--- a/src/cats/update_postgresql_tables.in
+++ b/src/cats/update_postgresql_tables.in
@@ -69,6 +69,8 @@ DROP INDEX file_fp_idx;
 -- CREATE INDEX CONCURRENTLY file_jpf_idx ON File (JobId, PathId, FilenameId)
 -- to make it without locks (require PostgreSQL 8.2 version)
 
+CREATE INDEX file_jpfid_idx on File (JobId, PathId, FilenameId);
+
 ANALYSE;
 
 END-OF-DATA
diff --git a/src/dird/bacula-dir.conf.in b/src/dird/bacula-dir.conf.in
index 44e4d89..080d59a 100644
--- a/src/dird/bacula-dir.conf.in
+++ b/src/dird/bacula-dir.conf.in
@@ -21,7 +21,6 @@ Director {                            # define myself
   Maximum Concurrent Jobs = 1
   Password = "@dir_password@"         # Console password
   Messages = Daemon
-  DirAddress = 127.0.0.1
 }
 
 JobDefs {
diff --git a/src/filed/bacula-fd.conf.in b/src/filed/bacula-fd.conf.in
index a196033..36f1061 100644
--- a/src/filed/bacula-fd.conf.in
+++ b/src/filed/bacula-fd.conf.in
@@ -34,7 +34,6 @@ FileDaemon {                          # this is me
   WorkingDirectory = @working_dir@
   Pid Directory = @piddir@
   Maximum Concurrent Jobs = 20
-  FDAddress = 127.0.0.1
 }
 
 # Send all messages except skipped files back to Director
diff --git a/src/stored/bacula-sd.conf.in b/src/stored/bacula-sd.conf.in
index d68c7db..7537cff 100644
--- a/src/stored/bacula-sd.conf.in
+++ b/src/stored/bacula-sd.conf.in
@@ -16,7 +16,6 @@ Storage {                             # definition of myself
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
   Maximum Concurrent Jobs = 20
-  SDAddress = 127.0.0.1
 }
 
 #
diff --git a/src/stored/stored.conf.in b/src/stored/stored.conf.in
index 4a7e3c4..6aa82cd 100644
--- a/src/stored/stored.conf.in
+++ b/src/stored/stored.conf.in
@@ -13,7 +13,6 @@ Storage {
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
   Subsys Directory = "@subsysdir@"
-  SDAddress = 127.0.0.1
 }
 
 #

-- 
Bacula, a network backup, recovery and verification program