You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
218 lines
7.6 KiB
218 lines
7.6 KiB
21 years ago
|
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
|
||
|
|
Index: scripts/bacula.in
|
||
|
|
--- scripts/bacula.in.orig 2005-07-04 21:57:31.000000000 +0200
|
||
|
|
+++ scripts/bacula.in 2005-07-20 09:26:30.410660000 +0200
|
||
|
|
@@ -203,9 +203,15 @@
|
||
|
|
export LD_ASSUME_KERNEL=2.4.19
|
||
|
|
fi
|
||
|
|
|
||
|
|
-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 ${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
|
||
|
|
}
|
||
|
|
;;
|
||
|
|
|
||
|
|
stop)
|
||
|
|
# Stop the FD first so that SD will fail jobs and update catalog
|
||
|
|
- [ -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 @@
|
||
|
|
;;
|
||
|
|
|
||
|
|
restart)
|
||
|
|
- $0 stop
|
||
|
|
+ $0 stop $debug $enable_dir $enable_sd $enable_fd
|
||
|
|
sleep 5
|
||
|
|
- $0 start
|
||
|
|
+ $0 start $debug $enable_dir $enable_sd $enable_fd
|
||
|
|
;;
|
||
|
|
|
||
|
|
status)
|
||
|
|
- [ -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}
|
||
|
|
+ [ "$enable_dir" = "yes" ] && [ -x ${BACDIRBIN}/bacula-dir ] && status ${BACDIRBIN}/bacula-dir ${DIR_PORT}
|
||
|
|
;;
|
||
|
|
|
||
|
|
*)
|
||
|
|
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 <pthread.h>
|
||
|
|
|
||
|
|
#ifdef HAVE_OPENSSL
|
||
|
|
+/* fight OpenSSL namespace pollution */
|
||
|
|
+#define STORE OSSL_STORE
|
||
|
|
#include <openssl/ssl.h>
|
||
|
|
#include <openssl/x509v3.h>
|
||
|
|
#include <openssl/rand.h>
|
||
|
|
#include <openssl/err.h>
|
||
|
|
+#undef STORE
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/* Local Bacula includes. Be sure to put all the system
|
||
|
|
Index: src/lib/tls.c
|
||
|
|
--- src/lib/tls.c.orig 2005-06-04 21:20:35.000000000 +0200
|
||
|
|
+++ src/lib/tls.c 2005-07-20 09:26:30.426826000 +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 */
|