TTOOL_LDFLAGS = @TTOOL_LDFLAGS@
#DEFS = @DEFS@ @LOCAL_DEFS@
LIBS = @LIBS@
+WRAPLIBS = @WRAPLIBS@
DINCLUDE = @DINCLUDE@
DLIB = @DLIB@
DB_LIBS = @DB_LIBS@
# Check whether user wants TCP wrappers support (default off)
# -----------------------------------------------------------
TCPW_MSG="no"
+WRAPLIBS=""
AC_ARG_WITH(tcp-wrappers,
[ --with-tcp-wrappers=DIR enable tcpwrappers support],
[
AC_MSG_CHECKING(for libwrap)
AC_SEARCH_LIBS(nanosleep, [rt])
AC_TRY_LINK(
- [ #include <tcpd.h>
+ [ #include <sys/types.h>
+ #include <tcpd.h>
int deny_severity = 0;
int allow_severity = 0;
struct request_info *req; ],
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_LIBWRAP)
TCPW_MSG="yes"
+ LIBS="$saved_LIBS"
+ WRAPLIBS="-lwrap"
], [
LIBS="$saved_LIBS -lwrap -lnsl"
+ WRAPLIBS="$saved_LIBS -lwrap -lnsl"
AC_TRY_LINK(
- [ #include <tcpd.h>
+ [ #include <sys/types.h>
+ #include <tcpd.h>
int deny_severity = 0;
int allow_severity = 0;
struct request_info *req; ],
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_LIBWRAP)
TCPW_MSG="yes"
+ LIBS="$saved_LIBS"
+ WRAPLIBS="-lwrap"
],
[AC_MSG_ERROR([*** libwrap missing]) ] ]
)
AC_SUBST(X_EXTRA_LIBS)
AC_SUBST(WCFLAGS)
AC_SUBST(WLDFLAGS)
+AC_SUBST(WRAPLIBS)
dnl# extra configurable objects
OBJLIST=
Large file support: $largefile_support
Bacula conio support: ${got_conio} ${CONS_LIBS}
readline support: ${got_readline} ${PRTREADLINE_SRC}
- TCP Wrappers support: ${TCPW_MSG}
+ TCP Wrappers support: ${TCPW_MSG} ${WRAPLIBS}
TLS support: ${support_tls}
ZLIB support: ${have_zlib}
enable-smartalloc: ${support_smartalloc}
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX DF MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC2 ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS DIRD_DIR DIR_TOOLS STORED_DIR CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX DF MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GLIBC2 ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS DIRD_DIR DIR_TOOLS STORED_DIR CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS WRAPLIBS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
ac_subst_files='MCOMMON'
# Initialize some variables set by options.
# Check whether user wants TCP wrappers support (default off)
# -----------------------------------------------------------
TCPW_MSG="no"
+WRAPLIBS=""
# Check whether --with-tcp-wrappers or --without-tcp-wrappers was given.
if test "${with_tcp_wrappers+set}" = set; then
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <tcpd.h>
+ #include <sys/types.h>
+ #include <tcpd.h>
int deny_severity = 0;
int allow_severity = 0;
struct request_info *req;
_ACEOF
TCPW_MSG="yes"
+ LIBS="$saved_LIBS"
+ WRAPLIBS="-lwrap"
else
echo "$as_me: failed program was:" >&5
LIBS="$saved_LIBS -lwrap -lnsl"
+ WRAPLIBS="$saved_LIBS -lwrap -lnsl"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <tcpd.h>
+ #include <sys/types.h>
+ #include <tcpd.h>
int deny_severity = 0;
int allow_severity = 0;
struct request_info *req;
_ACEOF
TCPW_MSG="yes"
+ LIBS="$saved_LIBS"
+ WRAPLIBS="-lwrap"
else
echo "$as_me: failed program was:" >&5
+
OBJLIST=
s,@DB_LIBS@,$DB_LIBS,;t t
s,@WCFLAGS@,$WCFLAGS,;t t
s,@WLDFLAGS@,$WLDFLAGS,;t t
+s,@WRAPLIBS@,$WRAPLIBS,;t t
s,@OBJLIST@,$OBJLIST,;t t
s,@hostname@,$hostname,;t t
s,@TAPEDRIVE@,$TAPEDRIVE,;t t
Large file support: $largefile_support
Bacula conio support: ${got_conio} ${CONS_LIBS}
readline support: ${got_readline} ${PRTREADLINE_SRC}
- TCP Wrappers support: ${TCPW_MSG}
+ TCP Wrappers support: ${TCPW_MSG} ${WRAPLIBS}
TLS support: ${support_tls}
ZLIB support: ${have_zlib}
enable-smartalloc: ${support_smartalloc}
General:
Changes to 1.37.40:
+28Sep05
+- Integrate libwrap patch from Szechuan Death. They should
+ also fix bug 423.
+- Clean up patches directory for next release.
+- Add PS variable in bacula.in script as recommended by a user.
+- Correct mtx-changer.in so it only creates a temp file when
+ actually needed.
+- Add patch supplied by user in a bug report to fix gnome2
+ console buttons.
+- Add patch from Peter Eriksson <peter@ifm.liu.se> to correct
+ NLS error in tray-monitor.c
26Sep05
- Add code to catalog_update to detect NULL db pointer.
- Remove char *msg argument from catalog_request and
+++ /dev/null
-Index: src/tray-monitor/tray-monitor.c
-===================================================================
-RCS file: /cvsroot/bacula/bacula/src/tray-monitor/tray-monitor.c,v
-retrieving revision 1.21
-diff -r1.21 tray-monitor.c
-455c455,468
-< writecmd(&items[i], "quit");
----
-> switch (items[i].type) {
-> case R_DIRECTOR:
-> trayMessage("Disconnecting from Director %s:%d\n", ((DIRRES*)items[i].resource)->address, ((DIRRES*)items[i].resource)->DIRport);
-> break;
-> case R_CLIENT:
-> trayMessage("Disconnecting from Client %s:%d\n", ((CLIENT*)items[i].resource)->address, ((CLIENT*)items[i].resource)->FDport);
-> break;
-> case R_STORAGE:
-> trayMessage("Disconnecting from Storage %s:%d\n", ((STORE*)items[i].resource)->address, ((STORE*)items[i].resource)->SDport);
-> break;
-> default:
-> break;
-> }
-> //writecmd(&items[i], "quit");
+++ /dev/null
-Index: src/wx-console/wxbrestorepanel.cpp
-===================================================================
-RCS file: /cvsroot/bacula/bacula/src/wx-console/wxbrestorepanel.cpp,v
-retrieving revision 1.40.8.1
-diff -u -r1.40.8.1 wxbrestorepanel.cpp
---- src/wx-console/wxbrestorepanel.cpp 24 Mar 2005 14:52:55 -0000 1.40.8.1
-+++ src/wx-console/wxbrestorepanel.cpp 5 May 2005 18:45:05 -0000
-@@ -1469,23 +1469,29 @@
- wxString* wxbRestorePanel::ParseList(wxString line) {
- /* See ls_output in dird/ua_tree.c */
-
-- //drwxrwxrwx 1 root root 0 2004-04-03 14:35:21 f:/tocd/NVSU 1.00.00/
-- //+ 10 + ++ + 8 + + 8 ++ 8 + + 19 + *+ ->
-- //0 12 15 24 32 42 62
--
-+ //drwxrwxrwx 111 root root 0 2004-04-03 14:35:21 f:/tocd/NVSU 1.00.00/
-+ //+ 10 + +i+ + 8 + + 8 ++ 8 + + 19 + *+ ->
-+ //0 12 i+15 i+24 i+32 i+42 i+62
-+
-+ int i;
-+
- if (line.Length() < 63)
- return NULL;
-
- wxString* ret = new wxString[9];
-
- ret[0] = line.Mid(0, 10).Trim();
-- ret[1] = line.Mid(12, 2).Trim();
-- ret[2] = line.Mid(15, 8).Trim();
-- ret[3] = line.Mid(24, 8).Trim();
-- ret[4] = line.Mid(32, 8).Trim();
-- ret[5] = line.Mid(42, 19).Trim();
-- ret[6] = line.Mid(62, 1);
-- ret[7] = line.Mid(63).Trim();
-+
-+ /* Column 1 has a variable width */
-+ i = line.find(' ', 14) - 14;
-+ ret[1] = line.Mid(12, 2+i).Trim();
-+
-+ ret[2] = line.Mid(15+i, 8).Trim();
-+ ret[3] = line.Mid(24+i, 8).Trim();
-+ ret[4] = line.Mid(32+i, 8).Trim();
-+ ret[5] = line.Mid(42+i, 19).Trim();
-+ ret[6] = line.Mid(62+i, 1);
-+ ret[7] = line.Mid(63+i).Trim();
-
- if (ret[6] == " ") ret[6] = "";
-
--- /dev/null
+Index: src/tray-monitor/tray-monitor.c
+===================================================================
+RCS file: /cvsroot/bacula/bacula/src/tray-monitor/tray-monitor.c,v
+retrieving revision 1.21
+diff -r1.21 tray-monitor.c
+455c455,468
+< writecmd(&items[i], "quit");
+---
+> switch (items[i].type) {
+> case R_DIRECTOR:
+> trayMessage("Disconnecting from Director %s:%d\n", ((DIRRES*)items[i].resource)->address, ((DIRRES*)items[i].resource)->DIRport);
+> break;
+> case R_CLIENT:
+> trayMessage("Disconnecting from Client %s:%d\n", ((CLIENT*)items[i].resource)->address, ((CLIENT*)items[i].resource)->FDport);
+> break;
+> case R_STORAGE:
+> trayMessage("Disconnecting from Storage %s:%d\n", ((STORE*)items[i].resource)->address, ((STORE*)items[i].resource)->SDport);
+> break;
+> default:
+> break;
+> }
+> //writecmd(&items[i], "quit");
--- /dev/null
+Index: src/wx-console/wxbrestorepanel.cpp
+===================================================================
+RCS file: /cvsroot/bacula/bacula/src/wx-console/wxbrestorepanel.cpp,v
+retrieving revision 1.40.8.1
+diff -u -r1.40.8.1 wxbrestorepanel.cpp
+--- src/wx-console/wxbrestorepanel.cpp 24 Mar 2005 14:52:55 -0000 1.40.8.1
++++ src/wx-console/wxbrestorepanel.cpp 5 May 2005 18:45:05 -0000
+@@ -1469,23 +1469,29 @@
+ wxString* wxbRestorePanel::ParseList(wxString line) {
+ /* See ls_output in dird/ua_tree.c */
+
+- //drwxrwxrwx 1 root root 0 2004-04-03 14:35:21 f:/tocd/NVSU 1.00.00/
+- //+ 10 + ++ + 8 + + 8 ++ 8 + + 19 + *+ ->
+- //0 12 15 24 32 42 62
+-
++ //drwxrwxrwx 111 root root 0 2004-04-03 14:35:21 f:/tocd/NVSU 1.00.00/
++ //+ 10 + +i+ + 8 + + 8 ++ 8 + + 19 + *+ ->
++ //0 12 i+15 i+24 i+32 i+42 i+62
++
++ int i;
++
+ if (line.Length() < 63)
+ return NULL;
+
+ wxString* ret = new wxString[9];
+
+ ret[0] = line.Mid(0, 10).Trim();
+- ret[1] = line.Mid(12, 2).Trim();
+- ret[2] = line.Mid(15, 8).Trim();
+- ret[3] = line.Mid(24, 8).Trim();
+- ret[4] = line.Mid(32, 8).Trim();
+- ret[5] = line.Mid(42, 19).Trim();
+- ret[6] = line.Mid(62, 1);
+- ret[7] = line.Mid(63).Trim();
++
++ /* Column 1 has a variable width */
++ i = line.find(' ', 14) - 14;
++ ret[1] = line.Mid(12, 2+i).Trim();
++
++ ret[2] = line.Mid(15+i, 8).Trim();
++ ret[3] = line.Mid(24+i, 8).Trim();
++ ret[4] = line.Mid(32+i, 8).Trim();
++ ret[5] = line.Mid(42+i, 19).Trim();
++ ret[6] = line.Mid(62+i, 1);
++ ret[7] = line.Mid(63+i).Trim();
+
+ if (ret[6] == " ") ret[6] = "";
+
--- /dev/null
+05May05 1.36.3-wx-console-fix-dir-alignment.diff
+ Fix a problem when link count for a file is greater than 99 (bug #304).
+
+25Apr05 1.36.3-tray-monitor-fix-broken-pipe.diff
+ Fix broken pipe when closing bacula-tray-monitor (bug #292).
+++ /dev/null
-This patch fixes a bug in version 1.37.24 when the wrong tape is initially loaded, the
-Storage daemon thinks that the desired tape is already loaded.
-
-Apply the patch to 1.37.24 with:
-
- cd <bacula-source>
- patch -p0 <1.37.24-wrong-tape.patch
- make
- ...
-
-Index: src/version.h
-===================================================================
-RCS file: /cvsroot/bacula/bacula/src/version.h,v
-retrieving revision 1.498
-diff -u -r1.498 version.h
---- src/version.h 18 Jun 2005 13:37:19 -0000 1.498
-+++ src/version.h 20 Jun 2005 08:09:56 -0000
-@@ -1,8 +1,8 @@
- /* */
- #undef VERSION
--#define VERSION "1.37.24"
--#define BDATE "18 June 2005"
--#define LSMDATE "18Jun05"
-+#define VERSION "1.37.25"
-+#define BDATE "20 June 2005"
-+#define LSMDATE "20Jun05"
-
- /* Debug flags */
- #undef DEBUG
-Index: src/stored/mount.c
-===================================================================
-RCS file: /cvsroot/bacula/bacula/src/stored/mount.c,v
-retrieving revision 1.88
-diff -u -r1.88 mount.c
---- src/stored/mount.c 18 Jun 2005 13:22:36 -0000 1.88
-+++ src/stored/mount.c 20 Jun 2005 08:09:56 -0000
-@@ -190,7 +190,7 @@
- return false;
- }
-
-- Dmsg2(100, "dirVol=%s dirStat=%s\n", dcr->VolumeName,
-+ Dmsg2(100, "Want dirVol=%s dirStat=%s\n", dcr->VolumeName,
- dcr->VolCatInfo.VolCatStatus);
- /*
- * At this point, dev->VolCatInfo has what is in the drive, if anything,
-@@ -230,6 +230,7 @@
- memcpy(&VolCatInfo, &dcr->VolCatInfo, sizeof(VolCatInfo));
- memcpy(&devVolCatInfo, &dev->VolCatInfo, sizeof(devVolCatInfo));
- /* Check if this is a valid Volume in the pool */
-+ bstrncpy(dcr->VolumeName, dev->VolHdr.VolumeName, sizeof(dcr->VolumeName));
- if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) {
- /* Restore desired volume name, note device info out of sync */
- /* This gets the info regardless of the Pool */
+++ /dev/null
-#!/bin/sh
-#
-# Shell script to fix PostgreSQL tables in version 8
-#
-echo " "
-echo "This script will fix a Bacula PostgreSQL database version 8"
-echo "Depending on the size of your database,"
-echo "this script may take several minutes to run."
-echo " "
-#
-# Set the following to the path to psql.
-bindir=****EDIT-ME to be the path to psql****
-
-if $bindir/psql $* -f - <<END-OF-DATA
-\c bacula
-
-begin;
-
-alter table media rename column endblock to endblock_old;
-alter table media add column endblock bigint;
-update media set endblock = endblock_old;
-alter table media alter column endblock set not null;
-alter table media drop column endblock_old;
-
-commit;
-
-vacuum;
-
-END-OF-DATA
-then
- echo "Update of Bacula PostgreSQL tables succeeded."
-else
- echo "Update of Bacula PostgreSQL tables failed."
-fi
-exit 0
+++ /dev/null
-05May05 1.36.3-wx-console-fix-dir-alignment.diff
- Fix a problem when link count for a file is greater than 99 (bug #304).
-
-25Apr05 1.36.3-tray-monitor-fix-broken-pipe.diff
- Fix broken pipe when closing bacula-tray-monitor (bug #292).
#
PSCMD="@PSCMD@"
+PS="ps"
#
# On Solaris, you may need to use nawk, or alternatively,
# Kill it.
if [ "$pid" != "" ] ; then
if [ "$notset" = "1" ] ; then
- if ps -p $pid>/dev/null 2>&1; then
+ if ${PS} -p $pid>/dev/null 2>&1; then
# TERM first, then KILL if not dead
kill -TERM $pid 2>/dev/null
sleep 1
- if ps -p $pid >/dev/null 2>&1 ; then
+ if ${PS} -p $pid >/dev/null 2>&1 ; then
sleep 1
- if ps -p $pid >/dev/null 2>&1 ; then
+ if ${PS} -p $pid >/dev/null 2>&1 ; then
sleep 3
- if ps -p $pid >/dev/null 2>&1 ; then
+ if ${PS} -p $pid >/dev/null 2>&1 ; then
kill -KILL $pid 2>/dev/null
fi
fi
fi
fi
- ps -p $pid >/dev/null 2>&1
+ ${PS} -p $pid >/dev/null 2>&1
RC=$?
[ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
# RC=$((! $RC))
# use specified level only
else
- if ps -p $pid >/dev/null 2>&1; then
+ if ${PS} -p $pid >/dev/null 2>&1; then
kill $killlevel $pid 2>/dev/null
RC=$?
[ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
#
MTX=@MTX@
-TMPFILE=`mktemp mtx.XXXXXXXXXX`
-if test x${TMPFILE} = x; then
- TMPFILE="@working_dir@/mtx.$$"
- if test -f ${TMPFILE}; then
- echo "Temp file security problem on: ${TMPFILE}"
- exit 1
- fi
-fi
+
+#
+# Create a temporary file
+#
+make_temp_file() {
+ TMPFILE=`mktemp -t mtx.XXXXXXXXXX`
+ if test x${TMPFILE} = x; then
+ TMPFILE="@working_dir@/mtx.$$"
+ if test -f ${TMPFILE}; then
+ echo "Temp file security problem on: ${TMPFILE}"
+ exit 1
+ fi
+ fi
+}
#
# The purpose of this function to wait a maximum
list)
# echo "Doing mtx -f $ctl -- to list volumes"
+ make_temp_file
${MTX} -f $ctl status >${TMPFILE}
rtn=$?
cat ${TMPFILE} | grep " *Storage Element [0-9]*:.*Full" | awk "{print \$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//"
loaded)
# echo "Doing mtx -f $ctl $drive -- to find what is loaded"
+ make_temp_file
${MTX} -f $ctl status >${TMPFILE}
rtn=$?
cat ${TMPFILE} | grep "^Data Transfer Element $drive:Full" | awk "{print \$7}"
bacula-dir: $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-lsql -lfind -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
- $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
static-bacula-dir: $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-lsql -lbac -lfind -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
- $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
strip $@
bacula-fd: $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
$(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
- $(DLIB) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
static-bacula-fd: $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
$(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
- $(DLIB) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
strip $@
}
-static GList *get_and_fill_combo(GtkWidget *dialog, const char *combo_name, const char *cm)
+static GList *get_and_fill_combo(GtkWidget *dialog, const char *combo_name, const char *dircmd)
{
GtkWidget *combo;
GList *options;
combo = lookup_widget(dialog, combo_name);
- options = get_list(cmd);
+ options = get_list((char *)dircmd);
if (combo && options) {
gtk_combo_set_popdown_strings(GTK_COMBO(combo), options);
}
bacula-sd: $(SVROBJS) ../lib/libbac.a
$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
- -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+ $(GETTEXT_LIBS) $(OPENSSL_LIBS)
static-bacula-sd: $(SVROBJS) ../lib/libbac.a
$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
- -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+ $(GETTEXT_LIBS) $(OPENSSL_LIBS)
strip $@
btape.o: btape.c
"%s"
"\n<small>%s: %s (%s) %s %s %s</small>",
_("Bacula Tray Monitor"),
- _("Copyright (C) 2004 Kern Sibbald and John Walker\n"
+ _("Copyright (C) 2004-2005 Kern Sibbald\n"
"Written by Nicolas Boichat\n"),
- _("Version"),
+ _("Version:"),
VERSION, BDATE, HOST_OS, DISTNAME, DISTVER);
#else
- GtkWidget* about = gtk_message_dialog_new(GTK_WINDOW(window),GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _(
+ GtkWidget* about = gtk_message_dialog_new(GTK_WINDOW(window),GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
"%s\n\n"
"%s"
"\n%s %s (%s) %s %s %s",
_("Bacula Tray Monitor"),
- _("Copyright (C) 2004 Kern Sibbald and John Walker\n"
+ _("Copyright (C) 2004-2005 Kern Sibbald\n"
"Written by Nicolas Boichat\n"),
_("Version:"),
VERSION, BDATE, HOST_OS, DISTNAME, DISTVER);
#undef VERSION
#define VERSION "1.37.40"
-#define BDATE "26 September 2005"
-#define LSMDATE "26Sep05"
+#define BDATE "28 September 2005"
+#define LSMDATE "28Sep05"
/* Debug flags */
#undef DEBUG
projects / bacula / bacula / commitdiff