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

Update to 9.6.2

Browse Source
This commit is contained in:
Simone Caronni 2020-02-29 17:56:13 +01:00
parent 7278ebf373
commit 184ea64536
7 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bacula-dir.service
View File

@ -1,5 +1,5 @@
[Unit]
Description=Bacula-Director, the Backup-server
Description=Bacula Director
Documentation=man:bacula-dir(8)
After=network.target nss-lookup.target

2
bacula-fd.service
View File

@ -1,5 +1,5 @@
[Unit]
Description=Bacula-FileDaemon, a Backup-client
Description=Bacula File Daemon
Documentation=man:bacula-fd(8)
After=network.target nss-lookup.target

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

@ -1,7 +1,7 @@
diff -Naur bacula-9.4.2.old/autoconf/configure.in bacula-9.4.2/autoconf/configure.in
--- bacula-9.4.2.old/autoconf/configure.in 2019-04-18 11:49:06.099005902 +0200
+++ bacula-9.4.2/autoconf/configure.in 2019-04-18 11:49:27.545391181 +0200
@@ -2993,11 +2993,6 @@
diff -Naur bacula-9.6.2.old/autoconf/configure.in bacula-9.6.2/autoconf/configure.in
--- bacula-9.6.2.old/autoconf/configure.in 2020-03-03 16:21:10.910563621 +0100
+++ bacula-9.6.2/autoconf/configure.in 2020-03-03 16:21:21.733789410 +0100
@@ -3074,11 +3074,6 @@
AC_DEFINE(FDLIBS)
CFLAGS=${CFLAGS--O}

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

@ -1,7 +1,7 @@
diff -Naur bacula-9.4.0.old/src/lib/lib.h bacula-9.4.0/src/lib/lib.h
--- bacula-9.4.0.old/src/lib/lib.h 2018-12-16 11:30:25.000000000 +0100
+++ bacula-9.4.0/src/lib/lib.h 2019-01-12 15:29:19.939350837 +0100
@@ -54,7 +54,6 @@
diff -Naur bacula-9.6.2.old/src/lib/lib.h bacula-9.6.2/src/lib/lib.h
--- bacula-9.6.2.old/src/lib/lib.h 2020-02-29 17:45:42.941374709 +0100
+++ bacula-9.6.2/src/lib/lib.h 2020-02-29 17:45:49.721502334 +0100
@@ -55,7 +55,6 @@
#include "fnmatch.h"
#endif
#include "md5.h"
@ -9,9 +9,9 @@ diff -Naur bacula-9.4.0.old/src/lib/lib.h bacula-9.4.0/src/lib/lib.h
#include "tree.h"
#include "watchdog.h"
#include "btimers.h"
diff -Naur bacula-9.4.0.old/src/lib/Makefile.in bacula-9.4.0/src/lib/Makefile.in
--- bacula-9.4.0.old/src/lib/Makefile.in 2018-12-16 11:30:25.000000000 +0100
+++ bacula-9.4.0/src/lib/Makefile.in 2019-01-12 15:29:46.724837145 +0100
diff -Naur bacula-9.6.2.old/src/lib/Makefile.in bacula-9.6.2/src/lib/Makefile.in
--- bacula-9.6.2.old/src/lib/Makefile.in 2020-02-29 17:45:42.940374690 +0100
+++ bacula-9.6.2/src/lib/Makefile.in 2020-02-29 17:45:49.722502353 +0100
@@ -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 \
@ -19,7 +19,7 @@ diff -Naur bacula-9.4.0.old/src/lib/Makefile.in bacula-9.4.0/src/lib/Makefile.in
- 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 \
watchdog.h workq.h ini.h \
watchdog.h workq.h ini.h collect.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 \
@ -29,7 +29,7 @@ diff -Naur bacula-9.4.0.old/src/lib/Makefile.in bacula-9.4.0/src/lib/Makefile.in
+ 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 \
worker.c flist.c bcollector.c collect.c \
@@ -246,22 +246,6 @@
$(RMF) md5.o
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c
@ -53,7 +53,7 @@ diff -Naur bacula-9.4.0.old/src/lib/Makefile.in bacula-9.4.0/src/lib/Makefile.in
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
@@ -329,7 +313,7 @@
@@ -343,7 +327,7 @@
clean: libtool-clean
@$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
@ -62,9 +62,9 @@ diff -Naur bacula-9.4.0.old/src/lib/Makefile.in bacula-9.4.0/src/lib/Makefile.in
realclean: clean
@$(RMF) tags
diff -Naur bacula-9.4.0.old/src/lib/sha1.c bacula-9.4.0/src/lib/sha1.c
--- bacula-9.4.0.old/src/lib/sha1.c 2018-12-16 11:30:25.000000000 +0100
+++ bacula-9.4.0/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100
diff -Naur bacula-9.6.2.old/src/lib/sha1.c bacula-9.6.2/src/lib/sha1.c
--- bacula-9.6.2.old/src/lib/sha1.c 2020-02-29 17:45:42.943374747 +0100
+++ bacula-9.6.2/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-9.4.0.old/src/lib/sha1.c bacula-9.4.0/src/lib/sha1.c
- fclose(fd);
-}
-#endif /* SHA1_SUM */
diff -Naur bacula-9.4.0.old/src/lib/sha1.h bacula-9.4.0/src/lib/sha1.h
--- bacula-9.4.0.old/src/lib/sha1.h 2018-12-16 11:30:25.000000000 +0100
+++ bacula-9.4.0/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100
diff -Naur bacula-9.6.2.old/src/lib/sha1.h bacula-9.6.2/src/lib/sha1.h
--- bacula-9.6.2.old/src/lib/sha1.h 2020-02-29 17:45:42.940374690 +0100
+++ bacula-9.6.2/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,107 +0,0 @@
-/*
- * sha1.h

24
bacula-s3-configure.patch
View File

@ -1,7 +1,7 @@
diff -Naur bacula-9.4.2.old/autoconf/configure.in bacula-9.4.2/autoconf/configure.in
--- bacula-9.4.2.old/autoconf/configure.in 2019-04-18 11:50:32.221553081 +0200
+++ bacula-9.4.2/autoconf/configure.in 2019-04-18 11:51:49.346938638 +0200
@@ -1894,6 +1894,20 @@
diff -Naur bacula-9.6.2.old/autoconf/configure.in bacula-9.6.2/autoconf/configure.in
--- bacula-9.6.2.old/autoconf/configure.in 2020-03-03 16:21:50.126381725 +0100
+++ bacula-9.6.2/autoconf/configure.in 2020-03-03 16:22:03.870668458 +0100
@@ -1938,6 +1938,20 @@
AC_CHECK_FUNC(accept4, [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if you have the 'accept4' function.])])
@ -22,11 +22,11 @@ diff -Naur bacula-9.4.2.old/autoconf/configure.in bacula-9.4.2/autoconf/configur
S3_INC=
S3_LIBS=
S3_LDFLAGS=
@@ -3631,6 +3645,7 @@
Encryption support: ${support_crypto}
ZLIB support: ${have_zlib}
LZO support: ${have_lzo}
+ S3 support: ${have_libs3}
enable-smartalloc: ${support_smartalloc}
enable-lockmgr: ${support_lockmgr}
bat support: ${support_bat}
@@ -3713,6 +3727,7 @@
Encryption support: ${support_crypto}
ZLIB support: ${have_zlib}
LZO support: ${have_lzo}
+ S3 support: ${have_libs3}
enable-smartalloc: ${support_smartalloc}
enable-lockmgr: ${support_lockmgr}
bat support: ${support_bat}

2
bacula-sd.service
View File

@ -1,5 +1,5 @@
[Unit]
Description=Bacula-StorageDaemon, the storage-server
Description=Bacula Storage Daemon
Documentation=man:bacula-sd(8)
After=network.target nss-lookup.target

7
bacula.spec
View File

@ -2,8 +2,8 @@
%global username bacula
Name: bacula
Version: 9.4.4
Release: 4%{?dist}
Version: 9.6.2
Release: 1%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: AGPLv3 with exceptions
@ -749,6 +749,9 @@ fi
%{_libdir}/nagios/plugins/check_bacula
%changelog
* Sat Feb 29 2020 Simone Caronni <negativo17@gmail.com> - 9.6.2-1
- Update to 9.6.2.
* Mon Feb 10 2020 Václav Doležal <vdolezal@redhat.com> - 9.4.4-4
- Fix FTBFS (#1799185)