diff --git a/bacula-5.2.13-queryfile.patch b/bacula-5.2.13-queryfile.patch new file mode 100644 index 0000000..52407db --- /dev/null +++ b/bacula-5.2.13-queryfile.patch @@ -0,0 +1,39 @@ +diff -Naur bacula-5.2.13.old/src/dird/bacula-dir.conf.in bacula-5.2.13/src/dird/bacula-dir.conf.in +--- bacula-5.2.13.old/src/dird/bacula-dir.conf.in 2013-02-19 20:21:35.000000000 +0100 ++++ bacula-5.2.13/src/dird/bacula-dir.conf.in 2014-04-01 17:32:06.108349877 +0200 +@@ -15,7 +15,7 @@ + Director { # define myself + Name = @basename@-dir + DIRport = @dir_port@ # where we listen for UA connections +- QueryFile = "@scriptdir@/query.sql" ++ QueryFile = "@sysconfdir@/query.sql" + WorkingDirectory = "@working_dir@" + PidDirectory = "@piddir@" + Maximum Concurrent Jobs = 1 +diff -Naur bacula-5.2.13.old/src/dird/Makefile.in bacula-5.2.13/src/dird/Makefile.in +--- bacula-5.2.13.old/src/dird/Makefile.in 2013-02-19 20:21:35.000000000 +0100 ++++ bacula-5.2.13/src/dird/Makefile.in 2014-04-01 17:32:06.108349877 +0200 +@@ -116,11 +116,11 @@ + @if test "x${dir_group}" != "x"; then \ + chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ + fi +- @if test -f ${DESTDIR}${scriptdir}/query.sql; then \ ++ @if test -f ${DESTDIR}${sysconfdir}/query.sql; then \ + echo " ==> Saving existing query.sql to query.sql.old"; \ +- $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \ ++ $(MV) -f ${DESTDIR}${sysconfdir}/query.sql ${DESTDIR}${sysconfdir}/query.sql.old; \ + fi +- ${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql ++ ${INSTALL_DATA} query.sql ${DESTDIR}${sysconfdir}/query.sql + @if test -f static-bacula-dir; then \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \ + fi +@@ -129,7 +129,7 @@ + uninstall: + (cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir) + (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new) +- (cd $(DESTDIR)$(scriptdir); $(RMF) query.sql) ++ (cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql) + + + diff --git a/bacula-5.2.2-queryfile.patch b/bacula-5.2.2-queryfile.patch deleted file mode 100644 index 4684234..0000000 --- a/bacula-5.2.2-queryfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur bacula-5.2.2.old/src/dird/bacula-dir.conf.in bacula-5.2.2/src/dird/bacula-dir.conf.in ---- bacula-5.2.2.old/src/dird/bacula-dir.conf.in 2011-12-05 13:51:20.375282302 +0100 -+++ bacula-5.2.2/src/dird/bacula-dir.conf.in 2011-12-05 13:54:12.809538069 +0100 -@@ -15,7 +15,7 @@ - Director { # define myself - Name = @basename@-dir - DIRport = @dir_port@ # where we listen for UA connections -- QueryFile = "@scriptdir@/query.sql" -+ QueryFile = "@sysconfdir@/query.sql" - WorkingDirectory = "@working_dir@" - PidDirectory = "@piddir@" - Maximum Concurrent Jobs = 1 diff --git a/bacula-help-update.patch b/bacula-help-update.patch deleted file mode 100644 index 5b6bf1b..0000000 --- a/bacula-help-update.patch +++ /dev/null @@ -1,102 +0,0 @@ -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 3468cfe..664bec4 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 5.2.13 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -32,12 +32,12 @@ Source17: %{name}-sd.sysconfig Source18: %{name}-sd.sysconfig.el5 Patch1: %{name}-5.0.2-openssl.patch -Patch2: %{name}-5.2.2-queryfile.patch +Patch2: %{name}-5.2.13-queryfile.patch Patch3: %{name}-5.0.3-sqlite-priv.patch Patch4: %{name}-5.2.13-bat-build.patch Patch5: %{name}-5.2.12-seg-fault.patch Patch6: %{name}-5.2.13-logwatch.patch -Patch7: %{name}-help-update.patch +Patch7: %{name}-5.2.13-help-update.patch Patch8: %{name}-aarch64.patch Patch9: %{name}-non-free-code.patch @@ -290,6 +290,7 @@ This development package contains static libraries and header files. Summary: Nagios Plugin - check_bacula Group: Applications/System Requires: bacula-libs%{?_isa} = %{version}-%{release} +Requires: nagios-common%{?_isa} %description -n nagios-plugins-bacula Provides check_bacula support for Nagios. @@ -363,14 +364,11 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} - -pushd examples/nagios/check_bacula - CFLAGS="%{optflags}" make LIBS="-lpthread -ldl -lssl -lcrypto -lz" -popd +make -C examples/nagios/check_bacula %if 0%{?fedora} || 0%{?rhel} >= 6 pushd src/qt-console/tray-monitor - /usr/bin/qmake-qt4 + $QMAKE make %{?_smp_mflags} popd %endif @@ -390,9 +388,6 @@ install -p -m 644 -D manpages/bpluginfo.8 %{buildroot}%{_mandir}/man8/bpluginfo. rm -f %{buildroot}%{_libdir}/libbaccats.so rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so -# Sample query file -mv %{buildroot}%{_libexecdir}/bacula/query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql - %if 0%{?fedora} || 0%{?rhel} >= 6 # Bat install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat.png @@ -764,6 +759,11 @@ fi %{_libdir}/nagios/plugins/check_bacula %changelog +* Tue Apr 01 2014 Simone Caronni - 5.2.13-18 +- Add missing requirement for Nagios plugin folder. +- Update queryfile patch. +- Update man pages patch. + * Tue Aug 06 2013 Simone Caronni - 5.2.13-17 - Fix dependencies for devel subpackage. - Explicitly declare dependency also on libs-sql subpackage where required, so