From: Kern Sibbald Date: Wed, 4 Jun 2008 10:23:12 +0000 (+0000) Subject: Doc + version update for release X-Git-Tag: Release-2.4.0~2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1ae95d12571a16b7b80d939ba447a3f7e902d288;p=bacula%2Fbacula Doc + version update for release git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@7103 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/ChangeLog b/bacula/ChangeLog index afa28545a0..d7cc682e29 100644 --- a/bacula/ChangeLog +++ b/bacula/ChangeLog @@ -1,6 +1,35 @@ - Technical notes on version 2.2.x + Technical notes on version 2.4.x General: +Release Version 2.4.0 +04Jun08 +kes Update version to reflect the magnitude of the SD changes. +03Jun08 +kes Make sure to clear JS_WaitMedia when operator mounts a Volume. + This fixes bug #1095. +31May08 +kes Add create_postgresql_database.sql to Win32 installer. Should + fix problem reported by Juilio Monteiro. +kes Get correct slot when auto unloading a device. This fixes bug + #1086. +30May08 +kes Fix multiple media restore. +kes Make DEVICE Slot private and access it via a method. + Allows better control over when it is set and cleared. +kes Fix possible seg fault if SQL error. +28May08 +kes Add debug code to SD. +kes Fix renaming a Volume, which used the wrong Volume name. +26May08 +kes If operator has rewind tape, print warning, release tape and + try once more. If tape is positioned somewhere, something went + wrong, so mark the tape in error and try once more. Previously + this error was fatal, now it produces an error message. +kes Ensure correct volume name displayed during restore +kes Ensure that Volume is mounted for restore. +25May08 +kes Fix a few more Coverity reported problems. + Beta Release Version 2.2.10-b4 24May08 kes Enhance a couple of SD debug messages. diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index 80b3e19245..5a84df3a03 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -1,150 +1,114 @@ - Release Notes for Bacula 2.2.10 + Release Notes for Bacula 2.4.0 - Bacula code: Total files = 498 Total lines = 167,596 (*.h *.c *.in) - 82 new files, 41,221 new lines of code, 208,380 lines of change from 2.0.3 + Bacula code: Total files = 500 Total lines = 188,654 (*.h *.c *.in) This Director and Storage daemon must be upgraded at the same time, but they should be compatible with all 2.0.x File daemons, unless you use some of the new features that affect the FD. In other words, you should not have to upgrade all your File daemons when you upgrade. There is -no database upgrade needed from version 2.0.x to 2.2.0. +no database upgrade needed from version 2.0.x to 2.2.0 nor from version +2.2.x to version 2.4.0 ================== Warning !!!!!! ========================== -As of Version 2.2.10-b4, the Win32 FD should not descend into +As of Version 2.4.0, the Win32 FD should not descend into any reparse point directory or reparse mount points unless the -specified directory is explicitly mentioned at the top level of +specified directory is explicitly mentioned at the top level of FileSet (as with Unix). A file that is linked to another file will be backed up, much like Unix hardlinked files. If you want reparse directories backed up, you must explicitly include them in your FileSet. ============================================================== -Beta Release Version 2.2.10-b4 -24May08 -kes Enhance a couple of SD debug messages. -kes Tweak unload flag setting and ensure it is set during swap. -23May08 -ebl Fix #1091 about bad output in estimate command. -21May08 -kes Modify autochanger locking to attempt to avoid race - conditions. -kes Make sure device not busy before doing label command. -kes Display open() errors except when polling. Previously too - many were suppressed. This should fix bug #1070. -kes Fix Win32 reparse points. Bacula will not recurse into any - reparse point directory, including mount points, unless the - directory is explicitly mentioned at the top level (same as - with Unix). A file that is linked to another file will be - backed up -- much as Unix does for hardlinked files. - This fixes bug #1041. -20May08 -kes Remove double quotes from ChangeLog and ReleaseNotes -kes Remove StorageId test when pruning and recycling (Eric's changes). -kes Remove old form of locking when getting volumes -- causes deadlock. -17May08 -kes Fix buffer overruns detected by Coverity. +This release consists mainly of a number of bug fixes since 2.2.x +but most importantly, a rewrite of significant portions of the +Storage daemon reservation and autochanger code. This rewritten +code is simpler, more stable, and works much better, particularly +with multiple drive autochangers than the prior code did. That +said, there are still a number of issues to be resolved. Note, +the new code has not been tested in manual volume mount situations. -Beta Release Version 2.2.10-b3 -12May08 -kes Implement --without-qwt -kes Fix layout of restore tree dialog -kes Add configure bat QWT libraries, so that bat can be built - with or without the QWT libaries. -11May08 -kes Apply batfix bat cleanup patch from Riccardo. -kes Make sure we unload the right slot when swapping. -08May08 -kes Improve SD reserve debug code. -kes Testing an improvement to free up volumes no longer in use. +Bugs fixed: + 1095, 1086, 1091, 1070, 1041, 1083, 1078, 1066, 1068, 1038 + 1062, 1065, 1046, 1047, 1031 -Beta Release Version 2.2.10-b2 -03May08 -kes Rework SD acquire for read to handle autochanger Volume - swapping. -kes Implement regression that explicitly tests swapping a Volume - from one drive to another. -kes Enhance disk-changer to detect most error conditions. -kes Fix SD code so that it properly swaps a Volume between drives. - This fixes bug #1083. -01May08 -kes Prevent a Volume that is being swapped from being freed from - the volume list. This will most likely fix, at least partially, - bug #1083. -kes Fix strippath so that it does not get a buffer overrun and crash FD. - This fixes bug #1078. -kes Make inability to change owner/group when creating a dir only a - warning rather than an error. -28Apr08 -ebl Fix SQL query in migration code -19Apr08 -kes Force unload of volume when wrong volume mounted in SD. -17Apr08 -kes Fix bat seg fault at termination. -kes Add Bacula generated version to bat about box. +New features: +- You can now build bat without the QWT libraries. Use + --without-qwt as a ./configure option. - -Version 2.2.10-b1 is primarily a Storage daemon reservations system - enhancement to 2.2.9-beta -16Apr08 -kes Permit multiple simultaneous restores -- experiment. -15Apr08 -kes Backport development stream SD reservation system changes. - See below: -=== -16Apr08 -kes Move final volume swapping code to DCR method and - call it from acquire_for_read(). -kes When wrong volume is mounted during read, unload_autochanger. -14Apr08 -kes Stop searching for Volumes in SD askdir if DIR returns the - same volume name twice in a row. -13Apr08 -kes Tweak the swap Volume from one drive to another code so that - it now seems to work. -kes Resolve several problems with recycling that broke the new - code (these problems are in 2.2.9 as well). -kes Remove the volume lock when calling the sysop code. -kes Don't mark a reserved volume with no writers as unused otherwise - jobs fail. -12Apr08 -kes Rework class structures for VOLRES, DCR, and DEVICE to make - the method names a bit more logical, and for more logically - handling the responsibilities. -11Apr08 -kes Remove redundant code in terminating the scheduler that just - causes a seg fault in many cases. -kes Cleanup releasing a volume and make it a DCR method. -kes Improve algorithm for detecting pre-reserved volume and - swapping volumes. -10Apr08 -kes Tweak volume swapping code so it works. -kes Correct name overloading in mount.c -kes Replace released flag in VOLRES with reserved and add access - methods for the VOLRES class. -kes Prevent volume from being released while being swapped. -kes Refactor parts of stored/mount.c -09Apr08 -ebl Add sanity checks for VolWriteTime and VolReadTime -ebl Take care of bad clock changes while computing VolWriteTime - and VolReadTime. This should fix or limit #1066 -kes Correct error string numbers in dird/catreq.c -kes Restructure reserving, acquiring, and mounting volumes. Calls to - autochanger are deferred for mount.c -- simplifes the code. -08Apr08 -kes Do not prune any running job. It just fails the job. -kes Lock the volumes when changing dev->reserved_device and marking - the volume unused otherwise the device can get reserved by - another job before the volume is released, thus blocking it. -=== - -Version 2.2.9 is a bug fix to version 2.2.8: -- Close bat console windows first to eliminate error message - from the notifier. -- Remove useless code in Scheduler that causes seg fault on - termination. +Release Version 2.4.0 +- Update version to 2.4.0 to reflect the magnitude of the SD changes. +- Make sure to clear JS_WaitMedia when operator mounts a Volume. + This fixes bug #1095. +- Add create_postgresql_database.sql to Win32 installer. Should + fix problem reported by Juilio Monteiro. +- Get correct slot when auto unloading a device. This fixes bug + #1086. +- Fix possible seg fault if SQL error. +- Fix renaming a Volume, which used the wrong Volume name. +- If operator has rewind tape, print warning, release tape and + try once more. If tape is positioned somewhere, something went + wrong, so mark the tape in error and try once more. Previously + this error was fatal, now it produces an error message. +- Ensure correct volume name displayed during restore +- Fix a few more Coverity reported problems. +- Fix #1091 about bad output in estimate command. +- Modify autochanger locking to attempt to avoid race + conditions. +- Make sure device not busy before doing label command. +- Display open() errors except when polling. Previously too + many were suppressed. This should fix bug #1070. +- Fix Win32 reparse points. Bacula will not recurse into any + reparse point directory, including mount points, unless the + directory is explicitly mentioned at the top level (same as + with Unix). A file that is linked to another file will be + backed up -- much as Unix does for hardlinked files. + This fixes bug #1041. +- Remove StorageId test when pruning and recycling (Eric's changes). +- Fix buffer overruns detected by Coverity. +- Implement --without-qwt +- Fix layout of restore tree dialog +- Add configure bat QWT libraries, so that bat can be built + with or without the QWT libaries. +- Implement regression that explicitly tests swapping a Volume + from one drive to another. +- Enhance disk-changer to detect most error conditions. +- Fix SD code so that it properly swaps a Volume between drives. + This fixes bug #1083. +- Prevent a Volume that is being swapped from being freed from + the volume list. This will most likely fix, at least partially, + bug #1083. +- Fix strippath so that it does not get a buffer overrun and crash FD. + This fixes bug #1078. +- Make inability to change owner/group when creating a dir only a + warning rather than an error. +- Fix SQL query in migration code +- Fix bat seg fault at termination. +- Add Bacula generated version to bat about box. +- Backport development stream SD reservation system changes. +- When wrong volume is mounted during read, unload_autochanger. +- Stop searching for Volumes in SD askdir if DIR returns the + same volume name twice in a row. +- Rework class structures for VOLRES, DCR, and DEVICE to make + the method names a bit more logical, and for more logically + handling the responsibilities. +- Remove redundant code in terminating the scheduler that just + causes a seg fault in many cases. +- Improve algorithm for detecting pre-reserved volume and + swapping volumes. +- Prevent volume from being released while being swapped. +- Refactor parts of stored/mount.c +- Add sanity checks for VolWriteTime and VolReadTime +- Take care of bad clock changes while computing VolWriteTime + and VolReadTime. This should fix or limit #1066 +- Correct error string numbers in dird/catreq.c +- Restructure reserving, acquiring, and mounting volumes. Calls to + autochanger are deferred for mount.c -- simplifes the code. +- Do not prune any running job. It just fails the job. +- Lock the volumes when changing dev->reserved_device and marking + the volume unused otherwise the device can get reserved by + another job before the volume is released, thus blocking it. - Correct some SD catalog request error messages. -- Don't allow pruning of any running job. - Turn off code in read_record that causes a seg fault in the SD when reading past an EOS_LABEL. - Turn off unloading the autochanger in reserve.c as it just @@ -169,7 +133,6 @@ Version 2.2.9 is a bug fix to version 2.2.8: - Attempt to do correct handling of Win32 mount points. Should fix bug #1046. - Add const to AIX prototype for initgroups() -- Undo bug #1047 heap overrun fix as it is not correct. - Fix to the JobMedia patch, which introduced a new problem. - Fix creating first JobMedia record during Migration to include proper index. This caused slow restores of migrated jobs. @@ -179,11 +142,14 @@ Version 2.2.9 is a bug fix to version 2.2.8: - Apply patch to correct bug #1031, about wrong pool source information in job report. + +========================================================================= + Version 2.2.8 is a bug fix to version 2.2.7: - It fixes bugs: 1036, 1033(doc), 1028, 1040, 1045(doc), 1030, 1042(partially), and possibly bugs 1018 and 1032. Bugs 1018 and 1032 involve problems with multiple-drive autochangers, - and are difficult to reproduce. + and are difficult to reproduce. See the ChangeLog for more details. Version 2.2.7 has several new features and several important bug fixes @@ -250,8 +216,8 @@ Version 2.2.3 is a critical bug fix release to version 2.2.2 2.0.0 on, and probably versions prior to that. A detailed analysis of the bug can be found at: - http://www.bacula.org/downloads/bug-395.txt - + http://www.bacula.org/downloads/bug-395.txt + - Add ./configure search in qwt-qt4 for qwt package - Apply Martin Simmons patch that should turn off the new API usage when batch insert is turned off allowing building on older @@ -269,7 +235,7 @@ Version 2.2.1 is mainly a minor bug fix release to version 2.2.0, the main changes since 2.2.0 are: - Fixed bugs #921, 930, and 923. - More portable timezone offset in bsmtp thaks to Attila Fülöp. -- Fix several bat issues. +- Fix several bat issues. - Use GTK+ calls instead of egg files in tray-monitor. - Win32 service routines rewritten - Updated projects file @@ -346,15 +312,15 @@ New bconsole commands: New directives: - Heartbeat Interval (bconsole.conf) - Heartbeat Interval (bacula-dir.conf in Director, Client, Storage) -- TLS Allowed CN (bacula-dir.conf in Client) -- Regex Where (bacula-dir.conf in Job) -- Strip Prefix (bacula-dir.conf in Job) -- Add Prefix (bacula-dir.conf in Job) -- Add Suffex (bacula-dir.conf in Job) -- Recycle Pool (bacula-dir.conf in Pool) -- FailJobOnError (bacula-dir.conf in RunScript) +- TLS Allowed CN (bacula-dir.conf in Client) +- Regex Where (bacula-dir.conf in Job) +- Strip Prefix (bacula-dir.conf in Job) +- Add Prefix (bacula-dir.conf in Job) +- Add Suffex (bacula-dir.conf in Job) +- Recycle Pool (bacula-dir.conf in Pool) +- FailJobOnError (bacula-dir.conf in RunScript) - CheckFileChanges (bacula-dir.conf in FileSet) -- StripPath (bacula-dir.conf in FileSet) +- StripPath (bacula-dir.conf in FileSet) Other features or bug fixes: - Fixed bugs: 916, 910, 917, 914, 906, 907, @@ -384,7 +350,7 @@ Other features or bug fixes: - Different locking in reservations and despooling systems, which means more micro-locking and less macro-locking, which should give a lot more concurrency at the expense of slightly - (<0.1%) more overhead due to more locking/unlocking, but + (<0.1%) more overhead due to more locking/unlocking, but concurrent jobs should run much faster. - Additional drive reservation algorithm that should solve a lot of the problems experienced with multiple drive autochangers. diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index 9942e4bf73..09915edd79 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2006 Kern Sibbald +# Copyright (C) 2000-2008 Kern Sibbald # Platform Build Configuration @@ -1279,15 +1279,15 @@ export QTLIB=/usr/lib64/qt4/ %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ --enable-client-only \ - %if %{mdk} - --disable-nls \ - %endif + %if %{mdk} + --disable-nls \ + %endif --enable-static-fd make @@ -1295,10 +1295,10 @@ make %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ %if %{gconsole} --enable-gnome \ @@ -1316,22 +1316,22 @@ make --with-postgresql \ %endif %if %{wxconsole} - --enable-bwx-console \ + --enable-bwx-console \ %endif %if %{bat} - --enable-bat \ - --with-qwt=${cwd}/%{depkgs}/qwt \ + --enable-bat \ + --with-qwt=${cwd}/%{depkgs}/qwt \ %endif %if %{python} - --with-python \ + --with-python \ %endif %if %{client_only} - --enable-client-only \ + --enable-client-only \ %endif %if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3} - --disable-batch-insert \ + --disable-batch-insert \ %endif - --mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-subsys-dir=/var/lock/subsys \ --with-dir-user=%{director_daemon_user} \ --with-dir-group=%{daemon_group} \ @@ -1384,11 +1384,11 @@ mkdir -p $RPM_BUILD_ROOT%{sqlite_bindir} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ install %if ! %{client_only} && %{mtx} @@ -1396,10 +1396,10 @@ cd %{depkgs} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ mtx-install cd ${cwd} @@ -1741,24 +1741,24 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` # are we upgrading from sqlite to sqlite3? if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite ];then echo "This version of bacula-sqlite involves an upgrade to sqlite3." - echo "Your catalog database file is not compatible with sqlite3, thus" - echo "you will need to dump the data, delete the old file, and re-run" - echo "this rpm upgrade." - echo "" - echo "Backing up your current database..." + echo "Your catalog database file is not compatible with sqlite3, thus" + echo "you will need to dump the data, delete the old file, and re-run" + echo "this rpm upgrade." + echo "" + echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite %{working_dir}/bacula.db > %{working_dir}/bacula_backup.sql - mv %{working_dir}/bacula.db %{working_dir}/bacula.db.old - echo "Your catalog data has been saved in %{working_dir}/bacula_backup.sql and your" - echo "catalog file has been renamed %{working_dir}/bacula.db.old." - echo "" - echo "Please re-run this rpm package upgrade." - echo "After the upgrade is complete, restore your catalog" - echo "with the following commands:" - echo "%{script_dir}/drop_sqlite3_tables" - echo "cd %{working_dir}" - echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql" - echo "chown bacula.bacula bacula.db" - exit 1 + mv %{working_dir}/bacula.db %{working_dir}/bacula.db.old + echo "Your catalog data has been saved in %{working_dir}/bacula_backup.sql and your" + echo "catalog file has been renamed %{working_dir}/bacula.db.old." + echo "" + echo "Please re-run this rpm package upgrade." + echo "After the upgrade is complete, restore your catalog" + echo "with the following commands:" + echo "%{script_dir}/drop_sqlite3_tables" + echo "cd %{working_dir}" + echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql" + echo "chown bacula.bacula bacula.db" + exit 1 fi # test for bacula database older than version 9 and sqlite3 if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite3 ];then @@ -1775,7 +1775,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "This bacula upgrade will update a bacula database from version 9 to 10." echo "You appear to be running database version $DB_VER. You must first update" echo "your database to version 9 and then install this upgrade. The alternative" - echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" + echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" echo "catalog information, then do the upgrade. Information on updating a" echo "database older than version 9 can be found in the release notes." exit 1 @@ -1789,7 +1789,7 @@ fi %if ! %{client_only} # check for and copy %{sysconf_dir}/console.conf to bconsole.conf if [ -s %{sysconf_dir}/console.conf ];then - cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf + cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf fi # create the daemon users and groups @@ -1871,11 +1871,11 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Granting privileges for MySQL user bacula..." - %{script_dir}/grant_mysql_privileges + %{script_dir}/grant_mysql_privileges echo "Creating MySQL bacula database..." - %{script_dir}/create_mysql_database + %{script_dir}/create_mysql_database echo "Creating bacula tables..." - %{script_dir}/make_mysql_tables + %{script_dir}/make_mysql_tables # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1883,7 +1883,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." mysqldump -f --opt bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_mysql_tables + %{script_dir}/update_mysql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1899,17 +1899,17 @@ if [ -s %{working_dir}/bacula.db ]; then echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite3 %{working_dir}/bacula.db | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_sqlite3_tables + %{script_dir}/update_sqlite3_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi else # create the database and tables echo "Hmm, doesn't look like you have an existing database." echo "Creating SQLite database..." - %{script_dir}/create_sqlite3_database - chown %{director_daemon_user}.%{daemon_group} %{working_dir}/bacula.db + %{script_dir}/create_sqlite3_database + chown %{director_daemon_user}.%{daemon_group} %{working_dir}/bacula.db echo "Creating the SQLite tables..." - %{script_dir}/make_sqlite3_tables + %{script_dir}/make_sqlite3_tables fi %endif @@ -1922,11 +1922,11 @@ DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Creating PostgreSQL bacula database..." - %{script_dir}/create_postgresql_database + %{script_dir}/create_postgresql_database echo "Creating bacula tables..." - %{script_dir}/make_postgresql_tables + %{script_dir}/make_postgresql_tables echo "Granting privileges for PostgreSQL user bacula..." - %{script_dir}/grant_postgresql_privileges + %{script_dir}/grant_postgresql_privileges # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1934,7 +1934,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." pg_dump bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_postgresql_tables + %{script_dir}/update_postgresql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1943,7 +1943,7 @@ fi %if ! %{client_only} # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2053,7 +2053,7 @@ fi # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2130,7 +2130,7 @@ fi %post gconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2175,7 +2175,7 @@ fi %post wxconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2220,7 +2220,7 @@ fi %post bat # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index e1d95378b2..56b68dd192 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2006 Kern Sibbald +# Copyright (C) 2000-2008 Kern Sibbald # Platform Build Configuration @@ -1331,15 +1331,15 @@ export QTLIB=/usr/lib64/qt4/ %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ --enable-client-only \ - %if %{mdk} - --disable-nls \ - %endif + %if %{mdk} + --disable-nls \ + %endif --enable-static-fd make @@ -1347,10 +1347,10 @@ make %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ %if %{gconsole} --enable-gnome \ @@ -1368,22 +1368,22 @@ make --with-postgresql \ %endif %if %{wxconsole} - --enable-bwx-console \ + --enable-bwx-console \ %endif %if %{bat} - --enable-bat \ - --with-qwt=${cwd}/%{depkgs}/qwt \ + --enable-bat \ + --with-qwt=${cwd}/%{depkgs}/qwt \ %endif %if %{python} - --with-python \ + --with-python \ %endif %if %{client_only} - --enable-client-only \ + --enable-client-only \ %endif %if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3} - --disable-batch-insert \ + --disable-batch-insert \ %endif - --mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-subsys-dir=/var/lock/subsys \ --with-dir-user=%{director_daemon_user} \ --with-dir-group=%{daemon_group} \ @@ -1436,11 +1436,11 @@ mkdir -p $RPM_BUILD_ROOT%{sqlite_bindir} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ install %if ! %{client_only} && %{mtx} @@ -1448,10 +1448,10 @@ cd %{depkgs} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ mtx-install cd ${cwd} @@ -1793,24 +1793,24 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` # are we upgrading from sqlite to sqlite3? if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite ];then echo "This version of bacula-sqlite involves an upgrade to sqlite3." - echo "Your catalog database file is not compatible with sqlite3, thus" - echo "you will need to dump the data, delete the old file, and re-run" - echo "this rpm upgrade." - echo "" - echo "Backing up your current database..." + echo "Your catalog database file is not compatible with sqlite3, thus" + echo "you will need to dump the data, delete the old file, and re-run" + echo "this rpm upgrade." + echo "" + echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite %{working_dir}/bacula.db > %{working_dir}/bacula_backup.sql - mv %{working_dir}/bacula.db %{working_dir}/bacula.db.old - echo "Your catalog data has been saved in %{working_dir}/bacula_backup.sql and your" - echo "catalog file has been renamed %{working_dir}/bacula.db.old." - echo "" - echo "Please re-run this rpm package upgrade." - echo "After the upgrade is complete, restore your catalog" - echo "with the following commands:" - echo "%{script_dir}/drop_sqlite3_tables" - echo "cd %{working_dir}" - echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql" - echo "chown bacula.bacula bacula.db" - exit 1 + mv %{working_dir}/bacula.db %{working_dir}/bacula.db.old + echo "Your catalog data has been saved in %{working_dir}/bacula_backup.sql and your" + echo "catalog file has been renamed %{working_dir}/bacula.db.old." + echo "" + echo "Please re-run this rpm package upgrade." + echo "After the upgrade is complete, restore your catalog" + echo "with the following commands:" + echo "%{script_dir}/drop_sqlite3_tables" + echo "cd %{working_dir}" + echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql" + echo "chown bacula.bacula bacula.db" + exit 1 fi # test for bacula database older than version 9 and sqlite3 if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite3 ];then @@ -1827,7 +1827,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "This bacula upgrade will update a bacula database from version 9 to 10." echo "You appear to be running database version $DB_VER. You must first update" echo "your database to version 9 and then install this upgrade. The alternative" - echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" + echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" echo "catalog information, then do the upgrade. Information on updating a" echo "database older than version 9 can be found in the release notes." exit 1 @@ -1841,7 +1841,7 @@ fi %if ! %{client_only} # check for and copy %{sysconf_dir}/console.conf to bconsole.conf if [ -s %{sysconf_dir}/console.conf ];then - cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf + cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf fi # create the daemon users and groups @@ -1923,11 +1923,11 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Granting privileges for MySQL user bacula..." - %{script_dir}/grant_mysql_privileges + %{script_dir}/grant_mysql_privileges echo "Creating MySQL bacula database..." - %{script_dir}/create_mysql_database + %{script_dir}/create_mysql_database echo "Creating bacula tables..." - %{script_dir}/make_mysql_tables + %{script_dir}/make_mysql_tables # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1935,7 +1935,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." mysqldump -f --opt bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_mysql_tables + %{script_dir}/update_mysql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1951,17 +1951,17 @@ if [ -s %{working_dir}/bacula.db ]; then echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite3 %{working_dir}/bacula.db | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_sqlite3_tables + %{script_dir}/update_sqlite3_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi else # create the database and tables echo "Hmm, doesn't look like you have an existing database." echo "Creating SQLite database..." - %{script_dir}/create_sqlite3_database - chown %{director_daemon_user}.%{daemon_group} %{working_dir}/bacula.db + %{script_dir}/create_sqlite3_database + chown %{director_daemon_user}.%{daemon_group} %{working_dir}/bacula.db echo "Creating the SQLite tables..." - %{script_dir}/make_sqlite3_tables + %{script_dir}/make_sqlite3_tables fi %endif @@ -1974,11 +1974,11 @@ DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Creating PostgreSQL bacula database..." - %{script_dir}/create_postgresql_database + %{script_dir}/create_postgresql_database echo "Creating bacula tables..." - %{script_dir}/make_postgresql_tables + %{script_dir}/make_postgresql_tables echo "Granting privileges for PostgreSQL user bacula..." - %{script_dir}/grant_postgresql_privileges + %{script_dir}/grant_postgresql_privileges # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1986,7 +1986,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." pg_dump bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_postgresql_tables + %{script_dir}/update_postgresql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1995,7 +1995,7 @@ fi %if ! %{client_only} # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2105,7 +2105,7 @@ fi # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2182,7 +2182,7 @@ fi %post gconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2227,7 +2227,7 @@ fi %post wxconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2272,7 +2272,7 @@ fi %post bat # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index e1d95378b2..56b68dd192 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2006 Kern Sibbald +# Copyright (C) 2000-2008 Kern Sibbald # Platform Build Configuration @@ -1331,15 +1331,15 @@ export QTLIB=/usr/lib64/qt4/ %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ --enable-client-only \ - %if %{mdk} - --disable-nls \ - %endif + %if %{mdk} + --disable-nls \ + %endif --enable-static-fd make @@ -1347,10 +1347,10 @@ make %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ %if %{gconsole} --enable-gnome \ @@ -1368,22 +1368,22 @@ make --with-postgresql \ %endif %if %{wxconsole} - --enable-bwx-console \ + --enable-bwx-console \ %endif %if %{bat} - --enable-bat \ - --with-qwt=${cwd}/%{depkgs}/qwt \ + --enable-bat \ + --with-qwt=${cwd}/%{depkgs}/qwt \ %endif %if %{python} - --with-python \ + --with-python \ %endif %if %{client_only} - --enable-client-only \ + --enable-client-only \ %endif %if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3} - --disable-batch-insert \ + --disable-batch-insert \ %endif - --mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-subsys-dir=/var/lock/subsys \ --with-dir-user=%{director_daemon_user} \ --with-dir-group=%{daemon_group} \ @@ -1436,11 +1436,11 @@ mkdir -p $RPM_BUILD_ROOT%{sqlite_bindir} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ install %if ! %{client_only} && %{mtx} @@ -1448,10 +1448,10 @@ cd %{depkgs} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ mtx-install cd ${cwd} @@ -1793,24 +1793,24 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` # are we upgrading from sqlite to sqlite3? if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite ];then echo "This version of bacula-sqlite involves an upgrade to sqlite3." - echo "Your catalog database file is not compatible with sqlite3, thus" - echo "you will need to dump the data, delete the old file, and re-run" - echo "this rpm upgrade." - echo "" - echo "Backing up your current database..." + echo "Your catalog database file is not compatible with sqlite3, thus" + echo "you will need to dump the data, delete the old file, and re-run" + echo "this rpm upgrade." + echo "" + echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite %{working_dir}/bacula.db > %{working_dir}/bacula_backup.sql - mv %{working_dir}/bacula.db %{working_dir}/bacula.db.old - echo "Your catalog data has been saved in %{working_dir}/bacula_backup.sql and your" - echo "catalog file has been renamed %{working_dir}/bacula.db.old." - echo "" - echo "Please re-run this rpm package upgrade." - echo "After the upgrade is complete, restore your catalog" - echo "with the following commands:" - echo "%{script_dir}/drop_sqlite3_tables" - echo "cd %{working_dir}" - echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql" - echo "chown bacula.bacula bacula.db" - exit 1 + mv %{working_dir}/bacula.db %{working_dir}/bacula.db.old + echo "Your catalog data has been saved in %{working_dir}/bacula_backup.sql and your" + echo "catalog file has been renamed %{working_dir}/bacula.db.old." + echo "" + echo "Please re-run this rpm package upgrade." + echo "After the upgrade is complete, restore your catalog" + echo "with the following commands:" + echo "%{script_dir}/drop_sqlite3_tables" + echo "cd %{working_dir}" + echo "%{sqlite_bindir}/sqlite3 $* bacula.db < bacula_backup.sql" + echo "chown bacula.bacula bacula.db" + exit 1 fi # test for bacula database older than version 9 and sqlite3 if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite3 ];then @@ -1827,7 +1827,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "This bacula upgrade will update a bacula database from version 9 to 10." echo "You appear to be running database version $DB_VER. You must first update" echo "your database to version 9 and then install this upgrade. The alternative" - echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" + echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" echo "catalog information, then do the upgrade. Information on updating a" echo "database older than version 9 can be found in the release notes." exit 1 @@ -1841,7 +1841,7 @@ fi %if ! %{client_only} # check for and copy %{sysconf_dir}/console.conf to bconsole.conf if [ -s %{sysconf_dir}/console.conf ];then - cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf + cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf fi # create the daemon users and groups @@ -1923,11 +1923,11 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Granting privileges for MySQL user bacula..." - %{script_dir}/grant_mysql_privileges + %{script_dir}/grant_mysql_privileges echo "Creating MySQL bacula database..." - %{script_dir}/create_mysql_database + %{script_dir}/create_mysql_database echo "Creating bacula tables..." - %{script_dir}/make_mysql_tables + %{script_dir}/make_mysql_tables # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1935,7 +1935,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." mysqldump -f --opt bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_mysql_tables + %{script_dir}/update_mysql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1951,17 +1951,17 @@ if [ -s %{working_dir}/bacula.db ]; then echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite3 %{working_dir}/bacula.db | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_sqlite3_tables + %{script_dir}/update_sqlite3_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi else # create the database and tables echo "Hmm, doesn't look like you have an existing database." echo "Creating SQLite database..." - %{script_dir}/create_sqlite3_database - chown %{director_daemon_user}.%{daemon_group} %{working_dir}/bacula.db + %{script_dir}/create_sqlite3_database + chown %{director_daemon_user}.%{daemon_group} %{working_dir}/bacula.db echo "Creating the SQLite tables..." - %{script_dir}/make_sqlite3_tables + %{script_dir}/make_sqlite3_tables fi %endif @@ -1974,11 +1974,11 @@ DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Creating PostgreSQL bacula database..." - %{script_dir}/create_postgresql_database + %{script_dir}/create_postgresql_database echo "Creating bacula tables..." - %{script_dir}/make_postgresql_tables + %{script_dir}/make_postgresql_tables echo "Granting privileges for PostgreSQL user bacula..." - %{script_dir}/grant_postgresql_privileges + %{script_dir}/grant_postgresql_privileges # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1986,7 +1986,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." pg_dump bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_postgresql_tables + %{script_dir}/update_postgresql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1995,7 +1995,7 @@ fi %if ! %{client_only} # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2105,7 +2105,7 @@ fi # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2182,7 +2182,7 @@ fi %post gconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2227,7 +2227,7 @@ fi %post wxconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -2272,7 +2272,7 @@ fi %post bat # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` diff --git a/bacula/src/version.h b/bacula/src/version.h index d627037392..01d8e012a1 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -3,9 +3,9 @@ */ #undef VERSION -#define VERSION "2.2.10-b4" -#define BDATE "01 June 2008" -#define LSMDATE "01Jun08" +#define VERSION "2.4.0" +#define BDATE "04 June 2008" +#define LSMDATE "04Jun08" #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n" #define BYEAR "2008" /* year for copyright messages in progs */ diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index 895ee37043..ea6aaaab20 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -1,12 +1,17 @@ Technical notes on version 2.2 General: +Release Version 2.4.0 +04Jun08 +kes Update version to reflect the magnitude of the SD changes. 03Jun08 kes Make sure to clear JS_WaitMedia when operator mounts a Volume. + This fixes bug #1095. 31May08 kes Add create_postgresql_database.sql to Win32 installer. Should fix problem reported by Juilio Monteiro. -kes Get correct slot when auto unloading a device. +kes Get correct slot when auto unloading a device. This fixes bug + #1086. 30May08 kes Fix multiple media restore. kes Make DEVICE Slot private and access it via a method.