Hi,
The --disable-libtool configure option is broken in 5.2.1 and the attached
patches address the issues (on FreeBSD 8 at least).
bacula-5.2.1-bscan-dblibs.patch defines DB_LIBS (this is an independent bug).
bacula-5.2.1-tools-lib-order.patch puts the libraries in the correct order for
linking (another independent bug).
bacula-5.2.1-binflate.patch adds a new file src/lib/binflate.c and moves
Zdeflate and Zinflate into it from src/lib/bsys.c, to allow various
executables to link with bsys.o without pulling in functions that need libz.
This is needed because some of Bacula's executables don't link with libz, but
they do use code from bsys.c.
__Martin
--- src/stored/Makefile.in 2011-10-30 12:03:42.000000000 +0000
+++ src/stored/Makefile.in 2011-11-02 13:43:52.472109304 +0000
@@ -18,6 +18,8 @@
GETTEXT_LIBS = @LIBINTL@
+DB_LIBS=@DB_LIBS@
+
first_rule: all
dummy:
--- src/tools/Makefile.in 2011-10-30 12:03:42.000000000 +0000
+++ src/tools/Makefile.in 2011-11-02 13:49:40.736755271 +0000
@@ -66,7 +66,7 @@
dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o
$(DIRCONFOBJS) \
- -lbacsql -lbaccats -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS)
$(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ -lbaccats -lbacsql -lbaccfg -lbac -lm $(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 \
@@ -105,17 +105,17 @@
bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@
bbatch.o \
- -lbacsql -lbaccats -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS)
$(OPENSSL_LIBS)
+ -lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS)
$(OPENSSL_LIBS)
bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib
-L../findlib -o $@ bvfs_test.o \
- -lbacsql -lbaccats -lbacfind -lbac -lm $(DB_LIBS) $(LIBS)
$(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS)
$(GETTEXT_LIBS) $(OPENSSL_LIBS)
ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ing_test.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib
-L../findlib -o $@ ing_test.o \
- -lbacsql -lbaccats -lbacfind -lbac -lm $(DB_LIBS) $(LIBS)
$(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS)
$(GETTEXT_LIBS) $(OPENSSL_LIBS)
cats_test.o: cats_test.c
echo "Compiling $<"
@@ -123,7 +123,7 @@
cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
cats_test.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib
-L../findlib -o $@ cats_test.o \
- -lbacsql -lbaccats -lbacfind -lbac -lm $(DB_LIBS) $(LIBS)
$(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS)
$(GETTEXT_LIBS) $(OPENSSL_LIBS)
gigaslam.o: gigaslam.c
$(CXX) $(CFLAGS) -c $<
--- src/lib/Makefile.in 2011-10-30 12:03:42.000000000 +0000
+++ src/lib/Makefile.in 2011-11-02 13:34:22.525688922 +0000
@@ -48,7 +48,7 @@
#
# libbac
#
-LIBBAC_SRCS = attr.c base64.c berrno.c bsys.c bget_msg.c \
+LIBBAC_SRCS = attr.c base64.c berrno.c bsys.c binflate.c bget_msg.c \
bnet.c bnet_server.c runscript.c \
bsock.c bpipe.c bsnprintf.c btime.c \
cram-md5.c crc32.c crypto.c daemon.c edit.c fnmatch.c \
--- src/lib/binflate.c 1970-01-01 01:00:00.000000000 +0100
+++ src/lib/binflate.c 2011-11-02 13:32:47.550783940 +0000
@@ -0,0 +1,113 @@
+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version three of the GNU Affero General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of Kern Sibbald.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:f...@fsfeurope.org.
+*/
+/*
+ * Bacula zlib compression wrappers
+ *
+ */
+
+#include "bacula.h"
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
+
+/*
+ * Deflate or compress and input buffer. You must supply an
+ * output buffer sufficiently long and the length of the
+ * output buffer. Generally, if the output buffer is the
+ * same size as the input buffer, it should work (at least
+ * for text).
+ */
+int Zdeflate(char *in, int in_len, char *out, int &out_len)
+{
+#ifdef HAVE_LIBZ
+ z_stream strm;
+ int ret;
+
+ /* allocate deflate state */
+ strm.zalloc = Z_NULL;
+ strm.zfree = Z_NULL;
+ strm.opaque = Z_NULL;
+ ret = deflateInit(&strm, 9);
+ if (ret != Z_OK) {
+ Dmsg0(200, "deflateInit error\n");
+ (void)deflateEnd(&strm);
+ return ret;
+ }
+
+ strm.next_in = (Bytef *)in;
+ strm.avail_in = in_len;
+ Dmsg1(200, "In: %d bytes\n", strm.avail_in);
+ strm.avail_out = out_len;
+ strm.next_out = (Bytef *)out;
+ ret = deflate(&strm, Z_FINISH);
+ out_len = out_len - strm.avail_out;
+ Dmsg1(200, "compressed=%d\n", out_len);
+ (void)deflateEnd(&strm);
+ return ret;
+#else
+ return 1;
+#endif
+}
+
+/*
+ * Inflate or uncompress an input buffer. You must supply
+ * and output buffer and an output length sufficiently long
+ * or there will be an error. This uncompresses in one call.
+ */
+int Zinflate(char *in, int in_len, char *out, int &out_len)
+{
+#ifdef HAVE_LIBZ
+ z_stream strm;
+ int ret;
+
+ /* allocate deflate state */
+ strm.zalloc = Z_NULL;
+ strm.zfree = Z_NULL;
+ strm.opaque = Z_NULL;
+ strm.next_in = (Bytef *)in;
+ strm.avail_in = in_len;
+ ret = inflateInit(&strm);
+ if (ret != Z_OK) {
+ Dmsg0(200, "inflateInit error\n");
+ (void)inflateEnd(&strm);
+ return ret;
+ }
+
+ Dmsg1(200, "In len: %d bytes\n", strm.avail_in);
+ strm.avail_out = out_len;
+ strm.next_out = (Bytef *)out;
+ ret = inflate(&strm, Z_FINISH);
+ out_len -= strm.avail_out;
+ Dmsg1(200, "Uncompressed=%d\n", out_len);
+ (void)inflateEnd(&strm);
+ return ret;
+#else
+ return 1;
+#endif
+}
+
--- src/lib/bsys.c 2011-10-30 12:03:42.000000000 +0000
+++ src/lib/bsys.c 2011-11-02 13:32:23.375570927 +0000
@@ -35,9 +35,6 @@
*/
#include "bacula.h"
-#ifdef HAVE_LIBZ
-#include <zlib.h>
-#endif
static pthread_mutex_t timer_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -680,82 +677,6 @@
return escaped_path;
}
-/*
- * Deflate or compress and input buffer. You must supply an
- * output buffer sufficiently long and the length of the
- * output buffer. Generally, if the output buffer is the
- * same size as the input buffer, it should work (at least
- * for text).
- */
-int Zdeflate(char *in, int in_len, char *out, int &out_len)
-{
-#ifdef HAVE_LIBZ
- z_stream strm;
- int ret;
-
- /* allocate deflate state */
- strm.zalloc = Z_NULL;
- strm.zfree = Z_NULL;
- strm.opaque = Z_NULL;
- ret = deflateInit(&strm, 9);
- if (ret != Z_OK) {
- Dmsg0(200, "deflateInit error\n");
- (void)deflateEnd(&strm);
- return ret;
- }
-
- strm.next_in = (Bytef *)in;
- strm.avail_in = in_len;
- Dmsg1(200, "In: %d bytes\n", strm.avail_in);
- strm.avail_out = out_len;
- strm.next_out = (Bytef *)out;
- ret = deflate(&strm, Z_FINISH);
- out_len = out_len - strm.avail_out;
- Dmsg1(200, "compressed=%d\n", out_len);
- (void)deflateEnd(&strm);
- return ret;
-#else
- return 1;
-#endif
-}
-
-/*
- * Inflate or uncompress an input buffer. You must supply
- * and output buffer and an output length sufficiently long
- * or there will be an error. This uncompresses in one call.
- */
-int Zinflate(char *in, int in_len, char *out, int &out_len)
-{
-#ifdef HAVE_LIBZ
- z_stream strm;
- int ret;
-
- /* allocate deflate state */
- strm.zalloc = Z_NULL;
- strm.zfree = Z_NULL;
- strm.opaque = Z_NULL;
- strm.next_in = (Bytef *)in;
- strm.avail_in = in_len;
- ret = inflateInit(&strm);
- if (ret != Z_OK) {
- Dmsg0(200, "inflateInit error\n");
- (void)inflateEnd(&strm);
- return ret;
- }
-
- Dmsg1(200, "In len: %d bytes\n", strm.avail_in);
- strm.avail_out = out_len;
- strm.next_out = (Bytef *)out;
- ret = inflate(&strm, Z_FINISH);
- out_len -= strm.avail_out;
- Dmsg1(200, "Uncompressed=%d\n", out_len);
- (void)inflateEnd(&strm);
- return ret;
-#else
- return 1;
-#endif
-}
-
#if HAVE_BACKTRACE && HAVE_GCC
#include <cxxabi.h>
#include <execinfo.h>
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Bacula-devel mailing list
Bacula-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-devel
