[pkg-bacula-commits] [bacula] 02/04: Refresh no-pid-option patch
Sven Hartge
hartge-guest at moszumanska.debian.org
Sat Oct 28 14:11:14 UTC 2017
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 e2b02e0a62dd23fdd0f7692b02512a507396afcc
Author: Sven Hartge <sven at svenhartge.de>
Date: Sat Oct 28 15:55:34 2017 +0200
Refresh no-pid-option patch
---
debian/patches/no-pid-option.patch | 64 ++++++++++++++++----------------------
1 file changed, 26 insertions(+), 38 deletions(-)
diff --git a/debian/patches/no-pid-option.patch b/debian/patches/no-pid-option.patch
index 95421f2..b85e73a 100644
--- a/debian/patches/no-pid-option.patch
+++ b/debian/patches/no-pid-option.patch
@@ -1,5 +1,3 @@
-diff --git a/bacula/manpages/bacula-dir.8 b/bacula/manpages/bacula-dir.8
-index 1fdc89b..662bc4e 100644
--- a/manpages/bacula-dir.8
+++ b/manpages/bacula-dir.8
@@ -2,7 +2,7 @@
@@ -11,7 +9,7 @@ index 1fdc89b..662bc4e 100644
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
-@@ -43,6 +43,9 @@ Set the group/gid to run as.
+@@ -43,6 +43,9 @@
.BI \-m
Print kaboom output (for debugging).
.TP
@@ -21,8 +19,6 @@ index 1fdc89b..662bc4e 100644
.BI \-r\ job
Run <job>.
.TP
-diff --git a/bacula/manpages/bacula-fd.8 b/bacula/manpages/bacula-fd.8
-index 4f2c584..c5f2194 100644
--- a/manpages/bacula-fd.8
+++ b/manpages/bacula-fd.8
@@ -2,7 +2,7 @@
@@ -34,7 +30,7 @@ index 4f2c584..c5f2194 100644
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
-@@ -48,6 +48,9 @@ Keep readall permission when dropping privileges.
+@@ -48,6 +48,9 @@
.BI \-m
Print kaboom output (for debugging).
.TP
@@ -44,8 +40,6 @@ index 4f2c584..c5f2194 100644
.BI \-s
No signals (for debugging).
.TP
-diff --git a/bacula/manpages/bacula-sd.8 b/bacula/manpages/bacula-sd.8
-index 56ee778..4a54c26 100644
--- a/manpages/bacula-sd.8
+++ b/manpages/bacula-sd.8
@@ -2,7 +2,7 @@
@@ -57,7 +51,7 @@ index 56ee778..4a54c26 100644
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
-@@ -40,6 +40,9 @@ Run in foreground (for debugging).
+@@ -40,6 +40,9 @@
.BI \-g\ group
Set the group/gid to run as.
.TP
@@ -67,11 +61,9 @@ index 56ee778..4a54c26 100644
.BI \-p
Proceed in spite of I/O errors
.TP
-diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
-index c950080..545aa6f 100644
--- a/src/dird/dird.c
+++ b/src/dird/dird.c
-@@ -64,6 +64,7 @@ void init_device_resources();
+@@ -64,6 +64,7 @@
static char *runjob = NULL;
static bool foreground = false;
@@ -79,7 +71,7 @@ index c950080..545aa6f 100644
static void init_reload(void);
static CONFIG *config;
static bool test_config = false;
-@@ -131,6 +132,7 @@ static void usage()
+@@ -133,6 +134,7 @@
" -g groupid\n"
" -m print kaboom output (for debugging)\n"
" -r <job> run <job> now\n"
@@ -87,8 +79,8 @@ index c950080..545aa6f 100644
" -s no signals\n"
" -t test - read configuration and exit\n"
" -u userid\n"
-@@ -190,7 +192,7 @@ int main (int argc, char *argv[])
- setup_daemon_message_queue();
+@@ -194,7 +196,7 @@
+ daemon_msg_queue = New(dlist(item, &item->link));
console_command = run_console_command;
- while ((ch = getopt(argc, argv, "c:d:fg:mr:stu:v?T")) != -1) {
@@ -96,7 +88,7 @@ index c950080..545aa6f 100644
switch (ch) {
case 'c': /* specify config file */
if (configfile != NULL) {
-@@ -235,6 +237,10 @@ int main (int argc, char *argv[])
+@@ -239,6 +241,10 @@
prt_kaboom = true;
break;
@@ -107,7 +99,7 @@ index c950080..545aa6f 100644
case 'r': /* run job */
if (runjob != NULL) {
free(runjob);
-@@ -307,8 +313,10 @@ int main (int argc, char *argv[])
+@@ -311,8 +317,10 @@
if (!test_config) {
/* Create pid must come after we are a daemon -- so we have our final pid */
@@ -120,7 +112,7 @@ index c950080..545aa6f 100644
read_state_file(director->working_directory, "bacula-dir",
get_first_port_host_order(director->DIRaddrs));
}
-@@ -673,7 +681,9 @@ void terminate_dird(int sig)
+@@ -677,7 +685,9 @@
unload_plugins();
if (!test_config) {
write_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
@@ -131,11 +123,9 @@ index c950080..545aa6f 100644
}
term_scheduler();
term_job_server();
-diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
-index b9a7d74..7e684b1 100644
--- a/src/filed/filed.c
+++ b/src/filed/filed.c
-@@ -46,6 +46,7 @@ extern struct s_cmds cmds[];
+@@ -49,6 +49,7 @@
char *configfile = NULL;
static bool test_config = false;
static bool foreground = false;
@@ -143,7 +133,7 @@ index b9a7d74..7e684b1 100644
static workq_t dir_workq; /* queue of work from Director */
static pthread_t server_tid;
static CONFIG *config;
-@@ -63,11 +64,13 @@ static void usage()
+@@ -66,11 +67,13 @@
" -g groupid\n"
" -k keep readall capabilities\n"
" -m print kaboom output (for debugging)\n"
@@ -157,16 +147,16 @@ index b9a7d74..7e684b1 100644
" -? print this message.\n"
"\n"), 2000, VERSION, BDATE);
-@@ -99,7 +102,7 @@ int main (int argc, char *argv[])
- daemon_start_time = time(NULL);
- setup_daemon_message_queue();
+@@ -104,7 +107,7 @@
+ /* Setup daemon message queue */
+ daemon_msg_queue = New(dlist(item, &item->link));
- while ((ch = getopt(argc, argv, "c:d:fg:kmstTu:v?D:")) != -1) {
+ while ((ch = getopt(argc, argv, "c:d:fg:kmPstTu:v?D:")) != -1) {
switch (ch) {
case 'c': /* configuration file */
if (configfile != NULL) {
-@@ -143,6 +146,10 @@ int main (int argc, char *argv[])
+@@ -148,6 +151,10 @@
prt_kaboom = true;
break;
@@ -177,7 +167,7 @@ index b9a7d74..7e684b1 100644
case 's':
no_signals = true;
break;
-@@ -228,8 +235,10 @@ int main (int argc, char *argv[])
+@@ -233,8 +240,10 @@
lmgr_init_thread(); /* initialize the lockmanager stack */
/* Maximum 1 daemon at a time */
@@ -190,7 +180,7 @@ index b9a7d74..7e684b1 100644
read_state_file(me->working_directory, PROG_NAME,
get_first_port_host_order(me->FDaddrs));
-@@ -285,8 +294,10 @@ void terminate_filed(int sig)
+@@ -293,8 +302,10 @@
if (!test_config) {
write_state_file(me->working_directory,
"bacula-fd", get_first_port_host_order(me->FDaddrs));
@@ -203,11 +193,9 @@ index b9a7d74..7e684b1 100644
}
if (configfile != NULL) {
-diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
-index 9ca4c56..3f0f9c4 100644
--- a/src/stored/stored.c
+++ b/src/stored/stored.c
-@@ -64,7 +64,8 @@ static pthread_t server_tid;
+@@ -68,7 +68,8 @@
static bool server_tid_valid = false;
/* Global static variables */
@@ -217,7 +205,7 @@ index 9ca4c56..3f0f9c4 100644
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static workq_t dird_workq; /* queue for processing connections */
static CONFIG *config;
-@@ -84,6 +85,7 @@ static void usage()
+@@ -88,6 +89,7 @@
" -g <group> set groupid to group\n"
" -m print kaboom output (for debugging)\n"
" -p proceed despite I/O errors\n"
@@ -225,7 +213,7 @@ index 9ca4c56..3f0f9c4 100644
" -s no signals (for debugging)\n"
" -t test - read config and exit\n"
" -u <user> userid to <user>\n"
-@@ -148,7 +150,7 @@ int main (int argc, char *argv[])
+@@ -154,7 +156,7 @@
Jmsg1(NULL, M_ABORT, 0, _("Tape block size (%d) is not a power of 2\n"), TAPE_BSIZE);
}
@@ -234,7 +222,7 @@ index 9ca4c56..3f0f9c4 100644
switch (ch) {
case 'c': /* configuration file */
if (configfile != NULL) {
-@@ -188,6 +190,11 @@ int main (int argc, char *argv[])
+@@ -194,6 +196,11 @@
gid = optarg;
break;
@@ -246,7 +234,7 @@ index 9ca4c56..3f0f9c4 100644
case 'm': /* print kaboom output */
prt_kaboom = true;
break;
-@@ -196,6 +203,10 @@ int main (int argc, char *argv[])
+@@ -202,6 +209,10 @@
forge_on = true;
break;
@@ -257,7 +245,7 @@ index 9ca4c56..3f0f9c4 100644
case 's': /* no signals */
no_signals = true;
break;
-@@ -212,11 +223,6 @@ int main (int argc, char *argv[])
+@@ -218,11 +229,6 @@
verbose++;
break;
@@ -269,7 +257,7 @@ index 9ca4c56..3f0f9c4 100644
case '?':
default:
usage();
-@@ -270,9 +276,10 @@ int main (int argc, char *argv[])
+@@ -276,9 +282,10 @@
my_name_is(0, (char **)NULL, me->hdr.name); /* Set our real name */
@@ -283,7 +271,7 @@ index 9ca4c56..3f0f9c4 100644
read_state_file(me->working_directory, "bacula-sd",
get_first_port_host_order(me->sdaddrs));
-@@ -741,8 +748,10 @@ void terminate_stored(int sig)
+@@ -747,8 +754,10 @@
if (!test_config) {
write_state_file(me->working_directory,
"bacula-sd", get_first_port_host_order(me->sdaddrs));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list