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

Update to 7.2.0

Browse Source
This commit is contained in:
Simone Caronni 2015-09-29 11:16:35 +02:00
parent 04013b8429
commit b5979e3228
9 changed files with 259 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -23,3 +23,4 @@ bacula-docs-5.0.3.tar.bz2
/bacula-7.0.3.tar.gz /bacula-7.0.3.tar.gz
/bacula-7.0.4.tar.gz /bacula-7.0.4.tar.gz
/bacula-7.0.5.tar.gz /bacula-7.0.5.tar.gz
/bacula-7.2.0.tar.gz

21
bacula-7.0.3-tray-monitor-configure.patch
View File

@ -1,21 +0,0 @@
diff -Naur bacula-7.0.3.old/configure bacula-7.0.3/configure
--- bacula-7.0.3.old/configure 2014-05-15 15:45:13.795148212 +0200
+++ bacula-7.0.3/configure 2014-05-15 15:55:54.512118343 +0200
@@ -30748,7 +30748,7 @@
exit 1
fi
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 updatedb/update_mysql_tables_12_to_14 updatedb/update_sqlite3_tables_12_to_14 updatedb/update_postgresql_tables_12_to_14 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 updatedb/update_mysql_tables_12_to_14 updatedb/update_sqlite3_tables_12_to_14 updatedb/update_postgresql_tables_12_to_14 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES"
ac_config_commands="$ac_config_commands default"
@@ -31879,6 +31879,8 @@
"src/qt-console/bat.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro" ;;
"src/qt-console/bat.pro.mingw32") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro.mingw32" ;;
"src/qt-console/install_conf_file") CONFIG_FILES="$CONFIG_FILES src/qt-console/install_conf_file" ;;
+ "src/qt-console/tray-monitor/tray-monitor.conf") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.conf" ;;
+ "src/qt-console/tray-monitor/tray-monitor.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.pro" ;;
"src/dird/Makefile") CONFIG_FILES="$CONFIG_FILES src/dird/Makefile" ;;
"src/dird/bacula-dir.conf") CONFIG_FILES="$CONFIG_FILES src/dird/bacula-dir.conf" ;;
"src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;

16
bacula-7.0.3-bat-build.patch → bacula-7.2.0-bat-build.patch
View File

@ -1,10 +1,10 @@
diff -Naur bacula-7.0.3.old/src/qt-console/bat.pro.in bacula-7.0.3/src/qt-console/bat.pro.in diff -Naur bacula-7.2.0.old/src/qt-console/bat.pro.in bacula-7.2.0/src/qt-console/bat.pro.in
--- bacula-7.0.3.old/src/qt-console/bat.pro.in 2014-05-15 15:45:13.750148702 +0200 --- bacula-7.2.0.old/src/qt-console/bat.pro.in 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.0.3/src/qt-console/bat.pro.in 2014-05-15 15:49:57.592032881 +0200 +++ bacula-7.2.0/src/qt-console/bat.pro.in 2015-09-29 10:31:49.354763250 +0200
@@ -6,13 +6,13 @@ @@ -6,13 +6,13 @@
# #
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# #
-CONFIG += qt debug @QWT@ -CONFIG += qt debug @QWT@
+CONFIG += qt release @QWT@ +CONFIG += qt release @QWT@
@ -17,10 +17,10 @@ diff -Naur bacula-7.0.3.old/src/qt-console/bat.pro.in bacula-7.0.3/src/qt-consol
help.files = help/*.html images/status.png images/mail-message-new.png help.files = help/*.html images/status.png images/mail-message-new.png
TEMPLATE = app TEMPLATE = app
diff -Naur bacula-7.0.3.old/src/qt-console/main.cpp bacula-7.0.3/src/qt-console/main.cpp diff -Naur bacula-7.2.0.old/src/qt-console/main.cpp bacula-7.2.0/src/qt-console/main.cpp
--- bacula-7.0.3.old/src/qt-console/main.cpp 2014-05-15 15:45:13.749148713 +0200 --- bacula-7.2.0.old/src/qt-console/main.cpp 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.0.3/src/qt-console/main.cpp 2014-05-15 15:49:57.593032870 +0200 +++ bacula-7.2.0/src/qt-console/main.cpp 2015-09-29 10:30:54.252674240 +0200
@@ -28,9 +28,9 @@ @@ -32,9 +32,9 @@
/* /*
* We need Qt version 4.8.4 or later to be able to comple correctly * We need Qt version 4.8.4 or later to be able to comple correctly
*/ */

42
bacula-7.0.3-non-free-code.patch → bacula-7.2.0-non-free-code.patch
View File

@ -1,7 +1,7 @@
diff -Naur bacula-7.0.3.old/src/lib/lib.h bacula-7.0.3/src/lib/lib.h diff -Naur bacula-7.2.0.old/src/lib/lib.h bacula-7.2.0.new/src/lib/lib.h
--- bacula-7.0.3.old/src/lib/lib.h 2014-05-15 15:45:13.745148756 +0200 --- bacula-7.2.0.old/src/lib/lib.h 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.0.3/src/lib/lib.h 2014-05-15 15:52:33.005327683 +0200 +++ bacula-7.2.0.new/src/lib/lib.h 2015-09-29 10:35:11.720417548 +0200
@@ -47,7 +47,6 @@ @@ -51,7 +51,6 @@
#include "fnmatch.h" #include "fnmatch.h"
#endif #endif
#include "md5.h" #include "md5.h"
@ -9,28 +9,28 @@ diff -Naur bacula-7.0.3.old/src/lib/lib.h bacula-7.0.3/src/lib/lib.h
#include "tree.h" #include "tree.h"
#include "watchdog.h" #include "watchdog.h"
#include "btimers.h" #include "btimers.h"
diff -Naur bacula-7.0.3.old/src/lib/Makefile.in bacula-7.0.3/src/lib/Makefile.in diff -Naur bacula-7.2.0.old/src/lib/Makefile.in bacula-7.2.0.new/src/lib/Makefile.in
--- bacula-7.0.3.old/src/lib/Makefile.in 2014-05-15 15:45:13.748148724 +0200 --- bacula-7.2.0.old/src/lib/Makefile.in 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.0.3/src/lib/Makefile.in 2014-05-15 15:52:33.005327683 +0200 +++ bacula-7.2.0.new/src/lib/Makefile.in 2015-09-29 10:35:34.896034387 +0200
@@ -37,7 +37,7 @@ @@ -38,7 +38,7 @@
fnmatch.h guid_to_name.h htable.h lex.h \ fnmatch.h guid_to_name.h htable.h lex.h \
lib.h md5.h mem_pool.h message.h mntent_cache.h \ lib.h md5.h mem_pool.h message.h \
openssl.h plugins.h protos.h queue.h rblist.h \ openssl.h plugins.h protos.h queue.h rblist.h \
- runscript.h rwlock.h serial.h sellist.h sha1.h \ - runscript.h rwlock.h serial.h sellist.h sha1.h \
+ runscript.h rwlock.h serial.h sellist.h \ + runscript.h rwlock.h serial.h sellist.h \
smartall.h status.h tls.h tree.h var.h \ smartall.h status.h tls.h tree.h var.h \
waitq.h watchdog.h workq.h \ waitq.h watchdog.h workq.h \
parse_conf.h ini.h \ parse_conf.h ini.h \
@@ -53,7 +53,7 @@ @@ -54,7 +54,7 @@
guid_to_name.c hmac.c jcr.c lex.c alist.c dlist.c \ guid_to_name.c hmac.c jcr.c lex.c alist.c dlist.c \
md5.c message.c mem_pool.c mntent_cache.c openssl.c \ md5.c message.c mem_pool.c openssl.c \
plugins.c priv.c queue.c bregex.c \ plugins.c priv.c queue.c bregex.c \
- rwlock.c scan.c sellist.c serial.c sha1.c \ - runscript.c rwlock.c scan.c sellist.c serial.c sha1.c \
+ rwlock.c scan.c sellist.c serial.c \ + runscript.c rwlock.c scan.c sellist.c serial.c \
signal.c smartall.c rblist.c tls.c tree.c \ signal.c smartall.c rblist.c tls.c tree.c \
util.c var.c watchdog.c workq.c btimers.c \ util.c var.c watchdog.c workq.c btimers.c \
address_conf.c breg.c htable.c lockmgr.c devlock.c address_conf.c breg.c htable.c lockmgr.c devlock.c
@@ -169,13 +169,6 @@ @@ -176,13 +176,6 @@
$(RMF) md5.o $(RMF) md5.o
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c
@ -44,7 +44,7 @@ diff -Naur bacula-7.0.3.old/src/lib/Makefile.in bacula-7.0.3/src/lib/Makefile.in
bsnprintf: Makefile bsnprintf.o bsnprintf: Makefile bsnprintf.o
$(RMF) bsnprintf.o $(RMF) bsnprintf.o
$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) bsnprintf.c $(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) bsnprintf.c
@@ -225,7 +218,7 @@ @@ -232,7 +225,7 @@
clean: libtool-clean clean: libtool-clean
@$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3 @$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
@ -53,9 +53,9 @@ diff -Naur bacula-7.0.3.old/src/lib/Makefile.in bacula-7.0.3/src/lib/Makefile.in
realclean: clean realclean: clean
@$(RMF) tags @$(RMF) tags
diff -Naur bacula-7.0.3.old/src/lib/sha1.c bacula-7.0.3/src/lib/sha1.c diff -Naur bacula-7.2.0.old/src/lib/sha1.c bacula-7.2.0.new/src/lib/sha1.c
--- bacula-7.0.3.old/src/lib/sha1.c 2014-05-15 15:45:13.745148756 +0200 --- bacula-7.2.0.old/src/lib/sha1.c 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.0.3/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100 +++ bacula-7.2.0.new/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,510 +0,0 @@ @@ -1,510 +0,0 @@
-/* -/*
- * sha1.c - * sha1.c
@ -567,9 +567,9 @@ diff -Naur bacula-7.0.3.old/src/lib/sha1.c bacula-7.0.3/src/lib/sha1.c
- fclose(fd); - fclose(fd);
-} -}
-#endif -#endif
diff -Naur bacula-7.0.3.old/src/lib/sha1.h bacula-7.0.3/src/lib/sha1.h diff -Naur bacula-7.2.0.old/src/lib/sha1.h bacula-7.2.0.new/src/lib/sha1.h
--- bacula-7.0.3.old/src/lib/sha1.h 2014-05-15 15:45:13.742148789 +0200 --- bacula-7.2.0.old/src/lib/sha1.h 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.0.3/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100 +++ bacula-7.2.0.new/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,107 +0,0 @@ @@ -1,107 +0,0 @@
-/* -/*
- * sha1.h - * sha1.h

18
bacula-7.0.0-queryfile.patch → bacula-7.2.0-queryfile.patch
View File

@ -1,6 +1,6 @@
diff -Naur bacula-7.0.0.old/src/dird/bacula-dir.conf.in bacula-7.0.0/src/dird/bacula-dir.conf.in diff -Naur bacula-7.2.0/src/dird/bacula-dir.conf.in bacula-7.2.0.new/src/dird/bacula-dir.conf.in
--- bacula-7.0.0.old/src/dird/bacula-dir.conf.in 2014-03-29 10:00:03.000000000 +0100 --- bacula-7.2.0/src/dird/bacula-dir.conf.in 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.0.0/src/dird/bacula-dir.conf.in 2014-03-31 09:59:31.629996491 +0200 +++ bacula-7.2.0.new/src/dird/bacula-dir.conf.in 2015-09-29 10:27:30.691039725 +0200
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
Director { # define myself Director { # define myself
Name = @basename@-dir Name = @basename@-dir
@ -10,10 +10,10 @@ diff -Naur bacula-7.0.0.old/src/dird/bacula-dir.conf.in bacula-7.0.0/src/dird/ba
WorkingDirectory = "@working_dir@" WorkingDirectory = "@working_dir@"
PidDirectory = "@piddir@" PidDirectory = "@piddir@"
Maximum Concurrent Jobs = 20 Maximum Concurrent Jobs = 20
diff -Naur bacula-7.0.0.old/src/dird/Makefile.in bacula-7.0.0/src/dird/Makefile.in diff -Naur bacula-7.2.0/src/dird/Makefile.in bacula-7.2.0.new/src/dird/Makefile.in
--- bacula-7.0.0.old/src/dird/Makefile.in 2014-03-29 10:00:03.000000000 +0100 --- bacula-7.2.0/src/dird/Makefile.in 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.0.0/src/dird/Makefile.in 2014-03-31 10:00:34.017663662 +0200 +++ bacula-7.2.0.new/src/dird/Makefile.in 2015-09-29 10:29:14.069330577 +0200
@@ -112,11 +112,11 @@ @@ -113,11 +113,11 @@
@if test "x${dir_group}" != "x"; then \ @if test "x${dir_group}" != "x"; then \
chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
fi fi
@ -22,15 +22,15 @@ diff -Naur bacula-7.0.0.old/src/dird/Makefile.in bacula-7.0.0/src/dird/Makefile.
echo " ==> Saving existing query.sql to query.sql.old"; \ echo " ==> Saving existing query.sql to query.sql.old"; \
- $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/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; \ + $(MV) -f ${DESTDIR}${sysconfdir}/query.sql ${DESTDIR}${sysconfdir}/query.sql.old; \
fi fi
- ${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql - ${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql
+ ${INSTALL_DATA} query.sql ${DESTDIR}${sysconfdir}/query.sql + ${INSTALL_DATA} query.sql ${DESTDIR}${sysconfdir}/query.sql
@if test -f static-bacula-dir; then \ @if test -f static-bacula-dir; then \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \
fi fi
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
uninstall: uninstall:
(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir
(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new) (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
- (cd $(DESTDIR)$(scriptdir); $(RMF) query.sql) - (cd $(DESTDIR)$(scriptdir); $(RMF) query.sql)
+ (cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql) + (cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql)

153
bacula-7.2.0-remove-bpluginfo-remnants.patch Normal file
View File

@ -0,0 +1,153 @@
diff -Naur bacula-7.2.0/manpages/bpluginfo.8 bacula-7.2.0.new/manpages/bpluginfo.8
--- bacula-7.2.0/manpages/bpluginfo.8 2015-09-29 10:58:59.412811581 +0200
+++ bacula-7.2.0.new/manpages/bpluginfo.8 1970-01-01 01:00:00.000000000 +0100
@@ -1,121 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH bpluginfo "8" "July 2012" "bpluginfo" "Network backup, recovery and verification"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.SH NAME
-bpluginfo \- Bacula Plugin information utility
-.SH SYNOPSIS
-.B bplufinfo
-.RI [ options ]
-.I plugin_filename.so
-.br
-.SH DESCRIPTION
-.LP
-The main purpose of
-.B bpluginfo
-is to display different information about Bacula plugin. You can use it to
-check a plugin name, author, license and short description. You can use
-'-f' option to display API implemented by the plugin. Some plugins may require
-additional '-a' option for validating a Bacula Daemons API. In most cases it
-is not required.
-.PP
-./ Bacula is a set of programs for performing a
-./ .PP
-./ -
-./ .BR bpluginfo
-
-.PP
-.SH OPTIONS
-A summary of options is included below.
-.TP
-.B \-h
-Show usage of the program.
-.TP
-.BI \-v
-Verbose information printing all available data from the plugin, including
-plugin header and implemented API.
-.TP
-.BI \-i
-Display short information from plugin header only. This is a default option.
-Option incompatible with
-.B -f
-option.
-.TP
-.BI \-f
-Display information about implemented API functions.
-.TP
-.BI \-a\ <api>
-You can supply the plugin initialization function with a particular Bacula
-API number. Without this option a default API number is '1'. Option require
-a numeric argument.
-.SH RETURN CODE
-.BR bpluginfo
-returns 0 on success, and non-zero on error.
-.TP
-You can check return code to find what was a cause of the error.
- * 0 - success
- * 1 - cannot load a plugin
- * 2 - cannot find a loadPlugin function
- * 3 - cannot find an unloadPlugin function
- * 10 - not enough memory
-.SH EXAMPLE USAGE
-This is an example of bplufinfo usage with verbose option (-v) and default plugin.
-.LP
-.sp
-.RS
-.nf
-
-\fB$ bpluginfo -v bpipe-fd.so
-
-Plugin type: File Daemon plugin
-Plugin magic: *FDPluginData*
-Plugin version: 1
-Plugin release date: January 2008
-Plugin author: Kern Sibbald
-Plugin license: Bacula or Bacula Enterprise
-Plugin description: Bacula Pipe File Daemon Plugin
-Plugin API version: 6
-
-Plugin functions:
- newPlugin()
- freePlugin()
- getPluginValue()
- setPluginValue()
- handlePluginEvent()
- startBackupFile()
- endBackupFile()
- startRestoreFile()
- endRestoreFile()
- pluginIO()
- createFile()
- setFileAttributes()
-.fi
-.RE
-
-.SH AUTHOR
-Written by Radoslaw Korzeniewski (c) Inteos Sp. z o.o.
-.SH BUGS
-Does not handle all required bacula functions callbacks which can lead to
-utility crash.
-.\".SH TODO"
-
-.PP
-
-.PP
-
-.SH "REPORTING BUGS"
-Report bugs to <support@inteos.pl>.
-.SH COPYRIGHT
-Copyright \(co 2012 Free Software Foundation Europe e.V.
-.br
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR bacula-dir,
-.BR bacula-sd,
-.BR bacula-fd,
-.BR "Bacula Plugins API"
-This man page document is released under the BSD 2-Clause license.
diff -Naur bacula-7.2.0/manpages/Makefile.in bacula-7.2.0.new/manpages/Makefile.in
--- bacula-7.2.0/manpages/Makefile.in 2015-09-29 10:58:59.412811581 +0200
+++ bacula-7.2.0.new/manpages/Makefile.in 2015-09-29 11:08:00.157868223 +0200
@@ -8,7 +8,7 @@
MAN8 = bacula.8 bacula-dir.8 bacula-fd.8 bacula-sd.8 \
bconsole.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 \
- btraceback.8 dbcheck.8 bwild.8 bregex.8 bpluginfo.8
+ btraceback.8 dbcheck.8 bwild.8 bregex.8
MAN1 = bsmtp.1 bat.1
diff -Naur bacula-7.2.0/src/tools/Makefile.in bacula-7.2.0.new/src/tools/Makefile.in
--- bacula-7.2.0/src/tools/Makefile.in 2015-09-29 10:58:59.405811697 +0200
+++ bacula-7.2.0.new/src/tools/Makefile.in 2015-09-29 11:07:45.975102788 +0200
@@ -136,12 +136,6 @@
grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-bpluginfo.o: bpluginfo.c
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored $(DINCLUDE) $(CFLAGS) $<
-
-bpluginfo: Makefile bpluginfo.o
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o -lbac $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
&& CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

51
bacula-7.2.0-tray-monitor-configure.patch Normal file
View File

@ -0,0 +1,51 @@
diff -Naur bacula-7.2.0/configure bacula-7.2.0.new/configure
--- bacula-7.2.0/configure 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.2.0.new/configure 2015-09-29 10:50:51.758874960 +0200
@@ -30881,7 +30881,7 @@
fi
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 updatedb/update_mysql_tables_12_to_13 updatedb/update_postgresql_tables_12_to_13 updatedb/update_mysql_tables_13_to_14 updatedb/update_postgresql_tables_13_to_14 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 updatedb/update_mysql_tables_12_to_13 updatedb/update_postgresql_tables_12_to_13 updatedb/update_mysql_tables_13_to_14 updatedb/update_postgresql_tables_13_to_14 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES"
ac_config_commands="$ac_config_commands default"
@@ -32001,6 +32001,8 @@
"src/qt-console/bat.pro.mingw32") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro.mingw32" ;;
"src/qt-console/bat.pro.mingw64") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro.mingw64" ;;
"src/qt-console/install_conf_file") CONFIG_FILES="$CONFIG_FILES src/qt-console/install_conf_file" ;;
+ "src/qt-console/tray-monitor/tray-monitor.conf") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.conf" ;;
+ "src/qt-console/tray-monitor/tray-monitor.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.pro" ;;
"src/qt-console/tray-monitor/tray-monitor.pro.mingw32") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.pro.mingw32" ;;
"src/qt-console/tray-monitor/tray-monitor.pro.mingw64") CONFIG_FILES="$CONFIG_FILES src/qt-console/tray-monitor/tray-monitor.pro.mingw64" ;;
"src/dird/Makefile") CONFIG_FILES="$CONFIG_FILES src/dird/Makefile" ;;
diff -Naur bacula-7.2.0/src/qt-console/tray-monitor/authenticate.cpp bacula-7.2.0.new/src/qt-console/tray-monitor/authenticate.cpp
--- bacula-7.2.0/src/qt-console/tray-monitor/authenticate.cpp 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.2.0.new/src/qt-console/tray-monitor/authenticate.cpp 2015-09-29 10:53:52.452887255 +0200
@@ -30,7 +30,11 @@
*
*/
+#if defined(HAVE_WIN32)
+#if defined(HAVE_MINGW)
#include "winhdrs.h"
+#endif
+#endif
#include "tray-monitor.h"
void senditf(const char *fmt, ...);
diff -Naur bacula-7.2.0/src/qt-console/tray-monitor/tray-ui.h bacula-7.2.0.new/src/qt-console/tray-monitor/tray-ui.h
--- bacula-7.2.0/src/qt-console/tray-monitor/tray-ui.h 2015-08-13 15:52:24.000000000 +0200
+++ bacula-7.2.0.new/src/qt-console/tray-monitor/tray-ui.h 2015-09-29 10:55:34.295203332 +0200
@@ -27,7 +27,11 @@
# endif
#endif
+#if defined(HAVE_WIN32)
+#if defined(HAVE_MINGW)
#include "winhdrs.h"
+#endif
+#endif
#include <QAction>
#include <QApplication>
#include <QButtonGroup>

26
bacula.spec
View File

@ -2,8 +2,8 @@
%global username bacula %global username bacula
Name: bacula Name: bacula
Version: 7.0.5 Version: 7.2.0
Release: 9%{?dist} Release: 1%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details # See LICENSE for details
License: AGPLv3 with exceptions License: AGPLv3 with exceptions
@ -34,20 +34,21 @@ Source18: %{name}-sd.sysconfig.el5
Source19: generic.xpm Source19: generic.xpm
Patch1: %{name}-7.0.3-openssl.patch Patch1: %{name}-7.0.3-openssl.patch
Patch2: %{name}-7.0.0-queryfile.patch Patch2: %{name}-7.2.0-queryfile.patch
Patch3: %{name}-7.0.3-sqlite-priv.patch Patch3: %{name}-7.0.3-sqlite-priv.patch
Patch4: %{name}-7.0.3-bat-build.patch Patch4: %{name}-7.2.0-bat-build.patch
Patch5: %{name}-7.0.3-seg-fault.patch Patch5: %{name}-7.0.3-seg-fault.patch
Patch6: %{name}-5.2.13-logwatch.patch Patch6: %{name}-5.2.13-logwatch.patch
Patch7: %{name}-7.0.3-non-free-code.patch Patch7: %{name}-7.2.0-non-free-code.patch
Patch8: %{name}-7.0.3-tray-monitor-configure.patch Patch8: %{name}-7.2.0-tray-monitor-configure.patch
Patch9: %{name}-7.2.0-remove-bpluginfo-remnants.patch
# Original patch removed by mistake, upstream is not willing to add it again: # Original patch removed by mistake, upstream is not willing to add it again:
# http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a # http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a
# Without this, there is no library providing the correct shared object name # Without this, there is no library providing the correct shared object name
# required by the daemons. # required by the daemons.
# http://bugs.bacula.org/view.php?id=2084 # http://bugs.bacula.org/view.php?id=2084
Patch9: %{name}-7.0.4-autoconf.patch Patch10: %{name}-7.0.4-autoconf.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: perl BuildRequires: perl
@ -333,6 +334,7 @@ Provides check_bacula support for Nagios.
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
# Remove execution permissions from files we're packaging as docs later on # Remove execution permissions from files we're packaging as docs later on
@ -471,7 +473,7 @@ rm -f %{buildroot}%{_sbindir}/bacula
rm -f %{buildroot}%{_mandir}/man8/bacula.8.gz rm -f %{buildroot}%{_mandir}/man8/bacula.8.gz
rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.la
%if 0%{?fedora} || 0%{?rhel} >= 6 %if 0%{?fedora} || 0%{?rhel} >= 6
rm -f %{buildroot}%{_datadir}/bacula/{ChangeLog,INSTALL,LICENSE,README,ReleaseNotes,VERIFYING,technotes} rm -f %{buildroot}%{_datadir}/bacula/{ChangeLog,INSTALL,LICENSE*,README,ReleaseNotes,VERIFYING,technotes}
%else %else
rm -rf %{buildroot}%{_datadir}/bacula rm -rf %{buildroot}%{_datadir}/bacula
%endif %endif
@ -608,7 +610,7 @@ fi
%files libs %files libs
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license LICENSE %license LICENSE
%doc AUTHORS ChangeLog SUPPORT ReleaseNotes %doc AUTHORS ChangeLog SUPPORT ReleaseNotes LICENSE-FAQ LICENSE-FOSS
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libbac-%{version}.so %{_libdir}/libbac-%{version}.so
%{_libdir}/libbaccfg-%{version}.so %{_libdir}/libbaccfg-%{version}.so
@ -637,9 +639,7 @@ fi
%{_libexecdir}/%{name}/bacula_config %{_libexecdir}/%{name}/bacula_config
%{_libexecdir}/%{name}/btraceback.mdb %{_libexecdir}/%{name}/btraceback.mdb
%{_mandir}/man8/btraceback.8* %{_mandir}/man8/btraceback.8*
%{_mandir}/man8/bpluginfo.8*
%{_sbindir}/btraceback %{_sbindir}/btraceback
%{_sbindir}/bpluginfo
%files director %files director
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -775,6 +775,10 @@ fi
%{_libdir}/nagios/plugins/check_bacula %{_libdir}/nagios/plugins/check_bacula
%changelog %changelog
* Tue Sep 29 2015 Simone Caronni <negativo17@gmail.com> - 7.2.0-1
- Update to 7.2.0.
- Remove bpluginfo(8).
* Wed Jul 15 2015 Marcin Haba <marcin.haba@bacula.pl> - 7.0.5-9 * Wed Jul 15 2015 Marcin Haba <marcin.haba@bacula.pl> - 7.0.5-9
- Use an external icon for tray monitor. - Use an external icon for tray monitor.
- Add gcc and gcc-c++ to build requires. - Add gcc and gcc-c++ to build requires.

2
sources
View File

@ -1 +1 @@
b4a99d673f5e1eaae8b257ccc610241f bacula-7.0.5.tar.gz 8381b6523dab31648a0bae417e60832b bacula-7.2.0.tar.gz