From olivleh1@kartoffel.salatschuessel.net  Tue Mar  3 17:04:12 2009
Return-Path: <olivleh1@kartoffel.salatschuessel.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2234106564A;
	Tue,  3 Mar 2009 17:04:12 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (f049088112.adsl.alicedsl.de [78.49.88.112])
	by mx1.freebsd.org (Postfix) with ESMTP id D552C8FC27;
	Tue,  3 Mar 2009 17:04:10 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1])
	by kartoffel.salatschuessel.net (8.14.3/8.14.3) with ESMTP id n23H49UQ045935;
	Tue, 3 Mar 2009 18:04:09 +0100 (CET)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: (from olivleh1@localhost)
	by kartoffel.salatschuessel.net (8.14.3/8.14.3/Submit) id n23H49Kq045934;
	Tue, 3 Mar 2009 18:04:09 +0100 (CET)
	(envelope-from olivleh1)
Message-Id: <200903031704.n23H49Kq045934@kartoffel.salatschuessel.net>
Date: Tue, 3 Mar 2009 18:04:09 +0100 (CET)
From: Oliver Lehmann <oliver@freebsd.org>
Reply-To: Oliver Lehmann <oliver@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <oliver@freebsd.org>
Subject: update-port: sysutils/bacula-server
X-Send-Pr-Version: 3.113
X-GNATS-Notify: dan@langille.org

>Number:         132286
>Category:       ports
>Synopsis:       update-port: sysutils/bacula-server
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 03 17:10:00 UTC 2009
>Closed-Date:    Mon Jun 01 17:05:19 UTC 2009
>Last-Modified:  Mon Jun 01 17:05:19 UTC 2009
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->oliver 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Mar 3 17:10:38 UTC 2009 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132286 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Mar 3 17:10:42 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132286 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: dan@langille.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/132286: update-port: sysutils/bacula-server
Date: Tue, 3 Mar 2009 17:10:40 UT

 Maintainer of sysutils/bacula-server,
 
 Please note that PR ports/132286 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/132286
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Dan Langille <dan@langille.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/132286: update-port: sysutils/bacula-server
Date: Tue, 03 Mar 2009 16:13:30 -0500

 This is a good idea. Preliminary testing looks positive.
 
 Please commit.  With PORTREVISION bump, if you think of it.
 
 Thank you.
 
 -- 
 Dan Langille
 
 BSDCan - The Technical BSD Conference : http://www.bsdcan.org/
 PGCon  - The PostgreSQL Conference:     http://www.pgcon.org/
State-Changed-From-To: feedback->closed 
State-Changed-By: beech 
State-Changed-When: Sun Mar 8 23:06:26 UTC 2009 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132286 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/132286: commit references a PR
Date: Sun,  8 Mar 2009 23:05:55 +0000 (UTC)

 beech       2009-03-08 23:05:44 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/bacula-server Makefile 
     sysutils/bacula-server/files bacula-dir.in bacula-fd.in 
                                  bacula-sd.in 
   Added files:
     sysutils/bacula-server/files patch-src-stored-acquire.c 
                                  patch-src-stored-reserve.c 
   Log:
   - Fix rc.d scripts [1]
   - fix hang during multiple simultaneous backups. [2]
   
   PR:             ports/132286 [1]
   PR:             ports/132314 [2]
   Submitted by:   Oliver Lehmann <oliver@freebsd.org> [1]
                   Dan Langille <dan@langille.org> (maintainer) [2]
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.112     +1 -0      ports/sysutils/bacula-server/Makefile
   1.3       +4 -4      ports/sysutils/bacula-server/files/bacula-dir.in
   1.5       +4 -4      ports/sysutils/bacula-server/files/bacula-fd.in
   1.4       +4 -4      ports/sysutils/bacula-server/files/bacula-sd.in
   1.1       +23 -0     ports/sysutils/bacula-server/files/patch-src-stored-acquire.c (new)
   1.1       +28 -0     ports/sysutils/bacula-server/files/patch-src-stored-reserve.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: closed->open 
State-Changed-By: wxs 
State-Changed-When: Tue May 12 18:08:09 UTC 2009 
State-Changed-Why:  
Reopen per maintainers request. The rc.d changes didn't get committed. 


Responsible-Changed-From-To: oliver->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Tue May 12 18:08:09 UTC 2009 
Responsible-Changed-Why:  
Reopen per maintainers request. The rc.d changes didn't get committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132286 

From: Angelo Turetta <aturetta@bestunion.it>
To: bug-followup@FreeBSD.org, oliver@freebsd.org
Cc:  
Subject: Re: ports/132286: update-port: sysutils/bacula-server
Date: Thu, 14 May 2009 17:30:08 +0200

 I verified the status.
 
 The patch was actually committed fine to sysutils/bacula-server, but 
 this PR contained the equivalent patch for sysutils/bacula-server-devel 
 too, which is the part missing.
 
 If someone wants to commit that part too, the PS can be closed.
 
 Angelo.
 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Mon Jun 1 17:05:19 UTC 2009 
State-Changed-Why:  
Committed to bacula-server-devel. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132286 
>Unformatted:
