[bacula] Update to 7.0.3
Simone Caronni
slaanesh at fedoraproject.org
Thu May 15 14:02:53 UTC 2014
commit 47fa612afe4f130f128973216f65a5e07936304d
Author: Simone Caronni <negativo17 at gmail.com>
Date: Thu May 15 16:02:42 2014 +0200
Update to 7.0.3
.gitignore | 1 +
bacula-5.0.2-openssl.patch | 24 --
bacula-5.0.3-sqlite-priv.patch | 9 -
bacula-7.0.2-git.patch | 225 --------------------
...bat-build.patch => bacula-7.0.3-bat-build.patch | 14 +-
...-code.patch => bacula-7.0.3-non-free-code.patch | 54 ++---
bacula-7.0.3-openssl.patch | 24 ++
...seg-fault.patch => bacula-7.0.3-seg-fault.patch | 11 +-
bacula-7.0.3-sqlite-priv.patch | 9 +
...ch => bacula-7.0.3-tray-monitor-configure.patch | 14 +-
bacula.spec | 25 ++-
sources | 2 +-
12 files changed, 91 insertions(+), 321 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0c8e62..6d21001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ bacula-docs-5.0.3.tar.bz2
/bacula-7.0.0.tar.gz
/bacula-7.0.1.tar.gz
/bacula-7.0.2.tar.gz
+/bacula-7.0.3.tar.gz
diff --git a/bacula-5.2.13-bat-build.patch b/bacula-7.0.3-bat-build.patch
similarity index 60%
rename from bacula-5.2.13-bat-build.patch
rename to bacula-7.0.3-bat-build.patch
index 6b86cd4..134a2af 100644
--- a/bacula-5.2.13-bat-build.patch
+++ b/bacula-7.0.3-bat-build.patch
@@ -1,6 +1,6 @@
-diff -Naur bacula-5.2.13.old/src/qt-console/bat.pro.in bacula-5.2.13/src/qt-console/bat.pro.in
---- bacula-5.2.13.old/src/qt-console/bat.pro.in 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/qt-console/bat.pro.in 2013-02-20 09:45:44.110033340 +0100
+diff -Naur bacula-7.0.3.old/src/qt-console/bat.pro.in bacula-7.0.3/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.0.3/src/qt-console/bat.pro.in 2014-05-15 15:49:57.592032881 +0200
@@ -6,13 +6,13 @@
#
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -17,10 +17,10 @@ diff -Naur bacula-5.2.13.old/src/qt-console/bat.pro.in bacula-5.2.13/src/qt-cons
help.files = help/*.html images/status.png images/mail-message-new.png
TEMPLATE = app
-diff -Naur bacula-5.2.13.old/src/qt-console/main.cpp bacula-5.2.13/src/qt-console/main.cpp
---- bacula-5.2.13.old/src/qt-console/main.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/qt-console/main.cpp 2013-02-20 09:46:19.556679571 +0100
-@@ -40,9 +40,9 @@
+diff -Naur bacula-7.0.3.old/src/qt-console/main.cpp bacula-7.0.3/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.0.3/src/qt-console/main.cpp 2014-05-15 15:49:57.593032870 +0200
+@@ -28,9 +28,9 @@
/*
* We need Qt version 4.8.4 or later to be able to comple correctly
*/
diff --git a/bacula-non-free-code.patch b/bacula-7.0.3-non-free-code.patch
similarity index 95%
rename from bacula-non-free-code.patch
rename to bacula-7.0.3-non-free-code.patch
index 1da86d5..f35ed70 100644
--- a/bacula-non-free-code.patch
+++ b/bacula-7.0.3-non-free-code.patch
@@ -1,8 +1,18 @@
-diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
-index 009f157..a813a7c 100644
---- a/src/lib/Makefile.in
-+++ b/src/lib/Makefile.in
-@@ -39,7 +39,7 @@ INCLUDE_FILES = ../baconfig.h ../bacula.h ../bc_types.h \
+diff -Naur bacula-7.0.3.old/src/lib/lib.h bacula-7.0.3/src/lib/lib.h
+--- bacula-7.0.3.old/src/lib/lib.h 2014-05-15 15:45:13.745148756 +0200
++++ bacula-7.0.3/src/lib/lib.h 2014-05-15 15:52:33.005327683 +0200
+@@ -47,7 +47,6 @@
+ #include "fnmatch.h"
+ #endif
+ #include "md5.h"
+-#include "sha1.h"
+ #include "tree.h"
+ #include "watchdog.h"
+ #include "btimers.h"
+diff -Naur bacula-7.0.3.old/src/lib/Makefile.in bacula-7.0.3/src/lib/Makefile.in
+--- bacula-7.0.3.old/src/lib/Makefile.in 2014-05-15 15:45:13.748148724 +0200
++++ bacula-7.0.3/src/lib/Makefile.in 2014-05-15 15:52:33.005327683 +0200
+@@ -37,7 +37,7 @@
fnmatch.h guid_to_name.h htable.h lex.h \
lib.h md5.h mem_pool.h message.h mntent_cache.h \
openssl.h plugins.h protos.h queue.h rblist.h \
@@ -11,7 +21,7 @@ index 009f157..a813a7c 100644
smartall.h status.h tls.h tree.h var.h \
waitq.h watchdog.h workq.h \
parse_conf.h ini.h \
-@@ -55,7 +55,7 @@ LIBBAC_SRCS = attr.c base64.c berrno.c bsys.c binflate.c bget_msg.c \
+@@ -53,7 +53,7 @@
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 \
plugins.c priv.c queue.c bregex.c \
@@ -20,7 +30,7 @@ index 009f157..a813a7c 100644
signal.c smartall.c rblist.c tls.c tree.c \
util.c var.c watchdog.c workq.c btimers.c \
address_conf.c breg.c htable.c lockmgr.c devlock.c
-@@ -193,13 +193,6 @@ md5sum: Makefile md5.o
+@@ -169,13 +169,6 @@
$(RMF) md5.o
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c
@@ -34,7 +44,7 @@ index 009f157..a813a7c 100644
bsnprintf: Makefile bsnprintf.o
$(RMF) bsnprintf.o
$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) bsnprintf.c
-@@ -250,7 +243,7 @@ libtool-clean:
+@@ -225,7 +218,7 @@
clean: libtool-clean
@$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
@@ -43,23 +53,9 @@ index 009f157..a813a7c 100644
realclean: clean
@$(RMF) tags
-diff --git a/src/lib/lib.h b/src/lib/lib.h
-index b81f89f..c82dc29 100644
---- a/src/lib/lib.h
-+++ b/src/lib/lib.h
-@@ -59,7 +59,6 @@
- #include "fnmatch.h"
- #endif
- #include "md5.h"
--#include "sha1.h"
- #include "tree.h"
- #include "watchdog.h"
- #include "btimers.h"
-diff --git a/src/lib/sha1.c b/src/lib/sha1.c
-deleted file mode 100644
-index 7e58128..0000000
---- a/src/lib/sha1.c
-+++ /dev/null
+diff -Naur bacula-7.0.3.old/src/lib/sha1.c bacula-7.0.3/src/lib/sha1.c
+--- bacula-7.0.3.old/src/lib/sha1.c 2014-05-15 15:45:13.745148756 +0200
++++ bacula-7.0.3/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,510 +0,0 @@
-/*
- * sha1.c
@@ -571,11 +567,9 @@ index 7e58128..0000000
- fclose(fd);
-}
-#endif
-diff --git a/src/lib/sha1.h b/src/lib/sha1.h
-deleted file mode 100644
-index 437fe19..0000000
---- a/src/lib/sha1.h
-+++ /dev/null
+diff -Naur bacula-7.0.3.old/src/lib/sha1.h bacula-7.0.3/src/lib/sha1.h
+--- bacula-7.0.3.old/src/lib/sha1.h 2014-05-15 15:45:13.742148789 +0200
++++ bacula-7.0.3/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,107 +0,0 @@
-/*
- * sha1.h
diff --git a/bacula-7.0.3-openssl.patch b/bacula-7.0.3-openssl.patch
new file mode 100644
index 0000000..2a43ce8
--- /dev/null
+++ b/bacula-7.0.3-openssl.patch
@@ -0,0 +1,24 @@
+diff -Naur bacula-7.0.3.old/src/lib/crypto.c bacula-7.0.3/src/lib/crypto.c
+--- bacula-7.0.3.old/src/lib/crypto.c 2014-05-15 15:45:13.744148767 +0200
++++ bacula-7.0.3/src/lib/crypto.c 2014-05-15 15:45:23.381043832 +0200
+@@ -39,7 +39,7 @@
+ * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
+ * exists. It was not an official API.
+ */
+-#ifdef HAVE_OPENSSLv1
++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+ #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
+ #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
+ #endif
+diff -Naur bacula-7.0.3.old/src/lib/tls.c bacula-7.0.3/src/lib/tls.c
+--- bacula-7.0.3.old/src/lib/tls.c 2014-05-15 15:45:13.742148789 +0200
++++ bacula-7.0.3/src/lib/tls.c 2014-05-15 15:45:23.381043832 +0200
+@@ -304,7 +304,7 @@
+ extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
+
+ if (strcmp(extname, "subjectAltName") == 0) {
+-#ifdef HAVE_OPENSSLv1
++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+ const X509V3_EXT_METHOD *method;
+ #else
+ X509V3_EXT_METHOD *method;
diff --git a/bacula-5.2.12-seg-fault.patch b/bacula-7.0.3-seg-fault.patch
similarity index 57%
rename from bacula-5.2.12-seg-fault.patch
rename to bacula-7.0.3-seg-fault.patch
index a891ec4..0b35de9 100644
--- a/bacula-5.2.12-seg-fault.patch
+++ b/bacula-7.0.3-seg-fault.patch
@@ -1,8 +1,7 @@
-diff --git a/src/lib/message.c b/src/lib/message.c
-index 24afdf1..5d2c2ef 100644
---- a/src/lib/message.c
-+++ b/src/lib/message.c
-@@ -37,6 +37,7 @@
+diff -Naur bacula-7.0.3.old/src/lib/message.c bacula-7.0.3/src/lib/message.c
+--- bacula-7.0.3.old/src/lib/message.c 2014-05-15 15:45:13.744148767 +0200
++++ bacula-7.0.3/src/lib/message.c 2014-05-15 15:51:08.911250228 +0200
+@@ -25,6 +25,7 @@
*
*/
@@ -10,7 +9,7 @@ index 24afdf1..5d2c2ef 100644
#include "bacula.h"
#include "jcr.h"
-@@ -1230,7 +1231,8 @@ e_msg(const char *file, int line, int type, int level, const char *fmt,...)
+@@ -1322,7 +1323,8 @@
if (type == M_ABORT) {
char *p = 0;
diff --git a/bacula-7.0.3-sqlite-priv.patch b/bacula-7.0.3-sqlite-priv.patch
new file mode 100644
index 0000000..09ee027
--- /dev/null
+++ b/bacula-7.0.3-sqlite-priv.patch
@@ -0,0 +1,9 @@
+diff -Naur bacula-7.0.3.old/src/cats/make_sqlite3_tables.in bacula-7.0.3/src/cats/make_sqlite3_tables.in
+--- bacula-7.0.3.old/src/cats/make_sqlite3_tables.in 2014-05-15 15:45:13.730148920 +0200
++++ bacula-7.0.3/src/cats/make_sqlite3_tables.in 2014-05-15 15:47:26.465692114 +0200
+@@ -458,4 +458,5 @@
+ END-OF-DATA
+
+ chmod 640 ${db_name}.db
++chown bacula:bacula ${db_name}.db
+ exit 0
diff --git a/bacula-7.0.2-configure.patch b/bacula-7.0.3-tray-monitor-configure.patch
similarity index 81%
rename from bacula-7.0.2-configure.patch
rename to bacula-7.0.3-tray-monitor-configure.patch
index 36f5d5a..8b9bbac 100644
--- a/bacula-7.0.2-configure.patch
+++ b/bacula-7.0.3-tray-monitor-configure.patch
@@ -1,16 +1,16 @@
-diff -Naur bacula-7.0.2.old/configure bacula-7.0.2/configure
---- bacula-7.0.2.old/configure 2014-04-03 09:14:50.713286953 +0200
-+++ bacula-7.0.2/configure 2014-04-03 09:14:59.093210079 +0200
-@@ -30680,7 +30680,7 @@
+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/c
ats/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/updat
e_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 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/m
ake_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 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/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/c
ats/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/updat
e_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/m
ake_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"
-@@ -31813,6 +31813,8 @@
+@@ -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" ;;
diff --git a/bacula.spec b/bacula.spec
index 95f10ce..abe6a36 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,8 +2,8 @@
%global username bacula
Name: bacula
-Version: 7.0.2
-Release: 2%{?dist}
+Version: 7.0.3
+Release: 1%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: AGPLv3 with exceptions
@@ -31,15 +31,14 @@ Source16: %{name}-dir.sysconfig
Source17: %{name}-sd.sysconfig
Source18: %{name}-sd.sysconfig.el5
-Patch1: %{name}-5.0.2-openssl.patch
+Patch1: %{name}-7.0.3-openssl.patch
Patch2: %{name}-7.0.0-queryfile.patch
-Patch3: %{name}-5.0.3-sqlite-priv.patch
-Patch4: %{name}-5.2.13-bat-build.patch
-Patch5: %{name}-5.2.12-seg-fault.patch
+Patch3: %{name}-7.0.3-sqlite-priv.patch
+Patch4: %{name}-7.0.3-bat-build.patch
+Patch5: %{name}-7.0.3-seg-fault.patch
Patch6: %{name}-5.2.13-logwatch.patch
-Patch7: %{name}-non-free-code.patch
-Patch8: %{name}-7.0.2-configure.patch
-Patch9: %{name}-7.0.2-git.patch
+Patch7: %{name}-7.0.3-non-free-code.patch
+Patch8: %{name}-7.0.3-tray-monitor-configure.patch
BuildRequires: desktop-file-utils
BuildRequires: perl
@@ -295,15 +294,14 @@ Provides check_bacula support for Nagios.
%prep
%setup -q
-%patch1 -p2
+%patch1 -p1
%patch2 -p1
-%patch3 -p0
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p2
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
# Remove execution permissions from files we're packaging as docs later on
@@ -737,6 +735,9 @@ fi
%{_libdir}/nagios/plugins/check_bacula
%changelog
+* Thu May 15 2014 Simone Caronni <negativo17 at gmail.com> - 7.0.3-1
+- Update to 7.0.3.
+
* Thu Apr 24 2014 Simone Caronni <negativo17 at gmail.com> - 7.0.2-2
- Bug fixes from upstream.
diff --git a/sources b/sources
index f44316a..221ca06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c85acb539118df0baded1d004d532a4 bacula-7.0.2.tar.gz
+d21bd92311396828daa776d3d076a2da bacula-7.0.3.tar.gz
More information about the scm-commits
mailing list