# HG changeset patch # User Michael Schloh von Bennewitz # Date 1254579532 -7200 # Node ID a6cd892638c1fa9d0c62868cda21ede7f29f98d0 # Parent fe49d631b2255be4000bfe92c080dd708ea71b6a Update version, adjust corresponding buildconf, and correct logic. 1: Make minor corrections and improvements to scripts patch logic. 2: Upgrade to most recent stable release version 3.0.2. 3: Force selection of a single db backend, as multiple ones never were supported (changing 'with_db' identifiers accordingly.) 4: Unfortunately add gawk requirement although only partly needed. 5: Add openssl::with_threads requirement to solve strange and hard to debug problems on Solaris leading to connection failures: 'host-dir JobId 0: Error: openssl.c:86 Connect failure: ERR=error:1408F10B:SSL routines:SSL3_GET_RECORD:wrong version number' and 'host-dir JobId 40: Fatal error: TLS negotiation failed with FD at "back1.host.com:9102"' diff -r fe49d631b225 -r a6cd892638c1 bacula/bacula.patch --- a/bacula/bacula.patch Sat Oct 03 16:15:32 2009 +0200 +++ b/bacula/bacula.patch Sat Oct 03 16:18:52 2009 +0200 @@ -31,17 +31,22 @@ + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ done - clean: dummy + clean: Index: scripts/bacula.in diff -Nau scripts/bacula.in.orig scripts/bacula.in ---- scripts/bacula.in.orig 2008-07-06 15:06:15.000000000 +0200 -+++ scripts/bacula.in 2008-11-19 23:08:15.438347068 +0100 -@@ -13,32 +13,38 @@ +--- scripts/bacula.in.orig 2008-07-24 17:02:06.000000000 +0200 ++++ scripts/bacula.in 2009-09-17 00:40:53.423969596 +0200 +@@ -13,37 +13,43 @@ # easier to "steal" this code for the development # environment where they are different. # -SCRIPTDIR=@scriptdir@ +SCRIPTDIR=@libexecdir@ + # + # Disable Glibc malloc checks, it doesn't help and it keeps from getting + # good dumps + MALLOC_CHECK_=0 + export MALLOC_CHECK_ -case "$1" in +action=$1 @@ -65,8 +70,8 @@ - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 ;; @@ -104,11 +109,11 @@ | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@ Index: src/dird/bacula-dir.conf.in diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in ---- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34.000000000 +0200 -+++ src/dird/bacula-dir.conf.in 2008-11-19 23:10:11.001069502 +0100 +--- src/dird/bacula-dir.conf.in.orig 2009-07-15 19:05:40.000000000 +0200 ++++ src/dird/bacula-dir.conf.in 2009-09-17 00:45:04.055970595 +0200 @@ -29,7 +29,8 @@ Level = Incremental - Client = @hostname@-fd + Client = @basename@-fd FileSet = "Full Set" - Schedule = "WeeklyCycle" + #Schedule = "WeeklyCycle" @@ -120,12 +125,12 @@ # directory to give a reasonable FileSet to backup to # disk storage during initial testing. # -- File = @BUILD_DIR@ +- File = @sbindir@ + File = @scriptdir@ } # -@@ -124,6 +125,11 @@ +@@ -126,6 +127,11 @@ } } diff -r fe49d631b225 -r a6cd892638c1 bacula/bacula.spec --- a/bacula/bacula.spec Sat Oct 03 16:15:32 2009 +0200 +++ b/bacula/bacula.spec Sat Oct 03 16:18:52 2009 +0200 @@ -21,6 +21,11 @@ ## SUCH DAMAGE. ## +# MSvB: +# MSvB: Note, see http://www.bacula.org/en/?page=news +# MSvB: for information on new configuration options. +# MSvB: + # package information Name: bacula Summary: Network Backup Tool @@ -31,8 +36,8 @@ Class: PLUS Group: System License: GPL -Version: 2.4.4 -Release: 20090405 +Version: 3.0.2 +Release: 20090916 # package options %option with_server yes @@ -41,15 +46,7 @@ %option with_dvd no %option with_mtx no %option with_python no -%option with_db_sqlite no -%option with_db_pgsql no -%option with_db_mysql no - -# package option sanity check -%if "%{with_db_sqlite}" == "no" && "%{with_db_mysql}" == "no" && "%{with_db_pgsql}" == "no" -%undefine with_db_sqlite -%define with_db_sqlite yes -%endif +%option with_dbback sqlite # list of sources Source0: http://switch.dl.sourceforge.net/bacula/bacula-%{version}.tar.gz @@ -62,25 +59,25 @@ BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20060823 -BuildPreReq: ncurses, readline, zlib -PreReq: ncurses, readline, zlib +BuildPreReq: ncurses, readline, zlib, gawk +PreReq: ncurses, readline, zlib, gawk %if "%{with_ssl}" == "yes" -BuildPreReq: openssl >= 0.9.8 -PreReq: openssl >= 0.9.8 +BuildPreReq: openssl >= 0.9.8, openssl::with_threads = yes +PreReq: openssl >= 0.9.8, openssl::with_threads = yes %endif %if "%{with_wrap}" == "yes" BuildPreReq: tcpwrappers PreReq: tcpwrappers %endif -%if "%{with_db_sqlite}" == "yes" +%if "%{with_dbback}" == "sqlite" BuildPreReq: sqlite PreReq: sqlite %endif -%if "%{with_db_mysql}" == "yes" +%if "%{with_dbback}" == "mysql" BuildPreReq: mysql PreReq: mysql %endif -%if "%{with_db_pgsql}" == "yes" +%if "%{with_dbback}" == "postgresql" BuildPreReq: postgresql PreReq: postgresql %endif @@ -178,13 +175,13 @@ %if "%{with_wrap}" == "yes" --with-tcp-wrappers=yes \ %endif -%if "%{with_db_sqlite}" == "yes" +%if "%{with_dbback}" == "sqlite" --with-sqlite3=%{l_prefix} \ %endif -%if "%{with_db_mysql}" == "yes" +%if "%{with_dbback}" == "mysql" --with-mysql=%{l_prefix} \ %endif -%if "%{with_db_pgsql}" == "yes" +%if "%{with_dbback}" == "postgresql" --with-postgresql=%{l_prefix} \ %endif %if "%{with_python}" == "yes" || "%{with_dvd}" == "yes" @@ -200,6 +197,7 @@ --with-subsys-dir=%{l_prefix}/var/bacula/run/subsys \ --with-archivedir=/tmp \ --with-sbin-perm=0755 \ + --disable-libtool \ --disable-nls # build @@ -221,9 +219,7 @@ $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run \ $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run/subsys \ $RPM_BUILD_ROOT%{l_prefix}/man/man1 \ - $RPM_BUILD_ROOT%{l_prefix}/man/man8 \ - $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples \ - $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples/default-config + $RPM_BUILD_ROOT%{l_prefix}/man/man8 # install %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT