2022-03-26 14:57:04 +00:00
|
|
|
diff -Naur bacula-11.0.6.old/autoconf/configure.in bacula-11.0.6/autoconf/configure.in
|
|
|
|
|
--- bacula-11.0.6.old/autoconf/configure.in 2022-03-26 15:50:09.232270232 +0100
|
|
|
|
|
+++ bacula-11.0.6/autoconf/configure.in 2022-03-26 15:50:24.774542471 +0100
|
|
|
|
|
@@ -3859,7 +3859,7 @@
|
2021-01-12 11:38:25 +00:00
|
|
|
cd src/qt-console
|
2020-07-24 07:40:06 +00:00
|
|
|
chmod 755 install_conf_file build-depkgs-qt-console
|
|
|
|
|
cd tray-monitor
|
2021-02-11 13:03:38 +00:00
|
|
|
-chmod 755 install_conf_file
|
2020-03-05 10:45:51 +00:00
|
|
|
+chmod 755 install_conf_file build-depkgs-qt-console
|
|
|
|
|
cd ${BUILD_DIR}
|
|
|
|
|
|
|
|
|
|
cd scripts
|
2022-03-26 14:57:04 +00:00
|
|
|
diff -Naur bacula-11.0.6.old/examples/nagios/check_bacula/Makefile.in bacula-11.0.6/examples/nagios/check_bacula/Makefile.in
|
|
|
|
|
--- bacula-11.0.6.old/examples/nagios/check_bacula/Makefile.in 2022-03-26 15:44:08.615953788 +0100
|
|
|
|
|
+++ bacula-11.0.6/examples/nagios/check_bacula/Makefile.in 2022-03-26 15:50:24.775542488 +0100
|
|
|
|
|
@@ -72,7 +72,8 @@
|
2020-03-05 10:45:51 +00:00
|
|
|
(cd $(srcdir); $(RMF) Makefile)
|
|
|
|
|
|
|
|
|
|
install: all
|
|
|
|
|
- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) check_bacula $(DESTDIR)$(sbindir)/check_bacula
|
2022-03-26 14:57:04 +00:00
|
|
|
+ $(MKDIR) $(DESTDIR)$(libdir)/nagios/plugins
|
|
|
|
|
+ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) .libs/check_bacula $(DESTDIR)$(libdir)/nagios/plugins/check_bacula
|
2020-03-05 10:45:51 +00:00
|
|
|
|
|
|
|
|
uninstall:
|
|
|
|
|
(cd $(DESTDIR)$(sbindir); $(RMF) check_bacula)
|
2022-03-26 14:57:04 +00:00
|
|
|
diff -Naur bacula-11.0.6.old/src/cats/make_sqlite3_tables.in bacula-11.0.6/src/cats/make_sqlite3_tables.in
|
|
|
|
|
--- bacula-11.0.6.old/src/cats/make_sqlite3_tables.in 2022-03-26 15:44:08.497951721 +0100
|
|
|
|
|
+++ bacula-11.0.6/src/cats/make_sqlite3_tables.in 2022-03-26 15:50:30.181637182 +0100
|
|
|
|
|
@@ -555,4 +555,5 @@
|
|
|
|
|
echo ""
|
|
|
|
|
|
|
|
|
|
chmod 640 ${db_name}.db
|
|
|
|
|
+chown bacula:bacula ${db_name}.db
|
|
|
|
|
exit 0
|
|
|
|
|
diff -Naur bacula-11.0.6.old/src/dird/bacula-dir.conf.in bacula-11.0.6/src/dird/bacula-dir.conf.in
|
|
|
|
|
--- bacula-11.0.6.old/src/dird/bacula-dir.conf.in 2022-03-26 15:44:08.560952825 +0100
|
|
|
|
|
+++ bacula-11.0.6/src/dird/bacula-dir.conf.in 2022-03-26 15:50:27.421588838 +0100
|
|
|
|
|
@@ -18,7 +18,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 = 20
|
|
|
|
|
diff -Naur bacula-11.0.6.old/src/dird/Makefile.in bacula-11.0.6/src/dird/Makefile.in
|
|
|
|
|
--- bacula-11.0.6.old/src/dird/Makefile.in 2022-03-26 15:44:08.560952825 +0100
|
|
|
|
|
+++ bacula-11.0.6/src/dird/Makefile.in 2022-03-26 15:50:27.452589381 +0100
|
|
|
|
|
@@ -125,11 +125,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
|
|
|
|
|
@@ -138,7 +138,7 @@
|
|
|
|
|
uninstall:
|
|
|
|
|
(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir bdirjson)
|
|
|
|
|
(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
|
|
|
|
|
- (cd $(DESTDIR)$(scriptdir); $(RMF) query.sql)
|
|
|
|
|
+ (cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -Naur bacula-11.0.6.old/src/qt-console/bat.pro.in bacula-11.0.6/src/qt-console/bat.pro.in
|
|
|
|
|
--- bacula-11.0.6.old/src/qt-console/bat.pro.in 2022-03-26 15:50:09.233270249 +0100
|
|
|
|
|
+++ bacula-11.0.6/src/qt-console/bat.pro.in 2022-03-26 15:50:24.807543049 +0100
|
2020-03-05 10:45:51 +00:00
|
|
|
@@ -12,7 +12,7 @@
|
|
|
|
|
|
2021-01-12 11:38:25 +00:00
|
|
|
datarootdir = @datarootdir@
|
2020-03-05 10:45:51 +00:00
|
|
|
bins.path = /$(DESTDIR)@sbindir@
|
|
|
|
|
-bins.files = bat
|
|
|
|
|
+bins.files = .libs/bat
|
|
|
|
|
confs.path = /$(DESTDIR)@sysconfdir@
|
|
|
|
|
confs.commands = ./install_conf_file
|
|
|
|
|
help.path = /$(DESTDIR)@htmldir@
|
2022-03-26 14:57:04 +00:00
|
|
|
diff -Naur bacula-11.0.6.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-11.0.6/src/qt-console/tray-monitor/tray-monitor.pro.in
|
|
|
|
|
--- bacula-11.0.6.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-03-26 15:50:09.234270267 +0100
|
|
|
|
|
+++ bacula-11.0.6/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-03-26 15:50:24.807543049 +0100
|
2020-03-05 10:45:51 +00:00
|
|
|
@@ -26,7 +26,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bins.path = /$(DESTDIR)@sbindir@
|
|
|
|
|
-bins.files = bacula-tray-monitor
|
|
|
|
|
+bins.files = .libs/bacula-tray-monitor
|
|
|
|
|
confs.path = /$(DESTDIR)@sysconfdir@
|
|
|
|
|
confs.commands = ./install_conf_file
|
|
|
|
|
|
