head 1.11; access; symbols OPENPKG_E1_MP_HEAD:1.5 OPENPKG_E1_MP:1.5 OPENPKG_E1_MP_2_STABLE:1.5.2.2 OPENPKG_E1_FP:1.5.2.2 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.5.2.2 OPENPKG_2_STABLE:1.5.0.2; locks; strict; comment @# @; 1.11 date 2009.07.22.18.02.58; author rse; state Exp; branches; next 1.10; commitid zDm9a0cID5U5CJWt; 1.10 date 2009.01.13.22.08.58; author rse; state Exp; branches; next 1.9; commitid rlAt9Pgm1WK85lyt; 1.9 date 2008.07.09.05.59.04; author rse; state Exp; branches; next 1.8; commitid t99fPno1OKI4L5at; 1.8 date 2007.05.18.16.16.43; author rse; state Exp; branches; next 1.7; commitid GbJZxj48yDrZBqis; 1.7 date 2007.03.09.12.41.58; author cs; state Exp; branches; next 1.6; commitid PuFcIPT2KRNOFp9s; 1.6 date 2007.01.12.14.42.30; author cs; state Exp; branches; next 1.5; commitid Jt8xNmrH3SwM8e2s; 1.5 date 2006.05.15.07.31.39; author rse; state Exp; branches 1.5.2.1; next 1.4; commitid eZPIzZA1kxdfx5xr; 1.4 date 2005.10.01.19.34.07; author thl; state Exp; branches; next 1.3; 1.3 date 2005.08.24.07.08.10; author mk; state Exp; branches; next 1.2; 1.2 date 2005.07.20.19.45.16; author rse; state Exp; branches; next 1.1; 1.1 date 2005.07.20.11.36.09; author mk; state Exp; branches; next ; 1.5.2.1 date 2006.05.15.07.31.39; author rse; state dead; branches; next 1.5.2.2; commitid iZxwRSmmWscPXUQr; 1.5.2.2 date 2006.10.16.14.48.22; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.11 log @upgrading package: bacula 3.0.1 -> 3.0.2 @ text @Index: manpages/Makefile.in --- manpages/Makefile.in.orig 2009-02-18 12:40:09 +0100 +++ manpages/Makefile.in 2009-07-22 19:56:15 +0200 @@@@ -20,23 +20,21 @@@@ install: $(MKDIR) $(DESTDIR)/$(mandir)/man8 for I in ${MAN8}; \ - do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ - $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \ - rm -f $$I.gz); \ + do \ + $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \ done $(MKDIR) $(DESTDIR)/$(mandir)/man1 for I in ${MAN1}; \ - do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ - $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \ - rm -f $$I.gz); \ + do \ + $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \ done uninstall: for I in ${MAN8}; \ - do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \ + do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \ done for I in ${MAN1}; \ - do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \ + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ done clean: Index: scripts/bacula.in --- scripts/bacula.in.orig 2008-07-24 17:02:06 +0200 +++ scripts/bacula.in 2009-07-22 19:56:15 +0200 @@@@ -20,30 +20,36 @@@@ MALLOC_CHECK_=0 export MALLOC_CHECK_ +action=$1 +debug=$2 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes + case "$1" in start) - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $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_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 ;; stop) # Stop the FD first so that SD will fail jobs and update catalog - [ -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_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 ;; restart) - $0 stop + $0 stop $debug $enable_dir $enable_sd $enable_fd sleep 2 - $0 start + $0 start $debug $enable_dir $enable_sd $enable_fd ;; status) - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status ;; *) Index: scripts/btraceback.in --- scripts/btraceback.in.orig 2008-10-28 17:34:52 +0100 +++ scripts/btraceback.in 2009-07-22 19:56:15 +0200 @@@@ -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 --- src/dird/bacula-dir.conf.in.orig 2009-07-15 19:05:40 +0200 +++ src/dird/bacula-dir.conf.in 2009-07-22 19:57:06 +0200 @@@@ -29,7 +29,8 @@@@ Level = Incremental Client = @@basename@@-fd FileSet = "Full Set" - Schedule = "WeeklyCycle" + #Schedule = "WeeklyCycle" + Schedule = "NEVER" Storage = File Messages = Standard Pool = Default @@@@ -126,6 +127,11 @@@@ } } +# This schedule can be used to disable automatic scheduling +Schedule { + Name = NEVER +} + # # When to do the backups, full backup on first sunday of the month, # differential (i.e. incremental since full) every other sunday, @ 1.10 log @upgrading package: bacula 2.4.3 -> 2.4.4 @ text @d2 2 a3 2 --- manpages/Makefile.in.orig 2007-04-24 17:47:01 +0200 +++ manpages/Makefile.in 2009-01-13 16:55:33 +0100 d33 1 a33 1 clean: dummy d35 5 a39 5 --- scripts/bacula.in.orig 2008-07-06 15:06:15 +0200 +++ scripts/bacula.in 2009-01-13 16:55:33 +0100 @@@@ -15,30 +15,36 @@@@ # SCRIPTDIR=@@scriptdir@@ d86 2 a87 2 --- scripts/btraceback.in.orig 2008-10-31 09:32:10 +0100 +++ scripts/btraceback.in 2009-01-13 22:59:41 +0100 d99 2 a100 2 --- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34 +0200 +++ src/dird/bacula-dir.conf.in 2009-01-13 16:55:33 +0100 d103 1 a103 1 Client = @@hostname@@-fd d111 1 a111 10 @@@@ -109,7 +110,7 @@@@ # directory to give a reasonable FileSet to backup to # disk storage during initial testing. # - File = @@BUILD_DIR@@ + File = @@scriptdir@@ } # @@@@ -124,6 +125,11 @@@@ @ 1.9 log @upgrading package: bacula 2.4.0 -> 2.4.1 @ text @d3 1 a3 1 +++ manpages/Makefile.in 2008-07-09 07:45:59 +0200 d36 1 a36 1 +++ scripts/bacula.in 2008-07-09 07:53:22 +0200 d86 4 a89 4 --- scripts/btraceback.in.orig 2008-06-01 10:49:00 +0200 +++ scripts/btraceback.in 2008-07-09 07:45:59 +0200 @@@@ -12,6 +12,9 @@@@ PNAME="${PNAME} on `hostname`" d91 1 a91 1 gcore -o @@working_dir@@/${PNAME} $2 d95 2 a96 1 dbx $1 $2 <@@scriptdir@@/btraceback.dbx 2>&1 \ a97 1 else d100 1 a100 1 +++ src/dird/bacula-dir.conf.in 2008-07-09 07:45:59 +0200 @ 1.8 log @upgrading package: bacula 2.0.3 -> 2.1.8 @ text @d3 1 a3 1 +++ manpages/Makefile.in 2007-05-18 17:50:22 +0200 d35 5 a39 5 --- scripts/bacula.in.orig 2006-04-07 10:22:17 +0200 +++ scripts/bacula.in 2007-05-18 17:50:22 +0200 @@@@ -17,31 +17,37 @@@@ BACSDCFG=@@sysconfdir@@ BACDIRCFG=@@sysconfdir@@ a40 1 -case "$1" in d46 2 a47 2 + +case "$action" in d49 6 a54 6 - [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2 - [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2 - [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2 + [ "$enable_sd" = "yes" ] && [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2 + [ "$enable_fd" = "yes" ] && [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2 + [ "$enable_dir" = "yes" ] && [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2 d59 6 a64 8 - [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2 - [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2 - [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2 + [ "$enable_fd" = "yes" ] && [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2 + [ "$enable_sd" = "yes" ] && [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2 + [ "$enable_dir" = "yes" ] && [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2 echo sleep 6 d69 2 a71 1 + $0 stop $debug $enable_dir $enable_sd $enable_fd d76 6 a81 6 - [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd status - [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd status - [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir status + [ "$enable_sd" = "yes" ] && [ -x ${BACSDBIN}/bacula-sd ] && status ${BACSDBIN}/bacula-sd ${SD_PORT} + [ "$enable_fd" = "yes" ] && [ -x ${BACFDBIN}/bacula-fd ] && status ${BACFDBIN}/bacula-fd ${FD_PORT} + [ "$enable_dir" = "yes" ] && [ -x ${BACDIRBIN}/bacula-dir ] && status ${BACDIRBIN}/bacula-dir ${DIR_PORT} d86 4 a89 4 --- scripts/btraceback.in.orig 2005-05-08 11:18:24 +0200 +++ scripts/btraceback.in 2007-05-18 17:50:22 +0200 @@@@ -11,6 +11,9 @@@@ PNAME=`basename $1` d99 2 a100 2 --- src/dird/bacula-dir.conf.in.orig 2007-03-30 23:46:04 +0200 +++ src/dird/bacula-dir.conf.in 2007-05-18 17:50:22 +0200 d111 1 a111 1 @@@@ -105,7 +106,7 @@@@ d120 1 a120 1 @@@@ -120,6 +121,11 @@@@ @ 1.7 log @fix original problem which obsoletes change of rev 1.45 and 1.46 @ text @d2 2 a3 2 --- manpages/Makefile.in.orig 2006-08-27 20:30:56 +0200 +++ manpages/Makefile.in 2007-01-12 15:35:55 +0100 d35 2 a36 2 --- scripts/bacula.in.orig 2006-04-05 15:18:45 +0200 +++ scripts/bacula.in 2006-05-14 20:38:13 +0200 d88 2 a89 2 --- scripts/btraceback.in.orig 2005-05-08 11:18:21 +0200 +++ scripts/btraceback.in 2006-05-14 20:32:36 +0200 d101 2 a102 2 --- src/dird/bacula-dir.conf.in.orig 2005-10-26 16:02:04 +0200 +++ src/dird/bacula-dir.conf.in 2006-05-14 20:32:36 +0200 a133 14 Index: src/console/console.c --- src/console/console.c.orig 2007-02-06 15:37:57 +0100 +++ src/console/console.c 2007-03-09 13:30:52 +0100 @@@@ -55,10 +55,6 @@@@ #define isatty(fd) (fd==0) #endif -/* Exported variables */ - -extern int rl_catch_signals; - /* Imported functions */ int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons); @ 1.6 log @require g++; avoid gzip, so dependency can be dropped @ text @d134 14 @ 1.5 log @upgrading package: bacula 1.38.5 -> 1.38.9 @ text @d1 33 @ 1.5.2.1 log @file bacula.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:48:22 +0000 @ text @d1 100 @ 1.5.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 100 Index: scripts/bacula.in --- scripts/bacula.in.orig 2006-04-05 15:18:45 +0200 +++ scripts/bacula.in 2006-05-14 20:38:13 +0200 @@@@ -17,31 +17,37 @@@@ BACSDCFG=@@sysconfdir@@ BACDIRCFG=@@sysconfdir@@ -case "$1" in +action=$1 +debug=$2 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes + +case "$action" in start) - [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2 - [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2 - [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2 + [ "$enable_sd" = "yes" ] && [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2 + [ "$enable_fd" = "yes" ] && [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2 + [ "$enable_dir" = "yes" ] && [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2 ;; stop) # Stop the FD first so that SD will fail jobs and update catalog - [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2 - [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2 - [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2 + [ "$enable_fd" = "yes" ] && [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2 + [ "$enable_sd" = "yes" ] && [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2 + [ "$enable_dir" = "yes" ] && [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1 $2 echo sleep 6 ;; restart) - $0 stop - $0 start + $0 stop $debug $enable_dir $enable_sd $enable_fd + $0 start $debug $enable_dir $enable_sd $enable_fd ;; status) - [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd status - [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd status - [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir status + [ "$enable_sd" = "yes" ] && [ -x ${BACSDBIN}/bacula-sd ] && status ${BACSDBIN}/bacula-sd ${SD_PORT} + [ "$enable_fd" = "yes" ] && [ -x ${BACFDBIN}/bacula-fd ] && status ${BACFDBIN}/bacula-fd ${FD_PORT} + [ "$enable_dir" = "yes" ] && [ -x ${BACDIRBIN}/bacula-dir ] && status ${BACDIRBIN}/bacula-dir ${DIR_PORT} ;; *) Index: scripts/btraceback.in --- scripts/btraceback.in.orig 2005-05-08 11:18:21 +0200 +++ scripts/btraceback.in 2006-05-14 20:32:36 +0200 @@@@ -11,6 +11,9 @@@@ PNAME=`basename $1` if test `uname -s` = SunOS ; then gcore -o @@working_dir@@/${PNAME} $2 +fi +if test `uname -s` = SunOS && + test -n `which dbx 2>/dev/null` ; then dbx $1 $2 <@@scriptdir@@/btraceback.dbx 2>&1 \ | @@sbindir@@/bsmtp -h @@smtp_host@@ -f @@dump_email@@ -s "Bacula DBX traceback of ${PNAME}" @@dump_email@@ else Index: src/dird/bacula-dir.conf.in --- src/dird/bacula-dir.conf.in.orig 2005-10-26 16:02:04 +0200 +++ src/dird/bacula-dir.conf.in 2006-05-14 20:32:36 +0200 @@@@ -29,7 +29,8 @@@@ Level = Incremental Client = @@hostname@@-fd FileSet = "Full Set" - Schedule = "WeeklyCycle" + #Schedule = "WeeklyCycle" + Schedule = "NEVER" Storage = File Messages = Standard Pool = Default @@@@ -105,7 +106,7 @@@@ # directory to give a reasonable FileSet to backup to # disk storage during initial testing. # - File = @@BUILD_DIR@@ + File = @@scriptdir@@ } # @@@@ -120,6 +121,11 @@@@ } } +# This schedule can be used to disable automatic scheduling +Schedule { + Name = NEVER +} + # # When to do the backups, full backup on first sunday of the month, # differential (i.e. incremental since full) every other sunday, @ 1.4 log @upgrading package: bacula 1.37.38 -> 1.37.40 @ text @d2 3 a4 11 --- scripts/bacula.in.orig 2005-07-04 21:57:31.000000000 +0200 +++ scripts/bacula.in 2005-08-20 13:22:03.830778000 +0200 @@@@ -21,11 +21,11 @@@@ # easier to "steal" this code for the development # environment where they are different. # -BACFDBIN=@@sbindir@@ +BACFDBIN=@@scriptdir@@ BACFDCFG=@@sysconfdir@@ -BACSDBIN=@@sbindir@@ +BACSDBIN=@@scriptdir@@ a5 2 -BACDIRBIN=@@sbindir@@ +BACDIRBIN=@@scriptdir@@ a6 5 PIDDIR=@@piddir@@ SUBSYSDIR=@@subsysdir@@ @@@@ -203,9 +203,15 @@@@ export LD_ASSUME_KERNEL=2.4.19 fi d14 1 a14 1 + d17 6 a22 38 - [ -x ${BACSDBIN}/bacula-sd ] && { + [ "$enable_sd" = "yes" ] && [ -x ${BACSDBIN}/bacula-sd ] && { echo "Starting the Bacula Storage daemon" OPTIONS='' if [ "${SD_USER}" != '' ]; then @@@@ -216,10 +222,10 @@@@ OPTIONS="${OPTIONS} -g ${SD_GROUP}" fi - ${BACSDBIN}/bacula-sd $2 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf + ${BACSDBIN}/bacula-sd $debug ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf } - [ -x ${BACFDBIN}/bacula-fd ] && { + [ "$enable_fd" = "yes" ] && [ -x ${BACFDBIN}/bacula-fd ] && { echo "Starting the Bacula File daemon" OPTIONS='' if [ "${FD_USER}" != '' ]; then @@@@ -230,10 +236,10 @@@@ OPTIONS="${OPTIONS} -g ${FD_GROUP}" fi - ${BACFDBIN}/bacula-fd $2 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf + ${BACFDBIN}/bacula-fd $debug ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf } - [ -x ${BACDIRBIN}/bacula-dir ] && { + [ "$enable_dir" = "yes" ] && [ -x ${BACDIRBIN}/bacula-dir ] && { sleep 2 echo "Starting the Bacula Director daemon" OPTIONS='' @@@@ -245,23 +251,23 @@@@ OPTIONS="${OPTIONS} -g ${DIR_GROUP}" fi - ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf + ${BACDIRBIN}/bacula-dir $debug ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf } d27 8 a34 18 - [ -x ${BACFDBIN}/bacula-fd ] && { + [ "$enable_fd" = "yes" ] && [ -x ${BACFDBIN}/bacula-fd ] && { echo "Stopping the Bacula File daemon" killproc ${BACFDBIN}/bacula-fd ${FD_PORT} } - [ -x ${BACSDBIN}/bacula-sd ] && { + [ "$enable_sd" = "yes" ] && [ -x ${BACSDBIN}/bacula-sd ] && { echo "Stopping the Bacula Storage daemon" killproc ${BACSDBIN}/bacula-sd ${SD_PORT} } - [ -x ${BACDIRBIN}/bacula-dir ] && { + [ "$enable_dir" = "yes" ] && [ -x ${BACDIRBIN}/bacula-dir ] && { echo "Stopping the Bacula Director daemon" killproc ${BACDIRBIN}/bacula-dir ${DIR_PORT} } @@@@ -269,15 +275,15 @@@@ a38 2 + $0 stop $debug $enable_dir $enable_sd $enable_fd sleep 5 d40 1 d45 5 a49 5 - [ -x ${BACSDBIN}/bacula-sd ] && status ${BACSDBIN}/bacula-sd ${SD_PORT} - [ -x ${BACFDBIN}/bacula-fd ] && status ${BACFDBIN}/bacula-fd ${FD_PORT} - [ -x ${BACDIRBIN}/bacula-dir ] && status ${BACDIRBIN}/bacula-dir ${DIR_PORT} + [ "$enable_sd" = "yes" ] && [ -x ${BACSDBIN}/bacula-sd ] && status ${BACSDBIN}/bacula-sd ${SD_PORT} + [ "$enable_fd" = "yes" ] && [ -x ${BACFDBIN}/bacula-fd ] && status ${BACFDBIN}/bacula-fd ${FD_PORT} d55 2 a56 2 --- scripts/btraceback.in.orig 2005-05-08 11:18:21.000000000 +0200 +++ scripts/btraceback.in 2005-08-20 20:06:37.084652000 +0200 d68 2 a69 2 --- src/dird/bacula-dir.conf.in.orig 2005-07-04 21:57:32.000000000 +0200 +++ src/dird/bacula-dir.conf.in 2005-08-24 08:09:43.569070000 +0200 @ 1.3 log @- Upgrade to latest release - various improvements @ text @a124 12 Index: src/lib/tls.c --- src/lib/tls.c.orig 2005-06-04 21:20:35.000000000 +0200 +++ src/lib/tls.c 2005-08-06 18:58:21.163568000 +0200 @@@@ -331,7 +331,7 @@@@ X509V3_EXT_METHOD *method; STACK_OF(CONF_VALUE) *val; CONF_VALUE *nval; - unsigned char *data; + const unsigned char *data; void *extstr = NULL; /* Get x509 extension method structure */ @ 1.2 log @commit my pending changes to this new package to allow Matthias to continue working on this package without creating further merge conflicts for him @ text @a0 92 Index: configure --- configure.orig 2005-06-18 15:34:19.000000000 +0200 +++ configure 2005-07-20 09:26:54.328806000 +0200 @@@@ -5942,15 +5943,15 @@@@ no) : ;; yes|*) if test "$with_readline" != "yes"; then - CONS_INC="-I${with_readline}" - CONS_LDFLAGS="-L$with_readline" + CONS_INC="-I${with_readline}/include/readline" + CONS_LDFLAGS="-L$with_readline/lib" else with_readline="/usr/include/readline" fi - as_ac_Header=`echo "ac_cv_header_${with_readline}/readline.h" | $as_tr_sh` + as_ac_Header=`echo "ac_cv_header_${with_readline}/include/readline/readline.h" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for ${with_readline}/readline.h" >&5 -echo $ECHO_N "checking for ${with_readline}/readline.h... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for ${with_readline}/include/readline/readline.h" >&5 +echo $ECHO_N "checking for ${with_readline}/include/readline/readline.h... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi @@@@ -5958,8 +5959,8 @@@@ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else # Is the header compilable? -echo "$as_me:$LINENO: checking ${with_readline}/readline.h usability" >&5 -echo $ECHO_N "checking ${with_readline}/readline.h usability... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking ${with_readline}/include/readline/readline.h usability" >&5 +echo $ECHO_N "checking ${with_readline}/include/readline/readline.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@@ -5967,7 +5968,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <${with_readline}/readline.h> +#include <${with_readline}/include/readline/readline.h> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@@@ -6003,15 +6004,15 @@@@ echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:$LINENO: checking ${with_readline}/readline.h presence" >&5 -echo $ECHO_N "checking ${with_readline}/readline.h presence... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking ${with_readline}/include/readline/readline.h presence" >&5 +echo $ECHO_N "checking ${with_readline}/include/readline/readline.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <${with_readline}/readline.h> +#include <${with_readline}/include/readline/readline.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@@@ -6074,8 +6075,8 @@@@ sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for ${with_readline}/readline.h" >&5 -echo $ECHO_N "checking for ${with_readline}/readline.h... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for ${with_readline}/include/readline/readline.h" >&5 +echo $ECHO_N "checking for ${with_readline}/include/readline/readline.h... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@@@ -6090,7 +6091,7 @@@@ #define HAVE_READLINE 1 _ACEOF - CONS_LIBS="-lreadline -ltermcap" + CONS_LIBS="-lreadline -lhistory -ltermcap" got_readline="yes" else @@@@ -22032,7 +22033,7 @@@@ s,@@WCFLAGS@@,$WCFLAGS,;t t s,@@WLDFLAGS@@,$WLDFLAGS,;t t s,@@OBJLIST@@,$OBJLIST,;t t -s,@@hostname@@,$hostname,;t t +s,@@hostname@@,localhost,;t t s,@@TAPEDRIVE@@,$TAPEDRIVE,;t t s,@@PSCMD@@,$PSCMD,;t t s,@@WIN32@@,$WIN32,;t t d3 16 a18 1 +++ scripts/bacula.in 2005-07-20 09:26:30.410660000 +0200 d112 13 a124 17 Index: src/bacula.h --- src/bacula.h.orig 2005-04-22 10:09:08.000000000 +0200 +++ src/bacula.h 2005-07-20 09:26:30.424894000 +0200 @@@@ -113,10 +113,13 @@@@ #include #ifdef HAVE_OPENSSL +/* fight OpenSSL namespace pollution */ +#define STORE OSSL_STORE #include #include #include #include +#undef STORE #endif /* Local Bacula includes. Be sure to put all the system d127 1 a127 1 +++ src/lib/tls.c 2005-07-20 09:26:30.426826000 +0200 d137 34 @ 1.1 log @new package: bacula 1.37.30 (Network backup tool) @ text @a3 8 @@@@ -5932,6 +5932,7 @@@@ got_readline="no" READLINE_SRC= +#set -x if test x$support_readline = xyes; then # Check whether --with-readline or --without-readline was given. a63 42 @@@@ -6045,25 +6046,25 @@@@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${with_readline}/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${with_readline}/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${with_readline}/readline.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${with_readline}/readline.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${with_readline}/include/readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${with_readline}/include/readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${with_readline}/include/readline/readline.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${with_readline}/include/readline/readline.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${with_readline}/readline.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${with_readline}/readline.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${with_readline}/readline.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${with_readline}/readline.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${with_readline}/readline.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${with_readline}/readline.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${with_readline}/readline.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${with_readline}/readline.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${with_readline}/readline.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${with_readline}/readline.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${with_readline}/readline.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${with_readline}/readline.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${with_readline}/include/readline/readline.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${with_readline}/include/readline/readline.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${with_readline}/include/readline/readline.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${with_readline}/include/readline/readline.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${with_readline}/include/readline/readline.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${with_readline}/include/readline/readline.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${with_readline}/include/readline/readline.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${with_readline}/include/readline/readline.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${with_readline}/include/readline/readline.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${with_readline}/include/readline/readline.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${with_readline}/include/readline/readline.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${with_readline}/include/readline/readline.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------------------ ## @