From 4cf73a7dcace4d03745f9ae92e0899729d6cd281 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 6 Nov 2005 18:04:07 +0000 Subject: [PATCH] - Apply patch supplied by Eric Bollinger to fix PostgreSQL grant on status. Bug #465 - Apply patch supplied by Eric Bollinger to fix PostgreSQL update script. Bug #464 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2551 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/.cvsignore | 61 ++++++++++--------- bacula/ChangeLog | 26 +++++++- bacula/ReleaseNotes | 24 +++++++- bacula/kes-1.38 | 29 +++++++++ bacula/kes-1.39 | 13 ++++ bacula/src/.cvsignore | 1 + .../src/cats/grant_postgresql_privileges.in | 1 + bacula/src/cats/update_postgresql_tables.in | 12 ++-- bacula/src/console/.cvsignore | 1 + bacula/src/gnome2-console/.cvsignore | 1 + bacula/src/version.h | 2 +- .../updatedb/update_postgresql_tables_8_to_9 | 14 ++--- bacula/updatedb/update_sqlite3_tables_8_to_9 | 4 +- bacula/updatedb/update_sqlite_tables_8_to_9 | 4 +- 14 files changed, 143 insertions(+), 50 deletions(-) create mode 100644 bacula/kes-1.38 create mode 100644 bacula/kes-1.39 diff --git a/bacula/.cvsignore b/bacula/.cvsignore index 9d9a15180d..d447ee6f7a 100644 --- a/bacula/.cvsignore +++ b/bacula/.cvsignore @@ -1,13 +1,6 @@ -*.txt -wxconsole 1 2 -txt -set-gnome2 -set-gnome1.4 -kerns-gprof-config autom4te.cache -Makefile bacula btraceback config.cache @@ -16,47 +9,57 @@ config.out config.status configure.lineno console +console.log +console.sum diff fd gconsole -kerns-console.conf -kerns-dird.conf -kerns-filed.conf -kerns-gnome-console.conf -kerns-mysql-config -kerns-sqlite-config -kerns-stored.conf kernsconfig kernsconfignodb +kerns-console.conf kernsdesign +kerns-dird.conf kernsdisclaimers kernsdone +kerns-filed.conf kernsfloppymount +kerns-gnome-console.conf +kerns-gprof-config +kerns-mysql-config +kerns-nopython-conf kernsnosqlconfig kernsolarisconfig +kerns-postgresql-config kernsproductionconfig +kerns-sqlite-config +kerns-stored.conf kernssunproductionconfig kernswinconfig kernswinproductionconfig +Makefile +newdb +newtape +run +run_clean +run_clean_tape +run_two +run_two_broken +set-gnome1.4 +set-gnome2 startit startmysql +startpostgre stopit stopmysql -console.log -console.sum -zapall -zaptapes stoppostgre -startpostgre -kerns-postgresql-config -run -run_clean -run_two_broken -run_two -run_clean_tape -newdb -kerns-nopython-conf -newtape +test.out +test-tape time.py time.pyc -test.out +txt +*.txt +wxconsole +zapall +zaptapes +kerns-pgsql-config +fake-mtx diff --git a/bacula/ChangeLog b/bacula/ChangeLog index 653ad4c674..0bea4ebf02 100644 --- a/bacula/ChangeLog +++ b/bacula/ChangeLog @@ -1,5 +1,29 @@ -Released as 1.38.0 28Oct05: + +Changes to 1.38.1: +- Apply patch supplied by Eric Bollinger to fix PostgreSQL + grant on status. Bug #465 +- Apply patch supplied by Eric Bollinger to fix PostgreSQL + update script. Bug #464 +- Fix off by one for last Slot of autochanger for label. +- Update release date. +- Tweak an authentication error message in dir. +- Fix autoloader so that mutex is set and released around + each run_program(). There was a missing set. +- Remove an unnecessary drive release in autochanger. +- Modify configure.in to add execute option to sqlite3 catalog + scripts. +- Create update_xxx_table_8_to_9 scripts for updatedb +- Fix wrong variable in bpipe.c debug output reported by user. +- Fix improper placement of encode_and_send_attributes() in + FD backup.c causing first file of non-portable Win32 backup + to have wrong stream. Reported by Thorsten. +- Move the -lcrypt for PostgreSQL after the PostgreSQL libs in + autoconf/bacula-macros/db.m4 as suggested by user. Fixes bug #457. +- Remove @STATIC_CONS@ from tray-monitor Makefile as suggested + by user. Fixes bug #456. + +Released 1.38.0 (28Oct05): 31 October 2005 Changes to 1.37.42: 26Oct05 diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index 60ebe5858c..88447bce39 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -1,10 +1,25 @@ - Release Notes for Bacula 1.38.0 + Release Notes for Bacula 1.38.1 Bacula code: Total files = 420 Total lines = 138,440 (*.h *.c *.in) 20,440 additional lines of code since version 1.36.3 -Major Changes: +Changes since 1.38.0: +- Fix several problems with PostgreSQL scripts. +- Critical: allow restore of the first file of non-portable Win32 backup. +- Important: with muliple concurrent jobs the autochanger could get + confused because of a missing mutex. +- Fix accessing last slot in label and update slots. +- Modify configure.in to add execute option to sqlite3 catalog + scripts. +- Create update_xxx_table_8_to_9 scripts for updatedb +- Move the -lcrypt for PostgreSQL after the PostgreSQL libs in + autoconf/bacula-macros/db.m4 as suggested by user. Fixes bug #457. +- Remove @STATIC_CONS@ from tray-monitor Makefile as suggested + by user. Fixes bug #456. + + +Major Changes in 1.38: - Fixed out of order Volumes in restore. - Improved algorithm for reserving drives in multiple drive autochangers. Autochange users MUST use the new Autochanger @@ -190,6 +205,11 @@ Items to note!!! Typically you will see this in the Storage daemon first. The solution is to compile Bacula ensuring that no optimization is turned on (normally it is -O2). + This same compiler bug has been reported and confirmed with + gcc (GCC) 4.0.2 20050901 (prerelease) (SUSE Linux) running on + an AMD64 CPU. This for the moment, I would recommend that all + users of GCC 4.0.1 or greater turn off all optimization when + compiling. Other Items: diff --git a/bacula/kes-1.38 b/bacula/kes-1.38 new file mode 100644 index 0000000000..5c12a155c6 --- /dev/null +++ b/bacula/kes-1.38 @@ -0,0 +1,29 @@ + Technical notes on version 1.38 + Kern Sibbald + +General: + +Changes to 1.38.1: +- Apply patch supplied by Eric Bollinger to fix PostgreSQL + grant on status. Bug #465 +- Apply patch supplied by Eric Bollinger to fix PostgreSQL + update script. Bug #464 +- Fix off by one for last Slot of autochanger for label. +- Update release date. +- Tweak an authentication error message in dir. +- Fix autoloader so that mutex is set and released around + each run_program(). There was a missing set. +- Remove an unnecessary drive release in autochanger. +- Modify configure.in to add execute option to sqlite3 catalog + scripts. +- Create update_xxx_table_8_to_9 scripts for updatedb +- Fix wrong variable in bpipe.c debug output reported by user. +- Fix improper placement of encode_and_send_attributes() in + FD backup.c causing first file of non-portable Win32 backup + to have wrong stream. Reported by Thorsten. +- Move the -lcrypt for PostgreSQL after the PostgreSQL libs in + autoconf/bacula-macros/db.m4 as suggested by user. Fixes bug #457. +- Remove @STATIC_CONS@ from tray-monitor Makefile as suggested + by user. Fixes bug #456. + +Released 1.38.0 (28Oct05): 31 October 2005 diff --git a/bacula/kes-1.39 b/bacula/kes-1.39 new file mode 100644 index 0000000000..70f29dc4bf --- /dev/null +++ b/bacula/kes-1.39 @@ -0,0 +1,13 @@ + Technical notes on version 1.39 + Kern Sibbald + +General: + +Changes to 1.39.0: +- Apply patch supplied by Eric Bollinger to fix PostgreSQL + grant on status. Bug #465 +- Apply patch supplied by Eric Bollinger to fix PostgreSQL + update script. Bug #464 +- Tweak #ifdefing a bit in new Win32 stream code. +- Fix #ifdeffing for FD_NO_SEND_TEST. +- Add documentation of performance #defines diff --git a/bacula/src/.cvsignore b/bacula/src/.cvsignore index 463e48169e..07944ff029 100644 --- a/bacula/src/.cvsignore +++ b/bacula/src/.cvsignore @@ -7,3 +7,4 @@ testprogs host.h perlgui python +pyqt diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in index 60df1692a8..24e0cdce1e 100644 --- a/bacula/src/cats/grant_postgresql_privileges.in +++ b/bacula/src/cats/grant_postgresql_privileges.in @@ -27,6 +27,7 @@ grant all on cdimages to ${USER}; grant all on mediatype to ${USER}; grant all on storage to ${USER}; grant all on device to ${USER}; +grant all on status to ${USER}; -- for sequences on those tables diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in index ea746d5835..e98062f51b 100755 --- a/bacula/src/cats/update_postgresql_tables.in +++ b/bacula/src/cats/update_postgresql_tables.in @@ -21,13 +21,13 @@ ALTER TABLE pool ADD COLUMN labeltype integer; UPDATE pool set labeltype=0; ALTER TABLE pool ALTER COLUMN labeltype SET NOT NULL; ALTER TABLE pool ADD COLUMN NextPoolId integer; -ALTER TABLE pool SET NextPoolId=0; +UPDATE pool SET NextPoolId=0; ALTER TABLE pool ADD COLUMN MigrationHighBytes BIGINT; -ALTER TABLE pool SET MigrationHighBytes=0; +UPDATE pool SET MigrationHighBytes=0; ALTER TABLE pool ADD COLUMN MigrationLowBytes BIGINT; -ALTER TABLE pool SET MigrationLowBytes=0; +UPDATE pool SET MigrationLowBytes=0; ALTER TABLE pool ADD COLUMN MigrationTime BIGINT; -ALTER TABLE pool SET MigrationTime=0; +UPDATE pool SET MigrationTime=0; ALTER TABLE jobmedia ADD COLUMN Copy integer; @@ -51,7 +51,7 @@ CREATE TABLE Device ( DeviceId SERIAL, Name TEXT NOT NULL, MediaTypeId INTEGER NOT NULL, - StorageId INTEGER UNSIGNED, + StorageId INTEGER, DevMounts INTEGER NOT NULL DEFAULT 0, DevReadBytes BIGINT NOT NULL DEFAULT 0, DevWriteBytes BIGINT NOT NULL DEFAULT 0, @@ -60,7 +60,7 @@ CREATE TABLE Device ( DevReadTime BIGINT NOT NULL DEFAULT 0, DevWriteTime BIGINT NOT NULL DEFAULT 0, DevReadTimeSinceCleaning BIGINT NOT NULL DEFAULT 0, - DevWriteTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0, + DevWriteTimeSinceCleaning BIGINT DEFAULT 0, CleaningDate TIMESTAMP WITHOUT TIME ZONE, CleaningPeriod BIGINT NOT NULL DEFAULT 0, PRIMARY KEY(DeviceId) diff --git a/bacula/src/console/.cvsignore b/bacula/src/console/.cvsignore index 3a7ec3075f..d2b54c74a8 100644 --- a/bacula/src/console/.cvsignore +++ b/bacula/src/console/.cvsignore @@ -8,3 +8,4 @@ bconsole bconsole.conf startit stopit +static-bconsole diff --git a/bacula/src/gnome2-console/.cvsignore b/bacula/src/gnome2-console/.cvsignore index 37844ba1f1..d1324549a1 100644 --- a/bacula/src/gnome2-console/.cvsignore +++ b/bacula/src/gnome2-console/.cvsignore @@ -6,3 +6,4 @@ gnome-console.conf 2 3 main.c +static-gnome-console diff --git a/bacula/src/version.h b/bacula/src/version.h index eae3792045..625d577e89 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -3,7 +3,7 @@ */ #undef VERSION -#define VERSION "1.38.1" +#define VERSION "1.39.0" #define BDATE "05 November 2005" #define LSMDATE "05Nov05" diff --git a/bacula/updatedb/update_postgresql_tables_8_to_9 b/bacula/updatedb/update_postgresql_tables_8_to_9 index c97f87144d..2d43038084 100755 --- a/bacula/updatedb/update_postgresql_tables_8_to_9 +++ b/bacula/updatedb/update_postgresql_tables_8_to_9 @@ -20,14 +20,14 @@ UPDATE media SET StorageId=0; ALTER TABLE pool ADD COLUMN labeltype integer; UPDATE pool set labeltype=0; ALTER TABLE pool ALTER COLUMN labeltype SET NOT NULL; -ALTER TABLE pool ADD COLUMN NextPoolId integer; -ALTER TABLE pool SET NextPoolId=0; +ALTER TABLE pool ADD COLUMN NextPoolId integer; +UPDATE pool SET NextPoolId=0; ALTER TABLE pool ADD COLUMN MigrationHighBytes BIGINT; -ALTER TABLE pool SET MigrationHighBytes=0; +UPDATE pool SET MigrationHighBytes=0; ALTER TABLE pool ADD COLUMN MigrationLowBytes BIGINT; -ALTER TABLE pool SET MigrationLowBytes=0; +UPDATE pool SET MigrationLowBytes=0; ALTER TABLE pool ADD COLUMN MigrationTime BIGINT; -ALTER TABLE pool SET MigrationTime=0; +UPDATE pool SET MigrationTime=0; ALTER TABLE jobmedia ADD COLUMN Copy integer; @@ -51,7 +51,7 @@ CREATE TABLE Device ( DeviceId SERIAL, Name TEXT NOT NULL, MediaTypeId INTEGER NOT NULL, - StorageId INTEGER UNSIGNED, + StorageId INTEGER, DevMounts INTEGER NOT NULL DEFAULT 0, DevReadBytes BIGINT NOT NULL DEFAULT 0, DevWriteBytes BIGINT NOT NULL DEFAULT 0, @@ -60,7 +60,7 @@ CREATE TABLE Device ( DevReadTime BIGINT NOT NULL DEFAULT 0, DevWriteTime BIGINT NOT NULL DEFAULT 0, DevReadTimeSinceCleaning BIGINT NOT NULL DEFAULT 0, - DevWriteTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0, + DevWriteTimeSinceCleaning BIGINT DEFAULT 0, CleaningDate TIMESTAMP WITHOUT TIME ZONE, CleaningPeriod BIGINT NOT NULL DEFAULT 0, PRIMARY KEY(DeviceId) diff --git a/bacula/updatedb/update_sqlite3_tables_8_to_9 b/bacula/updatedb/update_sqlite3_tables_8_to_9 index 6c3a641cd1..a6bf0878c9 100755 --- a/bacula/updatedb/update_sqlite3_tables_8_to_9 +++ b/bacula/updatedb/update_sqlite3_tables_8_to_9 @@ -10,7 +10,7 @@ echo " " bindir=/usr/bin cd /var/bacula/working -sqlite=postgresql +sqlite=sqlite3 ${bindir}/${sqlite} $* bacula.db <