aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2012-09-20 14:42:53 +0000
committerFabian Affolter <fabian@affolter-engineering.ch>2012-09-21 22:27:53 +0000
commit82e4f8eeef382c2316c3f4989edd6072f07992b7 (patch)
tree55afca234b10925637e51d5a7a0bf832678815b4
parent58a5ab8a40de443e15dc454382ab5543b26d639e (diff)
downloadaports-82e4f8eeef382c2316c3f4989edd6072f07992b7.tar.bz2
aports-82e4f8eeef382c2316c3f4989edd6072f07992b7.tar.xz
main/bacula*: remove/add patches
-rw-r--r--main/bacula-client/bacula-5.0.2-python27.patch.disabled22
-rw-r--r--main/bacula/bacula-5.0.3-log-path.patch13
2 files changed, 13 insertions, 22 deletions
diff --git a/main/bacula-client/bacula-5.0.2-python27.patch.disabled b/main/bacula-client/bacula-5.0.2-python27.patch.disabled
deleted file mode 100644
index 36543872e8..0000000000
--- a/main/bacula-client/bacula-5.0.2-python27.patch.disabled
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./configure~ 2010-04-27 14:58:29.000000000 -0500
-+++ ./configure 2010-07-30 11:28:47.494178663 -0500
-@@ -26255,7 +26255,7 @@
- PYTHON_LIBS=`/usr/bin/python-config --libs`
- else
- for python_root in /usr /usr/local /usr/sfw; do
-- for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
-+ for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python2.7 python3; do
- if test -f $python_root/include/${ver}/Python.h; then
- PYTHON_INCDIR=-I$python_root/include/${ver}
- if test -d $python_root/lib64/${ver}/config; then
---- ./autoconf/configure.in~ 2010-04-27 14:58:29.000000000 -0500
-+++ ./autoconf/configure.in 2010-07-30 11:30:22.837182092 -0500
-@@ -963,7 +963,7 @@
- PYTHON_LIBS=`/usr/bin/python-config --libs`
- else
- for python_root in /usr /usr/local /usr/sfw; do
-- for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
-+ for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python2.7 python3; do
- if test -f $python_root/include/${ver}/Python.h; then
- PYTHON_INCDIR=-I$python_root/include/${ver}
- if test -d $python_root/lib64/${ver}/config; then
diff --git a/main/bacula/bacula-5.0.3-log-path.patch b/main/bacula/bacula-5.0.3-log-path.patch
new file mode 100644
index 0000000000..15a2fecb5e
--- /dev/null
+++ b/main/bacula/bacula-5.0.3-log-path.patch
@@ -0,0 +1,13 @@
+diff --git bacula-5.0.3/src/dird/bacula-dir.conf.in b/bacula-5.0.3/src/dird/bacula-dir.conf.in
+index 922be44..54cca3f 100644
+--- bacula-5.0.3/src/dird/bacula-dir.conf.in
++++ bacula-5.0.3/src/dird/bacula-dir.conf.in
+@@ -273,7 +273,7 @@ Messages {
+ 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 = "/var/log/bacula/bacula.log" = all, !skipped
+ }
+
+ # Default pool definition