diff --git a/bacula-5.2.10-log-path.patch b/bacula-5.2.10-log-path.patch new file mode 100644 index 0000000..85fe012 --- /dev/null +++ b/bacula-5.2.10-log-path.patch @@ -0,0 +1,41 @@ +diff -Naur bacula-5.2.10.old/scripts/logrotate.in bacula-5.2.10/scripts/logrotate.in +--- bacula-5.2.10.old/scripts/logrotate.in 2012-07-16 10:28:18.315149487 +0200 ++++ bacula-5.2.10/scripts/logrotate.in 2012-07-16 10:30:32.024248913 +0200 +@@ -6,7 +6,7 @@ + # + # /etc/logrotate.d/bacula + # +-@working_dir@/log { ++@logdir@/bacula.log { + monthly + rotate 5 + notifempty +diff -Naur bacula-5.2.10.old/scripts/logwatch/logfile.bacula.conf.in bacula-5.2.10/scripts/logwatch/logfile.bacula.conf.in +--- bacula-5.2.10.old/scripts/logwatch/logfile.bacula.conf.in 2012-07-16 10:28:18.314149434 +0200 ++++ bacula-5.2.10/scripts/logwatch/logfile.bacula.conf.in 2012-07-16 10:29:33.428805897 +0200 +@@ -1,3 +1,3 @@ + # What actual file? Defaults to LogPath if not absolute path.... +-LogFile = @working_dir@/log ++LogFile = @logdir@/bacula.log + +diff -Naur bacula-5.2.10.old/src/dird/bacula-dir.conf.in bacula-5.2.10/src/dird/bacula-dir.conf.in +--- bacula-5.2.10.old/src/dird/bacula-dir.conf.in 2012-07-16 10:28:18.114138847 +0200 ++++ bacula-5.2.10/src/dird/bacula-dir.conf.in 2012-07-16 10:28:33.508940427 +0200 +@@ -261,7 +261,7 @@ + # time to time as it will grow indefinitely. However, it will + # also keep all your messages if they scroll off the console. + # +- append = "@working_dir@/log" = all, !skipped ++ append = "@logdir@/bacula.log" = all, !skipped + catalog = all + } + +@@ -273,7 +273,7 @@ + mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r" + mail = @job_email@ = all, !skipped + console = all, !skipped, !saved +- append = "@working_dir@/log" = all, !skipped ++ append = "@logdir@/bacula.log" = all, !skipped + } + + # Default pool definition diff --git a/bacula-5.2.4-log-path.patch b/bacula-5.2.4-log-path.patch deleted file mode 100644 index aec5d45..0000000 --- a/bacula-5.2.4-log-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur bacula-5.2.2.old/src/dird/bacula-dir.conf.in bacula-5.2.2/src/dird/bacula-dir.conf.in ---- bacula-5.2.2.old/src/dird/bacula-dir.conf.in 2011-12-05 14:14:52.730892121 +0100 -+++ bacula-5.2.2/src/dird/bacula-dir.conf.in 2011-12-07 16:55:16.391276283 +0100 -@@ -261,7 +261,7 @@ - # time to time as it will grow indefinitely. However, it will - # also keep all your messages if they scroll off the console. - # -- append = "@working_dir@/log" = all, !skipped -+ append = "@logdir@/bacula.log" = all, !skipped - catalog = all - } - -@@ -273,7 +273,7 @@ - mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r" - mail = @job_email@ = all, !skipped - console = all, !skipped, !saved -- append = "@working_dir@/log" = all, !skipped -+ append = "@logdir@/bacula.log" = all, !skipped - } - - # Default pool definition -diff -Naur bacula-5.2.4.old/scripts/logwatch/logfile.bacula.conf.in bacula-5.2.4/scripts/logwatch/logfile.bacula.conf.in ---- bacula-5.2.4.old/scripts/logwatch/logfile.bacula.conf.in 2012-01-20 17:56:38.650667075 +0100 -+++ bacula-5.2.4/scripts/logwatch/logfile.bacula.conf.in 2012-01-20 17:58:24.199868050 +0100 -@@ -1,3 +1,4 @@ - # What actual file? Defaults to LogPath if not absolute path.... - LogFile = @working_dir@/log -+LogFile = @logdir@/bacula.log - diff --git a/bacula.spec b/bacula.spec index 41fb319..9d2bd01 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 5.2.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -845,6 +845,9 @@ fi %changelog +* Mon Jul 16 2012 Simone Caronni - 5.2.10-3 +- Updated log path patch (rhbz#837706). + * Tue Jul 10 2012 Simone Caronni - 5.2.10-2 - Add nss-lookup.target as required to service files (rhbz#838828). - Fix bsmtp upstream bug sending mails to ipv4/ipv6 hosts.