From c661f5bea015ce0f8d72693e1999c4afd6f91388 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Fri, 3 Feb 2012 08:41:08 +0000 Subject: main/bacula-client: upgrade to 5.2.5 --- main/bacula-client/APKBUILD | 14 +- main/bacula-client/bacula-5.0.1-dsolink.patch | 11 -- main/bacula-client/bacula-5.0.3-as-needed.patch | 33 ----- main/bacula-client/bacula-5.0.3-dsolink.patch | 165 ------------------------ main/bacula-client/bacula-5.0.3-mysql55.patch | 11 -- 5 files changed, 3 insertions(+), 231 deletions(-) delete mode 100644 main/bacula-client/bacula-5.0.1-dsolink.patch delete mode 100644 main/bacula-client/bacula-5.0.3-as-needed.patch delete mode 100644 main/bacula-client/bacula-5.0.3-dsolink.patch delete mode 100644 main/bacula-client/bacula-5.0.3-mysql55.patch (limited to 'main/bacula-client') diff --git a/main/bacula-client/APKBUILD b/main/bacula-client/APKBUILD index 337cb6a601..e0c8f373d5 100644 --- a/main/bacula-client/APKBUILD +++ b/main/bacula-client/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Leonardo Arena pkgname="bacula-client" _realname="bacula" -pkgver=5.0.3 -pkgrel=8 +pkgver=5.2.5 +pkgrel=0 pkgdesc="Client (File Daemon) of Bacula, a network based backup program" url="http://www.bacula.org" arch="all" @@ -15,15 +15,11 @@ subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/project/$_realname/$_realname/$pkgver/$_realname-$pkgver.tar.gz bacula-fd-init bacula-fd-conf - bacula-5.0.1-dsolink.patch bacula-5.0.2-config.patch bacula-5.0.2-openssl.patch bacula-5.0.2-python27.patch bacula-5.0.3-Makefile.patch - bacula-5.0.3-as-needed.patch - bacula-5.0.3-dsolink.patch bacula-5.0.3-log-path.patch - bacula-5.0.3-mysql55.patch bacula-5.0.3-sqlite-priv.patch configure.in.patch cxx.patch @@ -80,18 +76,14 @@ package() { find "$pkgdir" -iname *.la -delete } -md5sums="9de254ae39cab0587fdb2f5d8d90b03b bacula-5.0.3.tar.gz +md5sums="89bd0ecf7ce0afbb222f47a01fa9a370 bacula-5.2.5.tar.gz 38b0fe78acdc5e65aec3a59578e98a20 bacula-fd-init 4500ce2d62bf9df33c07f70dc40f7b85 bacula-fd-conf -eee101f1b7b6b4f2c140898db5f8123b bacula-5.0.1-dsolink.patch 71f7f9c041eff045b2e97d141316c059 bacula-5.0.2-config.patch 4e310e84c7aba5b8d043758e0fa0088f bacula-5.0.2-openssl.patch 13e511698b5dc376e673c963a848d364 bacula-5.0.2-python27.patch 0ec20df57bb632ed729cfaf5d0a3ee33 bacula-5.0.3-Makefile.patch -76267747f4d2e85e033cc6793ccb6afa bacula-5.0.3-as-needed.patch -82d3a5c113c633bf0bd86ac3590baaff bacula-5.0.3-dsolink.patch 9bde1e9d43146af8985ff62d491d7218 bacula-5.0.3-log-path.patch -def9da0c090141dcef817d80c1a29fd1 bacula-5.0.3-mysql55.patch 9def0e68e3eb2f5f8b4c34108a248efd bacula-5.0.3-sqlite-priv.patch ebc9c2bbc9be95c920723a3f142d8e19 configure.in.patch 1bfdbfea7a36d5503753414dffb953eb cxx.patch diff --git a/main/bacula-client/bacula-5.0.1-dsolink.patch b/main/bacula-client/bacula-5.0.1-dsolink.patch deleted file mode 100644 index 1669cecb68..0000000000 --- a/main/bacula-client/bacula-5.0.1-dsolink.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bacula-5.0.1/src/qt-console/bat.pro.in~ 2010-02-24 09:33:48.000000000 -0600 -+++ bacula-5.0.1/src/qt-console/bat.pro.in 2010-03-11 17:12:44.645296544 -0600 -@@ -20,7 +20,7 @@ - TARGET = bat - DEPENDPATH += . - INCLUDEPATH += .. . ./console ./restore ./select --LIBS += -L../lib -lbaccfg -lbac @OPENSSL_LIBS@ -+LIBS += -L../lib -lbaccfg -lbac -ldl @OPENSSL_LIBS@ - LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link - LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install - QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) diff --git a/main/bacula-client/bacula-5.0.3-as-needed.patch b/main/bacula-client/bacula-5.0.3-as-needed.patch deleted file mode 100644 index 3603e936bb..0000000000 --- a/main/bacula-client/bacula-5.0.3-as-needed.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN bacula-5.0.3.orig/src/findlib/Makefile.in bacula-5.0.3/src/findlib/Makefile.in ---- bacula-5.0.3.orig/src/findlib/Makefile.in 2010-02-24 16:33:48.000000000 +0100 -+++ bacula-5.0.3/src/findlib/Makefile.in 2010-03-22 17:37:43.772805754 +0100 -@@ -59,7 +59,7 @@ - - libbacfind.la: Makefile $(LIBBACFIND_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS) - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ -diff -urN bacula-5.0.1.orig/src/lib/Makefile.in bacula-5.0.1/src/lib/Makefile.in ---- bacula-5.0.1.orig/src/lib/Makefile.in 2010-02-24 16:33:48.000000000 +0100 -+++ bacula-5.0.1/src/lib/Makefile.in 2010-03-22 17:37:05.352226188 +0100 -@@ -126,7 +126,7 @@ - - libbac.la: Makefile $(LIBBAC_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(LIBS) $(OPENSSL_LIBS) - - libbaccfg.a: $(LIBBACCFG_OBJS) - @echo "Making $@ ..." -@@ -135,7 +135,7 @@ - - libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) - @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(LIBS) $(OPENSSL_LIBS) - - libbacpy.a: $(LIBBACPY_OBJS) - @echo "Making $@ ..." diff --git a/main/bacula-client/bacula-5.0.3-dsolink.patch b/main/bacula-client/bacula-5.0.3-dsolink.patch deleted file mode 100644 index 44309dad86..0000000000 --- a/main/bacula-client/bacula-5.0.3-dsolink.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- bacula-5.0.3/src/qt-console/bat.pro.in~ 2010-08-10 11:27:17.000000000 -0500 -+++ bacula-5.0.3/src/qt-console/bat.pro.in 2010-08-10 12:32:00.312182153 -0500 -@@ -20,7 +20,7 @@ - TARGET = bat - DEPENDPATH += . - INCLUDEPATH += .. . ./console ./restore ./select --LIBS += -L../lib -lbaccfg -lbac -ldl @OPENSSL_LIBS@ -+LIBS += -L../lib -lbaccfg -lbac -ldl -lz @OPENSSL_LIBS@ - LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link - LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install - QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) ---- bacula-5.0.3/src/tools/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500 -+++ bacula-5.0.3/src/tools/Makefile.in 2010-08-11 12:54:02.028450916 -0500 -@@ -57,7 +57,7 @@ - @echo " " - - bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm -lz $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) ---- bacula-5.0.3/src/tools/Makefile.in~ 2010-08-11 12:57:29.000000000 -0500 -+++ bacula-5.0.3/src/tools/Makefile.in 2010-08-11 14:10:52.998447849 -0500 -@@ -64,7 +64,7 @@ - - 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 -lz $(DB_LIBS) $(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 \ ---- bacula-5.0.3/src/tools/Makefile.in~ 2010-08-11 14:13:51.000000000 -0500 -+++ bacula-5.0.3/src/tools/Makefile.in 2010-08-11 15:11:00.309447155 -0500 -@@ -97,7 +97,7 @@ - - bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o - $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \ -- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -+ $(DLIB) -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - 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 \ ---- bacula-5.0.3/src/tools/Makefile.in~ 2010-08-12 06:57:25.000000000 -0500 -+++ bacula-5.0.3/src/tools/Makefile.in 2010-08-12 07:58:13.545781384 -0500 -@@ -93,7 +93,7 @@ - - bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o - $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \ -- $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -+ $(DLIB) -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o - $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \ ---- bacula-5.0.3/src/stored/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500 -+++ bacula-5.0.3/src/stored/Makefile.in 2010-08-12 08:56:11.053777811 -0500 -@@ -91,7 +91,7 @@ - bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(FDLIBS) \ -- -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ -+ -lbacpy -lbaccfg -lbac -lm -lz $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ - $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) - - static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ---- bacula-5.0.3/src/stored/Makefile.in~ 2010-08-12 08:59:17.000000000 -0500 -+++ bacula-5.0.3/src/stored/Makefile.in 2010-08-12 10:24:42.478529732 -0500 -@@ -117,7 +117,7 @@ - bls: Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Compiling $<" - $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ -- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -+ -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bextract.o: bextract.c - @echo "Compiling $<" ---- bacula-5.0.3/src/stored/Makefile.in~ 2010-08-12 10:27:36.000000000 -0500 -+++ bacula-5.0.3/src/stored/Makefile.in 2010-08-12 11:45:39.904529074 -0500 -@@ -127,7 +127,7 @@ - bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Compiling $<" - $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \ -- -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -+ -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bscan.o: bscan.c - @echo "Compiling $<" ---- bacula-5.0.3/src/stored/Makefile.in~ 2010-08-12 11:48:22.000000000 -0500 -+++ bacula-5.0.3/src/stored/Makefile.in 2010-08-12 13:21:02.246528324 -0500 -@@ -136,7 +136,7 @@ - - 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 $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bcopy.o: bcopy.c - @echo "Compiling $<" ---- bacula-5.0.3/src/stored/Makefile.in~ 2010-08-12 13:23:58.000000000 -0500 -+++ bacula-5.0.3/src/stored/Makefile.in 2010-08-12 14:31:11.204777284 -0500 -@@ -107,7 +107,7 @@ - - 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) -+ -lbacsql -lbaccfg -lbac $(DLIB) -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - bls.o: bls.c - @echo "Compiling $<" ---- bacula-5.0.3/src/stored/Makefile.in~ 2010-08-13 07:02:47.000000000 -0500 -+++ bacula-5.0.3/src/stored/Makefile.in 2010-08-13 08:25:50.830920608 -0500 -@@ -145,7 +145,7 @@ - - bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \ -- -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -+ -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ ---- bacula-5.0.3/src/dird/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500 -+++ bacula-5.0.3/src/dird/Makefile.in 2010-08-13 09:25:38.855168511 -0500 -@@ -64,7 +64,7 @@ - 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 -lz $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(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) ---- bacula-5.0.3/src/console/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500 -+++ bacula-5.0.3/src/console/Makefile.in 2010-08-13 10:26:18.001169569 -0500 -@@ -48,7 +48,7 @@ - - bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ -- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ -+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm -lz $(LIBS) $(GETTEXT_LIBS) \ - $(OPENSSL_LIBS) - - static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ---- bacula-5.0.3/src/wx-console/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500 -+++ bacula-5.0.3/src/wx-console/Makefile.in 2010-08-13 11:28:43.829917394 -0500 -@@ -83,7 +83,7 @@ - - bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ -L../lib $(CONS_LDFLAGS) \ -- -lbaccfg -lbac $(LIBS) $(OPENSSL_LIBS) -+ -lbaccfg -lbac -lz $(LIBS) $(OPENSSL_LIBS) - - win32: bwx-console_private.res - ---- bacula-5.0.3/src/tray-monitor/Makefile.in~ 2010-08-05 09:29:51.000000000 -0500 -+++ bacula-5.0.3/src/tray-monitor/Makefile.in 2010-08-13 12:34:18.573918720 -0500 -@@ -45,7 +45,7 @@ - - bacula-tray-monitor: Makefile $(MONITOROBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -o $@ \ -- $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm $(LIBS) $(OPENSSL_LIBS) -+ $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm -lz $(LIBS) $(OPENSSL_LIBS) - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ diff --git a/main/bacula-client/bacula-5.0.3-mysql55.patch b/main/bacula-client/bacula-5.0.3-mysql55.patch deleted file mode 100644 index 910ea02302..0000000000 --- a/main/bacula-client/bacula-5.0.3-mysql55.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/cats/mysql.c~ 2010-08-05 09:29:51.000000000 -0500 -+++ ./src/cats/mysql.c 2011-01-06 11:28:59.907306001 -0600 -@@ -292,7 +292,7 @@ - void db_thread_cleanup() - { - #ifndef HAVE_WIN32 -- my_thread_end(); -+ mysql_thread_end(); - #endif - } - -- cgit v1.2.3