rpms/bacula
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/bacula.git#f430161083328900915f65fcf8bd5e7e3dfd1f63
This commit is contained in:
DistroBaker 2021-02-11 17:02:28 +00:00
parent 510730379d
commit 57d1d3d6b6
8 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -53,3 +53,4 @@ bacula-docs-5.0.3.tar.bz2
/bacula-9.6.6.tar.gz
/bacula-9.6.7.tar.gz
/bacula-11.0.0.tar.gz
/bacula-11.0.1.tar.gz

8
bacula-docker-plugin.patch
View File

@ -1,7 +1,7 @@
diff -Naur bacula-11.0.0.old/autoconf/configure.in bacula-11.0.0/autoconf/configure.in
--- bacula-11.0.0.old/autoconf/configure.in 2021-01-12 12:54:46.373504805 +0100
+++ bacula-11.0.0/autoconf/configure.in 2021-01-12 12:57:21.990356810 +0100
@@ -3237,20 +3237,11 @@
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

8
bacula-g++-options.patch
View File

@ -1,7 +1,7 @@
diff -Naur bacula-11.0.0.old/autoconf/configure.in bacula-11.0.0/autoconf/configure.in
--- bacula-11.0.0.old/autoconf/configure.in 2021-01-12 12:36:32.689471174 +0100
+++ bacula-11.0.0/autoconf/configure.in 2021-01-12 12:42:02.619511095 +0100
@@ -3271,11 +3271,6 @@
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}

28
bacula-install.patch
View File

@ -1,18 +1,18 @@
diff -Naur bacula-11.0.0.old/autoconf/configure.in bacula-11.0.0/autoconf/configure.in
--- bacula-11.0.0.old/autoconf/configure.in 2021-01-12 12:42:18.332798754 +0100
+++ bacula-11.0.0/autoconf/configure.in 2021-01-12 12:43:50.415484480 +0100
@@ -3795,7 +3795,7 @@
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
+chmod 755 install_conf_file build-depkgs-qt-console
cd ${BUILD_DIR}
cd scripts
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-12 12:36:32.682471046 +0100
+++ bacula-11.0.0/examples/nagios/check_bacula/Makefile.in 2021-01-12 12:42:38.919175622 +0100
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)
@ -22,9 +22,9 @@ diff -Naur bacula-11.0.0.old/examples/nagios/check_bacula/Makefile.in bacula-11.
uninstall:
(cd $(DESTDIR)$(sbindir); $(RMF) check_bacula)
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:39:35.876824725 +0100
+++ bacula-11.0.0/src/qt-console/bat.pro.in 2021-01-12 12:42:38.919175622 +0100
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@
@ -34,9 +34,9 @@ diff -Naur bacula-11.0.0.old/src/qt-console/bat.pro.in bacula-11.0.0/src/qt-cons
confs.path = /$(DESTDIR)@sysconfdir@
confs.commands = ./install_conf_file
help.path = /$(DESTDIR)@htmldir@
diff -Naur bacula-11.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-11.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in
--- bacula-11.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2021-01-12 12:36:32.636470203 +0100
+++ bacula-11.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in 2021-01-12 12:42:38.920175640 +0100
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 @@

30
bacula-non-free-code.patch
View File

@ -1,7 +1,7 @@
diff -Naur bacula-11.0.0.old/src/lib/lib.h bacula-11.0.0/src/lib/lib.h
--- bacula-11.0.0.old/src/lib/lib.h 2021-01-12 12:36:32.629470075 +0100
+++ bacula-11.0.0/src/lib/lib.h 2021-01-12 12:40:33.030871025 +0100
@@ -56,7 +56,6 @@
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 @@
#include "fnmatch.h"
#endif
#include "md5.h"
@ -9,9 +9,9 @@ diff -Naur bacula-11.0.0.old/src/lib/lib.h bacula-11.0.0/src/lib/lib.h
#include "tree.h"
#include "watchdog.h"
#include "btimers.h"
diff -Naur bacula-11.0.0.old/src/lib/Makefile.in bacula-11.0.0/src/lib/Makefile.in
--- bacula-11.0.0.old/src/lib/Makefile.in 2021-01-12 12:36:32.628470057 +0100
+++ bacula-11.0.0/src/lib/Makefile.in 2021-01-12 12:40:54.400262228 +0100
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 @@
flist.h fnmatch.h guid_to_name.h htable.h lex.h \
lib.h lz4.h md5.h mem_pool.h message.h \
@ -30,7 +30,7 @@ diff -Naur bacula-11.0.0.old/src/lib/Makefile.in bacula-11.0.0/src/lib/Makefile.
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 \
@@ -278,22 +278,6 @@
@@ -286,22 +286,6 @@
$(RMF) md5.o
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c
@ -53,7 +53,7 @@ diff -Naur bacula-11.0.0.old/src/lib/Makefile.in bacula-11.0.0/src/lib/Makefile.
bsnprintf_test: Makefile libbac.la bsnprintf.c unittests.o
$(RMF) bsnprintf.o
$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) bsnprintf.c
@@ -389,7 +373,7 @@
@@ -397,7 +381,7 @@
clean: libtool-clean
@$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
@ -62,9 +62,9 @@ diff -Naur bacula-11.0.0.old/src/lib/Makefile.in bacula-11.0.0/src/lib/Makefile.
realclean: clean
@$(RMF) tags
diff -Naur bacula-11.0.0.old/src/lib/sha1.c bacula-11.0.0/src/lib/sha1.c
--- bacula-11.0.0.old/src/lib/sha1.c 2021-01-12 12:36:32.629470075 +0100
+++ bacula-11.0.0/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100
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 @@
-/*
- * sha1.c
@ -583,9 +583,9 @@ diff -Naur bacula-11.0.0.old/src/lib/sha1.c bacula-11.0.0/src/lib/sha1.c
- fclose(fd);
-}
-#endif /* SHA1_SUM */
diff -Naur bacula-11.0.0.old/src/lib/sha1.h bacula-11.0.0/src/lib/sha1.h
--- bacula-11.0.0.old/src/lib/sha1.h 2021-01-12 12:36:32.630470094 +0100
+++ bacula-11.0.0/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100
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
@@ -1,107 +0,0 @@
-/*
- * sha1.h

16
bacula-openssl.patch
View File

@ -1,6 +1,6 @@
diff -Naur bacula-9.4.0.old/src/lib/crypto.c bacula-9.4.0/src/lib/crypto.c
--- bacula-9.4.0.old/src/lib/crypto.c 2018-12-16 11:30:25.000000000 +0100
+++ bacula-9.4.0/src/lib/crypto.c 2019-01-12 15:18:04.623955646 +0100
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
@@ -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-9.4.0.old/src/lib/crypto.c bacula-9.4.0/src/lib/crypto.c
#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
#endif
diff -Naur bacula-9.4.0.old/src/lib/tls.c bacula-9.4.0/src/lib/tls.c
--- bacula-9.4.0.old/src/lib/tls.c 2018-12-16 11:30:25.000000000 +0100
+++ bacula-9.4.0/src/lib/tls.c 2019-01-12 15:18:04.646956092 +0100
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
@@ -47,9 +47,6 @@
#include "openssl-compat.h"
@ -23,7 +23,7 @@ diff -Naur bacula-9.4.0.old/src/lib/tls.c bacula-9.4.0/src/lib/tls.c
/* TLS Context Structure */
struct TLS_Context {
SSL_CTX *openssl;
@@ -215,7 +212,7 @@
@@ -350,7 +347,7 @@
SSL_CTX_set_options(ctx->openssl, SSL_OP_SINGLE_DH_USE);
}
@ -32,7 +32,7 @@ diff -Naur bacula-9.4.0.old/src/lib/tls.c bacula-9.4.0/src/lib/tls.c
Jmsg0(NULL, M_ERROR, 0,
_("Error setting cipher list, no valid ciphers available\n"));
goto err;
@@ -336,7 +333,7 @@
@@ -551,7 +548,7 @@
extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
if (strcmp(extname, "subjectAltName") == 0) {

7
bacula.spec
View File

@ -2,8 +2,8 @@
%global username bacula
Name: bacula
Version: 11.0.0
Release: 5%{?dist}
Version: 11.0.1
Release: 1%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: AGPLv3 with exceptions
@ -626,6 +626,9 @@ exit 0
%{_libdir}/nagios/plugins/check_bacula
%changelog
* Thu Feb 11 2021 Simone Caronni <negativo17@gmail.com> - 11.0.1-1
- Update to 11.0.1.
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 11.0.0-5
- rebuild for libpq ABI fix rhbz#1908268

2
sources
View File

@ -1 +1 @@
SHA512 (bacula-11.0.0.tar.gz) = 5c835dbaa65f89add5b38abf0105a20b4fd545d7a8ab9828cfc4f7e9f27862f9e18f7beab1c1ea8e3528504f265a46d50a1e73720737b981ba092bb72aa63501
SHA512 (bacula-11.0.1.tar.gz) = d2ac473f322ba5eec8737f02b12bcee6feafc0185cbc92feee4b9f5f33f1ce622a6de75fbec41b3f3709463c7aa661ada2daa9985cab1b71d271af7cb55cd4ca