ports/132286: update-port: sysutils/bacula-server

[Oliver Lehmann]

>Number:         132286
>Category:       ports
>Synopsis:       update-port: sysutils/bacula-server
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 03 17:10:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Lehmann
>Release:        FreeBSD 7.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Mon Nov 10 11:47:21 CET 2008 olivleh1 at kartoffel.salatschuessel.net:/usr/obj/usr/src/sys/KARTOFFEL amd64


>Description:

	there are two small errors in the bacula rc.d startup scripts:
	- PROVIDE should be something meaningfull and should match the
	  contents of the variable name defined inside the script
	- pidfile= should be defined after the defaults for the variable
	  which is used to define pidfile is defined itself. Otherwise
	  pidfile will be empty and the rc.d subsystem will fallback to
	  use ps(1) for killing the old process on stop or restart which
	  can lead to wrong results.

	please check, test and approve this update if it is OK for you

	I also modfied the rc.d scripts for the -devel port

>How-To-Repeat:
	
>Fix:

	

--- bacula.diff begins here ---
Index: bacula-server-devel/files/bacula-dir.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server-devel/files/bacula-dir.in,v
retrieving revision 1.1
diff -u -r1.1 bacula-dir.in
--- bacula-server-devel/files/bacula-dir.in	11 Jun 2007 05:53:03 -0000	1.1
+++ bacula-server-devel/files/bacula-dir.in	3 Mar 2009 17:00:53 -0000
@@ -2,7 +2,7 @@
 #
 # $FreeBSD: ports/sysutils/bacula-server-devel/files/bacula-dir.in,v 1.1 2007/06/11 05:53:03 miwi Exp $
 #
-# PROVIDE: utility
+# PROVIDE: bacula_dir
 # REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
 # KEYWORD: shutdown
 #
@@ -22,10 +22,10 @@
 
 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"
Index: bacula-server-devel/files/bacula-fd.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server-devel/files/bacula-fd.in,v
retrieving revision 1.1
diff -u -r1.1 bacula-fd.in
--- bacula-server-devel/files/bacula-fd.in	11 Jun 2007 05:53:03 -0000	1.1
+++ bacula-server-devel/files/bacula-fd.in	3 Mar 2009 17:00:53 -0000
@@ -2,7 +2,7 @@
 #
 # $FreeBSD: ports/sysutils/bacula-server-devel/files/bacula-fd.in,v 1.1 2007/06/11 05:53:03 miwi Exp $
 #
-# PROVIDE: utility
+# PROVIDE: bacula_fd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
@@ -22,10 +22,10 @@
 
 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"
Index: bacula-server-devel/files/bacula-sd.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server-devel/files/bacula-sd.in,v
retrieving revision 1.1
diff -u -r1.1 bacula-sd.in
--- bacula-server-devel/files/bacula-sd.in	11 Jun 2007 05:53:03 -0000	1.1
+++ bacula-server-devel/files/bacula-sd.in	3 Mar 2009 17:00:53 -0000
@@ -2,7 +2,7 @@
 #
 # $FreeBSD: ports/sysutils/bacula-server-devel/files/bacula-sd.in,v 1.1 2007/06/11 05:53:03 miwi Exp $
 #
-# PROVIDE: utility
+# PROVIDE: bacula_sd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
@@ -22,10 +22,10 @@
 
 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"
Index: bacula-server/files/bacula-dir.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/bacula-dir.in,v
retrieving revision 1.2
diff -u -r1.2 bacula-dir.in
--- bacula-server/files/bacula-dir.in	4 Jan 2007 23:22:30 -0000	1.2
+++ bacula-server/files/bacula-dir.in	3 Mar 2009 17:00:53 -0000
@@ -2,7 +2,7 @@
 #
 # $FreeBSD: ports/sysutils/bacula-server/files/bacula-dir.in,v 1.2 2007/01/04 23:22:30 itetcu Exp $
 #
-# PROVIDE: utility
+# PROVIDE: bacula_dir
 # REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
 # KEYWORD: shutdown
 #
@@ -22,10 +22,10 @@
 
 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"
Index: bacula-server/files/bacula-fd.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/bacula-fd.in,v
retrieving revision 1.4
diff -u -r1.4 bacula-fd.in
--- bacula-server/files/bacula-fd.in	1 Mar 2007 12:19:01 -0000	1.4
+++ bacula-server/files/bacula-fd.in	3 Mar 2009 17:00:53 -0000
@@ -2,7 +2,7 @@
 #
 # $FreeBSD: ports/sysutils/bacula-server/files/bacula-fd.in,v 1.4 2007/03/01 12:19:01 miwi Exp $
 #
-# PROVIDE: utility
+# PROVIDE: bacula_fd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
@@ -22,10 +22,10 @@
 
 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"
Index: bacula-server/files/bacula-sd.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/files/bacula-sd.in,v
retrieving revision 1.3
diff -u -r1.3 bacula-sd.in
--- bacula-server/files/bacula-sd.in	28 Feb 2007 21:13:11 -0000	1.3
+++ bacula-server/files/bacula-sd.in	3 Mar 2009 17:00:53 -0000
@@ -2,7 +2,7 @@
 #
 # $FreeBSD: ports/sysutils/bacula-server/files/bacula-sd.in,v 1.3 2007/02/28 21:13:11 laszlof Exp $
 #
-# PROVIDE: utility
+# PROVIDE: bacula_sd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
@@ -22,10 +22,10 @@
 
 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"
--- bacula.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: