diff -up bacula-5.0.2/autoconf/configure.in.orig bacula-5.0.2/autoconf/configure.in --- bacula-5.0.2/autoconf/configure.in.orig 2010-04-27 21:58:29.000000000 +0200 +++ bacula-5.0.2/autoconf/configure.in 2010-05-20 13:17:24.000000000 +0200 @@ -128,7 +128,7 @@ AC_PATH_PROG(GROWISOFS, growisofs, growi AC_PATH_PROG(DVDRWMEDIAINFO, dvd+rw-mediainfo, dvd+rw-mediainfo) AC_PATH_PROG(DVDRWFORMAT, dvd+rw-format, dvd+rw-format) AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config) -AC_PATH_PROG(QMAKE, qmake, none) +AC_PATH_PROG(QMAKE, qmake, none, /usr/bin:$QTDIR/bin) AC_PATH_PROG(GMAKE, gmake, none) AC_ARG_VAR(WXCONFIG, [wx-config command. On some systems, you must set it to wx-config-2.6 to use wxWidgets 2.6.]) if test "x$WXCONFIG" = x; then @@ -1118,7 +1118,7 @@ AC_ARG_WITH(openssl, ) if test "x$with_openssl_directory" != "xno"; then - OPENSSL_LIBS="-lssl -lcrypto" + OPENSSL_LIBS="`pkg-config --libs openssl` -lresolv" OPENSSL_INC="" if test "x$with_openssl_directory" != "xyes" && test x"${with_openssl_directory}" != "x"; then @@ -2679,14 +2679,13 @@ PSCMD="ps -e" WIN32= MACOSX= -hostname=`uname -n | cut -d '.' -f 1` if test x${hostname} = x ; then - hostname="localhost" + hostname="XXX_HOSTNAME_XXX" fi dnl Make sure hostname is resolved ping -c 1 $hostname 2>/dev/null 1>/dev/null if test ! $? = 0; then - hostname="localhost" + hostname="XXX_HOSTNAME_XXX" fi case "$DISTNAME" in @@ -3094,13 +3093,13 @@ if test "${support_bat}" = "yes" ; then AC_MSG_ERROR([Could not find qmake $PATH. Check your Qt installation]) fi - QMAKEBIN="qmake" + QMAKEBIN="${QMAKE:-qmake}" cd src/qt-console echo "Creating bat Makefile" touch bat chmod 755 bat rm -f Makefile - $QMAKEBIN + $QMAKEBIN QMAKE_CXXFLAGS="${CFLAGS}" ${MAKE:-make} clean cd ${BUILD_DIR} fi diff -up bacula-5.0.2/configure.orig bacula-5.0.2/configure --- bacula-5.0.2/configure.orig 2010-04-27 21:58:29.000000000 +0200 +++ bacula-5.0.2/configure 2010-05-20 13:27:19.000000000 +0200 @@ -5062,9 +5062,9 @@ else ac_cv_path_QMAKE="$QMAKE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +for as_dir in $PATH $QTDIR/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -27044,7 +27044,7 @@ fi if test "x$with_openssl_directory" != "xno"; then - OPENSSL_LIBS="-lssl -lcrypto" + OPENSSL_LIBS="`pkg-config --libs openssl` -lresolv" OPENSSL_INC="" if test "x$with_openssl_directory" != "xyes" && test x"${with_openssl_directory}" != "x"; then @@ -43881,7 +43881,7 @@ if test "${ac_cv_lib_cap_cap_set_proc+se echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lcap $LIBS" +LIBS="-L/lib64 -L/lib -lcap $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43937,17 +43937,12 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_cap_cap_set_proc" >&5 echo "${ECHO_T}$ac_cv_lib_cap_cap_set_proc" >&6; } if test $ac_cv_lib_cap_cap_set_proc = yes; then - CAP_LIBS="-lcap" -else - CAP_LIBS= -fi - -if test x$CAP_LIBS = x-lcap; then - -cat >>confdefs.h <<\_ACEOF + CAP_LIBS="-L/lib64 -L/lib -lcap" + cat >>confdefs.h <<\_ACEOF #define HAVE_LIBCAP 1 _ACEOF - +else + CAP_LIBS= fi @@ -43997,13 +43992,12 @@ PSCMD="ps -e" WIN32= MACOSX= -hostname=`uname -n | cut -d '.' -f 1` if test x${hostname} = x ; then - hostname="localhost" + hostname="XXX_HOSTNAME_XXX" fi ping -c 1 $hostname 2>/dev/null 1>/dev/null if test ! $? = 0; then - hostname="localhost" + hostname="XXX_HOSTNAME_XXX" fi case "$DISTNAME" in @@ -47193,13 +47187,13 @@ echo "$as_me: error: Could not find qmak { (exit 1); exit 1; }; } fi - QMAKEBIN="qmake" + QMAKEBIN="${QMAKE:-qmake}" cd src/qt-console echo "Creating bat Makefile" touch bat chmod 755 bat rm -f Makefile - $QMAKEBIN + $QMAKEBIN QMAKE_CXXFLAGS="${CFLAGS}" ${MAKE:-make} clean cd ${BUILD_DIR} fi diff -up bacula-5.0.3/src/cats/Makefile.in.orig bacula-5.0.3/src/cats/Makefile.in --- bacula-5.0.3/src/cats/Makefile.in.orig 2010-08-05 16:29:51.000000000 +0200 +++ bacula-5.0.3/src/cats/Makefile.in 2010-09-27 14:15:12.000000000 +0200 @@ -68,6 +68,8 @@ libbacsql.a: $(LIBBACSQL_OBJS) libbacsql.la: Makefile $(LIBBACSQL_LOBJS) @echo "Making $@ ..." $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS) + # Prevent linking programs against database libraries, only libbacsql.so needs them + $(SED) -i -e "s/\(dependency_libs\)=.*/\1=''/g" $@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ diff -up bacula-5.0.1/src/dird/Makefile.in.orig bacula-5.0.1/src/dird/Makefile.in --- bacula-5.0.1/src/dird/Makefile.in.orig 2010-02-24 16:33:48.000000000 +0100 +++ bacula-5.0.1/src/dird/Makefile.in 2010-03-01 14:45:55.000000000 +0100 @@ -64,12 +64,12 @@ all: Makefile bacula-dir @STATIC_DIR@ bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ - -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ + -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) \ $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ - -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ + -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) \ $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) strip $@ diff -up bacula-5.0.1/src/stored/Makefile.in.orig bacula-5.0.1/src/stored/Makefile.in --- bacula-5.0.1/src/stored/Makefile.in.orig 2010-02-24 16:33:48.000000000 +0100 +++ bacula-5.0.1/src/stored/Makefile.in 2010-03-01 14:47:20.000000000 +0100 @@ -107,7 +107,7 @@ btape.o: btape.c btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -o $@ $(TAPEOBJS) \ - -lbacsql -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) bls.o: bls.c @echo "Compiling $<" @@ -136,7 +136,7 @@ bscan.o: bscan.c bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ - -lbacsql $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + -lbacsql $(FDLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) bcopy.o: bcopy.c @echo "Compiling $<" diff -up bacula-5.0.1/src/tools/Makefile.in.orig bacula-5.0.1/src/tools/Makefile.in --- bacula-5.0.1/src/tools/Makefile.in.orig 2010-02-24 16:33:48.000000000 +0100 +++ bacula-5.0.1/src/tools/Makefile.in 2010-03-01 14:48:53.000000000 +0100 @@ -64,7 +64,7 @@ bregtest: Makefile bregtest.o ../lib/lib dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS) $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \ - -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + -lbacsql -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \ @@ -101,15 +101,15 @@ bwild: Makefile ../lib/libbac$(DEFAULT_A bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bbatch.o $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \ - -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + -lbacsql -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o \ - -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + -lbacsql -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ing_test.o $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o \ - -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) + -lbacsql -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) gigaslam.o: gigaslam.c $(CXX) $(CFLAGS) -c $<