[bacula2] PID patch.

[Jon Ciesla]

commit 41bac0c5b46d7598b4aadb07e6299e1baa19d2a4
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Mar 19 10:24:04 2012 -0500

    PID patch.

 bacula2-2.4.4-daemon-name.patch |   51 +++++++++++++++++++++++++++++++++++++++
 bacula2.spec                    |    6 ++++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/bacula2-2.4.4-daemon-name.patch b/bacula2-2.4.4-daemon-name.patch
new file mode 100644
index 0000000..537fabc
--- /dev/null
+++ b/bacula2-2.4.4-daemon-name.patch
@@ -0,0 +1,51 @@
+--- src/filed/filed.c.orig	2012-03-19 10:18:50.103235954 -0500
++++ src/filed/filed.c	2012-03-19 10:20:04.360207713 -0500
+@@ -50,7 +50,7 @@
+ void *start_heap;
+ 
+ 
+-#define CONFIG_FILE "bacula-fd.conf" /* default config file */
++#define CONFIG_FILE "bacula2-fd.conf" /* default config file */
+ 
+ char *configfile = NULL;
+ static bool foreground = false;
+@@ -63,7 +63,7 @@
+    Pmsg3(-1, _(
+ PROG_COPYRIGHT
+ "\nVersion: %s (%s)\n\n"
+-"Usage: bacula-fd [-f -s] [-c config_file] [-d debug_level]\n"
++"Usage: bacula2-fd [-f -s] [-c config_file] [-d debug_level]\n"
+ "        -c <file>   use <file> as configuration file\n"
+ "        -dnn        set debug level to nn\n"
+ "        -f          run in foreground (for debugging)\n"
+@@ -100,7 +100,7 @@
+    textdomain("bacula");
+ 
+    init_stack_dump();
+-   my_name_is(argc, argv, "bacula-fd");
++   my_name_is(argc, argv, "bacula2-fd");
+    init_msg(NULL, NULL);
+    daemon_start_time = time(NULL);
+ 
+@@ -200,8 +200,8 @@
+    }
+ 
+    /* Maximum 1 daemon at a time */
+-   create_pid_file(me->pid_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
+-   read_state_file(me->working_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
++   create_pid_file(me->pid_directory, "bacula2-fd", get_first_port_host_order(me->FDaddrs));
++   read_state_file(me->working_directory, "bacula2-fd", get_first_port_host_order(me->FDaddrs));
+ 
+    drop(uid, gid);
+ 
+@@ -244,8 +244,8 @@
+ 
+    bnet_stop_thread_server(server_tid);
+    generate_daemon_event(NULL, "Exit");
+-   write_state_file(me->working_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
+-   delete_pid_file(me->pid_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
++   write_state_file(me->working_directory, "bacula2-fd", get_first_port_host_order(me->FDaddrs));
++   delete_pid_file(me->pid_directory, "bacula2-fd", get_first_port_host_order(me->FDaddrs));
+ 
+    if (configfile != NULL) {
+       free(configfile);
diff --git a/bacula2.spec b/bacula2.spec
index bd97545..2142336 100644
--- a/bacula2.spec
+++ b/bacula2.spec
@@ -4,7 +4,7 @@
 Summary: Backup client for bacula version 2 server
 Name: bacula2
 Version: 2.4.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -15,6 +15,7 @@ Patch0:	bacula2-2.4.4-utf8.patch
 Patch1: bacula2-config.patch
 Patch2: bacula2-3.0.2-openssl.patch
 Patch3: bacula2-2.4.4-python27.patch
+Patch4: bacula2-2.4.4-daemon-name.patch
 URL: http://www.bacula.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, perl
@@ -208,6 +209,9 @@ fi
 %{_mandir}/man8/bacula2-fd.8*
 
 %changelog
+* Mon Mar 19 2012 Jon Ciesla <limburgher at gmail.com> - 2.4.4-11
+- Additional patch for 799167.
+
 * Tue Mar 06 2012 Jon Ciesla <limburgher at gmail.com> - 2.4.4-10
 - Fix PID listed in unit file, BZ 799167.