From b2a44e5710140c75cc40b70b934c1cfa9cf8adb6 Mon Sep 17 00:00:00 2001 From: phracek Date: Mon, 4 Feb 2013 14:42:50 +0100 Subject: [PATCH 1/3] Fix (#905309) e_msg: Process /usr/sbin/bat was killed by signal 11 (SIGSEGV) --- bacula-5.2.12-seg-fault.patch | 22 ++++++++++++++++++++++ bacula.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 bacula-5.2.12-seg-fault.patch diff --git a/bacula-5.2.12-seg-fault.patch b/bacula-5.2.12-seg-fault.patch new file mode 100644 index 0000000..a891ec4 --- /dev/null +++ b/bacula-5.2.12-seg-fault.patch @@ -0,0 +1,22 @@ +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 @@ + * + */ + ++#include + #include "bacula.h" + #include "jcr.h" + +@@ -1230,7 +1231,8 @@ e_msg(const char *file, int line, int type, int level, const char *fmt,...) + + 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.spec b/bacula.spec index 8edbc7c..f1762c7 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 5.2.12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -32,6 +32,7 @@ Patch1: bacula-5.0.2-openssl.patch Patch2: bacula-5.2.2-queryfile.patch Patch3: bacula-5.0.3-sqlite-priv.patch Patch4: bacula-5.2.11-bat-build.patch +Patch5: bacula-5.2.12-seg-fault.patch BuildRequires: desktop-file-utils BuildRequires: perl @@ -315,6 +316,7 @@ Provides check_bacula support for Nagios. %patch2 -p1 -b .queryfile %patch3 -p0 -b .priv %patch4 -p1 -b .bat-build +%patch5 -p1 -b .seg-fault # Remove execution permissions from files we're packaging as docs later on find updatedb -type f | xargs chmod -x @@ -904,6 +906,9 @@ fi %changelog +* Mon Feb 04 2013 Petr Hracek - 5.2.12-7 +- Fix (#905309) e_msg: Process /usr/sbin/bat was killed by signal 11 (SIGSEGV) + * Thu Jan 10 2013 Simone Caronni - 5.2.12-6 - Added missing line in bacula-sd SysV init script. From d184bac9a4e7ffaeb76ba4aec3eab42a662dd4ec Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 8 Feb 2013 13:22:09 +0100 Subject: [PATCH 2/3] Fix: #881146 syntax error in update_postgresql_tables_10_to_11.in --- bacula-5.2.12-update-postgresql-table.patch | 13 +++++++++++++ bacula.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 bacula-5.2.12-update-postgresql-table.patch diff --git a/bacula-5.2.12-update-postgresql-table.patch b/bacula-5.2.12-update-postgresql-table.patch new file mode 100644 index 0000000..4e9c5d5 --- /dev/null +++ b/bacula-5.2.12-update-postgresql-table.patch @@ -0,0 +1,13 @@ +diff --git a/updatedb/update_postgresql_tables_10_to_11.in b/updatedb/update_postgresql_tables_10_to_11.in +index f5df19f..1be8033 100644 +--- a/updatedb/update_postgresql_tables_10_to_11.in ++++ b/updatedb/update_postgresql_tables_10_to_11.in +@@ -10,7 +10,7 @@ bindir=@POSTGRESQL_BINDIR@ + PATH="$bindir:$PATH" + db_name=${db_name:-@db_name@} + +-psql -f - -d ${db_name} $* < - 5.2.12-8 +- Fix: (#881146) syntax error in update_postgresql_tables_10_to_11.in + * Mon Feb 04 2013 Petr Hracek - 5.2.12-7 - Fix (#905309) e_msg: Process /usr/sbin/bat was killed by signal 11 (SIGSEGV) From 4eb05c1a6379f8c9cca9ba6a7824b67f13b68eca Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Sun, 10 Feb 2013 21:41:58 -0500 Subject: [PATCH 3/3] remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 --- bacula.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bacula.spec b/bacula.spec index c26b42c..950904a 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 5.2.12 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -407,13 +407,13 @@ mv %{buildroot}%{_libexecdir}/bacula/query.sql %{buildroot}%{_sysconfdir}/bacula %if 0%{?fedora} || 0%{?rhel} >= 6 # Bat install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat.png -desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE13} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13} # QT Tray monitor install -p -m 755 -D src/qt-console/tray-monitor/.libs/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor install -p -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png -desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE14} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE14} %else rm -f %{buildroot}%{_mandir}/man1/bat.1* @@ -872,14 +872,14 @@ fi %attr(644,root,root) %config(noreplace) %{_sysconfdir}/bacula/bat.conf %{_sbindir}/bat %{_mandir}/man1/bat.1.* -%{_datadir}/applications/fedora-bacula-bat.desktop +%{_datadir}/applications/bacula-bat.desktop %{_datadir}/pixmaps/bat.png %files traymonitor %defattr(-,root,root,-) %{_sbindir}/bacula-tray-monitor %attr(644,root,root) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf -%{_datadir}/applications/fedora-bacula-traymonitor.desktop +%{_datadir}/applications/bacula-traymonitor.desktop %{_datadir}/pixmaps/bacula-tray-monitor.png %endif @@ -908,6 +908,9 @@ fi %changelog +* Sun Feb 10 2013 Rahul Sundaram - 5.2.12-9 +- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 + * Fri Feb 08 2013 Petr Hracek - 5.2.12-8 - Fix: (#881146) syntax error in update_postgresql_tables_10_to_11.in