Changes 2.4.3:

* Apply 2.4.2-cancel-non-running-jobs.patch to be able to cancel
  a non created job faster.
* Fix typo in configure.in that breaks --with-db-password option
* Remove all double quotes from SQLite creating script and
  replace by single quotes as suggested by John Huttley.
* Fix SQL case problem that may cause the failure of DiskToCatalog.
* Copy missing storage name into edit buffer. As far as I can tell
  this never caused a bug.
* Remove catalog dependency for bcopy
* Modify catalog scripts to have an easier packaging integration,
  using default variables.
  Make difference between SQLite3 and SQLite in db_get_type()
  job when reading from one autochanger and writing to another.
* Add more information to SD acquire.c INFO messages.
* Fix NULL Volume name error when reading and the drive must
  be switched.
* Fix a Verify InitCatalog problem where in certain cases
  a garbage filename may be entered in the verification database.
* Add space after version before date in bat about dialog.
* Fix seg fault in Dir during estimate command with no level value given.
* Add message to migration job when the target job is already migrated.

8 files changed, 23 insertions, 141 deletions

diff --git a/sysutils/bacula-doc/Makefile b/sysutils/bacula-doc/Makefile
index 893c9d665a0..cc2bb082ffd 100644
--- a/sysutils/bacula-doc/Makefile
+++ b/sysutils/bacula-doc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2008/07/13 15:26:36 tonnerre Exp $
+# $NetBSD: Makefile,v 1.17 2008/11/21 14:09:31 adam Exp $
 
-DISTNAME=		bacula-docs-2.0.2
-PKGREVISION=		1
+DISTNAME=		bacula-docs-2.4.3
 PKGNAME=		${DISTNAME:S/docs/doc/}
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.bacula.org/
@@ -17,16 +17,12 @@ NO_BUILD=		yes
 
 DOCDIR=			share/doc/bacula
 
-INSTALLATION_DIRS=	${DOCDIR} ${DOCDIR}/manual ${DOCDIR}/developers
+INSTALLATION_DIRS=	${DOCDIR} ${DOCDIR}/manual
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/manual/
 	${INSTALL_DATA} ${WRKSRC}/manual/bacula/bacula.css  ${DESTDIR}${PREFIX}/${DOCDIR}/manual/
 	${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.png  ${DESTDIR}${PREFIX}/${DOCDIR}/manual/
 	${INSTALL_DATA} ${WRKSRC}/manual/bacula.pdf  ${DESTDIR}${PREFIX}/${DOCDIR}/manual.pdf
-	${INSTALL_DATA} ${WRKSRC}/developers/developers/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
-	${INSTALL_DATA} ${WRKSRC}/developers/developers/developers.css  ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
-	${INSTALL_DATA} ${WRKSRC}/developers/developers/*.png  ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
-	${INSTALL_DATA} ${WRKSRC}/developers/developers.pdf  ${DESTDIR}${PREFIX}/${DOCDIR}/developers.pdf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula-doc/PLIST b/sysutils/bacula-doc/PLIST
index 454b53a3e6a..a927615fa40 100644
--- a/sysutils/bacula-doc/PLIST
+++ b/sysutils/bacula-doc/PLIST
@@ -1,67 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/31 17:59:10 ghen Exp $
-share/doc/bacula/developers.pdf
-share/doc/bacula/developers/About_this_document.html
-share/doc/bacula/developers/Bacula-tray-monitor.png
-share/doc/bacula/developers/Bacula_Developer_Notes.html
-share/doc/bacula/developers/Bacula_MD5_Algorithm.html
-share/doc/bacula/developers/Bacula_Memory_Management.html
-share/doc/bacula/developers/Bacula_Porting_Notes.html
-share/doc/bacula/developers/Bacula_Regression_Testing.html
-share/doc/bacula/developers/Catalog_Services.html
-share/doc/bacula/developers/Conf-Diagram.png
-share/doc/bacula/developers/Contents.html
-share/doc/bacula/developers/Daemon_Protocol.html
-share/doc/bacula/developers/Developers_Guide.html
-share/doc/bacula/developers/Director_Services_Daemon.html
-share/doc/bacula/developers/File_Services_Daemon.html
-share/doc/bacula/developers/GNU_Free_Documentat_License.html
-share/doc/bacula/developers/General_Index.html
-share/doc/bacula/developers/Impleme_Bacula_GUI_Interfa.html
-share/doc/bacula/developers/List_Figures.html
-share/doc/bacula/developers/List_Tables.html
-share/doc/bacula/developers/Platform_Support.html
-share/doc/bacula/developers/Smart_Memory_Allocatio_With.html
-share/doc/bacula/developers/Storage_Daemon_Design.html
-share/doc/bacula/developers/Storage_Media_Output_Format.html
-share/doc/bacula/developers/TCP_IP_Network_Protocol.html
-share/doc/bacula/developers/TLS.html
-share/doc/bacula/developers/access-is-denied.png
-share/doc/bacula/developers/back.png
-share/doc/bacula/developers/bacula-applications.png
-share/doc/bacula/developers/bacula-logo.png
-share/doc/bacula/developers/bacula-objects.png
-share/doc/bacula/developers/bat_icon.png
-share/doc/bacula/developers/bclogo.png
-share/doc/bacula/developers/bimagemgr1.png
-share/doc/bacula/developers/bimagemgr2.png
-share/doc/bacula/developers/bimagemgr3.png
-share/doc/bacula/developers/bweb-index.png
-share/doc/bacula/developers/bweb-report.png
-share/doc/bacula/developers/confirm.png
-share/doc/bacula/developers/contents.png
-share/doc/bacula/developers/developers.css
-share/doc/bacula/developers/error.png
-share/doc/bacula/developers/file.png
-share/doc/bacula/developers/flow.png
-share/doc/bacula/developers/home.png
-share/doc/bacula/developers/index.html
-share/doc/bacula/developers/index.png
-share/doc/bacula/developers/md5.png
-share/doc/bacula/developers/menu.png
-share/doc/bacula/developers/next.png
-share/doc/bacula/developers/next_g.png
-share/doc/bacula/developers/philosophical-gnu-sm.png
-share/doc/bacula/developers/prev.png
-share/doc/bacula/developers/prev_g.png
-share/doc/bacula/developers/properties-security-advanced-owner.png
-share/doc/bacula/developers/properties-security.png
-share/doc/bacula/developers/running.png
-share/doc/bacula/developers/smartall.png
-share/doc/bacula/developers/thanks.png
-share/doc/bacula/developers/tray-icon.png
-share/doc/bacula/developers/up.png
-share/doc/bacula/developers/up_g.png
-share/doc/bacula/developers/view-only.png
+@comment $NetBSD: PLIST,v 1.3 2008/11/21 14:09:31 adam Exp $
 share/doc/bacula/manual.pdf
 share/doc/bacula/manual/ANSI_IBM_Tape_Labels.html
 share/doc/bacula/manual/About_this_document.html
@@ -99,7 +36,6 @@ share/doc/bacula/manual/Data_Spooling.html
 share/doc/bacula/manual/Dealing_with_Firewalls.html
 share/doc/bacula/manual/Director_Index.html
 share/doc/bacula/manual/Disast_Recove_Using_Bacula.html
-share/doc/bacula/manual/FileSet_Resource.html
 share/doc/bacula/manual/File_Daemon_Index.html
 share/doc/bacula/manual/GNU_Free_Documentat_License.html
 share/doc/bacula/manual/GUI_Programs.html
@@ -115,6 +51,7 @@ share/doc/bacula/manual/Messages_Resource.html
 share/doc/bacula/manual/Migration.html
 share/doc/bacula/manual/Monitor_Configuration.html
 share/doc/bacula/manual/Python_Scripting.html
+share/doc/bacula/manual/Restore_Command.html
 share/doc/bacula/manual/Storage_Daemon_Configuratio.html
 share/doc/bacula/manual/Storage_Daemon_Index.html
 share/doc/bacula/manual/Supported_Autochangers.html
@@ -152,6 +89,7 @@ share/doc/bacula/manual/file.png
 share/doc/bacula/manual/flow.png
 share/doc/bacula/manual/home.png
 share/doc/bacula/manual/idle.png
+share/doc/bacula/manual/img2.png
 share/doc/bacula/manual/index.html
 share/doc/bacula/manual/index.png
 share/doc/bacula/manual/md5.png
@@ -185,5 +123,4 @@ share/doc/bacula/manual/win32-welcome.png
 share/doc/bacula/manual/wx-console-restore1.png
 share/doc/bacula/manual/wx-console-restore2.png
 @dirrm share/doc/bacula/manual
-@dirrm share/doc/bacula/developers
 @dirrm share/doc/bacula
diff --git a/sysutils/bacula-doc/distinfo b/sysutils/bacula-doc/distinfo
index 28f3054df46..71fe02ce727 100644
--- a/sysutils/bacula-doc/distinfo
+++ b/sysutils/bacula-doc/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.14 2008/07/13 15:26:36 tonnerre Exp $
+$NetBSD: distinfo,v 1.15 2008/11/21 14:09:31 adam Exp $
 
-SHA1 (bacula-docs-2.0.2.tar.gz) = a07c74b0c98f7afe0896f3f4908004e3984819e6
-RMD160 (bacula-docs-2.0.2.tar.gz) = 14c6582e9dabc4448fb681be192f46835ba0cb30
-Size (bacula-docs-2.0.2.tar.gz) = 29776690 bytes
-SHA1 (patch-aa) = 04898ece4b4c13b50acf08dad16a76eea0fbfc7d
-SHA1 (patch-ab) = e8320baae18f53f5091a0d0b662ec7e613cc1713
-SHA1 (patch-ac) = 829d3cff40f095f3d2e0959f8dbb368031d7c51b
-SHA1 (patch-ad) = 16a4e438f0931d436d914440d98874dcf0b17467
-SHA1 (patch-ae) = ddcb2258ae20aec96904bf6b08672a413358ed13
+SHA1 (bacula-docs-2.4.3.tar.bz2) = a27da517785b5f4108940f05e87e9a6461a9f458
+RMD160 (bacula-docs-2.4.3.tar.bz2) = a79987a209c4deb0aa1684a288133dd546e42f12
+Size (bacula-docs-2.4.3.tar.bz2) = 23011287 bytes
+SHA1 (patch-aa) = 52783e5e70ce0f444044474fae6ccee29711f445
+SHA1 (patch-ab) = ee8ed9aa3dbd1f689abbeee2ff8980b1c0ee9130
diff --git a/sysutils/bacula-doc/patches/patch-aa b/sysutils/bacula-doc/patches/patch-aa
index 2bc02683d52..d7610dd6a65 100644
--- a/sysutils/bacula-doc/patches/patch-aa
+++ b/sysutils/bacula-doc/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
+$NetBSD: patch-aa,v 1.2 2008/11/21 14:09:31 adam Exp $
 
---- manual/tips.tex.orig	2007-01-15 10:37:15.000000000 +0100
+--- manual/tips.tex.orig	2008-01-30 11:26:18.000000000 +0100
 +++ manual/tips.tex
-@@ -598,6 +598,11 @@ setup procedure leaves the database open
- assign the user {\bf bacula} a userid and add it to your Director's
- configuration file in the appropriate Catalog resource. 
+@@ -608,6 +608,11 @@ you should take care when supplying pass
+ Database - Security Considerations }{BackingUpBaculaSecurityConsiderations}
+ section for more information.
  
 +If you use the make_catalog_backup script provided by Bacula, remember that
 +you should take care when supplying passwords on the command line.  Read the
diff --git a/sysutils/bacula-doc/patches/patch-ab b/sysutils/bacula-doc/patches/patch-ab
index 63dbe364b49..5c5149fb5da 100644
--- a/sysutils/bacula-doc/patches/patch-ab
+++ b/sysutils/bacula-doc/patches/patch-ab
@@ -1,19 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/21 14:09:31 adam Exp $
 
---- manual/catmaintenance.tex.orig	2007-01-05 18:20:40.000000000 +0100
+--- manual/catmaintenance.tex.orig	2008-11-21 12:54:44.000000000 +0100
 +++ manual/catmaintenance.tex
-@@ -545,6 +545,8 @@ Job {
-   Storage = DLTDrive
-   Messages = Standard
-   Pool = Default
-+  # WARNING!!! Passing the password via the command line is insecure.
-+  # see comments in make_catalog_backup for details.
-   RunBeforeJob = "/home/kern/bacula/bin/make_catalog_backup"
-   RunAfterJob  = "/home/kern/bacula/bin/delete_catalog_backup"
-   Write Bootstrap = "/home/kern/bacula/working/BackupCatalog.bsr"
-@@ -573,6 +575,33 @@ you to quickly recover the database back
- you do not have a bootstrap file, it is still possible to recover your
- database backup, but it will be more work and take longer. 
+@@ -641,6 +641,33 @@ Only you can decide what is appropriate 
+ you with a starting point.  We hope it helps.
+ 
  
 +
 +\label{BackingUpBaculaSecurityConsiderations}
diff --git a/sysutils/bacula-doc/patches/patch-ac b/sysutils/bacula-doc/patches/patch-ac
deleted file mode 100644
index a5cdd011709..00000000000
--- a/sysutils/bacula-doc/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
-
---- manual/pools.tex.orig	2007-01-05 18:20:41.000000000 +0100
-+++ manual/pools.tex
-@@ -235,6 +235,8 @@ Job {
-   Messages = Standard
-   Pool = Default
-   # This creates an ASCII copy of the catalog
-+  # WARNING!!! Passing the password via the command line is insecure.
-+  # see comments in make_catalog_backup for details.
-   RunBeforeJob = "/home/bacula/bin/make_catalog_backup bacula bacula"
-   # This deletes the copy of the catalog
-   RunAfterJob  = "/home/bacula/bin/delete_catalog_backup"
diff --git a/sysutils/bacula-doc/patches/patch-ad b/sysutils/bacula-doc/patches/patch-ad
deleted file mode 100644
index bc92e170885..00000000000
--- a/sysutils/bacula-doc/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
-
---- manual/postgresql.tex.orig	2007-01-05 18:20:41.000000000 +0100
-+++ manual/postgresql.tex
-@@ -200,6 +200,8 @@ password in place, these two lines shoul
- \begin{verbatim}
-   dbname = bacula; user = bacula; password = "secret"
-     ... and ...
-+ # WARNING!!! Passing the password via the command line is insecure.
-+ # see comments in make_catalog_backup for details.
-   RunBeforeJob = "/etc/make_catalog_backup bacula bacula secret"
- \end{verbatim}
- \normalsize
diff --git a/sysutils/bacula-doc/patches/patch-ae b/sysutils/bacula-doc/patches/patch-ae
deleted file mode 100644
index 199f44ba844..00000000000
--- a/sysutils/bacula-doc/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
-
---- manual/strategies.tex.orig	2007-01-15 10:37:15.000000000 +0100
-+++ manual/strategies.tex
-@@ -232,6 +232,8 @@ Job {
-   Messages = Standard
-   Pool = Default
-  # This creates an ASCII copy of the catalog
-+ # WARNING!!! Passing the password via the command line is insecure.
-+ # see comments in make_catalog_backup for details.
-   RunBeforeJob = "/usr/lib/bacula/make_catalog_backup -u bacula"
-  # This deletes the copy of the catalog, and ejects the tape
-   RunAfterJob  = "/etc/bacula/end_of_backup.sh"