diff options
Diffstat (limited to 'packages/app-backup/bacula/files')
3 files changed, 78 insertions, 68 deletions
diff --git a/packages/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch b/packages/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch deleted file mode 100644 index 458c188..0000000 --- a/packages/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- src/console/Makefile.in.orig 2011-10-30 14:10:41.100802721 -0400 -+++ src/console/Makefile.in 2011-10-30 14:14:42.330488174 -0400 -@@ -29,10 +29,11 @@ - GETTEXT_LIBS = @LIBINTL@ - - CONS_INC=@CONS_INC@ - CONS_LIBS=@CONS_LIBS@ - CONS_LDFLAGS=@CONS_LDFLAGS@ -+ZLIBS=@ZLIBS@ - - .SUFFIXES: .c .o - .PHONY: - .DONTCARE: - -@@ -46,17 +47,17 @@ - @echo " " - - - bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ -+ $(OPENSSL_LIBS) $(LIBS) - - static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ -+ $(OPENSSL_LIBS) $(LIBS) $(ZLIBS) - strip $@ - - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ ---- src/filed/Makefile.in.orig 2012-06-28 16:52:03.000000000 +0200 -+++ src/filed/Makefile.in 2012-08-16 11:08:09.000000000 +0200 -@@ -96,13 +96,13 @@ - bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) -+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) - - static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) -+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) - strip $@ - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/packages/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch b/packages/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch deleted file mode 100644 index 8c419a3..0000000 --- a/packages/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch +++ /dev/null @@ -1,12 +0,0 @@ -# fix file not found error during make depend ---- src/tools/Makefile.in.orig 2012-09-20 20:42:54.000000000 +0200 -+++ src/tools/Makefile.in 2012-09-20 20:35:46.000000000 +0200 -@@ -194,7 +194,7 @@ - @$(MV) Makefile Makefile.bak - @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile - @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile -- @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile -+ @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile - @if test -f Makefile ; then \ - $(RMF) Makefile.bak; \ - else \ diff --git a/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch b/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch new file mode 100644 index 0000000..722123b --- /dev/null +++ b/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch @@ -0,0 +1,78 @@ +diff --git a/configure b/configure +index 99bb43c8e..cefcbca9f 100755 +--- a/configure ++++ b/configure +@@ -846,7 +846,7 @@ AWK + PIDOF + GMAKE + QMAKE +-PKGCONFIG ++PKG_CONFIG + DVDRWFORMAT + DVDRWMEDIAINFO + GROWISOFS +@@ -5600,12 +5600,12 @@ fi + set dummy pkg-config; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_PKGCONFIG+:} false; then : ++if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 + else +- case $PKGCONFIG in ++ case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) +- ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -5615,7 +5615,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5623,14 +5623,14 @@ done + done + IFS=$as_save_IFS + +- test -z "$ac_cv_path_PKGCONFIG" && ac_cv_path_PKGCONFIG="pkg-config" ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="pkg-config" + ;; + esac + fi +-PKGCONFIG=$ac_cv_path_PKGCONFIG +-if test -n "$PKGCONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +-$as_echo "$PKGCONFIG" >&6; } ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -21843,19 +21843,7 @@ fi + + BAT_DIR= + if test x$support_bat = xyes; then +- abc=`$PKGCONFIG QtGui` +- pkg=$? +- if test $pkg = 0; then +- BAT_DIR=src/qt-console +- else +- abc=`$PKGCONFIG Qt5Gui` +- pkg=$? +- if test $pkg = 0; then + BAT_DIR="src/qt-console src/qt-console/tray-monitor" +- else +- as_fn_error $? "Unable to find either Qt4 or Qt5 installation needed by bat" "$LINENO" 5 +- fi +- fi + fi + + |