diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-05 08:28:08 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-05 08:28:08 +0000 |
commit | c29443257269098790d08cc09755d4f5d63462d7 (patch) | |
tree | f5b8ba690e182c4e4ab19fc9a879ab7b7fd5f9f9 /main/bacula/bacula-config.patch | |
parent | 656d909f25b1a54e42c60f3eb1bf16ea39ae638e (diff) | |
download | aports-c29443257269098790d08cc09755d4f5d63462d7.tar.bz2 aports-c29443257269098790d08cc09755d4f5d63462d7.tar.xz |
main/bacula: apply a bunch of patches from fedora and gentoo
and fix building with ccache
Diffstat (limited to 'main/bacula/bacula-config.patch')
-rw-r--r-- | main/bacula/bacula-config.patch | 115 |
1 files changed, 115 insertions, 0 deletions
diff --git a/main/bacula/bacula-config.patch b/main/bacula/bacula-config.patch new file mode 100644 index 000000000..b6ab5037b --- /dev/null +++ b/main/bacula/bacula-config.patch @@ -0,0 +1,115 @@ +--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig 2008-12-10 10:17:27.000000000 -0600 ++++ bacula-2.4.3/src/dird/bacula-dir.conf.in 2008-12-10 10:17:27.000000000 -0600 +@@ -16 +16 @@ +- Name = @basename@-dir ++ Name = bacula-dir +@@ -30 +30 @@ +- Client = @basename@-fd ++ Client = bacula-fd +@@ -51 +51 @@ +-# Client = @basename@2-fd ++# Client = bacula2-fd +@@ -82 +82 @@ +- Client=@basename@-fd ++ Client=bacula-fd +@@ -157,2 +157,2 @@ +- Name = @basename@-fd +- Address = @hostname@ ++ Name = bacula-fd ++ Address = client.example.com +@@ -172,2 +172,2 @@ +-# Name = @basename@2-fd +-# Address = @hostname@2 ++# Name = bacula2-fd ++# Address = client2.example.com +@@ -187 +187 @@ +- Address = @hostname@ # N.B. Use a fully qualified name here ++ Address = storage.example.com # N.B. Use a fully qualified name here +@@ -200 +200 @@ +-# Address = @hostname@ # N.B. Use a fully qualified name here ++# Address = storage.example.com # N.B. Use a fully qualified name here +@@ -212 +212 @@ +-# Address = @hostname@ # N.B. Use a fully qualified name here ++# Address = storage.example.com # N.B. Use a fully qualified name here +@@ -223 +223 @@ +-# Address = @hostname@ # N.B. Use a fully qualified name here ++# Address = storage.example.com # N.B. Use a fully qualified name here +@@ -299 +299 @@ +- Name = @basename@-mon ++ Name = bacula-mon +--- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig 2008-12-10 10:19:12.000000000 -0600 ++++ bacula-2.4.3/src/filed/bacula-fd.conf.in 2008-12-10 10:19:12.000000000 -0600 +@@ -14 +14 @@ +- Name = @basename@-dir ++ Name = bacula-dir +@@ -23 +23 @@ +- Name = @basename@-mon ++ Name = bacula-mon +@@ -32 +32 @@ +- Name = @basename@-fd ++ Name = bacula-fd +@@ -42 +42 @@ +- director = @basename@-dir = all, !skipped, !restored ++ director = bacula-dir = all, !skipped, !restored +--- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig 2008-12-10 10:21:45.000000000 -0600 ++++ bacula-2.4.3/src/stored/bacula-sd.conf.in 2008-12-10 10:21:45.000000000 -0600 +@@ -14 +14 @@ +- Name = @basename@-sd ++ Name = bacula-sd +@@ -25 +25 @@ +- Name = @basename@-dir ++ Name = bacula-dir +@@ -34 +34 @@ +- Name = @basename@-mon ++ Name = bacula-mon +@@ -228 +228 @@ +- director = @basename@-dir = all ++ director = bacula-dir = all +--- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig 2008-12-10 10:22:23.000000000 -0600 ++++ bacula-2.4.3/src/wx-console/bwx-console.conf.in 2008-12-10 10:22:23.000000000 -0600 +@@ -6 +6 @@ +- Name = @basename@-dir ++ Name = bacula-dir +@@ -8 +8 @@ +- address = @hostname@ ++ address = server.example.com +--- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig 2008-12-10 10:28:02.000000000 -0600 ++++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in 2008-12-10 10:28:02.000000000 -0600 +@@ -6 +6 @@ +- Name = @basename@-mon ++ Name = bacula-mon +@@ -12,2 +12,2 @@ +- Name = @basename@-fd +- Address = @hostname@ ++ Name = bacula-fd ++ Address = client.example.com +@@ -19,2 +19,2 @@ +- Name = @basename@-sd +- Address = @hostname@ ++ Name = bacula-sd ++ Address = storage.example.com +@@ -26 +26 @@ +- Name = @basename@-dir ++ Name = bacula-dir +@@ -28 +28 @@ +- address = @hostname@ ++ Address = director.example.com +--- bacula-2.4.3/src/qt-console/bat.conf.in.orig 2008-12-10 10:27:02.000000000 -0600 ++++ bacula-2.4.3/src/qt-console/bat.conf.in 2008-12-10 10:27:02.000000000 -0600 +@@ -6 +6 @@ +- Name = @basename@-dir ++ Name = bacula-dir +@@ -8 +8 @@ +- address = @hostname@ ++ address = server.example.com +--- bacula-2.4.3/src/stored/stored.conf.in.orig 2008-12-10 10:27:44.000000000 -0600 ++++ bacula-2.4.3/src/stored/stored.conf.in 2008-12-10 10:27:44.000000000 -0600 +@@ -11 +11 @@ +- Address = @hostname@ ++ Address = storage.example.com +@@ -22 +22 @@ +- Name = @hostname@-dir ++ Name = bacula-dir +@@ -54 +54 @@ +- director = @hostname@-dir = all ++ director = bacula-dir = all |