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@-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@2-fd +-# Address = @hostname@2 ++# Address = client.example.com2 + # FDPort = @fd_port@ + # Catalog = MyCatalog + # Password = "@fd_password@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@-dir ++ Name = @basename@-dir + Password = local_storage_password + } + +@@ -51,6 +51,6 @@ + + Messages { + Name = Standard +- director = @hostname@-dir = all ++ director = @basename@-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@-fd +- Address = @hostname@ ++ Address = client.example.com + FDPort = @fd_port@ + Password = "@mon_fd_password@" # password for FileDaemon + } + + Storage { + Name = @basename@-sd +- Address = @hostname@ ++ Address = storage.example.com + SDPort = @sd_port@ + Password = "@mon_sd_password@" # password for StorageDaemon + } +@@ -25,5 +25,5 @@ + Director { + Name = @basename@-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@-dir + DIRport = @dir_port@ +- address = @hostname@ ++ address = director.example.com + Password = "@dir_password@" + } diff --git a/bacula-5.0.3-pamd.patch b/bacula-5.0.3-pamd.patch new file mode 100644 index 0000000..469335a --- /dev/null +++ b/bacula-5.0.3-pamd.patch @@ -0,0 +1,23 @@ +--- bacula-2.0.3/scripts/wxconsole.pamd.orig 2007-07-11 18:43:10.000000000 +0200 ++++ bacula-2.0.3/scripts/wxconsole.pamd 2007-07-11 18:43:23.000000000 +0200 +@@ -1,7 +1,7 @@ + #%PAM-1.0 + auth sufficient pam_rootok.so + auth sufficient pam_timestamp.so +-auth required pam_stack.so service=system-auth ++auth include system-auth + session optional pam_xauth.so + session optional pam_timestamp.so + account required pam_permit.so +--- bacula-2.0.3/scripts/bgnome-console.pamd.orig 2007-07-11 18:42:33.000000000 +0200 ++++ bacula-2.0.3/scripts/bgnome-console.pamd 2007-07-11 18:42:57.000000000 +0200 +@@ -1,7 +1,7 @@ + #%PAM-1.0 + auth sufficient pam_rootok.so + auth sufficient pam_timestamp.so +-auth required pam_stack.so service=system-auth ++auth include system-auth + session optional pam_xauth.so + session optional pam_timestamp.so + account required pam_permit.so + diff --git a/bacula-config.patch b/bacula-config.patch deleted file mode 100644 index b6ab503..0000000 --- a/bacula-config.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- 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 diff --git a/bacula-pamd.patch b/bacula-pamd.patch deleted file mode 100644 index 469335a..0000000 --- a/bacula-pamd.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- bacula-2.0.3/scripts/wxconsole.pamd.orig 2007-07-11 18:43:10.000000000 +0200 -+++ bacula-2.0.3/scripts/wxconsole.pamd 2007-07-11 18:43:23.000000000 +0200 -@@ -1,7 +1,7 @@ - #%PAM-1.0 - auth sufficient pam_rootok.so - auth sufficient pam_timestamp.so --auth required pam_stack.so service=system-auth -+auth include system-auth - session optional pam_xauth.so - session optional pam_timestamp.so - account required pam_permit.so ---- bacula-2.0.3/scripts/bgnome-console.pamd.orig 2007-07-11 18:42:33.000000000 +0200 -+++ bacula-2.0.3/scripts/bgnome-console.pamd 2007-07-11 18:42:57.000000000 +0200 -@@ -1,7 +1,7 @@ - #%PAM-1.0 - auth sufficient pam_rootok.so - auth sufficient pam_timestamp.so --auth required pam_stack.so service=system-auth -+auth include system-auth - session optional pam_xauth.so - session optional pam_timestamp.so - account required pam_permit.so - 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 \