# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346171780 -7200 # Node ID e3c6a8f912f4512bbf897ed85b68fac78ca878af # Parent b3a1e74cc78b1ac528f7bea11766b8d82744696d Blindly commit previous changes before reworking for forthcoming stack release. diff -r b3a1e74cc78b -r e3c6a8f912f4 bacula/bacula.patch --- a/bacula/bacula.patch Tue Aug 28 18:35:45 2012 +0200 +++ b/bacula/bacula.patch Tue Aug 28 18:36:20 2012 +0200 @@ -1,7 +1,7 @@ Index: manpages/Makefile.in diff -Nau manpages/Makefile.in.orig manpages/Makefile.in ---- manpages/Makefile.in.orig 2007-04-24 17:47:01.000000000 +0200 -+++ manpages/Makefile.in 2008-11-19 22:55:01.066689027 +0100 +--- manpages/Makefile.in.orig 2010-08-05 16:29:51.000000000 +0200 ++++ manpages/Makefile.in 2011-05-01 17:26:43.000000000 +0200 @@ -20,23 +20,21 @@ install: $(MKDIR) $(DESTDIR)/$(mandir)/man8 @@ -34,8 +34,8 @@ clean: Index: scripts/bacula.in diff -Nau scripts/bacula.in.orig scripts/bacula.in ---- scripts/bacula.in.orig 2008-07-24 17:02:06.000000000 +0200 -+++ scripts/bacula.in 2009-09-17 00:40:53.423969596 +0200 +--- scripts/bacula.in.orig 2010-08-05 16:29:51.000000000 +0200 ++++ scripts/bacula.in 2011-05-01 17:26:43.000000000 +0200 @@ -13,37 +13,43 @@ # easier to "steal" this code for the development # environment where they are different. @@ -93,24 +93,10 @@ ;; *) -Index: scripts/btraceback.in -diff -Nau scripts/btraceback.in.orig scripts/btraceback.in ---- scripts/btraceback.in.orig 2008-06-01 10:49:00.000000000 +0200 -+++ scripts/btraceback.in 2008-11-19 23:09:44.305993544 +0100 -@@ -13,6 +13,9 @@ - WD="@working_dir@" - if test `uname -s` = SunOS ; then - gcore -o ${WD}/${PNAME} $2 -+fi -+if test `uname -s` = SunOS && -+ test -n `which dbx 2>/dev/null` ; then - dbx $1 $2 <@scriptdir@/btraceback.dbx >${WD}/bacula.$$.traceback 2>&1 - cat ${WD}/bacula.$$.traceback \ - | @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 2009-07-15 19:05:40.000000000 +0200 -+++ src/dird/bacula-dir.conf.in 2009-09-17 00:45:04.055970595 +0200 +--- src/dird/bacula-dir.conf.in.orig 2010-08-05 16:29:51.000000000 +0200 ++++ src/dird/bacula-dir.conf.in 2011-05-01 17:26:43.000000000 +0200 @@ -29,7 +29,8 @@ Level = Incremental Client = @basename@-fd diff -r b3a1e74cc78b -r e3c6a8f912f4 bacula/bacula.spec --- a/bacula/bacula.spec Tue Aug 28 18:35:45 2012 +0200 +++ b/bacula/bacula.spec Tue Aug 28 18:36:20 2012 +0200 @@ -1,6 +1,6 @@ ## ## bacula.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2010 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -40,8 +40,8 @@ Class: PLUS Group: System License: GPL -Version: 3.0.3 -Release: 20091028 +Version: 5.0.3 +Release: 20120208 # package options %option with_server yes @@ -50,7 +50,15 @@ %option with_dvd no %option with_mtx no %option with_python no -%option with_dbback sqlite +%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 # list of sources Source0: http://switch.dl.sourceforge.net/bacula/bacula-%{version}.tar.gz @@ -63,8 +71,8 @@ BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes PreReq: OpenPKG, openpkg >= 20060823 -BuildPreReq: ncurses, readline, zlib, gawk -PreReq: ncurses, readline, zlib, gawk +BuildPreReq: ncurses, readline, zlib +PreReq: ncurses, readline, zlib %if "%{with_ssl}" == "yes" BuildPreReq: openssl >= 0.9.8, openssl::with_threads = yes PreReq: openssl >= 0.9.8, openssl::with_threads = yes @@ -73,15 +81,15 @@ BuildPreReq: tcpwrappers PreReq: tcpwrappers %endif -%if "%{with_dbback}" == "sqlite" +%if "%{with_db_sqlite}" == "yes" BuildPreReq: sqlite PreReq: sqlite %endif -%if "%{with_dbback}" == "mysql" +%if "%{with_db_mysql}" == "yes" BuildPreReq: mysql PreReq: mysql %endif -%if "%{with_dbback}" == "postgresql" +%if "%{with_db_pgsql}" == "yes" BuildPreReq: postgresql PreReq: postgresql %endif @@ -112,7 +120,7 @@ %track prog bacula = { version = %{version} - url = http://prdownloads.sourceforge.net/bacula/ + url = http://sourceforge.net/projects/bacula/files/ regex = bacula-(\d+\.\d*[02468]\.\d+)\.tar\.gz } @@ -145,13 +153,14 @@ # configure LIBS= case "%{l_platform -t}" in - *-linux*) LIBS="-L/usr/lib/termcap";; + *-linux*) ldfl="-L/usr/lib/termcap" ;; + *-sunos*) ldfl="-ldl" ;; esac CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags ncurses}" \ - LDFLAGS="%{l_ldflags} $LIBS" \ - LIBS="$libs" \ + LDFLAGS="%{l_ldflags} $ldfl" \ + LIBS="$libs -lz" \ GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ @@ -179,13 +188,13 @@ %if "%{with_wrap}" == "yes" --with-tcp-wrappers=yes \ %endif -%if "%{with_dbback}" == "sqlite" +%if "%{with_db_sqlite}" == "yes" --with-sqlite3=%{l_prefix} \ %endif -%if "%{with_dbback}" == "mysql" +%if "%{with_db_mysql}" == "yes" --with-mysql=%{l_prefix} \ %endif -%if "%{with_dbback}" == "postgresql" +%if "%{with_db_pgsql}" == "yes" --with-postgresql=%{l_prefix} \ %endif %if "%{with_python}" == "yes" || "%{with_dvd}" == "yes" @@ -209,6 +218,7 @@ %{l_make} %{l_mflags -O} %install + # clean up build cruft rm -rf $RPM_BUILD_ROOT # create installation hierarchy