From 38cff71ea072f904bc3505689c94de7eca510c08 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 25 Jan 2016 21:12:28 +0100 Subject: [PATCH] Update to 7.4.0. --- .gitignore | 1 + bacula-7.0.3-seg-fault.patch | 21 ------------------- bacula-7.0.3-sqlite-priv.patch | 9 -------- ...uild.patch => bacula-7.4.0-bat-build.patch | 14 ++++++------- ...penssl.patch => bacula-7.4.0-openssl.patch | 16 +++++++------- ...file.patch => bacula-7.4.0-queryfile.patch | 14 ++++++------- bacula-7.4.0-seg-fault.patch | 21 +++++++++++++++++++ bacula-7.4.0-sqlite-priv.patch | 9 ++++++++ bacula.spec | 20 ++++++++++-------- sources | 2 +- 10 files changed, 65 insertions(+), 62 deletions(-) delete mode 100644 bacula-7.0.3-seg-fault.patch delete mode 100644 bacula-7.0.3-sqlite-priv.patch rename bacula-7.2.0-bat-build.patch => bacula-7.4.0-bat-build.patch (65%) rename bacula-7.0.3-openssl.patch => bacula-7.4.0-openssl.patch (56%) rename bacula-7.2.0-queryfile.patch => bacula-7.4.0-queryfile.patch (72%) create mode 100644 bacula-7.4.0-seg-fault.patch create mode 100644 bacula-7.4.0-sqlite-priv.patch diff --git a/.gitignore b/.gitignore index 97bc709..be37db8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ bacula-docs-5.0.3.tar.bz2 /bacula-7.0.4.tar.gz /bacula-7.0.5.tar.gz /bacula-7.2.0.tar.gz +/bacula-7.4.0.tar.gz diff --git a/bacula-7.0.3-seg-fault.patch b/bacula-7.0.3-seg-fault.patch deleted file mode 100644 index 0b35de9..0000000 --- a/bacula-7.0.3-seg-fault.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 @@ - * - */ - -+#include - #include "bacula.h" - #include "jcr.h" - -@@ -1322,7 +1323,8 @@ - - if (type == M_ABORT) { - char *p = 0; -- p[0] = 0; /* generate segmentation violation */ -+ //p[0] = 0; /* generate segmentation violation */ -+ assert(p!=NULL); - } - if (type == M_ERROR_TERM) { - exit(1); diff --git a/bacula-7.0.3-sqlite-priv.patch b/bacula-7.0.3-sqlite-priv.patch deleted file mode 100644 index 09ee027..0000000 --- a/bacula-7.0.3-sqlite-priv.patch +++ /dev/null @@ -1,9 +0,0 @@ -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.2.0-bat-build.patch b/bacula-7.4.0-bat-build.patch similarity index 65% rename from bacula-7.2.0-bat-build.patch rename to bacula-7.4.0-bat-build.patch index b402361..0adbb1b 100644 --- a/bacula-7.2.0-bat-build.patch +++ b/bacula-7.4.0-bat-build.patch @@ -1,6 +1,6 @@ -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.2.0.old/src/qt-console/bat.pro.in 2015-08-13 15:52:24.000000000 +0200 -+++ bacula-7.2.0/src/qt-console/bat.pro.in 2015-09-29 10:31:49.354763250 +0200 +diff -Naur bacula-7.4.0.old/src/qt-console/bat.pro.in bacula-7.4.0/src/qt-console/bat.pro.in +--- bacula-7.4.0.old/src/qt-console/bat.pro.in 2016-01-25 21:00:14.022670354 +0100 ++++ bacula-7.4.0/src/qt-console/bat.pro.in 2016-01-25 21:04:26.092297488 +0100 @@ -6,13 +6,13 @@ # # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -17,10 +17,10 @@ diff -Naur bacula-7.2.0.old/src/qt-console/bat.pro.in bacula-7.2.0/src/qt-consol help.files = help/*.html images/status.png images/mail-message-new.png TEMPLATE = app -diff -Naur bacula-7.2.0.old/src/qt-console/main.cpp bacula-7.2.0/src/qt-console/main.cpp ---- bacula-7.2.0.old/src/qt-console/main.cpp 2015-08-13 15:52:24.000000000 +0200 -+++ bacula-7.2.0/src/qt-console/main.cpp 2015-09-29 10:30:54.252674240 +0200 -@@ -32,9 +32,9 @@ +diff -Naur bacula-7.4.0.old/src/qt-console/main.cpp bacula-7.4.0/src/qt-console/main.cpp +--- bacula-7.4.0.old/src/qt-console/main.cpp 2016-01-25 21:00:14.023670369 +0100 ++++ bacula-7.4.0/src/qt-console/main.cpp 2016-01-25 21:04:26.093297507 +0100 +@@ -31,9 +31,9 @@ /* * We need Qt version 4.8.4 or later to be able to comple correctly */ diff --git a/bacula-7.0.3-openssl.patch b/bacula-7.4.0-openssl.patch similarity index 56% rename from bacula-7.0.3-openssl.patch rename to bacula-7.4.0-openssl.patch index 2a43ce8..1a0d59f 100644 --- a/bacula-7.0.3-openssl.patch +++ b/bacula-7.4.0-openssl.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Naur bacula-7.4.0.old/src/lib/crypto.c bacula-7.4.0/src/lib/crypto.c +--- bacula-7.4.0.old/src/lib/crypto.c 2016-01-25 21:00:14.019670307 +0100 ++++ bacula-7.4.0/src/lib/crypto.c 2016-01-25 21:00:22.216798164 +0100 +@@ -42,7 +42,7 @@ * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer * exists. It was not an official API. */ @@ -10,10 +10,10 @@ diff -Naur bacula-7.0.3.old/src/lib/crypto.c bacula-7.0.3/src/lib/crypto.c #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 @@ +diff -Naur bacula-7.4.0.old/src/lib/tls.c bacula-7.4.0/src/lib/tls.c +--- bacula-7.4.0.old/src/lib/tls.c 2016-01-25 21:00:14.019670307 +0100 ++++ bacula-7.4.0/src/lib/tls.c 2016-01-25 21:00:22.218798196 +0100 +@@ -329,7 +329,7 @@ extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); if (strcmp(extname, "subjectAltName") == 0) { diff --git a/bacula-7.2.0-queryfile.patch b/bacula-7.4.0-queryfile.patch similarity index 72% rename from bacula-7.2.0-queryfile.patch rename to bacula-7.4.0-queryfile.patch index 1a1a6c5..a3078bb 100644 --- a/bacula-7.2.0-queryfile.patch +++ b/bacula-7.4.0-queryfile.patch @@ -1,7 +1,7 @@ -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.2.0/src/dird/bacula-dir.conf.in 2015-08-13 15:52:24.000000000 +0200 -+++ bacula-7.2.0.new/src/dird/bacula-dir.conf.in 2015-09-29 10:27:30.691039725 +0200 -@@ -15,7 +15,7 @@ +diff -Naur bacula-7.4.0.old/src/dird/bacula-dir.conf.in bacula-7.4.0/src/dird/bacula-dir.conf.in +--- bacula-7.4.0.old/src/dird/bacula-dir.conf.in 2016-01-25 21:00:14.020670323 +0100 ++++ bacula-7.4.0/src/dird/bacula-dir.conf.in 2016-01-25 21:01:40.449132870 +0100 +@@ -18,7 +18,7 @@ Director { # define myself Name = @basename@-dir DIRport = @dir_port@ # where we listen for UA connections @@ -10,9 +10,9 @@ diff -Naur bacula-7.2.0/src/dird/bacula-dir.conf.in bacula-7.2.0.new/src/dird/ba WorkingDirectory = "@working_dir@" PidDirectory = "@piddir@" Maximum Concurrent Jobs = 20 -diff -Naur bacula-7.2.0/src/dird/Makefile.in bacula-7.2.0.new/src/dird/Makefile.in ---- bacula-7.2.0/src/dird/Makefile.in 2015-08-13 15:52:24.000000000 +0200 -+++ bacula-7.2.0.new/src/dird/Makefile.in 2015-09-29 10:29:14.069330577 +0200 +diff -Naur bacula-7.4.0.old/src/dird/Makefile.in bacula-7.4.0/src/dird/Makefile.in +--- bacula-7.4.0.old/src/dird/Makefile.in 2016-01-25 21:00:14.020670323 +0100 ++++ bacula-7.4.0/src/dird/Makefile.in 2016-01-25 21:01:40.449132870 +0100 @@ -113,11 +113,11 @@ @if test "x${dir_group}" != "x"; then \ chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ diff --git a/bacula-7.4.0-seg-fault.patch b/bacula-7.4.0-seg-fault.patch new file mode 100644 index 0000000..fe67175 --- /dev/null +++ b/bacula-7.4.0-seg-fault.patch @@ -0,0 +1,21 @@ +diff -Naur bacula-7.4.0.old/src/lib/message.c bacula-7.4.0/src/lib/message.c +--- bacula-7.4.0.old/src/lib/message.c 2016-01-25 21:00:14.018670291 +0100 ++++ bacula-7.4.0/src/lib/message.c 2016-01-25 21:07:08.088325232 +0100 +@@ -28,6 +28,7 @@ + * + */ + ++#include + #include "bacula.h" + #include "jcr.h" + +@@ -1329,7 +1330,8 @@ + if (type == M_ABORT) { + assert_msg = bstrdup(buf); + char *p = 0; +- p[0] = 0; /* generate segmentation violation */ ++ // p[0] = 0; /* generate segmentation violation */ ++ assert(p!=NULL); + } + if (type == M_ERROR_TERM) { + exit(1); diff --git a/bacula-7.4.0-sqlite-priv.patch b/bacula-7.4.0-sqlite-priv.patch new file mode 100644 index 0000000..628a4d6 --- /dev/null +++ b/bacula-7.4.0-sqlite-priv.patch @@ -0,0 +1,9 @@ +diff -Naur bacula-7.4.0.old/src/cats/make_sqlite3_tables.in bacula-7.4.0/src/cats/make_sqlite3_tables.in +--- bacula-7.4.0.old/src/cats/make_sqlite3_tables.in 2016-01-25 21:00:13.970669543 +0100 ++++ bacula-7.4.0/src/cats/make_sqlite3_tables.in 2016-01-25 21:03:01.266828351 +0100 +@@ -474,4 +474,5 @@ + END-OF-DATA + + chmod 640 ${db_name}.db ++chown bacula:bacula ${db_name}.db + exit 0 diff --git a/bacula.spec b/bacula.spec index 489712e..901bbd0 100644 --- a/bacula.spec +++ b/bacula.spec @@ -2,8 +2,8 @@ %global username bacula Name: bacula -Version: 7.2.0 -Release: 3%{?dist} +Version: 7.4.0 +Release: 1%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -33,14 +33,13 @@ Source18: %{name}-sd.sysconfig.el5 # Image taken from http://www.bacula.org/git/cgit.cgi/bacula/plain/bacula/src/tray-monitor/generic.xpm Source19: generic.xpm -Patch1: %{name}-7.0.3-openssl.patch -Patch2: %{name}-7.2.0-queryfile.patch -Patch3: %{name}-7.0.3-sqlite-priv.patch -Patch4: %{name}-7.2.0-bat-build.patch -Patch5: %{name}-7.0.3-seg-fault.patch +Patch1: %{name}-7.4.0-openssl.patch +Patch2: %{name}-7.4.0-queryfile.patch +Patch3: %{name}-7.4.0-sqlite-priv.patch +Patch4: %{name}-7.4.0-bat-build.patch +Patch5: %{name}-7.4.0-seg-fault.patch Patch6: %{name}-5.2.13-logwatch.patch Patch7: %{name}-7.2.0-non-free-code.patch -Patch8: %{name}-7.2.0-git.patch # 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 @@ -331,7 +330,6 @@ Provides check_bacula support for Nagios. %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p2 %patch10 -p1 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -773,6 +771,10 @@ fi %{_libdir}/nagios/plugins/check_bacula %changelog +* Mon Jan 25 2016 Simone Caronni - 7.4.0-1 +- Update to 7.4.0. +- Rebase patches, remove git patch. + * Sun Dec 13 2015 Simone Caronni - 7.2.0-3 - Re-add autoconf patch erraneously removed. diff --git a/sources b/sources index 801e1bf..a04ab82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8381b6523dab31648a0bae417e60832b bacula-7.2.0.tar.gz +c290c505b51699201cc5e0adea01f2e0 bacula-7.4.0.tar.gz