From 24ed61b33bf314f30f3834e9d0e1f81bc0bd775f Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Nov 19 2008 13:30:26 +0000 Subject: Add BAT, BZ 470800, correct logrotate file. --- 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-bat.desktop b/bacula-bat.desktop index c9a2fa4..d841fc5 100644 --- a/bacula-bat.desktop +++ b/bacula-bat.desktop @@ -5,7 +5,7 @@ Name=Bacula Bat Console GenericName=Backup Management Console Comment=Control your Bacula Server Exec=bat -c /etc/bacula/bat.conf -Icon=bacula.png +Icon=bat_icon Terminal=false Type=Application Categories=System;Application;Utility diff --git a/bacula-bwxconsole.desktop b/bacula-bwxconsole.desktop index fe049ff..bf71d77 100644 --- a/bacula-bwxconsole.desktop +++ b/bacula-bwxconsole.desktop @@ -5,7 +5,7 @@ Name=Bacula WX Console GenericName=Backup Management Console Comment=Control your Bacula Server Exec=bwxconsole -c /etc/bacula/bwxconsole.conf -Icon=wxwin16x16.xpm +Icon=wxwin16x16 Terminal=false Type=Application Categories=System;Application;Utility diff --git a/bacula-gconsole.desktop b/bacula-gconsole.desktop index 52fbf15..10eb5e9 100644 --- a/bacula-gconsole.desktop +++ b/bacula-gconsole.desktop @@ -5,7 +5,7 @@ Name=Bacula Console GenericName=Backup Management Console Comment=Control your Bacula Server Exec=bgnome-console -c /etc/bacula/bgnome-console.conf -Icon=bacula.png +Icon=bacula Terminal=false Type=Application Categories=System;Application; diff --git a/bacula-traymonitor.desktop b/bacula-traymonitor.desktop index 51f4d9a..aaff951 100644 --- a/bacula-traymonitor.desktop +++ b/bacula-traymonitor.desktop @@ -5,7 +5,7 @@ Name=Bacula Monitor GenericName=Bacula Tray Monitor Comment=Monitor your Bacula Backup server Exec=bacula-tray-monitor -c /etc/bacula/tray-monitor.conf -Icon=bacula-tray-monitor.xpm +Icon=bacula-tray-monitor Terminal=false Type=Application Categories=System;Application;Utility diff --git a/bacula-wxconsole.desktop b/bacula-wxconsole.desktop index a763b3a..5d8aac6 100644 --- a/bacula-wxconsole.desktop +++ b/bacula-wxconsole.desktop @@ -5,7 +5,7 @@ Name=Bacula WX Console GenericName=Backup Management Console Comment=Control your Bacula Server Exec=wxconsole -c /etc/bacula/bwxconsole.conf -Icon=wxwin16x16.xpm +Icon=wxwin16x16 Terminal=false Type=Application Categories=System;Application; diff --git a/bacula.logrotate b/bacula.logrotate index ded3b7a..ec2ab65 100644 --- a/bacula.logrotate +++ b/bacula.logrotate @@ -1,6 +1,6 @@ # Bacula logrotate script -/var/log/bacula/*.log /var/spool/bacula/log { +/var/log/bacula/*.log /var/spool/bacula/log /var/log/bacula.log { monthly rotate 4 notifempty diff --git a/bacula.spec b/bacula.spec index 0fcbfe5..e563f4a 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: 1%{?dist} +Release: 3%{?dist} # See LICENSE for details License: GPLv2 with exceptions Group: System Environment/Daemons @@ -25,6 +25,7 @@ Source8: bacula-dir.init Source9: bacula-sd.init #Source10: http://download.sourceforge.net/bacula/bacula-gui-%{gui_version}.tar.gz #Source11: bacula-web.apache +Source12: bacula-bat.desktop Patch0: bacula-director-configuration.patch Patch1: bacula-config.patch #Patch2: bacula-wxconsole.patch @@ -36,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 @@ -46,7 +48,7 @@ BuildRequires: libbonobo-devel, libbonoboui-devel, bonobo-activation-devel BuildRequires: mysql-devel, cdrecord, postgresql-devel, wxGTK-devel BuildRequires: desktop-file-utils, python-devel, sqlite-devel, sed, BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript -BuildRequires: dvipdfm +BuildRequires: dvipdfm, qwt-devel %if 0%{?fedora} >= 7 BuildRequires: tcp_wrappers-devel @@ -256,6 +258,18 @@ different computers. It is based on a client/server architecture. This package contains the gnome version of the bacula management console +%package console-bat +Summary: Bacula bat console +Group: System Environment/Daemons +Requires: usermode + +%description console-bat +Bacula is a set of programs that allow you to manage the backup, +recovery, and verification of computer data across a network of +different computers. It is based on a client/server architecture. + +This package contains the bat version of the bacula management console + %package console-wxwidgets Summary: Bacula console using the wx widgets toolkit @@ -329,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 @@ -387,6 +402,8 @@ export CPPFLAGS=-I%{_includedir}/ncurses --with-python \ --enable-smartalloc \ --with-x \ + --enable-bat \ + --with-qwt=/usr/lib \ $* # Scratch this, it is trouble # --with-readline \ @@ -531,13 +548,18 @@ install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_dat install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole install -m 644 -D bacula-sqlite/src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm +install -m 644 -D bacula-sqlite/src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png + ln -sf consolehelper %{buildroot}%{_bindir}/gnome-console ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole +#ln -sf consolehelper %{buildroot}%{_bindir}/bat +install -m 755 bacula-sqlite/src/qt-console/bat %{buildroot}%{_sbindir} desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3} desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} +desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE12} # logrotate @@ -774,6 +796,17 @@ fi %{_datadir}/applications/fedora-bacula-gconsole.desktop %{_datadir}/pixmaps/bacula.png +%files console-bat +%defattr(-,root,root,-) +#%config %{_sysconfdir}/security/console.apps/bat +#%config %{_sysconfdir}/pam.d/bat +%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf +#%{_bindir}/bat +%{_sbindir}/bat +%{_mandir}/man1/bat.1.gz +%{_datadir}/applications/fedora-bacula-bat.desktop +%{_datadir}/pixmaps/bat_icon.png + %files console-wxwidgets %defattr(-,root,root,-) @@ -798,7 +831,6 @@ fi %{_initrddir}/bacula-dir %{_sbindir}/bregex %{_sbindir}/bwild -%{_mandir}/man1/bat.1.gz %{_mandir}/man8/dbcheck.8* %{_mandir}/man8/bacula-dir.8* %{_libexecdir}/bacula/delete_catalog_backup @@ -930,6 +962,13 @@ fi %changelog +* Mon Nov 17 2008 Jon Ciesla - 2.4.3-3 +- Added upstream orphaned jobs patch. +- Fixed logrotate file. + +* Mon Nov 10 2008 Jon Ciesla - 2.4.3-2 +- Added bat. BZ 470800. + * Wed Oct 22 2008 Jon Ciesla - 2.4.3-1 - Update to 2.4.3.