Compare commits
No commits in common. "imports/c9/bacula-11.0.1-5.el9" and "c8s" have entirely different histories.
imports/c9
...
c8s
|
@ -1,2 +1 @@
|
|||
3fbca0dc9eb78a083589465052016f669c3b5e70 SOURCES/bacula-11.0.1.tar.gz
|
||||
fec6073f62a07cd9df96fe3673d1dcea27d50984 SOURCES/bacula-tray-monitor.png
|
||||
207a56be12130d5a4505305045deb04e50b36938 SOURCES/bacula-9.0.6.tar.gz
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
SOURCES/bacula-11.0.1.tar.gz
|
||||
SOURCES/bacula-tray-monitor.png
|
||||
SOURCES/bacula-9.0.6.tar.gz
|
||||
|
|
|
@ -1,15 +1,19 @@
|
|||
======== Features
|
||||
|
||||
- Standard components: director, storage, client, docs, bconsole.
|
||||
- Graphical components: bat, bacula-tray-monitor.
|
||||
- Graphical components: bat, bacula-tray-monitor (where supported).
|
||||
- Tab completion for bconsole.
|
||||
- Nagios plugin.
|
||||
- HTML/PDF docs.
|
||||
- Quick start guides.
|
||||
- File Daemon bpipe-fd plugin.
|
||||
- POSIX.1e capabilities for File Daemon.
|
||||
- Systemd for Fedora and RHEL 7+.
|
||||
- SysV init scripts for RHEL 5/6.
|
||||
- GZIP/LZO compression.
|
||||
- Static uid/gid of 133 (see "setup" package).
|
||||
- No usermode / fedora-usermgmt stuff in the console packages.
|
||||
- Docs no longer an arch specific subpackage.
|
||||
- SQL libraries needed only by Director and Storage daemons.
|
||||
- SQL backend management through the alternatives system.
|
||||
|
||||
|
@ -78,13 +82,3 @@ of course have the same permissions as the main configuration file.
|
|||
|
||||
To see all the available documentation in both HTML and PDF formats, please
|
||||
install the "bacula-docs" package.
|
||||
|
||||
======== Granting user access to the console
|
||||
|
||||
The console configuration files are normally readable only by root for security
|
||||
reasons. If you need to grant access to a specific user or group of users to
|
||||
the consoles, you can adjust the ACLs on the configuration files. For example:
|
||||
|
||||
# setfacl -m u:user:r /etc/bacula/bconsole.conf /etc/bacula/bat.conf
|
||||
|
||||
This way the user 'user' can open the console without superuser privileges.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
diff -Naur bacula-11.0.1.old/src/lib/lib.h bacula-11.0.1/src/lib/lib.h
|
||||
--- bacula-11.0.1.old/src/lib/lib.h 2021-02-11 14:09:48.598047248 +0100
|
||||
+++ bacula-11.0.1/src/lib/lib.h 2021-02-11 14:10:04.432308524 +0100
|
||||
@@ -57,7 +57,6 @@
|
||||
diff -Naur bacula-9.0.0.old/src/lib/lib.h bacula-9.0.0/src/lib/lib.h
|
||||
--- bacula-9.0.0.old/src/lib/lib.h 2017-07-10 08:52:38.928834471 +0200
|
||||
+++ bacula-9.0.0/src/lib/lib.h 2017-07-10 09:06:14.956314468 +0200
|
||||
@@ -53,7 +53,6 @@
|
||||
#include "fnmatch.h"
|
||||
#endif
|
||||
#include "md5.h"
|
||||
|
@ -9,51 +9,42 @@ diff -Naur bacula-11.0.1.old/src/lib/lib.h bacula-11.0.1/src/lib/lib.h
|
|||
#include "tree.h"
|
||||
#include "watchdog.h"
|
||||
#include "btimers.h"
|
||||
diff -Naur bacula-11.0.1.old/src/lib/Makefile.in bacula-11.0.1/src/lib/Makefile.in
|
||||
--- bacula-11.0.1.old/src/lib/Makefile.in 2021-02-11 14:09:48.598047248 +0100
|
||||
+++ bacula-11.0.1/src/lib/Makefile.in 2021-02-11 14:10:04.433308540 +0100
|
||||
@@ -40,7 +40,7 @@
|
||||
diff -Naur bacula-9.0.0.old/src/lib/Makefile.in bacula-9.0.0/src/lib/Makefile.in
|
||||
--- bacula-9.0.0.old/src/lib/Makefile.in 2017-07-10 08:52:38.928834471 +0200
|
||||
+++ bacula-9.0.0/src/lib/Makefile.in 2017-07-10 09:06:49.445973039 +0200
|
||||
@@ -38,7 +38,7 @@
|
||||
flist.h fnmatch.h guid_to_name.h htable.h lex.h \
|
||||
lib.h lz4.h md5.h mem_pool.h message.h \
|
||||
openssl.h plugins.h protos.h queue.h rblist.h \
|
||||
openssl.h parse_conf.h plugins.h protos.h queue.h rblist.h \
|
||||
- runscript.h rwlock.h serial.h sellist.h sha1.h sha2.h \
|
||||
+ runscript.h rwlock.h serial.h sellist.h sha2.h \
|
||||
smartall.h status.h tls.h tree.h var.h \
|
||||
waitq.h watchdog.h workq.h \
|
||||
parse_conf.h ini.h \
|
||||
@@ -57,7 +57,7 @@
|
||||
watchdog.h workq.h ini.h \
|
||||
lockmgr.h devlock.h output.h bwlimit.h
|
||||
@@ -52,7 +52,7 @@
|
||||
guid_to_name.c hmac.c jcr.c lex.c lz4.c alist.c dlist.c \
|
||||
md5.c message.c mem_pool.c openssl.c \
|
||||
plugins.c priv.c queue.c bregex.c bsockcore.c \
|
||||
plugins.c priv.c queue.c bregex.c \
|
||||
- runscript.c rwlock.c scan.c sellist.c serial.c sha1.c sha2.c \
|
||||
+ runscript.c rwlock.c scan.c sellist.c serial.c sha2.c \
|
||||
signal.c smartall.c rblist.c tls.c tree.c \
|
||||
util.c var.c watchdog.c workq.c btimers.c \
|
||||
worker.c flist.c bcollector.c collect.c \
|
||||
@@ -286,22 +286,6 @@
|
||||
worker.c flist.c \
|
||||
@@ -218,13 +218,6 @@
|
||||
$(RMF) md5.o
|
||||
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c
|
||||
|
||||
-sha1sum: Makefile libbac.la sha1.c
|
||||
-sha1sum: Makefile sha1.o
|
||||
- $(RMF) sha1.o
|
||||
- $(CXX) -DSHA1_SUM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c
|
||||
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -o $@ sha1.o $(DLIB) -lbac -lm $(LIBS) $(OPENSSL_LIBS)
|
||||
- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $@ $(DESTDIR)$(sbindir)/
|
||||
- $(RMF) sha1.o
|
||||
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c
|
||||
-
|
||||
-sha1_test: Makefile libbac.la sha1.c unittests.o
|
||||
- $(RMF) sha1.o
|
||||
- $(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c
|
||||
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -o $@ sha1.o unittests.o $(DLIB) -lbac -lm $(LIBS)
|
||||
- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $@ $(DESTDIR)$(sbindir)/
|
||||
- $(RMF) sha1.o
|
||||
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c
|
||||
-
|
||||
bsnprintf_test: Makefile libbac.la bsnprintf.c unittests.o
|
||||
bsnprintf: Makefile bsnprintf.o
|
||||
$(RMF) bsnprintf.o
|
||||
$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) bsnprintf.c
|
||||
@@ -397,7 +381,7 @@
|
||||
@@ -274,7 +267,7 @@
|
||||
|
||||
clean: libtool-clean
|
||||
@$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
|
||||
|
@ -62,10 +53,10 @@ diff -Naur bacula-11.0.1.old/src/lib/Makefile.in bacula-11.0.1/src/lib/Makefile.
|
|||
|
||||
realclean: clean
|
||||
@$(RMF) tags
|
||||
diff -Naur bacula-11.0.1.old/src/lib/sha1.c bacula-11.0.1/src/lib/sha1.c
|
||||
--- bacula-11.0.1.old/src/lib/sha1.c 2021-02-11 14:09:48.598047248 +0100
|
||||
+++ bacula-11.0.1/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,517 +0,0 @@
|
||||
diff -Naur bacula-9.0.0.old/src/lib/sha1.c bacula-9.0.0/src/lib/sha1.c
|
||||
--- bacula-9.0.0.old/src/lib/sha1.c 2017-07-10 08:52:38.929834490 +0200
|
||||
+++ bacula-9.0.0/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,510 +0,0 @@
|
||||
-/*
|
||||
- * sha1.c
|
||||
- *
|
||||
|
@ -432,12 +423,8 @@ diff -Naur bacula-11.0.1.old/src/lib/sha1.c bacula-11.0.1/src/lib/sha1.c
|
|||
- SHA1ProcessMessageBlock(context);
|
||||
-}
|
||||
-
|
||||
-#ifdef TEST_DRIVER
|
||||
-
|
||||
-#ifndef TEST_PROGRAM
|
||||
-#define TEST_PROGRAM_A
|
||||
-#endif
|
||||
-
|
||||
-#ifdef TEST_PROGRAM
|
||||
-/*
|
||||
- * sha1test.c
|
||||
- *
|
||||
|
@ -456,9 +443,6 @@ diff -Naur bacula-11.0.1.old/src/lib/sha1.c bacula-11.0.1/src/lib/sha1.c
|
|||
-#include <stdio.h>
|
||||
-#include <string.h>
|
||||
-#include "sha1.h"
|
||||
-#include "unittests.h"
|
||||
-
|
||||
-#define NRTESTS 4
|
||||
-
|
||||
-/*
|
||||
- * Define patterns for testing
|
||||
|
@ -473,81 +457,81 @@ diff -Naur bacula-11.0.1.old/src/lib/sha1.c bacula-11.0.1/src/lib/sha1.c
|
|||
-#define TEST4b "01234567012345670123456701234567"
|
||||
- /* an exact multiple of 512 bits */
|
||||
-#define TEST4 TEST4a TEST4b
|
||||
-
|
||||
-const char *testarray[NRTESTS] =
|
||||
-char *testarray[4] =
|
||||
-{
|
||||
- TEST1,
|
||||
- TEST2,
|
||||
- TEST3,
|
||||
- TEST4
|
||||
-};
|
||||
-
|
||||
-int repeatcount[NRTESTS] = { 1, 1, 1000000, 10 };
|
||||
-
|
||||
-const uint8_t resultarray[NRTESTS][20] =
|
||||
-long int repeatcount[4] = { 1, 1, 1000000, 10 };
|
||||
-char *resultarray[4] =
|
||||
-{
|
||||
- { 0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, 0xBA, 0x3E, 0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C, 0x9C, 0xD0, 0xD8, 0x9D },
|
||||
- { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E, 0xBA, 0xAE, 0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, 0xE5, 0x46, 0x70, 0xF1 },
|
||||
- { 0x34, 0xAA, 0x97, 0x3C, 0xD4, 0xC4, 0xDA, 0xA4, 0xF6, 0x1E, 0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F },
|
||||
- { 0xDE, 0xA3, 0x56, 0xA2, 0xCD, 0xDD, 0x90, 0xC7, 0xA7, 0xEC, 0xED, 0xC5, 0xEB, 0xB5, 0x63, 0x93, 0x4F, 0x46, 0x04, 0x52 },
|
||||
- "A9 99 3E 36 47 06 81 6A BA 3E 25 71 78 50 C2 6C 9C D0 D8 9D",
|
||||
- "84 98 3E 44 1C 3B D2 6E BA AE 4A A1 F9 51 29 E5 E5 46 70 F1",
|
||||
- "34 AA 97 3C D4 C4 DA A4 F6 1E EB 2B DB AD 27 31 65 34 01 6F",
|
||||
- "DE A3 56 A2 CD DD 90 C7 A7 EC ED C5 EB B5 63 93 4F 46 04 52"
|
||||
-};
|
||||
-
|
||||
-int main()
|
||||
-{
|
||||
- Unittests sha1_test("sha1_test");
|
||||
- SHA1Context sha;
|
||||
- int i, j, err;
|
||||
- uint8_t Message_Digest[20];
|
||||
- bool check_cont;
|
||||
- bool ct;
|
||||
- SHA1Context sha;
|
||||
- int i, j, err;
|
||||
- uint8_t Message_Digest[20];
|
||||
-
|
||||
- /*
|
||||
- * Perform SHA-1 tests
|
||||
- */
|
||||
- for(j = 0; j < 4; ++j) {
|
||||
- // printf( "\nTest %d: %d, '%s'\n", j+1, repeatcount[j], testarray[j]);
|
||||
- err = SHA1Init(&sha);
|
||||
- nok(err, "Test SHA1Init");
|
||||
- if (err) {
|
||||
- break; /* out of for j loop */
|
||||
- }
|
||||
- ct = true;
|
||||
- for(i = 0; i < repeatcount[j]; ++i) {
|
||||
- err = SHA1Update(&sha, (const unsigned char *) testarray[j], strlen(testarray[j]));
|
||||
- if (i < 5){
|
||||
- nok(err, "Test SHA1Update");
|
||||
- }
|
||||
- if (ct && repeatcount[j] > 4 && i > 4){
|
||||
- ct = false;
|
||||
- printf("...\n");
|
||||
- }
|
||||
- if (err) {
|
||||
- nok(err, "Test SHA1Update");
|
||||
- break; /* out of for i loop */
|
||||
- }
|
||||
- }
|
||||
- /*
|
||||
- * Perform SHA-1 tests
|
||||
- */
|
||||
- for(j = 0; j < 4; ++j) {
|
||||
- printf( "\nTest %d: %d, '%s'\n",
|
||||
- j+1,
|
||||
- repeatcount[j],
|
||||
- testarray[j]);
|
||||
-
|
||||
- err = SHA1Final(&sha, Message_Digest);
|
||||
- nok(err, "Test SHA1Final");
|
||||
- check_cont = true;
|
||||
- for(i = 0; i < 20 ; ++i) {
|
||||
- if (Message_Digest[i] != resultarray[j][i]){
|
||||
- check_cont = false;
|
||||
- }
|
||||
- }
|
||||
- ok(check_cont, "Checking expected result");
|
||||
- }
|
||||
- err = SHA1Init(&sha);
|
||||
- if (err) {
|
||||
- fprintf(stderr, "SHA1Reset Error %d.\n", err );
|
||||
- break; /* out of for j loop */
|
||||
- }
|
||||
-
|
||||
- /* Test some error returns */
|
||||
- err = SHA1Update(&sha,(const unsigned char *) testarray[1], 1);
|
||||
- ok(err == shaStateError, "Checking for shaStateError");
|
||||
- err = SHA1Init(0);
|
||||
- ok(err == shaNull, "Checking for shaNull");
|
||||
- for(i = 0; i < repeatcount[j]; ++i) {
|
||||
-
|
||||
- return report();
|
||||
- err = SHA1Input(&sha,
|
||||
- (const unsigned char *) testarray[j],
|
||||
- strlen(testarray[j]));
|
||||
- if (err) {
|
||||
- fprintf(stderr, "SHA1Input Error %d.\n", err );
|
||||
- break; /* out of for i loop */
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- err = SHA1Final(&sha, Message_Digest);
|
||||
- if (err) {
|
||||
- fprintf(stderr,
|
||||
- "SHA1Result Error %d, could not compute message digest.\n",
|
||||
- err );
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- printf("\t");
|
||||
- for(i = 0; i < 20 ; ++i) {
|
||||
- printf("%02X ", Message_Digest[i]);
|
||||
- }
|
||||
- printf("\n");
|
||||
- }
|
||||
- printf("Should match:\n");
|
||||
- printf("\t%s\n", resultarray[j]);
|
||||
- }
|
||||
-
|
||||
- /* Test some error returns */
|
||||
- err = SHA1Input(&sha,(const unsigned char *) testarray[1], 1);
|
||||
- printf ("\nError %d. Should be %d.\n", err, shaStateError );
|
||||
- err = SHA1Init(0);
|
||||
- printf ("\nError %d. Should be %d.\n", err, shaNull );
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-#endif /* TEST_PROGRAM */
|
||||
-#endif /* TEST_DRIVER */
|
||||
-
|
||||
-#ifdef SHA1_SUM
|
||||
-/*
|
||||
|
@ -582,10 +566,10 @@ diff -Naur bacula-11.0.1.old/src/lib/sha1.c bacula-11.0.1/src/lib/sha1.c
|
|||
- printf(" %s\n", argv[1]);
|
||||
- fclose(fd);
|
||||
-}
|
||||
-#endif /* SHA1_SUM */
|
||||
diff -Naur bacula-11.0.1.old/src/lib/sha1.h bacula-11.0.1/src/lib/sha1.h
|
||||
--- bacula-11.0.1.old/src/lib/sha1.h 2021-02-11 14:09:48.599047264 +0100
|
||||
+++ bacula-11.0.1/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100
|
||||
-#endif
|
||||
diff -Naur bacula-9.0.0.old/src/lib/sha1.h bacula-9.0.0/src/lib/sha1.h
|
||||
--- bacula-9.0.0.old/src/lib/sha1.h 2017-07-10 08:52:38.928834471 +0200
|
||||
+++ bacula-9.0.0/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,107 +0,0 @@
|
||||
-/*
|
||||
- * sha1.h
|
|
@ -1,6 +1,6 @@
|
|||
diff -Naur bacula-11.0.0.old/src/dird/bacula-dir.conf.in bacula-11.0.0/src/dird/bacula-dir.conf.in
|
||||
--- bacula-11.0.0.old/src/dird/bacula-dir.conf.in 2021-01-12 12:36:32.650470459 +0100
|
||||
+++ bacula-11.0.0/src/dird/bacula-dir.conf.in 2021-01-12 12:36:38.297573839 +0100
|
||||
diff -Naur bacula-9.0.0.old/src/dird/bacula-dir.conf.in bacula-9.0.0/src/dird/bacula-dir.conf.in
|
||||
--- bacula-9.0.0.old/src/dird/bacula-dir.conf.in 2017-07-10 08:52:38.930834509 +0200
|
||||
+++ bacula-9.0.0/src/dird/bacula-dir.conf.in 2017-07-10 08:53:11.189444548 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
Director { # define myself
|
||||
Name = @basename@-dir
|
||||
|
@ -10,15 +10,15 @@ diff -Naur bacula-11.0.0.old/src/dird/bacula-dir.conf.in bacula-11.0.0/src/dird/
|
|||
WorkingDirectory = "@working_dir@"
|
||||
PidDirectory = "@piddir@"
|
||||
Maximum Concurrent Jobs = 20
|
||||
diff -Naur bacula-11.0.0.old/src/dird/Makefile.in bacula-11.0.0/src/dird/Makefile.in
|
||||
--- bacula-11.0.0.old/src/dird/Makefile.in 2021-01-12 12:36:32.657470588 +0100
|
||||
+++ bacula-11.0.0/src/dird/Makefile.in 2021-01-12 12:37:37.827663637 +0100
|
||||
@@ -125,11 +125,11 @@
|
||||
@if test "x${dir_group}" != "x"; then \
|
||||
diff -Naur bacula-9.0.0.old/src/dird/Makefile.in bacula-9.0.0/src/dird/Makefile.in
|
||||
--- bacula-9.0.0.old/src/dird/Makefile.in 2017-07-10 08:52:38.930834509 +0200
|
||||
+++ bacula-9.0.0/src/dird/Makefile.in 2017-07-10 08:54:24.363828341 +0200
|
||||
@@ -124,11 +124,11 @@
|
||||
@if test "x${dir_group}" != "x" -a "x${DESTDIR}" = "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 \
|
||||
- @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; \
|
||||
|
@ -28,7 +28,7 @@ diff -Naur bacula-11.0.0.old/src/dird/Makefile.in bacula-11.0.0/src/dird/Makefil
|
|||
@if test -f static-bacula-dir; then \
|
||||
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \
|
||||
fi
|
||||
@@ -138,7 +138,7 @@
|
||||
@@ -137,7 +137,7 @@
|
||||
uninstall:
|
||||
(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir bdirjson)
|
||||
(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
|
|
@ -1,6 +1,6 @@
|
|||
diff -Naur bacula-11.0.0.old/src/lib/message.c bacula-11.0.0/src/lib/message.c
|
||||
--- bacula-11.0.0.old/src/lib/message.c 2021-01-12 12:36:32.630470094 +0100
|
||||
+++ bacula-11.0.0/src/lib/message.c 2021-01-12 12:39:42.477945569 +0100
|
||||
diff -Naur bacula-9.0.0.old/src/lib/message.c bacula-9.0.0/src/lib/message.c
|
||||
--- bacula-9.0.0.old/src/lib/message.c 2017-07-10 08:52:38.928834471 +0200
|
||||
+++ bacula-9.0.0/src/lib/message.c 2017-07-10 09:04:34.923403834 +0200
|
||||
@@ -28,6 +28,7 @@
|
||||
*
|
||||
*/
|
||||
|
@ -9,7 +9,7 @@ diff -Naur bacula-11.0.0.old/src/lib/message.c bacula-11.0.0/src/lib/message.c
|
|||
#include "bacula.h"
|
||||
#include "jcr.h"
|
||||
|
||||
@@ -1476,7 +1477,8 @@
|
||||
@@ -1367,7 +1368,8 @@
|
||||
|
||||
if (type == M_ABORT) {
|
||||
char *p = 0;
|
|
@ -0,0 +1,39 @@
|
|||
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
|
|
@ -0,0 +1,9 @@
|
|||
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,6 +1,6 @@
|
|||
diff -Naur bacula-11.0.0.old/src/qt-console/bat.pro.in bacula-11.0.0/src/qt-console/bat.pro.in
|
||||
--- bacula-11.0.0.old/src/qt-console/bat.pro.in 2021-01-12 12:36:32.639470258 +0100
|
||||
+++ bacula-11.0.0/src/qt-console/bat.pro.in 2021-01-12 12:39:13.647417778 +0100
|
||||
diff -Naur bacula-9.0.6.old/src/qt-console/bat.pro.in bacula-9.0.6/src/qt-console/bat.pro.in
|
||||
--- bacula-9.0.6.old/src/qt-console/bat.pro.in 2017-12-07 15:44:44.737173178 +0100
|
||||
+++ bacula-9.0.6/src/qt-console/bat.pro.in 2017-12-07 15:44:55.118366334 +0100
|
||||
@@ -6,7 +6,7 @@
|
||||
#
|
||||
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
@ -8,8 +8,8 @@ diff -Naur bacula-11.0.0.old/src/qt-console/bat.pro.in bacula-11.0.0/src/qt-cons
|
|||
-CONFIG += qt debug @QWT@
|
||||
+CONFIG += qt release @QWT@
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
@@ -15,7 +15,7 @@
|
||||
bins.files = bat
|
||||
confs.path = /$(DESTDIR)@sysconfdir@
|
||||
|
@ -18,10 +18,10 @@ diff -Naur bacula-11.0.0.old/src/qt-console/bat.pro.in bacula-11.0.0/src/qt-cons
|
|||
+help.path = /$(DESTDIR)@htmldir@
|
||||
help.files = help/*.html images/status.png images/mail-message-new.png
|
||||
|
||||
TEMPLATE = app
|
||||
diff -Naur bacula-11.0.0.old/src/qt-console/main.cpp bacula-11.0.0/src/qt-console/main.cpp
|
||||
--- bacula-11.0.0.old/src/qt-console/main.cpp 2021-01-12 12:36:32.640470277 +0100
|
||||
+++ bacula-11.0.0/src/qt-console/main.cpp 2021-01-12 12:39:13.647417778 +0100
|
||||
datarootdir = @datarootdir@
|
||||
diff -Naur bacula-9.0.6.old/src/qt-console/main.cpp bacula-9.0.6/src/qt-console/main.cpp
|
||||
--- bacula-9.0.6.old/src/qt-console/main.cpp 2017-12-07 15:44:44.742173271 +0100
|
||||
+++ bacula-9.0.6/src/qt-console/main.cpp 2017-12-07 15:44:55.119366353 +0100
|
||||
@@ -29,11 +29,11 @@
|
||||
#include <QTranslator>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
diff -Naur bacula-11.0.1.old/src/lib/crypto.c bacula-11.0.1/src/lib/crypto.c
|
||||
--- bacula-11.0.1.old/src/lib/crypto.c 2021-02-11 14:08:38.220885976 +0100
|
||||
+++ bacula-11.0.1/src/lib/crypto.c 2021-02-11 14:08:42.518956898 +0100
|
||||
diff -Naur bacula-9.0.6.old/src/lib/crypto.c bacula-9.0.6/src/lib/crypto.c
|
||||
--- bacula-9.0.6.old/src/lib/crypto.c 2017-12-07 15:42:03.771178189 +0100
|
||||
+++ bacula-9.0.6/src/lib/crypto.c 2017-12-07 15:42:25.300578772 +0100
|
||||
@@ -42,7 +42,7 @@
|
||||
* For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
|
||||
* exists. It was not an official API.
|
||||
|
@ -10,9 +10,9 @@ diff -Naur bacula-11.0.1.old/src/lib/crypto.c bacula-11.0.1/src/lib/crypto.c
|
|||
#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
|
||||
#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
|
||||
#endif
|
||||
diff -Naur bacula-11.0.1.old/src/lib/tls.c bacula-11.0.1/src/lib/tls.c
|
||||
--- bacula-11.0.1.old/src/lib/tls.c 2021-02-11 14:08:38.218885943 +0100
|
||||
+++ bacula-11.0.1/src/lib/tls.c 2021-02-11 14:08:42.565957674 +0100
|
||||
diff -Naur bacula-9.0.6.old/src/lib/tls.c bacula-9.0.6/src/lib/tls.c
|
||||
--- bacula-9.0.6.old/src/lib/tls.c 2017-12-07 15:42:03.770178170 +0100
|
||||
+++ bacula-9.0.6/src/lib/tls.c 2017-12-07 15:42:26.891608376 +0100
|
||||
@@ -47,9 +47,6 @@
|
||||
|
||||
#include "openssl-compat.h"
|
||||
|
@ -23,7 +23,7 @@ diff -Naur bacula-11.0.1.old/src/lib/tls.c bacula-11.0.1/src/lib/tls.c
|
|||
/* TLS Context Structure */
|
||||
struct TLS_Context {
|
||||
SSL_CTX *openssl;
|
||||
@@ -350,7 +347,7 @@
|
||||
@@ -206,7 +203,7 @@
|
||||
SSL_CTX_set_options(ctx->openssl, SSL_OP_SINGLE_DH_USE);
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@ diff -Naur bacula-11.0.1.old/src/lib/tls.c bacula-11.0.1/src/lib/tls.c
|
|||
Jmsg0(NULL, M_ERROR, 0,
|
||||
_("Error setting cipher list, no valid ciphers available\n"));
|
||||
goto err;
|
||||
@@ -551,7 +548,7 @@
|
||||
@@ -328,7 +325,7 @@
|
||||
extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
|
||||
|
||||
if (strcmp(extname, "subjectAltName") == 0) {
|
|
@ -0,0 +1,12 @@
|
|||
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
|
|
@ -0,0 +1,33 @@
|
|||
--- 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)) {
|
|
@ -3,10 +3,11 @@ Date: Mon Aug 12 14:51:39 2019 +0200
|
|||
|
||||
Use functions from OpenSSL for HMAC, MD5 and random bytes
|
||||
|
||||
diff -up bacula-11.0.1/src/dird/dird_conf.c.orig bacula-11.0.1/src/dird/dird_conf.c
|
||||
--- bacula-11.0.1/src/dird/dird_conf.c.orig 2021-02-05 22:23:44.000000000 +0100
|
||||
+++ bacula-11.0.1/src/dird/dird_conf.c 2022-02-11 19:43:38.870718113 +0100
|
||||
@@ -43,6 +43,10 @@
|
||||
diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
|
||||
index 02fae0bab..dff241356 100644
|
||||
--- a/bacula/src/dird/dird_conf.c
|
||||
+++ b/bacula/src/dird/dird_conf.c
|
||||
@@ -42,6 +42,10 @@
|
||||
#include "bacula.h"
|
||||
#include "dird.h"
|
||||
|
||||
|
@ -17,7 +18,7 @@ diff -up bacula-11.0.1/src/dird/dird_conf.c.orig bacula-11.0.1/src/dird/dird_con
|
|||
/* Define the first and last resource ID record
|
||||
* types. Note, these should be unique for each
|
||||
* daemon though not a requirement.
|
||||
@@ -1783,6 +1787,11 @@ void free_resource(RES *rres, int type)
|
||||
@@ -1645,6 +1649,11 @@ void free_resource(RES *rres, int type)
|
||||
free(res->res_fs.exclude_items);
|
||||
}
|
||||
res->res_fs.num_excludes = 0;
|
||||
|
@ -29,10 +30,11 @@ diff -up bacula-11.0.1/src/dird/dird_conf.c.orig bacula-11.0.1/src/dird/dird_con
|
|||
break;
|
||||
case R_POOL:
|
||||
if (res->res_pool.pool_type) {
|
||||
diff -up bacula-11.0.1/src/dird/dird_conf.h.orig bacula-11.0.1/src/dird/dird_conf.h
|
||||
--- bacula-11.0.1/src/dird/dird_conf.h.orig 2021-02-05 22:23:44.000000000 +0100
|
||||
+++ bacula-11.0.1/src/dird/dird_conf.h 2022-02-11 19:43:38.870718113 +0100
|
||||
@@ -25,6 +25,10 @@
|
||||
diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
|
||||
index 5174a7a14..4e910c5bd 100644
|
||||
--- a/bacula/src/dird/dird_conf.h
|
||||
+++ b/bacula/src/dird/dird_conf.h
|
||||
@@ -24,6 +24,10 @@
|
||||
|
||||
/* NOTE: #includes at the end of this file */
|
||||
|
||||
|
@ -43,7 +45,7 @@ diff -up bacula-11.0.1/src/dird/dird_conf.h.orig bacula-11.0.1/src/dird/dird_con
|
|||
/*
|
||||
* Resource codes -- they must be sequential for indexing
|
||||
*/
|
||||
@@ -608,7 +612,11 @@ public:
|
||||
@@ -591,7 +595,11 @@ public:
|
||||
INCEXE **exclude_items;
|
||||
int32_t num_excludes;
|
||||
bool have_MD5; /* set if MD5 initialized */
|
||||
|
@ -55,9 +57,10 @@ diff -up bacula-11.0.1/src/dird/dird_conf.h.orig bacula-11.0.1/src/dird/dird_con
|
|||
char MD5[30]; /* base 64 representation of MD5 */
|
||||
bool ignore_fs_changes; /* Don't force Full if FS changed */
|
||||
bool enable_vss; /* Enable Volume Shadow Copy */
|
||||
diff -up bacula-11.0.1/src/dird/inc_conf.c.orig bacula-11.0.1/src/dird/inc_conf.c
|
||||
--- bacula-11.0.1/src/dird/inc_conf.c.orig 2021-02-05 22:23:44.000000000 +0100
|
||||
+++ bacula-11.0.1/src/dird/inc_conf.c 2022-02-11 19:43:38.870718113 +0100
|
||||
diff --git a/bacula/src/dird/inc_conf.c b/bacula/src/dird/inc_conf.c
|
||||
index 3f4fbf55e..64b422242 100644
|
||||
--- a/bacula/src/dird/inc_conf.c
|
||||
+++ b/bacula/src/dird/inc_conf.c
|
||||
@@ -32,6 +32,10 @@
|
||||
#include <regex.h>
|
||||
#endif
|
||||
|
@ -69,7 +72,7 @@ diff -up bacula-11.0.1/src/dird/inc_conf.c.orig bacula-11.0.1/src/dird/inc_conf.
|
|||
/* Forward referenced subroutines */
|
||||
|
||||
void store_inc(LEX *lc, RES_ITEM *item, int index, int pass);
|
||||
@@ -390,7 +394,17 @@ static void store_newinc(LEX *lc, RES_IT
|
||||
@@ -354,7 +358,17 @@ static void store_newinc(LEX *lc, RES_ITEM *item, int index, int pass)
|
||||
bool options;
|
||||
|
||||
if (!res_all.res_fs.have_MD5) {
|
||||
|
@ -86,8 +89,8 @@ diff -up bacula-11.0.1/src/dird/inc_conf.c.orig bacula-11.0.1/src/dird/inc_conf.
|
|||
+#endif
|
||||
res_all.res_fs.have_MD5 = true;
|
||||
}
|
||||
bmemset(&res_incexe, 0, sizeof(INCEXE));
|
||||
@@ -656,7 +670,13 @@ static void store_fname(LEX *lc, RES_ITE
|
||||
memset(&res_incexe, 0, sizeof(INCEXE));
|
||||
@@ -620,7 +634,13 @@ static void store_fname(LEX *lc, RES_ITEM2 *item, int index, int pass, bool excl
|
||||
}
|
||||
case T_QUOTED_STRING:
|
||||
if (res_all.res_fs.have_MD5) {
|
||||
|
@ -101,7 +104,7 @@ diff -up bacula-11.0.1/src/dird/inc_conf.c.orig bacula-11.0.1/src/dird/inc_conf.
|
|||
}
|
||||
incexe = &res_incexe;
|
||||
if (incexe->name_list.size() == 0) {
|
||||
@@ -699,7 +719,13 @@ static void store_plugin_name(LEX *lc, R
|
||||
@@ -663,7 +683,13 @@ static void store_plugin_name(LEX *lc, RES_ITEM2 *item, int index, int pass, boo
|
||||
}
|
||||
case T_QUOTED_STRING:
|
||||
if (res_all.res_fs.have_MD5) {
|
||||
|
@ -115,10 +118,11 @@ diff -up bacula-11.0.1/src/dird/inc_conf.c.orig bacula-11.0.1/src/dird/inc_conf.
|
|||
}
|
||||
incexe = &res_incexe;
|
||||
if (incexe->plugin_list.size() == 0) {
|
||||
diff -up bacula-11.0.1/src/dird/job.c.orig bacula-11.0.1/src/dird/job.c
|
||||
--- bacula-11.0.1/src/dird/job.c.orig 2021-02-05 22:23:44.000000000 +0100
|
||||
+++ bacula-11.0.1/src/dird/job.c 2022-02-11 19:43:38.871718095 +0100
|
||||
@@ -27,6 +27,10 @@
|
||||
diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
|
||||
index b5b39c7d5..7d69f0157 100644
|
||||
--- a/bacula/src/dird/job.c
|
||||
+++ b/bacula/src/dird/job.c
|
||||
@@ -25,6 +25,10 @@
|
||||
#include "bacula.h"
|
||||
#include "dird.h"
|
||||
|
||||
|
@ -129,7 +133,7 @@ diff -up bacula-11.0.1/src/dird/job.c.orig bacula-11.0.1/src/dird/job.c
|
|||
/* Forward referenced subroutines */
|
||||
static void *job_thread(void *arg);
|
||||
static void job_monitor_watchdog(watchdog_t *self);
|
||||
@@ -1342,10 +1346,27 @@ bool get_or_create_fileset_record(JCR *j
|
||||
@@ -1308,10 +1312,27 @@ bool get_or_create_fileset_record(JCR *jcr)
|
||||
memset(&fsr, 0, sizeof(FILESET_DBR));
|
||||
bstrncpy(fsr.FileSet, jcr->fileset->hdr.name, sizeof(fsr.FileSet));
|
||||
if (jcr->fileset->have_MD5) {
|
||||
|
@ -157,9 +161,10 @@ diff -up bacula-11.0.1/src/dird/job.c.orig bacula-11.0.1/src/dird/job.c
|
|||
/*
|
||||
* Keep the flag (last arg) set to false otherwise old FileSets will
|
||||
* get new MD5 sums and the user will get Full backups on everything
|
||||
diff -up bacula-11.0.1/src/lib/hmac.c.orig bacula-11.0.1/src/lib/hmac.c
|
||||
--- bacula-11.0.1/src/lib/hmac.c.orig 2021-02-05 22:23:44.000000000 +0100
|
||||
+++ bacula-11.0.1/src/lib/hmac.c 2022-02-11 19:43:38.871718095 +0100
|
||||
diff --git a/bacula/src/lib/hmac.c b/bacula/src/lib/hmac.c
|
||||
index a8d5e3dc0..dc3b78383 100644
|
||||
--- a/bacula/src/lib/hmac.c
|
||||
+++ b/bacula/src/lib/hmac.c
|
||||
@@ -26,6 +26,10 @@
|
||||
*/
|
||||
#include "bacula.h"
|
||||
|
@ -199,9 +204,10 @@ diff -up bacula-11.0.1/src/lib/hmac.c.orig bacula-11.0.1/src/lib/hmac.c
|
|||
/*
|
||||
Test Vectors (Trailing '\0' of a character string not included in test):
|
||||
|
||||
diff -up bacula-11.0.1/src/lib/parse_conf.c.orig bacula-11.0.1/src/lib/parse_conf.c
|
||||
--- bacula-11.0.1/src/lib/parse_conf.c.orig 2021-02-05 22:23:44.000000000 +0100
|
||||
+++ bacula-11.0.1/src/lib/parse_conf.c 2022-02-11 19:43:38.871718095 +0100
|
||||
diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c
|
||||
index cb3573fbd..3f3f93fdc 100644
|
||||
--- a/bacula/src/lib/parse_conf.c
|
||||
+++ b/bacula/src/lib/parse_conf.c
|
||||
@@ -59,6 +59,10 @@
|
||||
#define MAX_PATH 1024
|
||||
#endif
|
||||
|
@ -213,7 +219,7 @@ diff -up bacula-11.0.1/src/lib/parse_conf.c.orig bacula-11.0.1/src/lib/parse_con
|
|||
/*
|
||||
* Define the Union of all the common resource structure definitions.
|
||||
*/
|
||||
@@ -588,7 +592,11 @@ void store_dir(LEX *lc, RES_ITEM *item,
|
||||
@@ -538,7 +542,11 @@ void store_dir(LEX *lc, RES_ITEM *item, int index, int pass)
|
||||
void store_password(LEX *lc, RES_ITEM *item, int index, int pass)
|
||||
{
|
||||
unsigned int i, j;
|
||||
|
@ -225,7 +231,7 @@ diff -up bacula-11.0.1/src/lib/parse_conf.c.orig bacula-11.0.1/src/lib/parse_con
|
|||
unsigned char digest[CRYPTO_DIGEST_MD5_SIZE];
|
||||
char sig[100];
|
||||
|
||||
@@ -598,9 +606,21 @@ void store_password(LEX *lc, RES_ITEM *i
|
||||
@@ -548,9 +556,21 @@ void store_password(LEX *lc, RES_ITEM *item, int index, int pass)
|
||||
} else {
|
||||
lex_get_token(lc, T_STRING);
|
||||
if (pass == 1) {
|
||||
|
@ -247,10 +253,11 @@ diff -up bacula-11.0.1/src/lib/parse_conf.c.orig bacula-11.0.1/src/lib/parse_con
|
|||
for (i = j = 0; i < sizeof(digest); i++) {
|
||||
sprintf(&sig[j], "%02x", digest[i]);
|
||||
j += 2;
|
||||
diff -up bacula-11.0.1/src/lib/util.c.orig bacula-11.0.1/src/lib/util.c
|
||||
--- bacula-11.0.1/src/lib/util.c.orig 2021-02-05 22:23:44.000000000 +0100
|
||||
+++ bacula-11.0.1/src/lib/util.c 2022-02-11 19:43:38.872718077 +0100
|
||||
@@ -707,6 +707,35 @@ int do_shell_expansion(char *name, int n
|
||||
diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
|
||||
index 2c425aa4c..e82b907d8 100644
|
||||
--- a/bacula/src/lib/util.c
|
||||
+++ b/bacula/src/lib/util.c
|
||||
@@ -707,6 +707,35 @@ int do_shell_expansion(char *name, int name_len)
|
||||
from SpeakFreely by John Walker */
|
||||
|
||||
void make_session_key(char *key, char *seed, int mode)
|
||||
|
@ -286,7 +293,7 @@ diff -up bacula-11.0.1/src/lib/util.c.orig bacula-11.0.1/src/lib/util.c
|
|||
{
|
||||
int j, k;
|
||||
struct MD5Context md5c;
|
||||
@@ -790,6 +819,7 @@ void make_session_key(char *key, char *s
|
||||
@@ -790,6 +819,7 @@ void make_session_key(char *key, char *seed, int mode)
|
||||
}
|
||||
}
|
||||
#undef nextrand
|
|
@ -1,43 +0,0 @@
|
|||
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)
|
|
@ -1,34 +0,0 @@
|
|||
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
|
|
@ -0,0 +1,115 @@
|
|||
#!/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 $?
|
|
@ -1,5 +1,5 @@
|
|||
[Unit]
|
||||
Description=Bacula Director
|
||||
Description=Bacula-Director, the Backup-server
|
||||
Documentation=man:bacula-dir(8)
|
||||
After=network.target nss-lookup.target
|
||||
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
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)
|
|
@ -0,0 +1,113 @@
|
|||
#!/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 $?
|
|
@ -1,5 +1,5 @@
|
|||
[Unit]
|
||||
Description=Bacula File Daemon
|
||||
Description=Bacula-FileDaemon, a Backup-client
|
||||
Documentation=man:bacula-fd(8)
|
||||
After=network.target nss-lookup.target
|
||||
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
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"
|
|
@ -1,48 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
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)
|
|
@ -0,0 +1,115 @@
|
|||
#!/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 $?
|
|
@ -1,5 +1,5 @@
|
|||
[Unit]
|
||||
Description=Bacula Storage Daemon
|
||||
Description=Bacula-StorageDaemon, the storage-server
|
||||
Documentation=man:bacula-sd(8)
|
||||
After=network.target nss-lookup.target
|
||||
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
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
|
Binary file not shown.
After Width: | Height: | Size: 407 B |
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue