Add the vendor patches which are available for this version of bacula.

These fix a handful of bugs the most serious being a potential data loss
bug.  Committed during the freeze since a data loss bug in backup
software is no good!

See http://marc.info/?l=bacula-announce&m=119109399004039&w=2 for
the announcement on the bacula-announce mailing list about this bug.

6 files changed, 62 insertions, 11 deletions

diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 7bcfa62ebde..a7caa537a1f 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2008/06/23 15:46:41 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.26 2008/07/10 13:54:56 dmcmahill Exp $
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 CONFLICTS+=		bacula-client-[0-9]* bacula-clientonly-[0-9]*
 
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index f3b15f0a029..00abb8313b9 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,9 +1,20 @@
-# $NetBSD: Makefile.common,v 1.43 2008/01/04 14:32:49 ghen Exp $
+# $NetBSD: Makefile.common,v 1.44 2008/07/10 13:54:56 dmcmahill Exp $
 
 DISTNAME=		bacula-2.2.4
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 
+PATCH_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
+PATCHFILES=		2.2.4-lost-block.patch \
+			2.2.4-parse-command.patch \
+			2.2.4-poll-mount.patch \
+			2.2.4-replace.patch \
+			2.2.4-restore.patch \
+			2.2.4-sd-auth-fail.patch \
+			2.2.4-sql.patch \
+			2.2.4-verify.patch
+DIST_SUBDIR=		${PKGNAME_NOREV}
+
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.bacula.org/
 COMMENT?=		The Network Backup Solution
diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common
index c09d2ec95f0..5cc0295c2d1 100644
--- a/sysutils/bacula/PLIST.common
+++ b/sysutils/bacula/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2008/01/08 16:52:20 ghen Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2008/07/10 13:54:56 dmcmahill Exp $
 libexec/bacula/bacula
 libexec/bacula/bacula-ctl-dir
 libexec/bacula/bacula-ctl-fd
@@ -31,6 +31,8 @@ man/man8/dbcheck.8
 sbin/bacula-fd
 sbin/bconsole
 sbin/btraceback
+${STATIC}sbin/static-bacula-fd
+${STATIC}sbin/static-bconsole
 share/examples/bacula/bacula-fd.conf
 share/examples/bacula/bconsole.conf
 share/examples/bacula/dvd-handler
diff --git a/sysutils/bacula/PLIST.server b/sysutils/bacula/PLIST.server
index 3b094065761..4911d8201ea 100644
--- a/sysutils/bacula/PLIST.server
+++ b/sysutils/bacula/PLIST.server
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.server,v 1.2 2006/04/14 22:49:06 ghen Exp $
+@comment $NetBSD: PLIST.server,v 1.3 2008/07/10 13:54:56 dmcmahill Exp $
 libexec/bacula/create_${BACULA_DB}_database
 libexec/bacula/create_bacula_database
 libexec/bacula/delete_catalog_backup
@@ -25,6 +25,8 @@ sbin/bsmtp
 sbin/btape
 sbin/bwild
 sbin/dbcheck
+${STATIC}sbin/static-bacula-dir
+${STATIC}sbin/static-bacula-sd
 share/examples/bacula/bacula-dir.conf
 share/examples/bacula/bacula-sd.conf
 share/examples/rc.d/bacula
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index dc8514b39bc..985ed3e2574 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,8 +1,32 @@
-$NetBSD: distinfo,v 1.27 2008/01/08 16:52:20 ghen Exp $
+$NetBSD: distinfo,v 1.28 2008/07/10 13:54:56 dmcmahill 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.4/2.2.4-lost-block.patch) = d3b9f927100d148e831248b381c5b2543d215502
+RMD160 (bacula-2.2.4/2.2.4-lost-block.patch) = ff24810e204324acc42dbaff0291a0fa02b56e21
+Size (bacula-2.2.4/2.2.4-lost-block.patch) = 1057 bytes
+SHA1 (bacula-2.2.4/2.2.4-parse-command.patch) = 71538cee6fcfa07a20cabdf0e48887294e56723a
+RMD160 (bacula-2.2.4/2.2.4-parse-command.patch) = 6fc6d9a3c3e2defa0bdee725cf3a0e701cdab8f1
+Size (bacula-2.2.4/2.2.4-parse-command.patch) = 849 bytes
+SHA1 (bacula-2.2.4/2.2.4-poll-mount.patch) = 0b8839c3ecd47f58bcff7b0192e9816b2f9034a6
+RMD160 (bacula-2.2.4/2.2.4-poll-mount.patch) = a1bf2692534facb16ccbe697c39a9a61f0a0df35
+Size (bacula-2.2.4/2.2.4-poll-mount.patch) = 823 bytes
+SHA1 (bacula-2.2.4/2.2.4-replace.patch) = ef188d27fc90527737be874c045f6abbe423321c
+RMD160 (bacula-2.2.4/2.2.4-replace.patch) = ffc8d4bd4c4f520d3c2365a13b83fe2921aeda9c
+Size (bacula-2.2.4/2.2.4-replace.patch) = 631 bytes
+SHA1 (bacula-2.2.4/2.2.4-restore.patch) = 27bfbeb43b3d69bd5f77904be608f96d66e560ce
+RMD160 (bacula-2.2.4/2.2.4-restore.patch) = 03fb3ecf838a9390eb645d50b727bdfd508ee321
+Size (bacula-2.2.4/2.2.4-restore.patch) = 1234 bytes
+SHA1 (bacula-2.2.4/2.2.4-sd-auth-fail.patch) = c73ee8b3865f36752004805f6a44a4fcdaa740b8
+RMD160 (bacula-2.2.4/2.2.4-sd-auth-fail.patch) = eb8db56209c5918677844d751f010281f4b50e41
+Size (bacula-2.2.4/2.2.4-sd-auth-fail.patch) = 5385 bytes
+SHA1 (bacula-2.2.4/2.2.4-sql.patch) = 2e8bf86ba64d5b4d16197fbfeba0ca504b9f3721
+RMD160 (bacula-2.2.4/2.2.4-sql.patch) = ad49cfd911e3d82763d9101f129b7be24e20ec7d
+Size (bacula-2.2.4/2.2.4-sql.patch) = 18382 bytes
+SHA1 (bacula-2.2.4/2.2.4-verify.patch) = 0fe11ff7e49420c13b1b6a79b64e9c511a9e4516
+RMD160 (bacula-2.2.4/2.2.4-verify.patch) = da82063dc69d4de08331e80531b2edd6c4ea40ea
+Size (bacula-2.2.4/2.2.4-verify.patch) = 2076 bytes
+SHA1 (bacula-2.2.4/bacula-2.2.4.tar.gz) = 1fd8e75f231fb3a811696c05ea3c0c719c75289a
+RMD160 (bacula-2.2.4/bacula-2.2.4.tar.gz) = 5005d5566f55a8feb8a7efa610cd60a3d92383af
+Size (bacula-2.2.4/bacula-2.2.4.tar.gz) = 3020298 bytes
 SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599
 SHA1 (patch-ac) = 585f8a00fe7c0e6e8e4c0b91a0bd32bd2fb81c81
 SHA1 (patch-ae) = 69db6d396bd1654b3065d693c5ea2c0afbb8bc61
diff --git a/sysutils/bacula/options.mk b/sysutils/bacula/options.mk
index 14f6ff0865e..f2920bbfd4a 100644
--- a/sysutils/bacula/options.mk
+++ b/sysutils/bacula/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.10 2007/02/15 09:08:05 ghen Exp $
+# $NetBSD: options.mk,v 1.11 2008/07/10 13:54:56 dmcmahill Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bacula
-PKG_SUPPORTED_OPTIONS=		python
+PKG_SUPPORTED_OPTIONS=		bacula-static python 
 PKG_OPTIONS_REQUIRED_GROUPS=	database
 PKG_OPTIONS_GROUP.database=	catalog-sqlite catalog-sqlite3 catalog-pgsql catalog-mysql
 PKG_SUGGESTED_OPTIONS=		catalog-sqlite
@@ -38,3 +38,15 @@ SUBST_STAGE.python=	post-configure
 SUBST_FILES.python=	scripts/dvd-handler
 SUBST_SED.python=	-e '1s,^\#!.*,\#! ${PYTHONBIN},'
 .endif
+
+.if !empty(PKG_OPTIONS:Mbacula-static)
+CONFIGURE_ARGS+=	--enable-static-cons
+CONFIGURE_ARGS+=	--enable-static-dir
+CONFIGURE_ARGS+=	--enable-static-fd
+CONFIGURE_ARGS+=	--enable-static-sd
+CONFIGURE_ARGS+=	--enable-static-tools
+PLIST_SUBST+=		STATIC=
+.else
+PLIST_SUBST+=		STATIC="@comment "
+.endif
+