>Number:         37396
>Category:       pkg
>Synopsis:       Patch for upgrade of sysutils/bacula
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Nov 16 17:05:00 +0000 2007
>Originator:     Jesse Peterson
>Release:        N/A
>Organization:
>Environment:
(various - pkgsrc)
>Description:
Upgrade of sysutils/bacula mostly to address critical data-loss bug:
http://www.bacula.org/?page=news
(9/29 item)

Relevant changelog bits (note that the first 2.2.5 is a typo for 2.2.6 I think):

General:
Release Version 2.2.5
09Nov07
kes  Get fix for joblist bug in bat from trunk.
04Nov07
kes  This patch fixes bug #1003 where putting the message output from
     a Verify job into the catalog results in a recursive loop.  The problem
     seems to show up only with postgresql (to be verified).
02Nov07
kes  Fix bug #942 where lots of emails where generated when the heartbeat
     interval was low and Bacula wanted a different tape from the one in
     the drive.
26Oct07
ebl  Apply 2.2.5-lastwritten.patch to fix the LastWritten field 
     which was updated during a restore (or a reading migration) bug #982
24Oct07
ebl  Use qmake-qt4 instead of qmake when available (debian system). 
22Oct07
kes  Add a security warning to src/cats/make_catalog_backup.in indicating
     that passing the password via the command line (arg 3) is insecure.
     This responds to bug #990 (it doesn't fix it).
kes  Apply 2.2.5-postgresql-errors.patch
kes  Remove unneeded File table index on JobId, which is already
     present as the first index of another multi-index.
19Oct07
kes  Set default debug_level to zero. This corrects bugs #991 and #993. 
kes  Fix a crash in bat when it cannot connect to the Director for example
     if the Director is not running.
16Oct07
kes  Activate Close button on tray-monitor window. This fixes
     bug #986.
12Oct07
kes  Fix spurious warning message printed when creating a volume with
     a LabelFormat. This fixes bug #976.

Release Version 2.2.5
09Oct07
kes  Add JobId in place of Job name in all the Jmsg() output.  
kes  Correct the APP_DESC for the Win32 storage service (remove an e).
06Oct07
kes  Add new SD despooling attributes and Dir inserting attributes 
     job status codes.  This fixes bug #961.
kes  Fix Win32 drive display in bat version browser. Fixes bug #962.
05Oct07
kes  Fix doc issue. This fixes bug #963.
kes  Fix listing performance problems in bat. Pointed out by 
     Chris Howells.
ebl  Fix replace on restore. This fixes bug #969
kes  Fix bat code that tests for Win32. This should fix bug #968
kes  Query 5 list wrong Vol after migration. This fixes bug #960
04Oct07 
kes  Correct lib/Makefile.in to include enh_fnmatch.o that was removed
     in back porting from 2.3.x
03Oct07
kes  Backport almost 4000 lines of 2.3 code that fixes a number of bugs.
     The details are included in the notes in this file.
28Sep07
kes  Backport 2.3 code that fixes: it fixes incorrect or incomplete error
     messages; it fixes a problem opening the SQLite3 database when multiple
     simultaneous jobs were running; it fixes a bug with certain versions of
     MySQL where batch inserts failed because of table name character case
     (upper/lower) differences.
kes  Fix race condition that drops final block written to volume.
     This happens in rare cases with multiple simultaneous jobs 
     when the Volume fills.  This fixes bug #964.  May be related
     to bug #935 and possibly #903.
27Sep07 
kes  Fix FD->SD authorization failure, which was due to spurious
     wakeups from a pthread_cond_timedwait().  Simply check the
     predicate before continuing.  This fixes bug #953
dvl  Add new configuration item --archivedir
dvl  Adjust regression tests to use tmp not /tmp.  This will allow
     multiple concurrent runs of the regression tests.
28Sep07
kes  Fix race condition that drops final block written to volume.
     This happens in rare cases with multiple simultaneous jobs 
     when the Volume fills.  This fixes bug #964.  May be related
     to bug #935 and possibly #903.
kes  Eliminate more strerror() and replace with bstrerror().
kes  Remove BSD getopt and replace with unrestricted IBM version.
kes  Fix Win32 build for changed calling sequences.
27Sep07 
kes  Fix FD->SD authorization failure, which was due to spurious
     wakeups from a pthread_cond_timedwait().  Simply check the
     predicate before continuing.  This fixes bug #953.
kes  Add const char where needed (more to do).
26Sep07
kes  Setup SQLite busy handler before doing queries. Fixes bug #967.
kes  Don't overwrite error message in check_tables_version.
     Fixes bug #966.
kes  Unlock batch insert tables with same calls used elsewhere.
kes  Allow starting 59 jobs a second.
kes  Make SD session key more random.
kes  Add retry for SQLite opening db if it fails. Probably helps
     for bug #967.
kes  Suppress extra error messages during batch insert failure.
     Fixes bug #966.
kes  Put some FD auth code on dbglvl rather than fixed.
kes  Return insert attributes error message in db msg buffer to avoid
     false error messages. Helps fix bug #966.
kes  Separate batch init error messages. Probably helps fix bug #966.
kes  If Dir gets an error during inserting attributes, cancel SD.  
     This reduces unnecessary error messages.
24Sep07 
ebl  Cleanup batch insert code. Probably fixes bug #965.
23Sep07 
kes  Turn off some code when batch insert not enabled.
kes  Edit FD name in connect error messages.
22Sep07
kes  Add code to handle tray monitor separated from Win32 FD.
kes  Fix display of Win32 tray monitor after reboot. Fixes bug #952.
20Sep07
kes  Fix ANSI tape labeling.  This fixes bug #954.
kes  Increase the max block size to 4MB fixes bug #957.
kes  Apply 2.2.4-poll-mount fix, that resolves bug #908 where a tape 
     is not properly mounted (recognized) during a poll.
kes  Apply 2.2.4-verify patch that resolves bug #958.  A Verify catalog 
     Job that has differences reports Verify OK.





diff -u bacula.orig/Makefile.common bacula/Makefile.common
--- bacula.orig/Makefile.common 2007-09-21 00:09:08.000000000 -0700
+++ bacula/Makefile.common      2007-11-16 08:38:56.000000000 -0800
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile.common,v 1.42 2007/09/20 13:40:18 ghen Exp $
 
-DISTNAME=              bacula-2.2.4
+DISTNAME=              bacula-2.2.6
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=bacula/}
 
diff -u bacula.orig/distinfo bacula/distinfo
--- bacula.orig/distinfo        2007-09-21 00:09:08.000000000 -0700
+++ bacula/distinfo     2007-11-16 08:40:50.000000000 -0800
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.26 2007/09/20 13:40:18 ghen Exp $
 
-SHA1 (bacula-2.2.4.tar.gz) = 1fd8e75f231fb3a811696c05ea3c0c719c75289a
-RMD160 (bacula-2.2.4.tar.gz) = 5005d5566f55a8feb8a7efa610cd60a3d92383af
-Size (bacula-2.2.4.tar.gz) = 3020298 bytes
+SHA1 (bacula-2.2.6.tar.gz) = fc2f2d7605bd493b7d8b8423a0cbb24099674303
+RMD160 (bacula-2.2.6.tar.gz) = e67515f3d4b8f65769b379e5c212b4eced247885
+Size (bacula-2.2.6.tar.gz) = 3022520 bytes
 SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599
 SHA1 (patch-ac) = 585f8a00fe7c0e6e8e4c0b91a0bd32bd2fb81c81
 SHA1 (patch-ae) = 69db6d396bd1654b3065d693c5ea2c0afbb8bc61
>How-To-Repeat:
Known issue in upstream package, see above.
>Fix:
Patch included. Seems to build fine in my environment.