From d372500178bcb86b18565e686a8895ea144c47df Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Nov 18 2008 13:13:19 +0000 Subject: Upstream patch. --- diff --git a/bacula-2.4.3-orphaned-jobs.patch b/bacula-2.4.3-orphaned-jobs.patch new file mode 100644 index 0000000..6162c9e --- /dev/null +++ b/bacula-2.4.3-orphaned-jobs.patch @@ -0,0 +1,24 @@ + + This patch fixes a case of orphaned jobs (and possible deadlock) + during pruning. + Apply it to Bacula 2.4.3 (possibly earlier versions) with: + + cd + patch -p0 <2.4.3-orphaned-jobs.patch + ./configure + make + ... + make install + +Index: src/dird/ua_prune.c +=================================================================== +--- src/dird/ua_prune.c (revision 7949) ++++ src/dird/ua_prune.c (working copy) +@@ -468,6 +468,7 @@ + break; + } + } ++ endeach_jcr(jcr); + if (skip) { + continue; + } diff --git a/bacula.spec b/bacula.spec index e158e5d..3e730b6 100644 --- a/bacula.spec +++ b/bacula.spec @@ -9,7 +9,7 @@ Summary: Cross platform network backup for Linux, Unix, Mac and Windows Name: bacula Version: 2.4.3 -Release: 2%{?dist} +Release: 3%{?dist} # See LICENSE for details License: GPLv2 with exceptions Group: System Environment/Daemons @@ -37,6 +37,7 @@ Patch3: bacula-pamd.patch #Patch8: 2.0.3-verify.patch #Patch9: 2.0.3-tls-disconnect.patch #Patch10: bacula-web-smarty.patch +Patch11: bacula-2.4.3-orphaned-jobs.patch URL: http://www.bacula.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl @@ -342,6 +343,7 @@ pushd bacula-%{version} #%patch7 -p0 #%patch8 -p0 #%patch9 -p0 +%patch11 -p0 # Remove execution permissions from files we're packaging as docs later on find examples -type f | xargs chmod -x @@ -960,6 +962,9 @@ fi %changelog +* Mon Nov 17 2008 Jon Ciesla - 2.4.3-3 +- Added upstream orphaned jobs patch. + * Mon Nov 10 2008 Jon Ciesla - 2.4.3-2 - Added bat. BZ 470800.