From: Kern Sibbald Date: Mon, 22 Dec 2003 16:35:07 +0000 (+0000) Subject: Fix configure.in + build new configure X-Git-Tag: Release-1.34.0~228 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c133dc5b61cf54832ffe3c52e89b871ad43116f8;p=bacula%2Fbacula Fix configure.in + build new configure git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@931 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/Makefile.in b/bacula/Makefile.in index b9e212a182..5cb21f83af 100755 --- a/bacula/Makefile.in +++ b/bacula/Makefile.in @@ -60,6 +60,13 @@ configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autocon chmod 755 configure @rm -f config.cache +old-onfigure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h + cd $(srcdir); + autoconf --include=$(srcdir)/autoconf \ + autoconf/configure.in > configure + chmod 755 configure + @rm -f config.cache + config.status: if test -x config.status; then config.status --recheck; \ else $(SHELL) configure; fi diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 9a3c75775b..bc35f8171d 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -1602,24 +1602,26 @@ chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer chmod 755 bconsole gconsole mtx-changer cd .. -chmod 755 create_bacula_database update_bacula_tables make_bacula_tables -chmod 755 grant_bacula_privileges drop_bacula_tables drop_bacula_database +c=src/cats -chmod 755 create_bdb_database update_bdb_tables make_bdb_tables -chmod 755 grant_bdb_privileges drop_bdb_tables drop_bdb_database +chmod 755 $c/create_bacula_database $c/update_bacula_tables $c/make_bacula_tables +chmod 755 $c/grant_bacula_privileges $c/drop_bacula_tables $c/drop_bacula_database -chmod 755 create_mysql_database update_mysql_tables make_mysql_tables -chmod 755 grant_mysql_privileges drop_mysql_tables drop_mysql_database +chmod 755 $c/create_bdb_database $c/update_bdb_tables $c/make_bdb_tables +chmod 755 $c/grant_bdb_privileges $c/drop_bdb_tables $c/drop_bdb_database -chmod 755 create_postgresql_database update_postgresql_tables make_postgresql_tables -chmod 755 grant_postgresql_privileges drop_postgresql_tables drop_postgresql_database +chmod 755 $c/create_mysql_database $c/update_mysql_tables $c/make_mysql_tables +chmod 755 $c/grant_mysql_privileges $c/drop_mysql_tables $c/drop_mysql_database -chmod 755 create_sqlite_database update_sqlite_tables make_sqlite_tables -chmod 755 grant_sqlite_privileges drop_sqlite_tables drop_sqlite_database +chmod 755 $c/create_sqlite_database $c/update_sqlite_tables $c/make_sqlite_tables +chmod 755 $c/grant_sqlite_privileges $c/drop_sqlite_tables $c/drop_sqlite_database -chmod 755 src/cats/make_catalog_backup src/cats/delete_catalog_backup -chmod 755 src/cats/sqlite -chmod 755 src/cats/mysql +chmod 755 $c/create_postgresql_database $c/update_postgresql_tables $c/make_postgresql_tables +chmod 755 $c/grant_postgresql_privileges $c/drop_postgresql_tables $c/drop_postgresql_database + +chmod 755 $c/make_catalog_backup $c/delete_catalog_backup +chmod 755 $c/sqlite +chmod 755 $c/mysql if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then largefile_support="yes" diff --git a/bacula/configure b/bacula/configure index c140988094..79cad225cd 100755 --- a/bacula/configure +++ b/bacula/configure @@ -18032,7 +18032,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/tconsole/Makefile src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile $PFILES" + ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/tconsole/Makefile src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile $PFILES" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18630,6 +18630,7 @@ do "src/cats/drop_bdb_database" ) CONFIG_FILES="$CONFIG_FILES src/cats/drop_bdb_database" ;; "src/cats/create_bacula_database" ) CONFIG_FILES="$CONFIG_FILES src/cats/create_bacula_database" ;; "src/cats/update_bacula_tables" ) CONFIG_FILES="$CONFIG_FILES src/cats/update_bacula_tables" ;; + "src/cats/grant_bacula_privileges" ) CONFIG_FILES="$CONFIG_FILES src/cats/grant_bacula_privileges" ;; "src/cats/make_bacula_tables" ) CONFIG_FILES="$CONFIG_FILES src/cats/make_bacula_tables" ;; "src/cats/drop_bacula_tables" ) CONFIG_FILES="$CONFIG_FILES src/cats/drop_bacula_tables" ;; "src/cats/drop_bacula_database" ) CONFIG_FILES="$CONFIG_FILES src/cats/drop_bacula_database" ;; @@ -19407,24 +19408,26 @@ chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer chmod 755 bconsole gconsole mtx-changer cd .. -chmod 755 create_bacula_database update_bacula_tables make_bacula_tables -chmod 755 grant_bacula_privileges drop_bacula_tables drop_bacula_database +c=src/cats -chmod 755 create_bdb_database update_bdb_tables make_bdb_tables -chmod 755 grant_bdb_privileges drop_bdb_tables drop_bdb_database +chmod 755 $c/create_bacula_database $c/update_bacula_tables $c/make_bacula_tables +chmod 755 $c/grant_bacula_privileges $c/drop_bacula_tables $c/drop_bacula_database -chmod 755 create_mysql_database update_mysql_tables make_mysql_tables -chmod 755 grant_mysql_privileges drop_mysql_tables drop_mysql_database +chmod 755 $c/create_bdb_database $c/update_bdb_tables $c/make_bdb_tables +chmod 755 $c/grant_bdb_privileges $c/drop_bdb_tables $c/drop_bdb_database -chmod 755 create_postgresql_database update_postgresql_tables make_postgresql_tables -chmod 755 grant_postgresql_privileges drop_postgresql_tables drop_postgresql_database +chmod 755 $c/create_mysql_database $c/update_mysql_tables $c/make_mysql_tables +chmod 755 $c/grant_mysql_privileges $c/drop_mysql_tables $c/drop_mysql_database -chmod 755 create_sqlite_database update_sqlite_tables make_sqlite_tables -chmod 755 grant_sqlite_privileges drop_sqlite_tables drop_sqlite_database +chmod 755 $c/create_sqlite_database $c/update_sqlite_tables $c/make_sqlite_tables +chmod 755 $c/grant_sqlite_privileges $c/drop_sqlite_tables $c/drop_sqlite_database -chmod 755 src/cats/make_catalog_backup src/cats/delete_catalog_backup -chmod 755 src/cats/sqlite -chmod 755 src/cats/mysql +chmod 755 $c/create_postgresql_database $c/update_postgresql_tables $c/make_postgresql_tables +chmod 755 $c/grant_postgresql_privileges $c/drop_postgresql_tables $c/drop_postgresql_database + +chmod 755 $c/make_catalog_backup $c/delete_catalog_backup +chmod 755 $c/sqlite +chmod 755 $c/mysql if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then largefile_support="yes" diff --git a/bacula/kernstodo b/bacula/kernstodo index 77fcf8f313..ab6bbae26e 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -1,5 +1,5 @@ Kern's ToDo List - 18 December 2003 + 22 December 2003 Documentation to do: (any release a little bit at a time) - Document running a test version. @@ -55,6 +55,14 @@ For 1.33 Testing/Documentation: - Add subsections to the Disaster Recovery index section. For 1.33 +- In restore, provide option for limiting to a particular Pool. +- In restore, list FileSets that only have different base names -- + i.e. any FileSet with the same name should be treated as the same. +- From Johan Decock: + bscan: sql_update.c:65 UPDATE File SET MD5='Ij+5kwN6TFIxK+8l8+/I+A' WHERE FileId=0 + bscan: bscan.c:1074 Could not add MD5/SHA1 to File record. ERR=sql_update.c:65 Update problem: affected_rows=0 +- Do scheduling by UTC using gmtime_r() in run_conf, scheduler, and + ua_status.!!! Thanks to Alan Brown for this tip. - Look at Dan's field width problems in PostgreSQL. - Look at effect of removing GROUP BYs. - In restore take all filesets with same base name. diff --git a/bacula/platforms/debian/bacula-director b/bacula/platforms/debian/bacula-director new file mode 100644 index 0000000000..4d40a11154 --- /dev/null +++ b/bacula/platforms/debian/bacula-director @@ -0,0 +1,59 @@ +#! /bin/sh +# bacula-director SysV init script for Bacula-FD. +# +# Written by Miquel van Smoorenburg . +# Modified for Debian GNU/Linux by Ian Murdock . +# Customized for Bacula by Jose Luis Tallon +# Modified RJM 2-12-03 to fix errors with pidfile name +# +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/bacula-dir +NAME="bacula-dir" +PORT=9101 +DESC="Bacula Director" +ARGS="-c /etc/bacula/bacula-dir.conf -u bacula -g bacula" + +test -f $DAEMON || exit 0 + +set -e + +if [ -n "`getent services bacula-dir`" ]; then + PORT=`getent services bacula-dir | awk '{ gsub("/tcp","",$2); print $2; }'` +fi + +PIDFILE=/var/run/bacula/$NAME.$PORT.pid + +case "$1" in + start) + if [ -f /etc/bacula/do_not_run ]; then + echo "Not starting $DESC: disabled via /etc/bacula/do_not_run" + exit 0 + fi + + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $ARGS + echo "$NAME." + ;; + + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE --exec $DAEMON + echo "$NAME." + ;; + + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $ARGS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/bacula/src/cats/.cvsignore b/bacula/src/cats/.cvsignore index cf5f3f7e0b..515f94f37c 100644 --- a/bacula/src/cats/.cvsignore +++ b/bacula/src/cats/.cvsignore @@ -1,4 +1,6 @@ 1 +2 +3 Makefile make_catalog_backup delete_catalog_backup @@ -31,3 +33,10 @@ update_bacula_tables update_mysql_tables update_postgresql_tables update_sqlite_tables +drop_bacula_database +drop_bdb_database +drop_mysql_database +drop_postgresql_database +drop_sqlite_database +grant_bdb_privileges +update_bdb_tables diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c index 586594b4b2..04e4ecd1a3 100644 --- a/bacula/src/console/console.c +++ b/bacula/src/console/console.c @@ -432,12 +432,12 @@ try_again: /* Cleanup and then exit */ static void terminate_console(int sig) { - static int already_here = FALSE; + static bool already_here = false; if (already_here) { /* avoid recursive temination problems */ exit(1); } - already_here = TRUE; + already_here = true; free_pool_memory(args); con_term(); if (sig != 0) {