[bacula/f16] Reduce patching a bit
Simone Caronni
slaanesh at fedoraproject.org
Fri Dec 23 13:06:38 UTC 2011
commit 9d64218be8cefe4b24c0f4618cb56e48687cf46b
Author: Simone Caronni <negativo17 at gmail.com>
Date: Fri Dec 23 13:57:30 2011 +0100
Reduce patching a bit
bacula-5.0.3-config.patch | 124 ++++++++++++++++++++++++++
bacula-pamd.patch => bacula-5.0.3-pamd.patch | 0
bacula-config.patch | 115 ------------------------
bacula.spec | 11 ++-
4 files changed, 130 insertions(+), 120 deletions(-)
---
diff --git a/bacula-5.0.3-config.patch b/bacula-5.0.3-config.patch
new file mode 100644
index 0000000..7f4e5f3
--- /dev/null
+++ b/bacula-5.0.3-config.patch
@@ -0,0 +1,124 @@
+diff -Naur bacula-5.0.3.old/src/dird/bacula-dir.conf.in bacula-5.0.3/src/dird/bacula-dir.conf.in
+--- bacula-5.0.3.old/src/dird/bacula-dir.conf.in 2011-12-23 13:49:02.779450043 +0100
++++ bacula-5.0.3/src/dird/bacula-dir.conf.in 2011-12-23 13:50:51.664532669 +0100
+@@ -154,7 +154,7 @@
+ # Client (File Services) to backup
+ Client {
+ Name = @basename at -fd
+- Address = @hostname@
++ Address = client.example.com
+ FDPort = @fd_port@
+ Catalog = MyCatalog
+ Password = "@fd_password@" # password for FileDaemon
+@@ -169,7 +169,7 @@
+ #
+ #Client {
+ # Name = @basename at 2-fd
+-# Address = @hostname at 2
++# Address = client.example.com2
+ # FDPort = @fd_port@
+ # Catalog = MyCatalog
+ # Password = "@fd_password at 2" # password for FileDaemon 2
+@@ -183,7 +183,7 @@
+ Storage {
+ Name = File
+ # Do not use "localhost" here
+- 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
+@@ -196,7 +196,7 @@
+ #Storage {
+ # Name = DDS-4
+ # Do not use "localhost" here
+-# 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
+@@ -208,7 +208,7 @@
+ #Storage {
+ # Name = "8mmDrive"
+ # Do not use "localhost" here
+-# 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"
+@@ -219,7 +219,7 @@
+ #Storage {
+ # Name = "DVD"
+ # Do not use "localhost" here
+-# 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"
+diff -Naur bacula-5.0.3.old/src/stored/stored.conf.in bacula-5.0.3/src/stored/stored.conf.in
+--- bacula-5.0.3.old/src/stored/stored.conf.in 2011-12-23 13:49:02.808450598 +0100
++++ bacula-5.0.3/src/stored/stored.conf.in 2011-12-23 13:53:17.059311129 +0100
+@@ -8,7 +8,7 @@
+ #
+ Storage {
+ Name = "Storage daemon"
+- Address = @hostname@
++ Address = storage.example.com
+ SDPort = @sd_port@ # Directors port
+ WorkingDirectory = "@working_dir@"
+ Pid Directory = "@piddir@"
+@@ -19,7 +19,7 @@
+ # List Directors who are permitted to contact Storage daemon
+ #
+ Director {
+- Name = @hostname at -dir
++ Name = @basename at -dir
+ Password = local_storage_password
+ }
+
+@@ -51,6 +51,6 @@
+
+ Messages {
+ Name = Standard
+- director = @hostname at -dir = all
++ director = @basename at -dir = all
+ operator = @dump_email@ = mount
+ }
+diff -Naur bacula-5.0.3.old/src/tray-monitor/tray-monitor.conf.in bacula-5.0.3/src/tray-monitor/tray-monitor.conf.in
+--- bacula-5.0.3.old/src/tray-monitor/tray-monitor.conf.in 2011-12-23 13:49:02.773449929 +0100
++++ bacula-5.0.3/src/tray-monitor/tray-monitor.conf.in 2011-12-23 13:52:11.090050817 +0100
+@@ -10,14 +10,14 @@
+
+ Client {
+ Name = @basename at -fd
+- Address = @hostname@
++ Address = client.example.com
+ FDPort = @fd_port@
+ Password = "@mon_fd_password@" # password for FileDaemon
+ }
+
+ Storage {
+ Name = @basename at -sd
+- Address = @hostname@
++ Address = storage.example.com
+ SDPort = @sd_port@
+ Password = "@mon_sd_password@" # password for StorageDaemon
+ }
+@@ -25,5 +25,5 @@
+ Director {
+ Name = @basename at -dir
+ DIRport = @dir_port@
+- address = @hostname@
++ Address = director.example.com
+ }
+diff -Naur bacula-5.0.3.old/src/wx-console/bwx-console.conf.in bacula-5.0.3/src/wx-console/bwx-console.conf.in
+--- bacula-5.0.3.old/src/wx-console/bwx-console.conf.in 2011-12-23 13:49:02.798450408 +0100
++++ bacula-5.0.3/src/wx-console/bwx-console.conf.in 2011-12-23 13:51:22.208116570 +0100
+@@ -5,6 +5,6 @@
+ Director {
+ Name = @basename at -dir
+ DIRport = @dir_port@
+- address = @hostname@
++ address = director.example.com
+ Password = "@dir_password@"
+ }
diff --git a/bacula-pamd.patch b/bacula-5.0.3-pamd.patch
similarity index 100%
rename from bacula-pamd.patch
rename to bacula-5.0.3-pamd.patch
diff --git a/bacula.spec b/bacula.spec
index 5a10cf4..0ec3a77 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -27,8 +27,8 @@ Source15: bacula-fd.sysconfig
Source16: bacula-dir.sysconfig
Source17: bacula-sd.sysconfig
-Patch1: bacula-config.patch
-Patch3: bacula-pamd.patch
+Patch1: bacula-5.0.3-config.patch
+Patch3: bacula-5.0.3-pamd.patch
Patch14: bacula-5.0.1-dsolink.patch
Patch15: bacula-5.0.2-openssl.patch
Patch16: bacula-5.0.3-queryfile.patch
@@ -333,9 +333,9 @@ This package contains the documentation for most of the bacula-packages.
%setup -q -a 1 -D -T
pushd bacula-%{version}
-%patch1 -p1
-%patch3 -p1
-%patch14 -p2
+%patch1 -p1 -b .config
+%patch3 -p1 -b .pamd
+%patch14 -p2 -b .dsolink
%patch15 -p2 -b .openssl
%patch16 -p1 -b .queryfile
%patch17 -p0 -b .python27
@@ -372,6 +372,7 @@ export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
%configure \
--sysconfdir=%{_sysconfdir}/bacula \
+ --with-basename=bacula \
--with-dir-user=bacula \
--with-dir-group=bacula \
--with-sd-user=bacula \
More information about the scm-commits
mailing list