Update the bacula packages to 1.38.6.

patch-ak has been applied upstream.


	Release Notes for Bacula 1.38.6:

New features:
- For autochanger get Scratch tape if in autochanger if
  no appendable Volumes are available.
- New virtual disk autochanger.  See scripts/disk-changer for
  documentation.
- New optional Device resource directive in SD.  'Device Type =',
  which may have types: File, DVD, Tape, or FIFO.  This can
  be useful for writing DVDs on FreeBSD where Bacula cannot
  correctly detect the DVD.
- Faster restore tree building and uses less memory.
- The command line keyword job (or jobname) now refers to the
  name of the job specified in the Job resource; jobid refers
  as before to the non-unique numeric jobid; and ujobid refers
  to the unique job identification that Bacula creates for each
  job.
- The job report for Backups has a few more user friendly ways
  of displaying the information.
- The wait command can now be made to wait for jobids.
- New command line keywords are permitted in update volume. They
  are Inchanger=yes/no, slot=nn.
- Add two new console commands: enable job=<job-name> and
  disable job=<job-name>. When a job is disabled, it will not
  be started by the scheduler.  If you disable a job and restart
  Bacula or reload the .conf file, the job will be re-enabled.
- Add a new Job resource directive "enable = yes|no".

Major bug fixes:
- Fix race condition in multiple-drive autochangers where
  both drives want the same Volume.
- Do not allow opening default catalog for restricted console
  if it is not in ACL.
- Writable FIFOs now work for restore.
- ACLs are now checked in all dot commands.
- Multiple drive autochangers and multiple different autochangers
  should now work correctly (no race conditions for Volume names,
  update slots use correct StorageId).
- Fix bug where drive was always reserved if a restore job failed
  while in the reservation process.


	Release Notes for Bacula 1.38.5:

Release 1.38.5 released 19Jan06:
- Apply label barcodes fix supplied by Rudolf Cejka.
- Modify standard rpm installation to set SD group to disk
  so that SD will by default have access to tape drives.
- Allow users to specify user/group and start options
  for each daemon in /etc/sysconf/bacula file.

7 files changed, 21 insertions, 35 deletions

diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index fbc9a30b6c6..425dcda9579 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:10:48 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/29 21:44:41 ghen Exp $
 
-PKGREVISION=		1
 CONFLICTS+=		bacula-client-[0-9]*
 
 .include "options.mk"
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 213fbbf7605..0c757903eec 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.26 2006/02/03 08:18:45 ghen Exp $
+# $NetBSD: Makefile.common,v 1.27 2006/03/29 21:44:41 ghen Exp $
 
-DISTNAME=		bacula-1.38.4
+DISTNAME=		bacula-1.38.6
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 
diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common
index f5f5ad2ab2e..a5a07def843 100644
--- a/sysutils/bacula/PLIST.common
+++ b/sysutils/bacula/PLIST.common
@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST.common,v 1.1 2005/12/08 01:04:44 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2006/03/29 21:44:41 ghen Exp $
 libexec/bacula/bacula
+libexec/bacula/bacula-ctl-dir
+libexec/bacula/bacula-ctl-fd
+libexec/bacula/bacula-ctl-sd
 libexec/bacula/bconsole
 libexec/bacula/btraceback.dbx
 libexec/bacula/btraceback.gdb
+libexec/bacula/disk-changer
 libexec/bacula/dvd-handler
 libexec/bacula/gconsole
 libexec/bacula/mtx-changer
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 1339f5d8451..ca6cb692d47 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2006/03/16 09:08:55 ghen Exp $
+$NetBSD: distinfo,v 1.12 2006/03/29 21:44:41 ghen Exp $
 
-SHA1 (bacula-1.38.4.tar.gz) = 7e2e1114506b66dce95baec33017331dceda54bf
-RMD160 (bacula-1.38.4.tar.gz) = f2ba897c7ce08fd7c1fc9062610704282f8dc5e5
-Size (bacula-1.38.4.tar.gz) = 1910452 bytes
+SHA1 (bacula-1.38.6.tar.gz) = 60d0f118611d2b6d05c545e8534b89149129a595
+RMD160 (bacula-1.38.6.tar.gz) = cbdc2f81d1fc78400a0082f70d6712e4eb29a614
+Size (bacula-1.38.6.tar.gz) = 1952827 bytes
 SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599
 SHA1 (patch-ac) = 585f8a00fe7c0e6e8e4c0b91a0bd32bd2fb81c81
 SHA1 (patch-ae) = 69db6d396bd1654b3065d693c5ea2c0afbb8bc61
@@ -10,5 +10,4 @@ SHA1 (patch-af) = 6ecbac39c156c81f30ba53b565f55ab5e876b3e0
 SHA1 (patch-ag) = 9e54b2bb207e9ea82326e48b8548ad03bf71fb8d
 SHA1 (patch-ah) = f084238634be75e6122bb4ec8c14ed68e24bddb4
 SHA1 (patch-ai) = 499a164fcf9e4fc466b691f91203b4293dcee7eb
-SHA1 (patch-aj) = e67651d317e474253dcf0d86665dda3b521fbb7e
-SHA1 (patch-ak) = 8ec9048e9f9d80c179706c843e7fe53ef72e25bd
+SHA1 (patch-aj) = ff1cdc149bcc1d960ddd24d0fa044fff69db165c
diff --git a/sysutils/bacula/hacks.mk b/sysutils/bacula/hacks.mk
index 651fa062ef8..0e2d34ce2ed 100644
--- a/sysutils/bacula/hacks.mk
+++ b/sysutils/bacula/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2005/12/09 19:34:36 tv Exp $
+# $NetBSD: hacks.mk,v 1.4 2006/03/29 21:44:41 ghen Exp $
 
 .if !defined(BACULA_HACKS_MK)
 BACULA_HACKS_MK=	#defined
@@ -6,7 +6,7 @@ BACULA_HACKS_MK=	#defined
 ### gcc 4.0* has been reported to produce bad code on amd64
 ### with optimizations (-O2) turned on (causes segfaults).
 ###
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
 .  include "../../mk/compiler.mk"
 .    if !empty(CC_VERSION:Mgcc-4.0*)
 PKG_HACKS+=		dontoptimze
diff --git a/sysutils/bacula/patches/patch-aj b/sysutils/bacula/patches/patch-aj
index 55550d79b7f..f60ba08740c 100644
--- a/sysutils/bacula/patches/patch-aj
+++ b/sysutils/bacula/patches/patch-aj
@@ -1,15 +1,15 @@
-$NetBSD: patch-aj,v 1.3 2005/12/08 01:04:45 wiz Exp $
+$NetBSD: patch-aj,v 1.4 2006/03/29 21:44:41 ghen Exp $
 
---- scripts/Makefile.in.orig	2005-10-18 00:07:57.000000000 +0200
+--- scripts/Makefile.in.orig	2006-03-29 15:44:01.000000000 +0200
 +++ scripts/Makefile.in
-@@ -51,9 +51,7 @@ install: installdirs
- 	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
- 	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
+@@ -61,9 +61,7 @@ install: installdirs
+ 	chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
+ 		   $(DESTDIR)$(scriptdir)/btraceback.dbx
  	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
 -	gzip <bacula.man >bacula.8.gz
 -	$(INSTALL_DATA)   bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
-+	$(INSTALL_DATA)   bacula.man $(DESTDIR)$(mandir)/bacula.8
 -	@rm -f bacula.8.gz
++	$(INSTALL_DATA)   bacula.man $(DESTDIR)$(mandir)/bacula.8
  
  
  uninstall:
diff --git a/sysutils/bacula/patches/patch-ak b/sysutils/bacula/patches/patch-ak
deleted file mode 100644
index f40cddf64d9..00000000000
--- a/sysutils/bacula/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/03/16 09:08:55 ghen Exp $
-
-Fix build error on Solaris with SunStudio compilers (symbol referencing error),
-provided by PR pkg/33077.  Also submitted upstream as bacula bug #567.
-
---- src/dird/ua_dotcmds.c.orig	2006-03-16 09:53:18.000000000 +0100
-+++ src/dird/ua_dotcmds.c
-@@ -37,7 +37,7 @@ extern const char *client_backups;
- extern int console_msg_pending;
- 
- /* Imported functions */
--extern int do_messages(UAContext *ua, const char *cmd);
-+extern void do_messages(UAContext *ua, const char *cmd);
- extern int quit_cmd(UAContext *ua, const char *cmd);
- extern int qhelp_cmd(UAContext *ua, const char *cmd);
- extern int qstatus_cmd(UAContext *ua, const char *cmd);