rpms/bacula/devel bacula-config.patch, 1.2, 1.3 bacula-director-configuration.patch, 1.1, 1.2 bacula.spec, 1.17, 1.18
Jon Ciesla
limb at fedoraproject.org
Wed Dec 10 18:59:51 UTC 2008
Author: limb
Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3073
Modified Files:
bacula-config.patch bacula-director-configuration.patch
bacula.spec
Log Message:
Rediffed fuzzy patches.
bacula-config.patch:
Index: bacula-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-config.patch 30 Jul 2008 13:52:01 -0000 1.2
+++ bacula-config.patch 10 Dec 2008 18:59:21 -0000 1.3
@@ -1,256 +1,122 @@
---- bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in.orig 2007-02-06 13:35:12.000000000 +0100
-+++ bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in 2007-02-06 13:35:25.000000000 +0100
-@@ -3,9 +3,9 @@
- #
-
- Director {
+--- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig 2008-12-10 10:12:18.000000000 -0600
++++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in 2008-12-10 10:12:18.000000000 -0600
+@@ -6 +6 @@
- Name = @hostname at -dir
+ Name = bacula-dir
- DIRport = @dir_port@
+@@ -8 +8 @@
- address = @hostname@
+ address = server.example.com
- Password = "@dir_password@"
- }
-
---- bacula-2.0.2/src/dird/bacula-dir.conf.in.orig 2007-02-06 13:33:19.000000000 +0100
-+++ bacula-2.0.2/src/dird/bacula-dir.conf.in 2007-02-06 13:34:49.000000000 +0100
-@@ -13,7 +13,7 @@
- #
-
- Director { # define myself
+--- 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 = @hostname at -dir
+ Name = bacula-dir
- DIRport = @dir_port@ # where we listen for UA connections
- QueryFile = "@scriptdir@/query.sql"
- WorkingDirectory = "@working_dir@"
-@@ -27,7 +27,7 @@
- Name = "DefaultJob"
- Type = Backup
- Level = Incremental
+@@ -30 +30 @@
- Client = @hostname at -fd
+ Client = bacula-fd
- FileSet = "Full Set"
- Schedule = "WeeklyCycle"
- Storage = File
-@@ -48,7 +48,7 @@
-
- #Job {
- # Name = "Client2"
+@@ -51 +51 @@
-# Client = @hostname at 2-fd
+# Client = bacula2-fd
- # JobDefs = "DefaultJob"
- # Write Bootstrap = "@working_dir@/Client2.bsr"
- #}
-@@ -75,7 +75,7 @@
- Job {
- Name = "RestoreFiles"
- Type = Restore
+@@ -82 +82 @@
- Client=@hostname at -fd
+ Client=bacula-fd
- FileSet="Full Set"
- Storage = File
- Pool = Default
-@@ -149,8 +149,8 @@
-
- # Client (File Services) to backup
- Client {
+@@ -157,2 +157,2 @@
- Name = @hostname at -fd
- Address = @hostname@
+ Name = bacula-fd
+ Address = client.example.com
- FDPort = @fd_port@
- Catalog = MyCatalog
- Password = "@fd_password@" # password for FileDaemon
-@@ -164,8 +164,8 @@
- # You should change Name, Address, and Password before using
- #
- #Client {
+@@ -172,2 +172,2 @@
-# Name = @hostname at 2-fd
-# Address = @hostname at 2
+# Name = bacula2-fd
+# Address = client2.example.com
- # FDPort = @fd_port@
- # Catalog = MyCatalog
- # Password = "@fd_password at 2" # password for FileDaemon 2
-@@ -179,7 +179,7 @@
- Storage {
- Name = File
- # Do not use "localhost" here
+@@ -187 +187 @@
- Address = @hostname@ # N.B. Use a fully qualified name here
-+ Address = storage.example.com # N.B. Use a fully qualified name here
- SDPort = @sd_port@
- Password = "@sd_password@"
- Device = FileStorage
-@@ -192,7 +192,7 @@
- #Storage {
- # Name = DDS-4
- # Do not use "localhost" 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
- # SDPort = @sd_port@
- # Password = "@sd_password@" # password for Storage daemon
- # Device = DDS-4 # must be same as Device in Storage daemon
-@@ -204,7 +204,7 @@
- #Storage {
- # Name = "8mmDrive"
- # Do not use "localhost" 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
- # SDPort = @sd_port@
- # Password = "@sd_password@"
- # Device = "Exabyte 8mm"
-@@ -215,7 +215,7 @@
- #Storage {
- # Name = "DVD"
- # Do not use "localhost" 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
- # SDPort = @sd_port@
- # Password = "@sd_password@"
- # Device = "DVD Writer"
-@@ -285,7 +285,7 @@
- # Restricted console used by tray-monitor to get the status of the director
- #
- Console {
++# Address = storage.example.com # N.B. Use a fully qualified name here
+@@ -299 +299 @@
- Name = @hostname at -mon
+ Name = bacula-mon
- Password = "@mon_dir_password@"
- CommandACL = status, .status
- }
---- bacula-2.0.2/src/filed/bacula-fd.conf.in.orig 2007-02-06 13:30:59.000000000 +0100
-+++ bacula-2.0.2/src/filed/bacula-fd.conf.in 2007-02-06 13:31:25.000000000 +0100
-@@ -11,7 +11,7 @@
- # List Directors who are permitted to contact this File daemon
- #
- Director {
+--- 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 = @hostname at -dir
+ Name = bacula-dir
- Password = "@fd_password@"
- }
-
-@@ -20,7 +20,7 @@
- # status of the file daemon
- #
- Director {
+@@ -23 +23 @@
- Name = @hostname at -mon
+ Name = bacula-mon
- Password = "@mon_fd_password@"
- Monitor = yes
- }
-@@ -29,7 +29,7 @@
- # "Global" File daemon configuration specifications
- #
- FileDaemon { # this is me
+@@ -32 +32 @@
- Name = @hostname at -fd
+ Name = bacula-fd
- FDport = @fd_port@ # where we listen for the director
- WorkingDirectory = @working_dir@
- Pid Directory = @piddir@
-@@ -39,5 +39,5 @@
- # Send all messages except skipped files back to Director
- Messages {
- Name = Standard
+@@ -42 +42 @@
- director = @hostname at -dir = all, !skipped, !restored
+ director = bacula-dir = all, !skipped, !restored
- }
---- bacula-2.0.2/src/console/bconsole.conf.in.orig 2007-02-06 13:32:30.000000000 +0100
-+++ bacula-2.0.2/src/console/bconsole.conf.in 2007-02-06 13:33:06.000000000 +0100
-@@ -3,8 +3,8 @@
- #
-
- Director {
-- Name = @hostname at -dir
-+ Name = bacula-dir
- DIRport = @dir_port@
-- address = @hostname@
-+ address = server.example.com
- Password = "@dir_password@"
- }
---- bacula-2.0.2/src/stored/bacula-sd.conf.in.orig 2007-02-06 13:31:56.000000000 +0100
-+++ bacula-2.0.2/src/stored/bacula-sd.conf.in 2007-02-06 13:32:15.000000000 +0100
-@@ -11,7 +11,7 @@
- #
-
- Storage { # definition of myself
+--- 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 = @hostname at -sd
+ Name = bacula-sd
- SDPort = @sd_port@ # Director's port
- WorkingDirectory = "@working_dir@"
- Pid Directory = "@piddir@"
-@@ -22,7 +22,7 @@
- # List Directors who are permitted to contact Storage daemon
- #
- Director {
+@@ -25 +25 @@
- Name = @hostname at -dir
+ Name = bacula-dir
- Password = "@sd_password@"
- }
-
-@@ -31,7 +31,7 @@
- # status of the storage daemon
- #
- Director {
+@@ -34 +34 @@
- Name = @hostname at -mon
+ Name = bacula-mon
- Password = "@mon_sd_password@"
- Monitor = yes
- }
-@@ -204,5 +204,5 @@
- #
- Messages {
- Name = Standard
+@@ -228 +228 @@
- director = @hostname at -dir = all
+ director = bacula-dir = all
- }
---- bacula-2.0.2/src/wx-console/bwx-console.conf.in.orig 2007-02-06 13:37:12.000000000 +0100
-+++ bacula-2.0.2/src/wx-console/bwx-console.conf.in 2007-02-06 13:47:02.000000000 +0100
-@@ -3,8 +3,8 @@
- #
-
- Director {
+--- 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 = @hostname at -dir
+ Name = bacula-dir
- DIRport = @dir_port@
+@@ -8 +8 @@
- address = @hostname@
+ address = server.example.com
- Password = "@dir_password@"
- }
---- bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in.orig 2007-02-06 13:47:13.000000000 +0100
-+++ bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in 2007-02-06 13:47:55.000000000 +0100
-@@ -3,27 +3,27 @@
- #
-
- Monitor {
+--- 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 = @hostname at -mon
+ Name = bacula-mon
- Password = "@mon_dir_password@" # password for the Directors
- RefreshInterval = 5 seconds
- }
-
- Client {
+@@ -12,2 +12,2 @@
- Name = @hostname at -fd
- Address = @hostname@
+ Name = bacula-fd
+ Address = client.example.com
- FDPort = @fd_port@
- Password = "@mon_fd_password@" # password for FileDaemon
- }
-
- Storage {
+@@ -19,2 +19,2 @@
- Name = @hostname at -sd
- Address = @hostname@
+ Name = bacula-sd
+ Address = storage.example.com
- SDPort = @sd_port@
- Password = "@mon_sd_password@" # password for StorageDaemon
- }
-
- Director {
+@@ -26 +26 @@
+- Name = @hostname at -dir
++ Name = bacula-dir
+@@ -28 +27,0 @@
+- address = @hostname@
+--- 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 = @hostname at -dir
+ Name = bacula-dir
- DIRport = @dir_port@
+@@ -8 +8 @@
- address = @hostname@
--}
-\ No newline at end of file
+ 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 at -dir
++ Name = bacula-dir
+@@ -54 +54 @@
+- director = @hostname at -dir = all
++ director = bacula-dir = all
bacula-director-configuration.patch:
Index: bacula-director-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-director-configuration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-director-configuration.patch 24 Jul 2007 20:11:04 -0000 1.1
+++ bacula-director-configuration.patch 10 Dec 2008 18:59:21 -0000 1.2
@@ -1,34 +1,17 @@
---- bacula-1.38.11/src/dird/bacula-dir.conf.in.orig 2006-09-03 03:13:26.000000000 +0200
-+++ bacula-1.38.11/src/dird/bacula-dir.conf.in 2006-09-03 03:14:46.000000000 +0200
-@@ -15,7 +15,7 @@
- Director { # define myself
- Name = @hostname at -dir
- DIRport = @dir_port@ # where we listen for UA connections
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig 2008-12-10 08:59:18.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in 2008-12-10 08:59:18.000000000 -0600
+@@ -18 +18 @@
- QueryFile = "@scriptdir@/query.sql"
+ QueryFile = "/etc/bacula/query.sql"
- WorkingDirectory = "@working_dir@"
- PidDirectory = "@piddir@"
- Maximum Concurrent Jobs = 1
-@@ -101,11 +101,10 @@
- # if you have other partitons such as /usr or /home
- # you will probably want to add them too.
- #
+@@ -108,3 +108,2 @@
-# By default this is defined to point to the Bacula build
-# directory to give a reasonable FileSet to backup to
-# disk storage during initial testing.
+# This File-directive would backup your whole filesystem.
+# It is disabled by default
- #
+@@ -112 +111 @@
- File = @BUILD_DIR@
-+# File = /
- }
-
- #
-@@ -266,7 +266,7 @@
- mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
- mail = @job_email@ = all, !skipped
- console = all, !skipped, !saved
++ File = /
+@@ -263 +262 @@
- append = "@working_dir@/log" = all, !skipped
+ append = "/var/log/bacula.log" = all, !skipped
- }
-
Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bacula.spec 1 Dec 2008 19:52:37 -0000 1.17
+++ bacula.spec 10 Dec 2008 18:59:21 -0000 1.18
@@ -4,12 +4,11 @@
%define docs_version %{version}
%define gui_version %{version}
%define config_dir %{_sysconfdir}/bacula
-%define _default_patch_fuzz 2
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
Name: bacula
Version: 2.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
# See LICENSE for details
License: GPLv2 with exceptions
Group: System Environment/Daemons
@@ -986,6 +985,9 @@
%changelog
+* Wed Dec 10 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-5
+- Re-diffed fuzzy bacula-director-configuration and bacula-config patches.
+
* Mon Dec 1 2008 Andreas Thienemann <andreas at bawue.net> - 2.4.3-4
- Fixed dependency "issues" #473627 by adding the sysconfdir subpackage.
More information about the fedora-extras-commits
mailing list