diff --git a/bacula-help-update.patch b/bacula-help-update.patch new file mode 100644 index 0000000..5b6bf1b --- /dev/null +++ b/bacula-help-update.patch @@ -0,0 +1,102 @@ +diff --git a/manpages/bacula-dir.8 b/manpages/bacula-dir.8 +index 50056e8..0486bf4 100644 +--- a/manpages/bacula-dir.8 ++++ b/manpages/bacula-dir.8 +@@ -37,6 +37,9 @@ Run in foreground (for debugging). + .BI \-g\ group + Set the group/gid to run as. + .TP ++.BI \-m ++Print kaboom output (for debugging) ++.TP + .BI \-r\ job + Run . + .TP +diff --git a/manpages/bacula-fd.8 b/manpages/bacula-fd.8 +index 2dfbf9e..d0b2169 100644 +--- a/manpages/bacula-fd.8 ++++ b/manpages/bacula-fd.8 +@@ -39,12 +39,12 @@ Run in foreground (for debugging). + .BI \-g\ group + Set the group/gid to run as. + .TP +-.BI \-p +-Proceed inspite of I/O errors +-.TP + .BI \-k + Keep readall permission when dropping privileges. + .TP ++.BI \-m ++Print kaboom output (for debugging) ++.TP + .BI \-s + No signals (for debugging). + .TP +diff --git a/manpages/bacula-sd.8 b/manpages/bacula-sd.8 +index 6dd36dc..aed27a3 100644 +--- a/manpages/bacula-sd.8 ++++ b/manpages/bacula-sd.8 +@@ -40,6 +40,9 @@ Set the group/gid to run as. + .BI \-p + Proceed in spite of I/O errors + .TP ++.BI \-m ++Print kaboom output (for debugging) ++.TP + .BI \-s + No signals (for debugging). + .TP +diff --git a/manpages/bconsole.8 b/manpages/bconsole.8 +index a765b2e..d12bd2d 100644 +--- a/manpages/bconsole.8 ++++ b/manpages/bconsole.8 +@@ -18,6 +18,12 @@ command. + .PP + .SH OPTIONS + .TP ++.BI \-D\ dir ++Select a Director. ++.TP ++.BI \-l ++List defined Directors. ++.TP + .BI \-c\ config + Specify configuration file. + .TP +@@ -33,6 +39,9 @@ No conio (for scripting). + .B \-s + No signals (for debugging). + .TP ++.b \-u\ nn ++Set command execution timeout to \fInn\fP seconds ++.TP + .B \-t + Test the configuration file and report errors. + .TP +diff --git a/manpages/btape.8 b/manpages/btape.8 +index dff8d0e..3a149dc 100644 +--- a/manpages/btape.8 ++++ b/manpages/btape.8 +@@ -38,9 +38,6 @@ Set debug level to \fInn\fP. + .BI \-p + Proceed inspite of I/O errors. + .TP +-.B \-t +-Open the default tape device. +-.TP + .B \-s + No signals (for debugging). + .TP +diff --git a/src/console/console.c b/src/console/console.c +index 999515f..40ca8f6 100644 +--- a/src/console/console.c ++++ b/src/console/console.c +@@ -1019,7 +1019,7 @@ int main(int argc, char *argv[]) + working_directory = "/tmp"; + args = get_pool_memory(PM_FNAME); + +- while ((ch = getopt(argc, argv, "D:lbc:d:nstu:?")) != -1) { ++ while ((ch = getopt(argc, argv, "D:lc:d:nstu:?")) != -1) { + switch (ch) { + case 'D': /* Director */ + if (director) { diff --git a/bacula.spec b/bacula.spec index dfd477b..a01f8db 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 5.2.13 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -37,6 +37,7 @@ Patch3: bacula-5.0.3-sqlite-priv.patch Patch4: bacula-5.2.13-bat-build.patch Patch5: bacula-5.2.12-seg-fault.patch Patch6: bacula-5.2.13-logwatch.patch +Patch7: bacula-help-update.patch BuildRequires: desktop-file-utils BuildRequires: perl @@ -323,6 +324,7 @@ Provides check_bacula support for Nagios. %patch4 -p1 -b .bat-build %patch5 -p1 -b .seg-fault %patch6 -p1 -b .logwatch +%patch7 -p1 -b .help-update cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . # Remove execution permissions from files we're packaging as docs later on @@ -909,6 +911,9 @@ fi %changelog +* Mon Apr 08 2013 Petr Hracek - 5.2.13-8 +- Correcting options and man pages (#948837) + * Mon Apr 08 2013 Petr Hracek - 5.2.13-7 - include /var/log/bacula/*.log in logwatch (#924797)