Compare commits
No commits in common. 'i8c' and 'c9' have entirely different histories.
@ -1 +1,2 @@
|
|||||||
207a56be12130d5a4505305045deb04e50b36938 SOURCES/bacula-9.0.6.tar.gz
|
3fbca0dc9eb78a083589465052016f669c3b5e70 SOURCES/bacula-11.0.1.tar.gz
|
||||||
|
fec6073f62a07cd9df96fe3673d1dcea27d50984 SOURCES/bacula-tray-monitor.png
|
||||||
|
|||||||
@ -1 +1,2 @@
|
|||||||
SOURCES/bacula-9.0.6.tar.gz
|
SOURCES/bacula-11.0.1.tar.gz
|
||||||
|
SOURCES/bacula-tray-monitor.png
|
||||||
|
|||||||
@ -1,39 +0,0 @@
|
|||||||
diff -Naur bacula-9.0.2.old/scripts/bacula-tray-monitor.desktop.in bacula-9.0.2/scripts/bacula-tray-monitor.desktop.in
|
|
||||||
--- bacula-9.0.2.old/scripts/bacula-tray-monitor.desktop.in 2017-07-24 15:22:19.884540422 +0200
|
|
||||||
+++ bacula-9.0.2/scripts/bacula-tray-monitor.desktop.in 2017-07-24 15:37:02.175038149 +0200
|
|
||||||
@@ -1,10 +1,9 @@
|
|
||||||
[Desktop Entry]
|
|
||||||
Name=Bacula Monitor
|
|
||||||
Comment=Notification Tray Monitor
|
|
||||||
-Icon=/usr/share/pixmaps/bacula-tray-monitor.xpm
|
|
||||||
+Icon=/usr/share/pixmaps/bacula-tray-monitor.png
|
|
||||||
Exec=@sbindir@/bacula-tray-monitor -c @sysconfdir@/tray-monitor.conf
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
-Encoding=UTF-8
|
|
||||||
X-Desktop-File-Install-Version=0.3
|
|
||||||
-Categories=System;Application;Utility;X-Red-Hat-Base;
|
|
||||||
+Categories=Utility;
|
|
||||||
diff -Naur bacula-9.0.2.old/scripts/bat.desktop.in bacula-9.0.2/scripts/bat.desktop.in
|
|
||||||
--- bacula-9.0.2.old/scripts/bat.desktop.in 2017-07-24 15:22:19.884540422 +0200
|
|
||||||
+++ bacula-9.0.2/scripts/bat.desktop.in 2017-07-24 15:36:22.753301014 +0200
|
|
||||||
@@ -5,7 +5,6 @@
|
|
||||||
Exec=@sbindir@/bat -c @sysconfdir@/bat.conf
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
-Encoding=UTF-8
|
|
||||||
StartupNotify=true
|
|
||||||
X-Desktop-File-Install-Version=0.3
|
|
||||||
-Categories=System;Application;Utility;X-Red-Hat-Base;
|
|
||||||
+Categories=Utility;
|
|
||||||
diff -Naur bacula-9.0.2.old/scripts/Makefile.in bacula-9.0.2/scripts/Makefile.in
|
|
||||||
--- bacula-9.0.2.old/scripts/Makefile.in 2017-07-24 15:22:19.884540422 +0200
|
|
||||||
+++ bacula-9.0.2/scripts/Makefile.in 2017-07-24 15:25:03.829605989 +0200
|
|
||||||
@@ -67,7 +67,6 @@
|
|
||||||
$(MV) -f ${DESTDIR}${scriptdir}/baculabackupreport ${DESTDIR}${scriptdir}/baculabackupreport.old; \
|
|
||||||
fi
|
|
||||||
$(INSTALL_SCRIPT) baculabackupreport $(DESTDIR)$(scriptdir)/baculabackupreport
|
|
||||||
- $(INSTALL_SCRIPT) bacula-tray-monitor.desktop $(DESTDIR)$(scriptdir)/bacula-tray-monitor.desktop
|
|
||||||
chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
|
|
||||||
$(DESTDIR)$(scriptdir)/btraceback.dbx \
|
|
||||||
$(DESTDIR)$(scriptdir)/btraceback.mdb
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
diff -Naur bacula-9.0.4.old/src/cats/make_sqlite3_tables.in bacula-9.0.4/src/cats/make_sqlite3_tables.in
|
|
||||||
--- bacula-9.0.4.old/src/cats/make_sqlite3_tables.in 2017-09-15 13:38:22.717599355 +0200
|
|
||||||
+++ bacula-9.0.4/src/cats/make_sqlite3_tables.in 2017-09-15 13:38:36.414851879 +0200
|
|
||||||
@@ -481,4 +481,5 @@
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
chmod 640 ${db_name}.db
|
|
||||||
+chown bacula:bacula ${db_name}.db
|
|
||||||
exit 0
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -urNp old/src/qt-console/pages.h new/src/qt-console/pages.h
|
|
||||||
--- old/src/qt-console/pages.h 2017-11-21 18:37:16.000000000 +0100
|
|
||||||
+++ new/src/qt-console/pages.h 2018-02-06 12:37:04.490297821 +0100
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
/*
|
|
||||||
* Dirk Bartley, March 2007
|
|
||||||
*/
|
|
||||||
-
|
|
||||||
+#include <QtGlobal>
|
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QtWidgets>
|
|
||||||
#else
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
--- bacula-9.0.6.old/src/qt-console/tray-monitor/task.cpp 2018-01-28 15:19:14.055587280 -0600
|
|
||||||
+++ bacula-9.0.6/src/qt-console/tray-monitor/task.cpp 2018-01-28 15:18:55.151599308 -0600
|
|
||||||
@@ -992,15 +992,15 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/* cache the file set */
|
|
||||||
- res->bs->fsend(".bvfs_update jobid=%s\n", jobs.toUtf8());
|
|
||||||
+ res->bs->fsend(".bvfs_update jobid=%s\n", bstrdup(jobs.toUtf8()) );
|
|
||||||
while (get_next_line(res)) {
|
|
||||||
Dmsg2(dbglvl, "<- %d %s\n", res->bs->msglen, curline);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pathid == 0) {
|
|
||||||
- res->bs->fsend(".bvfs_lsdirs jobid=%s path=\"\"\n", jobs.toUtf8());
|
|
||||||
+ res->bs->fsend(".bvfs_lsdirs jobid=%s path=\"\"\n", bstrdup(jobs.toUtf8()));
|
|
||||||
} else {
|
|
||||||
- res->bs->fsend(".bvfs_lsdirs jobid=%s pathid=%lld\n", jobs.toUtf8(), pathid);
|
|
||||||
+ res->bs->fsend(".bvfs_lsdirs jobid=%s pathid=%lld\n", bstrdup(jobs.toUtf8()), pathid);
|
|
||||||
}
|
|
||||||
|
|
||||||
while (get_next_line(res)) {
|
|
||||||
@@ -1024,9 +1024,9 @@
|
|
||||||
|
|
||||||
/* then, request files */
|
|
||||||
if (pathid == 0) {
|
|
||||||
- res->bs->fsend(".bvfs_lsfiles jobid=%s path=\"\"\n", jobs.toUtf8());
|
|
||||||
+ res->bs->fsend(".bvfs_lsfiles jobid=%s path=\"\"\n", bstrdup(jobs.toUtf8()));
|
|
||||||
} else {
|
|
||||||
- res->bs->fsend(".bvfs_lsfiles jobid=%s pathid=%lld\n", jobs.toUtf8(), pathid);
|
|
||||||
+ res->bs->fsend(".bvfs_lsfiles jobid=%s pathid=%lld\n", bstrdup(jobs.toUtf8()), pathid);
|
|
||||||
}
|
|
||||||
|
|
||||||
while (get_next_line(res)) {
|
|
||||||
@ -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)
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
diff -Naur bacula-9.6.5.old/scripts/bacula-tray-monitor.desktop.in bacula-9.6.5/scripts/bacula-tray-monitor.desktop.in
|
||||||
|
--- bacula-9.6.5.old/scripts/bacula-tray-monitor.desktop.in 2020-07-24 09:11:40.976119619 +0200
|
||||||
|
+++ bacula-9.6.5/scripts/bacula-tray-monitor.desktop.in 2020-07-24 09:16:52.055851377 +0200
|
||||||
|
@@ -5,6 +5,5 @@
|
||||||
|
Exec=@sbindir@/bacula-tray-monitor -c @sysconfdir@/bacula-tray-monitor.conf
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
-Encoding=UTF-8
|
||||||
|
X-Desktop-File-Install-Version=0.3
|
||||||
|
-Categories=System;Application;Utility;X-Red-Hat-Base;
|
||||||
|
+Categories=System;Utility;
|
||||||
|
diff -Naur bacula-9.6.5.old/scripts/bat.desktop.in bacula-9.6.5/scripts/bat.desktop.in
|
||||||
|
--- bacula-9.6.5.old/scripts/bat.desktop.in 2020-07-24 09:11:40.976119619 +0200
|
||||||
|
+++ bacula-9.6.5/scripts/bat.desktop.in 2020-07-24 09:17:21.178294361 +0200
|
||||||
|
@@ -5,7 +5,6 @@
|
||||||
|
Exec=@sbindir@/bat -c @sysconfdir@/bat.conf
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
-Encoding=UTF-8
|
||||||
|
StartupNotify=true
|
||||||
|
X-Desktop-File-Install-Version=0.3
|
||||||
|
-Categories=System;Application;Utility;X-Red-Hat-Base;
|
||||||
|
+Categories=System;Utility;
|
||||||
|
diff -Naur bacula-9.6.5.old/scripts/Makefile.in bacula-9.6.5/scripts/Makefile.in
|
||||||
|
--- bacula-9.6.5.old/scripts/Makefile.in 2020-07-24 09:11:40.976119619 +0200
|
||||||
|
+++ bacula-9.6.5/scripts/Makefile.in 2020-07-24 09:17:57.725850277 +0200
|
||||||
|
@@ -67,7 +67,6 @@
|
||||||
|
$(MV) -f ${DESTDIR}${scriptdir}/baculabackupreport ${DESTDIR}${scriptdir}/baculabackupreport.old; \
|
||||||
|
fi
|
||||||
|
$(INSTALL_SCRIPT) baculabackupreport $(DESTDIR)$(scriptdir)/baculabackupreport
|
||||||
|
- $(INSTALL_SCRIPT) bacula-tray-monitor.desktop $(DESTDIR)$(scriptdir)/bacula-tray-monitor.desktop
|
||||||
|
chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
|
||||||
|
$(DESTDIR)$(scriptdir)/btraceback.dbx \
|
||||||
|
$(DESTDIR)$(scriptdir)/btraceback.mdb
|
||||||
@ -1,115 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# bacula-dir Takes care of starting and stopping the Bacula Director.
|
|
||||||
#
|
|
||||||
# chkconfig: - 80 20
|
|
||||||
# description: The Bacula Director is the daemon responsible for all the logic \
|
|
||||||
# regarding the backup infrastructure: database, file retention, \
|
|
||||||
# tape indexing, scheduling.
|
|
||||||
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Required-Start: $local_fs $network
|
|
||||||
# Required-Stop: $local_fs $network
|
|
||||||
# Default-Start: 3 4 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: Bacula Director Daemon.
|
|
||||||
# Description: The Bacula Director is the daemon responsible for all the logic
|
|
||||||
# regarding the backup infrastructure: database, file retention,
|
|
||||||
# tape indexing, scheduling.
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
# Source function library.
|
|
||||||
. /etc/rc.d/init.d/functions
|
|
||||||
|
|
||||||
exec="/usr/sbin/bacula-dir"
|
|
||||||
prog="bacula-dir"
|
|
||||||
CONFIG="/etc/bacula/bacula-dir.conf"
|
|
||||||
OPTS="-c $CONFIG"
|
|
||||||
|
|
||||||
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
|
|
||||||
|
|
||||||
lockfile=/var/lock/subsys/$prog
|
|
||||||
|
|
||||||
if [ "$DIR_USER" != '' ]; then
|
|
||||||
OPTS="$OPTS -u $DIR_USER"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$DIR_GROUP" != '' ]; then
|
|
||||||
OPTS="$OPTS -g $DIR_GROUP"
|
|
||||||
fi
|
|
||||||
|
|
||||||
start() {
|
|
||||||
[ -x $exec ] || exit 5
|
|
||||||
[ -f $config ] || exit 6
|
|
||||||
echo -n $"Starting $prog: "
|
|
||||||
daemon $prog $OPTS
|
|
||||||
retval=$?
|
|
||||||
echo
|
|
||||||
[ $retval -eq 0 ] && touch $lockfile
|
|
||||||
return $retval
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
echo -n $"Stopping $prog: "
|
|
||||||
killproc $prog
|
|
||||||
retval=$?
|
|
||||||
echo
|
|
||||||
[ $retval -eq 0 ] && rm -f $lockfile
|
|
||||||
return $retval
|
|
||||||
}
|
|
||||||
|
|
||||||
restart() {
|
|
||||||
stop
|
|
||||||
sleep 1
|
|
||||||
start
|
|
||||||
}
|
|
||||||
|
|
||||||
reload() {
|
|
||||||
restart
|
|
||||||
}
|
|
||||||
|
|
||||||
force_reload() {
|
|
||||||
restart
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status() {
|
|
||||||
# run checks to determine if the service is running or use generic status
|
|
||||||
status $prog
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status_q() {
|
|
||||||
rh_status >/dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
rh_status_q && exit 0
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
rh_status_q || exit 0
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
restart)
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
reload)
|
|
||||||
rh_status_q || exit 7
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
force-reload)
|
|
||||||
force_reload
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
rh_status
|
|
||||||
;;
|
|
||||||
condrestart|try-restart)
|
|
||||||
rh_status_q || exit 0
|
|
||||||
restart
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
exit $?
|
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
diff -Naur bacula-11.0.1.old/autoconf/configure.in bacula-11.0.1/autoconf/configure.in
|
||||||
|
--- bacula-11.0.1.old/autoconf/configure.in 2021-02-11 14:12:19.547538024 +0100
|
||||||
|
+++ bacula-11.0.1/autoconf/configure.in 2021-02-11 14:12:25.803641252 +0100
|
||||||
|
@@ -3240,20 +3240,11 @@
|
||||||
|
]
|
||||||
|
)
|
||||||
|
if test x$support_docker = xyes -o x$support_docker = xauto; then
|
||||||
|
- AC_CHECK_PROG(docker_bin, docker, yes, no, "/usr/bin/")
|
||||||
|
- if test x$docker_bin = xyes; then
|
||||||
|
- support_docker=yes
|
||||||
|
- FD_PLUGIN_DIR="$FD_PLUGIN_DIR src/plugins/fd/docker"
|
||||||
|
- PLUGCONFILES="${PLUGCONFILES} src/plugins/fd/docker/Makefile"
|
||||||
|
- else
|
||||||
|
- if test x$support_docker = xyes; then
|
||||||
|
- echo " "
|
||||||
|
- echo "You enabled a Docker Plugin build but 'docker' command not found."
|
||||||
|
- echo " "
|
||||||
|
- exit 1
|
||||||
|
- fi
|
||||||
|
- support_docker=no
|
||||||
|
- fi
|
||||||
|
+ support_docker=yes
|
||||||
|
+ FD_PLUGIN_DIR="$FD_PLUGIN_DIR src/plugins/fd/docker"
|
||||||
|
+ PLUGCONFILES="${PLUGCONFILES} src/plugins/fd/docker/Makefile"
|
||||||
|
+else
|
||||||
|
+ support_docker=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(FD_PLUGIN_DIR)
|
||||||
@ -1,113 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# bacula-fd Takes care of starting and stopping the Bacula File Daemon.
|
|
||||||
#
|
|
||||||
# chkconfig: - 80 20
|
|
||||||
# description: The Bacula File Daemon is the daemon responsible for backing up \
|
|
||||||
# data on the system.
|
|
||||||
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Required-Start: $local_fs $network
|
|
||||||
# Required-Stop: $local_fs $network
|
|
||||||
# Default-Start: 3 4 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: Bacula File Daemon.
|
|
||||||
# Description: The Bacula File Daemon is the daemon responsible for backing up
|
|
||||||
# data on the system.
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
# Source function library.
|
|
||||||
. /etc/rc.d/init.d/functions
|
|
||||||
|
|
||||||
exec="/usr/sbin/bacula-fd"
|
|
||||||
prog="bacula-fd"
|
|
||||||
CONFIG="/etc/bacula/bacula-fd.conf"
|
|
||||||
OPTS="-c $CONFIG"
|
|
||||||
|
|
||||||
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
|
|
||||||
|
|
||||||
lockfile=/var/lock/subsys/$prog
|
|
||||||
|
|
||||||
if [ "$FD_USER" != '' ]; then
|
|
||||||
OPTS="$OPTS -u $FD_USER"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$FD_GROUP" != '' ]; then
|
|
||||||
OPTS="$OPTS -g $FD_GROUP"
|
|
||||||
fi
|
|
||||||
|
|
||||||
start() {
|
|
||||||
[ -x $exec ] || exit 5
|
|
||||||
[ -f $config ] || exit 6
|
|
||||||
echo -n $"Starting $prog: "
|
|
||||||
daemon $prog $OPTS
|
|
||||||
retval=$?
|
|
||||||
echo
|
|
||||||
[ $retval -eq 0 ] && touch $lockfile
|
|
||||||
return $retval
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
echo -n $"Stopping $prog: "
|
|
||||||
killproc $prog
|
|
||||||
retval=$?
|
|
||||||
echo
|
|
||||||
[ $retval -eq 0 ] && rm -f $lockfile
|
|
||||||
return $retval
|
|
||||||
}
|
|
||||||
|
|
||||||
restart() {
|
|
||||||
stop
|
|
||||||
sleep 1
|
|
||||||
start
|
|
||||||
}
|
|
||||||
|
|
||||||
reload() {
|
|
||||||
restart
|
|
||||||
}
|
|
||||||
|
|
||||||
force_reload() {
|
|
||||||
restart
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status() {
|
|
||||||
# run checks to determine if the service is running or use generic status
|
|
||||||
status $prog
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status_q() {
|
|
||||||
rh_status >/dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
rh_status_q && exit 0
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
rh_status_q || exit 0
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
restart)
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
reload)
|
|
||||||
rh_status_q || exit 7
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
force-reload)
|
|
||||||
force_reload
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
rh_status
|
|
||||||
;;
|
|
||||||
condrestart|try-restart)
|
|
||||||
rh_status_q || exit 0
|
|
||||||
restart
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
exit $?
|
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
diff -Naur bacula-11.0.1.old/autoconf/configure.in bacula-11.0.1/autoconf/configure.in
|
||||||
|
--- bacula-11.0.1.old/autoconf/configure.in 2021-02-11 14:09:48.635047858 +0100
|
||||||
|
+++ bacula-11.0.1/autoconf/configure.in 2021-02-11 14:10:48.026027852 +0100
|
||||||
|
@@ -3274,11 +3274,6 @@
|
||||||
|
AC_DEFINE(FDLIBS)
|
||||||
|
|
||||||
|
CFLAGS=${CFLAGS--O}
|
||||||
|
-
|
||||||
|
-if test x$have_gcc = xyes ; then
|
||||||
|
- CPPFLAGS="$CPPFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti"
|
||||||
|
- CFLAGS="$CFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti"
|
||||||
|
-fi
|
||||||
|
LDFLAGS=${LDFLAGS--O}
|
||||||
|
CPPFLAGS="$CPPFLAGS"
|
||||||
|
CFLAGS="$CFLAGS"
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
diff -Naur bacula-11.0.1.old/autoconf/configure.in bacula-11.0.1/autoconf/configure.in
|
||||||
|
--- bacula-11.0.1.old/autoconf/configure.in 2021-02-11 14:11:00.673236537 +0100
|
||||||
|
+++ bacula-11.0.1/autoconf/configure.in 2021-02-11 14:11:36.910834489 +0100
|
||||||
|
@@ -3798,7 +3798,7 @@
|
||||||
|
cd src/qt-console
|
||||||
|
chmod 755 install_conf_file build-depkgs-qt-console
|
||||||
|
cd tray-monitor
|
||||||
|
-chmod 755 install_conf_file
|
||||||
|
+chmod 755 install_conf_file build-depkgs-qt-console
|
||||||
|
cd ${BUILD_DIR}
|
||||||
|
|
||||||
|
cd scripts
|
||||||
|
diff -Naur bacula-11.0.1.old/examples/nagios/check_bacula/Makefile.in bacula-11.0.1/examples/nagios/check_bacula/Makefile.in
|
||||||
|
--- bacula-11.0.1.old/examples/nagios/check_bacula/Makefile.in 2021-02-11 14:09:48.630047776 +0100
|
||||||
|
+++ bacula-11.0.1/examples/nagios/check_bacula/Makefile.in 2021-02-11 14:11:07.708352620 +0100
|
||||||
|
@@ -72,7 +72,7 @@
|
||||||
|
(cd $(srcdir); $(RMF) Makefile)
|
||||||
|
|
||||||
|
install: all
|
||||||
|
- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) check_bacula $(DESTDIR)$(sbindir)/check_bacula
|
||||||
|
+ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) .libs/check_bacula $(DESTDIR)$(sbindir)/check_bacula
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
(cd $(DESTDIR)$(sbindir); $(RMF) check_bacula)
|
||||||
|
diff -Naur bacula-11.0.1.old/src/qt-console/bat.pro.in bacula-11.0.1/src/qt-console/bat.pro.in
|
||||||
|
--- bacula-11.0.1.old/src/qt-console/bat.pro.in 2021-02-11 14:09:48.599047264 +0100
|
||||||
|
+++ bacula-11.0.1/src/qt-console/bat.pro.in 2021-02-11 14:11:07.742353181 +0100
|
||||||
|
@@ -12,7 +12,7 @@
|
||||||
|
|
||||||
|
datarootdir = @datarootdir@
|
||||||
|
bins.path = /$(DESTDIR)@sbindir@
|
||||||
|
-bins.files = bat
|
||||||
|
+bins.files = .libs/bat
|
||||||
|
confs.path = /$(DESTDIR)@sysconfdir@
|
||||||
|
confs.commands = ./install_conf_file
|
||||||
|
help.path = /$(DESTDIR)@htmldir@
|
||||||
|
diff -Naur bacula-11.0.1.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-11.0.1/src/qt-console/tray-monitor/tray-monitor.pro.in
|
||||||
|
--- bacula-11.0.1.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2021-02-11 14:09:48.603047330 +0100
|
||||||
|
+++ bacula-11.0.1/src/qt-console/tray-monitor/tray-monitor.pro.in 2021-02-11 14:11:07.743353198 +0100
|
||||||
|
@@ -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
|
||||||
|
|
||||||
@ -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)
|
||||||
@ -1,115 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# bacula-sd Takes care of starting and stopping the Bacula Storage Daemon.
|
|
||||||
#
|
|
||||||
# chkconfig: - 80 20
|
|
||||||
# description: The Bacula Storage Daemon is the daemon responsible for saving \
|
|
||||||
# backed up data on the various File Daemon to the appropriate \
|
|
||||||
# storage devices.
|
|
||||||
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Required-Start: $local_fs $network
|
|
||||||
# Required-Stop: $local_fs $network
|
|
||||||
# Default-Start: 3 4 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: Bacula Storage Daemon.
|
|
||||||
# Description: The Bacula Storage Daemon is the daemon responsible for saving
|
|
||||||
# backed up data on the various File Daemon to the appropriate
|
|
||||||
# storage devices.
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
# Source function library.
|
|
||||||
. /etc/init.d/functions
|
|
||||||
|
|
||||||
exec="/usr/sbin/bacula-sd"
|
|
||||||
prog="bacula-sd"
|
|
||||||
CONFIG="/etc/bacula/bacula-sd.conf"
|
|
||||||
OPTS="-c $CONFIG"
|
|
||||||
|
|
||||||
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
|
|
||||||
|
|
||||||
lockfile=/var/lock/subsys/$prog
|
|
||||||
|
|
||||||
if [ "$SD_USER" != '' ]; then
|
|
||||||
OPTS="$OPTS -u $SD_USER"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$SD_GROUP" != '' ]; then
|
|
||||||
OPTS="$OPTS -g $SD_GROUP"
|
|
||||||
fi
|
|
||||||
|
|
||||||
start() {
|
|
||||||
[ -x $exec ] || exit 5
|
|
||||||
[ -f $config ] || exit 6
|
|
||||||
echo -n $"Starting $prog: "
|
|
||||||
daemon $prog $OPTS
|
|
||||||
retval=$?
|
|
||||||
echo
|
|
||||||
[ $retval -eq 0 ] && touch $lockfile
|
|
||||||
return $retval
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
echo -n $"Stopping $prog: "
|
|
||||||
killproc $prog
|
|
||||||
retval=$?
|
|
||||||
echo
|
|
||||||
[ $retval -eq 0 ] && rm -f $lockfile
|
|
||||||
return $retval
|
|
||||||
}
|
|
||||||
|
|
||||||
restart() {
|
|
||||||
stop
|
|
||||||
sleep 2
|
|
||||||
start
|
|
||||||
}
|
|
||||||
|
|
||||||
reload() {
|
|
||||||
restart
|
|
||||||
}
|
|
||||||
|
|
||||||
force_reload() {
|
|
||||||
restart
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status() {
|
|
||||||
# run checks to determine if the service is running or use generic status
|
|
||||||
status $prog
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status_q() {
|
|
||||||
rh_status >/dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
rh_status_q && exit 0
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
rh_status_q || exit 0
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
restart)
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
reload)
|
|
||||||
rh_status_q || exit 7
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
force-reload)
|
|
||||||
force_reload
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
rh_status
|
|
||||||
;;
|
|
||||||
condrestart|try-restart)
|
|
||||||
rh_status_q || exit 0
|
|
||||||
restart
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
exit $?
|
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
diff -Naur bacula-11.0.0.old/src/cats/make_sqlite3_tables.in bacula-11.0.0/src/cats/make_sqlite3_tables.in
|
||||||
|
--- bacula-11.0.0.old/src/cats/make_sqlite3_tables.in 2021-01-12 12:36:32.660470643 +0100
|
||||||
|
+++ bacula-11.0.0/src/cats/make_sqlite3_tables.in 2021-01-12 12:38:45.241897767 +0100
|
||||||
|
@@ -555,4 +555,5 @@
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
chmod 640 ${db_name}.db
|
||||||
|
+chown bacula:bacula ${db_name}.db
|
||||||
|
exit 0
|
||||||
|
Before Width: | Height: | Size: 407 B |
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue