From 1e1b55452e1b7d82e7a75047cc96ce538936f7c1 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 11 Dec 2008 17:59:12 +0000 Subject: [PATCH] kes Fix configure to do minimum Win32 configure so that make clean works. kes Tweak modify FD header to use %ld instead of %d. kes Remove hand scanning of FD header in SD and use Bacula's sscanf, which is now OS independent. kes Define new object (file/dir) begin and end Volume label records in SD. kes Use new method of defining XATTR #defines to avoid need for having them in config.h.in git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8140 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/config.h.in.save | 3 + bacula/autoconf/configure.in | 95 +++++++++++--------- bacula/configure | 149 ++++++++++++++++++------------- bacula/src/filed/backup.c | 2 +- bacula/src/stored/append.c | 18 +--- bacula/src/stored/record.h | 2 + bacula/src/win32/Makefile | 12 +-- bacula/src/win32/Makefile.inc.in | 12 +-- bacula/technotes-2.5 | 10 +++ 9 files changed, 167 insertions(+), 136 deletions(-) diff --git a/bacula/autoconf/config.h.in.save b/bacula/autoconf/config.h.in.save index e0f50d210b..c20174f918 100644 --- a/bacula/autoconf/config.h.in.save +++ b/bacula/autoconf/config.h.in.save @@ -2,6 +2,9 @@ /* ------------------------------------------------------------------------- */ /* -- CONFIGURE SPECIFIED FEATURES -- */ /* ------------------------------------------------------------------------- */ + +/* Define if you want to use the lock manager */ +#undef _USE_LOCKMGR /* Define if you want to use MySQL as Catalog database */ #undef USE_MYSQL_DB diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 417337674f..f6c4befb50 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -12,6 +12,14 @@ AC_SUBST(TOP_DIR) AC_CONFIG_AUX_DIR(${BUILD_DIR}/autoconf) AC_CONFIG_HEADER(src/config.h:autoconf/config.h.in) +dnl minimal Win32 stuff for "make clean" +WIN32BUILDDIR=${BUILD_DIR}/src/win32 +WIN32MAINDIR=${BUILD_DIR} +WIN32TOPDIR=${TOP_DIR} +AC_SUBST(WIN32BUILDDIR) +AC_SUBST(WIN32MAINDIR) +AC_SUBST(WIN32TOPDIR) + dnl require a recent autoconf AC_PREREQ(2.61) @@ -2240,42 +2248,42 @@ if test x$support_acl = xyes; then AC_CHECK_HEADER(sys/acl.h, [ AC_DEFINE(HAVE_SYS_ACL_H,1,[Defines if your system have the sys/acl.h header file])] , ) AC_CHECK_FUNC(acl_get_file, [ - have_acl=yes + have_acl=yes ], [ - AC_CHECK_LIB(acl, acl_get_file, + AC_CHECK_LIB(acl, acl_get_file, [ - have_acl=yes; - FDLIBS="-lacl $FDLIBS" + have_acl=yes; + FDLIBS="-lacl $FDLIBS" ], [ - AC_CHECK_LIB(pacl, acl_get_file, - [ - have_acl=yes; - FDLIBS="-lpacl $FDLIBS" - ], [ - AC_CHECK_LIB(sec, acltotext, - [ - have_acl=yes; - FDLIBS="-lsec $FDLIBS" - - AC_CHECK_LIB(sec, acl_totext, - [ - have_extended_acl=yes - ] - ) - ] - ) - ] - ) - ] - ) + AC_CHECK_LIB(pacl, acl_get_file, + [ + have_acl=yes; + FDLIBS="-lpacl $FDLIBS" + ], [ + AC_CHECK_LIB(sec, acltotext, + [ + have_acl=yes; + FDLIBS="-lsec $FDLIBS" + + AC_CHECK_LIB(sec, acl_totext, + [ + have_extended_acl=yes + ] + ) + ] + ) + ] + ) + ] + ) ] ) if test $have_acl = yes; then - AC_DEFINE(HAVE_ACL) + AC_DEFINE([HAVE_ACL], [], [Normal attribute support]) fi if test $have_extended_acl = yes; then - AC_DEFINE(HAVE_EXTENDED_ACL) + AC_DEFINE([HAVE_EXTENDED_ACL], [], [Extended attribute support]) fi fi @@ -2297,24 +2305,24 @@ if test x$support_xattr = xyes; then AC_CHECK_HEADER(sys/xattr.h, [ AC_DEFINE(HAVE_SYS_XATTR_H,1,[Defines if your system have the sys/xattr.h header file])] , ) AC_CHECK_FUNCS(llistxattr lgetxattr lsetxattr, [ - have_xattr=yes - AC_DEFINE(HAVE_LLISTXATTR) - AC_DEFINE(HAVE_LGETXATTR) - AC_DEFINE(HAVE_LSETXATTR) + have_xattr=yes + AC_DEFINE([HAVE_LLISTXATTR], [], [LLISTXATTR support]) + AC_DEFINE([HAVE_LGETXATTR], [], [LGETXATTR support]) + AC_DEFINE([HAVE_LSETXATTR], [], [LSETXATTR support]) ], [ - AC_CHECK_FUNCS(listxattr getxattr setxattr, - [ - have_xattr=yes - AC_DEFINE(HAVE_LISTXATTR) - AC_DEFINE(HAVE_GETXATTR) - AC_DEFINE(HAVE_SETXATTR) - ] - ) + AC_CHECK_FUNCS(listxattr getxattr setxattr, + [ + have_xattr=yes + AC_DEFINE([HAVE_LLISTXATTR], [], [LLISTXATTR support]) + AC_DEFINE([HAVE_LGETXATTR], [], [LGETXATTR support]) + AC_DEFINE([HAVE_LSETXATTR], [], [LSETXATTR support]) + ] + ) ] ) if test $have_xattr = yes; then - AC_DEFINE(HAVE_XATTR) + AC_DEFINE([HAVE_XATTR], [], [XATTR support]) fi fi @@ -2812,6 +2820,7 @@ AC_OUTPUT([autoconf/Make.common \ src/plugins/fd/Makefile \ src/plugins/sd/Makefile \ src/plugins/dir/Makefile \ + src/win32/Makefile.inc \ po/Makefile.in \ updatedb/update_mysql_tables_10_to_11 \ updatedb/update_sqlite3_tables_10_to_11 \ @@ -2941,7 +2950,7 @@ Configuration on `date`: Subsys directory: ${subsysdir} Man directory: ${mandir} Data directory: ${datarootdir} - Plugin directory: ${plugindir} + Plugin directory: ${plugindir} C Compiler: ${CC} ${CCVERSION} C++ Compiler: ${CXX} ${CXXVERSION} Compiler flags: ${WCFLAGS} ${CFLAGS} @@ -2983,7 +2992,7 @@ Configuration on `date`: Encryption support: ${support_crypto} ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} - enable-lockmgr: ${support_lockmgr} + enable-lockmgr: ${support_lockmgr} bat support: ${support_bat} ${QWT_LDFLAGS} enable-gnome: ${support_gnome} ${gnome_version} enable-bwx-console: ${support_wx_console} ${wx_version} @@ -2992,7 +3001,7 @@ Configuration on `date`: build-dird: ${build_dird} build-stored: ${build_stored} ACL support: ${have_acl} - XATTR support: ${have_xattr} + XATTR support: ${have_xattr} Python support: ${support_python} ${PYTHON_LIBS} Batch insert enabled: ${support_batch_insert} diff --git a/bacula/configure b/bacula/configure index b52c27f633..46712d831c 100755 --- a/bacula/configure +++ b/bacula/configure @@ -801,6 +801,9 @@ host_alias target_alias BUILD_DIR TOP_DIR +WIN32BUILDDIR +WIN32MAINDIR +WIN32TOPDIR TRUEPRG FALSEPRG VERSION @@ -2225,6 +2228,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_config_headers="$ac_config_headers src/config.h:autoconf/config.h.in" +WIN32BUILDDIR=${BUILD_DIR}/src/win32 +WIN32MAINDIR=${BUILD_DIR} +WIN32TOPDIR=${TOP_DIR} + + + + @@ -5936,13 +5946,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5939: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5949: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5942: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5952: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5945: output\"" >&5) + (eval echo "\"\$as_me:5955: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7163,7 +7173,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7166 "configure"' > conftest.$ac_ext + echo '#line 7176 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9378,11 +9388,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9381: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9391: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9385: \$? = $ac_status" >&5 + echo "$as_me:9395: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9717,11 +9727,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9720: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9730: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9724: \$? = $ac_status" >&5 + echo "$as_me:9734: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9822,11 +9832,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9825: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9835: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9829: \$? = $ac_status" >&5 + echo "$as_me:9839: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9877,11 +9887,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9880: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9890: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9884: \$? = $ac_status" >&5 + echo "$as_me:9894: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12633,7 +12643,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12636 "configure" +#line 12646 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12729,7 +12739,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12732 "configure" +#line 12742 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14741,11 +14751,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14744: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14754: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14748: \$? = $ac_status" >&5 + echo "$as_me:14758: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14840,11 +14850,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14843: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14853: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14847: \$? = $ac_status" >&5 + echo "$as_me:14857: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14892,11 +14902,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14895: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14905: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14899: \$? = $ac_status" >&5 + echo "$as_me:14909: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -40475,11 +40485,11 @@ fi echo "${ECHO_T}$ac_cv_func_acl_get_file" >&6; } if test $ac_cv_func_acl_get_file = yes; then - have_acl=yes + have_acl=yes else - { echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 + { echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 echo $ECHO_N "checking for acl_get_file in -lacl... $ECHO_C" >&6; } if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -40542,12 +40552,12 @@ fi echo "${ECHO_T}$ac_cv_lib_acl_acl_get_file" >&6; } if test $ac_cv_lib_acl_acl_get_file = yes; then - have_acl=yes; - FDLIBS="-lacl $FDLIBS" + have_acl=yes; + FDLIBS="-lacl $FDLIBS" else - { echo "$as_me:$LINENO: checking for acl_get_file in -lpacl" >&5 + { echo "$as_me:$LINENO: checking for acl_get_file in -lpacl" >&5 echo $ECHO_N "checking for acl_get_file in -lpacl... $ECHO_C" >&6; } if test "${ac_cv_lib_pacl_acl_get_file+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -40610,12 +40620,12 @@ fi echo "${ECHO_T}$ac_cv_lib_pacl_acl_get_file" >&6; } if test $ac_cv_lib_pacl_acl_get_file = yes; then - have_acl=yes; - FDLIBS="-lpacl $FDLIBS" + have_acl=yes; + FDLIBS="-lpacl $FDLIBS" else - { echo "$as_me:$LINENO: checking for acltotext in -lsec" >&5 + { echo "$as_me:$LINENO: checking for acltotext in -lsec" >&5 echo $ECHO_N "checking for acltotext in -lsec... $ECHO_C" >&6; } if test "${ac_cv_lib_sec_acltotext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -40678,10 +40688,10 @@ fi echo "${ECHO_T}$ac_cv_lib_sec_acltotext" >&6; } if test $ac_cv_lib_sec_acltotext = yes; then - have_acl=yes; - FDLIBS="-lsec $FDLIBS" + have_acl=yes; + FDLIBS="-lsec $FDLIBS" - { echo "$as_me:$LINENO: checking for acl_totext in -lsec" >&5 + { echo "$as_me:$LINENO: checking for acl_totext in -lsec" >&5 echo $ECHO_N "checking for acl_totext in -lsec... $ECHO_C" >&6; } if test "${ac_cv_lib_sec_acl_totext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -40744,7 +40754,7 @@ fi echo "${ECHO_T}$ac_cv_lib_sec_acl_totext" >&6; } if test $ac_cv_lib_sec_acl_totext = yes; then - have_extended_acl=yes + have_extended_acl=yes fi @@ -40766,15 +40776,17 @@ fi fi if test $have_acl = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_ACL 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ACL _ACEOF fi if test $have_extended_acl = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_EXTENDED_ACL 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTENDED_ACL _ACEOF fi @@ -41021,17 +41033,20 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - have_xattr=yes - cat >>confdefs.h <<\_ACEOF -#define HAVE_LLISTXATTR 1 + have_xattr=yes + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LLISTXATTR _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_LGETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LGETXATTR _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_LSETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LSETXATTR _ACEOF @@ -41130,17 +41145,20 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - have_xattr=yes - cat >>confdefs.h <<\_ACEOF -#define HAVE_LISTXATTR 1 + have_xattr=yes + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LLISTXATTR _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_GETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LGETXATTR _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_SETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LSETXATTR _ACEOF @@ -41155,8 +41173,9 @@ done if test $have_xattr = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XATTR _ACEOF fi @@ -41823,7 +41842,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi -ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf 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/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/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_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 src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" +ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf 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/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/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_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 src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" ac_config_commands="$ac_config_commands default" @@ -42854,6 +42873,7 @@ do "src/plugins/fd/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/fd/Makefile" ;; "src/plugins/sd/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/sd/Makefile" ;; "src/plugins/dir/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dir/Makefile" ;; + "src/win32/Makefile.inc") CONFIG_FILES="$CONFIG_FILES src/win32/Makefile.inc" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "updatedb/update_mysql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_10_to_11" ;; "updatedb/update_sqlite3_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_10_to_11" ;; @@ -42967,6 +42987,9 @@ host_alias!$host_alias$ac_delim target_alias!$target_alias$ac_delim BUILD_DIR!$BUILD_DIR$ac_delim TOP_DIR!$TOP_DIR$ac_delim +WIN32BUILDDIR!$WIN32BUILDDIR$ac_delim +WIN32MAINDIR!$WIN32MAINDIR$ac_delim +WIN32TOPDIR!$WIN32TOPDIR$ac_delim TRUEPRG!$TRUEPRG$ac_delim FALSEPRG!$FALSEPRG$ac_delim VERSION!$VERSION$ac_delim @@ -43019,9 +43042,6 @@ MAKE_SHELL!$MAKE_SHELL$ac_delim LOCAL_LIBS!$LOCAL_LIBS$ac_delim LOCAL_CFLAGS!$LOCAL_CFLAGS$ac_delim LOCAL_LDFLAGS!$LOCAL_LDFLAGS$ac_delim -LOCAL_DEFS!$LOCAL_DEFS$ac_delim -LIBTOOL!$LIBTOOL$ac_delim -build!$build$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then @@ -43067,6 +43087,9 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +LOCAL_DEFS!$LOCAL_DEFS$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +build!$build$ac_delim build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim build_os!$build_os$ac_delim @@ -43161,9 +43184,6 @@ GNOME_DIR!$GNOME_DIR$ac_delim BAT_DIR!$BAT_DIR$ac_delim QWT_INC!$QWT_INC$ac_delim QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim -QWT_LIB!$QWT_LIB$ac_delim -QWT!$QWT$ac_delim -WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43205,6 +43225,9 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +QWT_LIB!$QWT_LIB$ac_delim +QWT!$QWT$ac_delim +WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim WX_DIR!$WX_DIR$ac_delim TRAY_MONITOR_CPPFLAGS!$TRAY_MONITOR_CPPFLAGS$ac_delim @@ -43296,7 +43319,7 @@ DISTVER!$DISTVER$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -44759,7 +44782,7 @@ Configuration on `date`: Subsys directory: ${subsysdir} Man directory: ${mandir} Data directory: ${datarootdir} - Plugin directory: ${plugindir} + Plugin directory: ${plugindir} C Compiler: ${CC} ${CCVERSION} C++ Compiler: ${CXX} ${CXXVERSION} Compiler flags: ${WCFLAGS} ${CFLAGS} @@ -44801,7 +44824,7 @@ Configuration on `date`: Encryption support: ${support_crypto} ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} - enable-lockmgr: ${support_lockmgr} + enable-lockmgr: ${support_lockmgr} bat support: ${support_bat} ${QWT_LDFLAGS} enable-gnome: ${support_gnome} ${gnome_version} enable-bwx-console: ${support_wx_console} ${wx_version} @@ -44810,7 +44833,7 @@ Configuration on `date`: build-dird: ${build_dird} build-stored: ${build_stored} ACL support: ${have_acl} - XATTR support: ${have_xattr} + XATTR support: ${have_xattr} Python support: ${support_python} ${PYTHON_LIBS} Batch insert enabled: ${support_batch_insert} diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c index c5d8d3e768..1d54c285bc 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -638,7 +638,7 @@ int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level) } /* Send our header */ - sd->fsend("%ld %d 0", jcr->JobFiles, STREAM_SIGNED_DIGEST); + sd->fsend("%ld %ld 0", jcr->JobFiles, STREAM_SIGNED_DIGEST); Dmsg1(300, "bfiled>stored:header %s\n", sd->msg); /* Encode signature data */ diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c index 3cb060ef55..83a5929e56 100644 --- a/bacula/src/stored/append.c +++ b/bacula/src/stored/append.c @@ -161,27 +161,11 @@ bool do_append_data(JCR *jcr) break; } - /* - * This hand scanning is a bit more complicated than a simple - * sscanf, but it allows us to handle any size integer up to - * int64_t without worrying about whether %d, %ld, %lld, or %q - * is the correct format for each different architecture. - * It is a real pity that sscanf() is not portable. - */ - char *p = ds->msg; - while (B_ISSPACE(*p)) { - p++; - } - file_index = (int32_t)str_to_int64(p); - while (B_ISDIGIT(*p)) { - p++; - } - if (!B_ISSPACE(*p) || !B_ISDIGIT(*(p+1))) { + if (sscanf(ds->msg, "%ld %ld", &file_index, &stream) != 2) { Jmsg1(jcr, M_FATAL, 0, _("Malformed data header from FD: %s\n"), ds->msg); ok = false; break; } - stream = (int32_t)str_to_int64(p); Dmsg2(890, " $@ + -e "s^@WIN3wBUILDDIR@^$${BUILDDIR}^" \ + -e "s^@WIN32MAINDIR@^$${MAINDIR}^" \ + -e "s^@WIN32TOPDIR@^$${TOPDIR}^" \ + -e "s^@WIN32BINDIR@^$${BINDIR}^" \ + -e "s^@WIN32INCDIR@^$${INCDIR}^" \ + -e "s^@WIN32DLLDIR@^$${DLLDIR}^" < Makefile.inc.in > $@ diff --git a/bacula/src/win32/Makefile.inc.in b/bacula/src/win32/Makefile.inc.in index f0dc0352e3..503d486b55 100644 --- a/bacula/src/win32/Makefile.inc.in +++ b/bacula/src/win32/Makefile.inc.in @@ -12,13 +12,13 @@ ECHO_CMD = @ # Main Bacula source dir -MAINDIR := @MAINDIR@ +MAINDIR := @WIN32MAINDIR@ # # Build dir -- i.e. normally src/win32 -BUILDDIR := @BUILDDIR@ +BUILDDIR := @WIN32BUILDDIR@ # # Dir above Bacula where we find depkgs -TOPDIR := @TOPDIR@ +TOPDIR := @WIN32TOPDIR@ # # where we find depkgs DEPKGS := $(TOPDIR)/depkgs-mingw32 @@ -28,9 +28,9 @@ BINDIR := $(BUILDDIR)/release LIBDIR := $(BUILDDIR)/release OBJDIR := . -MINGW_BIN := @BINDIR@ -MINGW_INCLUDE := @INCDIR@ -MINGW_DLLDIR := @DLLDIR@ +MINGW_BIN := @WIN32BINDIR@ +MINGW_INCLUDE := @WIN32INCDIR@ +MINGW_DLLDIR := @WIN32DLLDIR@ CC = $(MINGW_BIN)/mingw32-g++ $(DEFINES) $(INCLUDES) CXX = $(MINGW_BIN)/mingw32-g++ $(DEFINES) $(INCLUDES) diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index ee1a0e4c7f..80fb9d632d 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -10,6 +10,16 @@ filepattern (restore with regex in bsr) mixed priorities General: +11Dec08 +kes Fix configure to do minimum Win32 configure so that make clean + works. +kes Tweak modify FD header to use %ld instead of %d. +kes Remove hand scanning of FD header in SD and use Bacula's + sscanf, which is now OS independent. +kes Define new object (file/dir) begin and end Volume label records + in SD. +kes Use new method of defining XATTR #defines to avoid need for having + them in config.h.in 10Dec08 ebl Rename all STREAM_ACL_..._T into STREAM_ACL_.. 09Dec08 -- 2.39.5