From e10f3c96b2c52f90d9408371a62a46d02d36680f Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Jan 15 2021 14:09:08 +0000 Subject: Add patches --- diff --git a/bacula-build-cdp-plugin.patch b/bacula-build-cdp-plugin.patch new file mode 100644 index 0000000..9525a1e --- /dev/null +++ b/bacula-build-cdp-plugin.patch @@ -0,0 +1,43 @@ +diff -Naur bacula-11.0.0.old/src/plugins/fd/Makefile.in bacula-11.0.0/src/plugins/fd/Makefile.in +--- bacula-11.0.0.old/src/plugins/fd/Makefile.in 2021-01-15 14:28:41.375718846 +0100 ++++ bacula-11.0.0/src/plugins/fd/Makefile.in 2021-01-15 14:37:51.212066769 +0100 +@@ -22,7 +22,7 @@ + .c.lo: + $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c $< + +-all: bpipe-fd.la test-plugin-fd.la test-deltaseq-fd.la pluglib.lo ++all: bpipe-fd.la cdp-fd.la test-plugin-fd.la test-deltaseq-fd.la pluglib.lo + + example-plugin-fd.lo: example-plugin-fd.c ${FDDIR}/fd_plugins.h + $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I../.. -I${FDDIR} -c example-plugin-fd.c +@@ -36,8 +36,6 @@ + bpipe-fd.la: Makefile bpipe-fd$(DEFAULT_OBJECT_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared bpipe-fd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version + +-cdp: cdp-fd.la +- + cdp-fd.lo: cdp-fd.c journal.h folder-record.h file-record.h settings-record.h ${FDDIR}/fd_plugins.h + $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -Wno-unused-function -I../.. -I${FDDIR} -c cdp-fd.c + +@@ -47,12 +45,6 @@ + cdp-fd.la: Makefile cdp-fd$(DEFAULT_OBJECT_TYPE) journal.lo + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared cdp-fd.lo journal.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version + +-install-cdp: cdp-fd.la +- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) cdp-fd.la $(DESTDIR)$(plugindir) +- $(RMF) $(DESTDIR)$(plugindir)/cdp-fd.la +- +- +- + test-deltaseq-fd.lo: test-deltaseq-fd.c ${FDDIR}/fd_plugins.h fd_common.h + $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I../.. -I${FDDIR} -c test-deltaseq-fd.c + +@@ -69,6 +61,8 @@ + $(MKDIR) $(DESTDIR)$(plugindir) + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir) + $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la ++ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) cdp-fd.la $(DESTDIR)$(plugindir) ++ $(RMF) $(DESTDIR)$(plugindir)/cdp-fd.la + + install-test-plugin: all + $(MKDIR) $(DESTDIR)$(plugindir) diff --git a/bacula-nagios.patch b/bacula-nagios.patch new file mode 100644 index 0000000..10ea77a --- /dev/null +++ b/bacula-nagios.patch @@ -0,0 +1,13 @@ +diff -Naur bacula-11.0.0.old/examples/nagios/check_bacula/Makefile.in bacula-11.0.0/examples/nagios/check_bacula/Makefile.in +--- bacula-11.0.0.old/examples/nagios/check_bacula/Makefile.in 2021-01-15 14:28:41.415719526 +0100 ++++ bacula-11.0.0/examples/nagios/check_bacula/Makefile.in 2021-01-15 15:01:26.371678793 +0100 +@@ -72,7 +72,8 @@ + (cd $(srcdir); $(RMF) Makefile) + + install: all +- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) .libs/check_bacula $(DESTDIR)$(sbindir)/check_bacula ++ $(MKDIR) $(DESTDIR)$(libdir)/nagios/plugins ++ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) .libs/check_bacula $(DESTDIR)$(libdir)/nagios/plugins/check_bacula + + uninstall: + (cd $(DESTDIR)$(sbindir); $(RMF) check_bacula)