6 files changed, 61 insertions, 9 deletions
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 815178aa2f82..33ada8e62461 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bacula
 DISTVERSION=	2.4.4
+PORTREVISION=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
diff --git a/sysutils/bacula-server/files/bacula-dir.in b/sysutils/bacula-server/files/bacula-dir.in
index 5739a308b77a..4124b1a2e9f6 100644
--- a/sysutils/bacula-server/files/bacula-dir.in
+++ b/sysutils/bacula-server/files/bacula-dir.in
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: utility
+# PROVIDE: bacula_dir
 # REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
 # KEYWORD: shutdown
 #
@@ -22,10 +22,10 @@ command=%%PREFIX%%/sbin/bacula-dir
 
 load_rc_config $name
 
-pidfile="${bacula_dir_pidfile}"
-
 : ${bacula_dir_enable="NO"}
 : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-dir.conf"}
 : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
 
+pidfile="${bacula_dir_pidfile}"
+
 run_rc_command "$1"
diff --git a/sysutils/bacula-server/files/bacula-fd.in b/sysutils/bacula-server/files/bacula-fd.in
index e974c8b43228..507a1699e6b9 100644
--- a/sysutils/bacula-server/files/bacula-fd.in
+++ b/sysutils/bacula-server/files/bacula-fd.in
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: utility
+# PROVIDE: bacula_fd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
@@ -22,10 +22,10 @@ command=%%PREFIX%%/sbin/bacula-fd
 
 load_rc_config $name
 
-pidfile="${bacula_fd_pidfile}"
-
 : ${bacula_fd_enable="NO"}
 : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula-fd.conf"}
 : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
 
+pidfile="${bacula_fd_pidfile}"
+
 run_rc_command "$1"
diff --git a/sysutils/bacula-server/files/bacula-sd.in b/sysutils/bacula-server/files/bacula-sd.in
index 3288a3e1088a..6916dd5b898a 100644
--- a/sysutils/bacula-server/files/bacula-sd.in
+++ b/sysutils/bacula-server/files/bacula-sd.in
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: utility
+# PROVIDE: bacula_sd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
@@ -22,10 +22,10 @@ command=%%PREFIX%%/sbin/bacula-sd
 
 load_rc_config $name
 
-pidfile="${bacula_sd_pidfile}"
-
 : ${bacula_sd_enable="NO"}
 : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-sd.conf"}
 : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
 
+pidfile="${bacula_sd_pidfile}"
+
 run_rc_command "$1"
diff --git a/sysutils/bacula-server/files/patch-src-stored-acquire.c b/sysutils/bacula-server/files/patch-src-stored-acquire.c
new file mode 100644
index 000000000000..1d644900cbf0
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-src-stored-acquire.c
@@ -0,0 +1,23 @@
+Index: src/stored/acquire.c
+===================================================================
+--- src/stored/acquire.c	(revision 8426)
++++ src/stored/acquire.c	(working copy)
+@@ -1,7 +1,7 @@
+ /*
+    Bacula® - The Network Backup Solution
+ 
+-   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
++   Copyright (C) 2002-2009 Free Software Foundation Europe e.V.
+ 
+    The main author of Bacula is Kern Sibbald, with contributions from
+    many others, a complete list can be found in the file AUTHORS.
+@@ -647,8 +647,8 @@
+ 
+    /* Detach this dcr only if attached */
+    if (dcr->attached_to_dev && dev) {
++      dev->dlock();
+       dcr->unreserve_device();
+-      dev->dlock();
+       dcr->dev->attached_dcrs->remove(dcr);  /* detach dcr from device */
+       dcr->attached_to_dev = false;
+ //    remove_dcr_from_dcrs(dcr);      /* remove dcr from jcr list */
diff --git a/sysutils/bacula-server/files/patch-src-stored-reserve.c b/sysutils/bacula-server/files/patch-src-stored-reserve.c
new file mode 100644
index 000000000000..589404f8427d
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-src-stored-reserve.c
@@ -0,0 +1,28 @@
+Index: src/stored/reserve.c
+===================================================================
+--- src/stored/reserve.c	(revision 8426)
++++ src/stored/reserve.c	(working copy)
+@@ -1,7 +1,7 @@
+ /*
+    Bacula® - The Network Backup Solution
+ 
+-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
++   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+ 
+    The main author of Bacula is Kern Sibbald, with contributions from
+    many others, a complete list can be found in the file AUTHORS.
+@@ -498,7 +498,6 @@
+ void DCR::unreserve_device()
+ {
+    lock_volumes();
+-   dev->dlock();
+    if (is_reserved()) {
+       clear_reserved();
+       reserved_volume = false;
+@@ -514,7 +513,6 @@
+          volume_unused(this);
+       }
+    }
+-   dev->dunlock();
+    unlock_volumes();
+ }