[pkg-bacula-commits] [bacula] 03/04: Refresh patch again

[Sven Hartge]

This is an automated email from the git hooks/post-receive script.

hartge-guest pushed a commit to branch no-foreground-pidfile
in repository bacula.

commit 945da538b1c0eaef526aa59c2d2a5454481e3666
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sat Oct 28 16:00:23 2017 +0200

    Refresh patch again
---
 debian/patches/no-pid-option.patch | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/debian/patches/no-pid-option.patch b/debian/patches/no-pid-option.patch
index b85e73a..b7dbb22 100644
--- a/debian/patches/no-pid-option.patch
+++ b/debian/patches/no-pid-option.patch
@@ -133,7 +133,7 @@
  static workq_t dir_workq;             /* queue of work from Director */
  static pthread_t server_tid;
  static CONFIG *config;
-@@ -66,11 +67,13 @@
+@@ -66,6 +67,7 @@
        "     -g               groupid\n"
        "     -k               keep readall capabilities\n"
        "     -m               print kaboom output (for debugging)\n"
@@ -141,13 +141,7 @@
        "     -s               no signals (for debugging)\n"
        "     -t               test configuration file and exit\n"
        "     -T               set trace on\n"
-       "     -u               userid\n"
-       "     -v               verbose user messages\n"
-+      "     -x               do not create pid file\n"
-       "     -?               print this message.\n"
-       "\n"), 2000, VERSION, BDATE);
- 
-@@ -104,7 +107,7 @@
+@@ -104,7 +106,7 @@
     /* Setup daemon message queue */
     daemon_msg_queue = New(dlist(item, &item->link));
  
@@ -156,7 +150,7 @@
        switch (ch) {
        case 'c':                    /* configuration file */
           if (configfile != NULL) {
-@@ -148,6 +151,10 @@
+@@ -148,6 +150,10 @@
           prt_kaboom = true;
           break;
  
@@ -167,7 +161,7 @@
        case 's':
           no_signals = true;
           break;
-@@ -233,8 +240,10 @@
+@@ -233,8 +239,10 @@
     lmgr_init_thread(); /* initialize the lockmanager stack */
  
     /* Maximum 1 daemon at a time */
@@ -180,7 +174,7 @@
     read_state_file(me->working_directory, PROG_NAME,
                     get_first_port_host_order(me->FDaddrs));
  
-@@ -293,8 +302,10 @@
+@@ -293,8 +301,10 @@
     if (!test_config) {
        write_state_file(me->working_directory,
                         "bacula-fd", get_first_port_host_order(me->FDaddrs));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git