[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-121-g2b82cc6

[Luca Capello]

The following commit has been merged in the master branch:
commit 2b82cc6db4bf9323593c156eea0163c718ff6096
Author: Luca Capello <luca at pca.it>
Date:   Thu May 31 21:19:36 2012 +0200

    debian/patches/fix-binutils-gold-linking.patch: from upstream BTS

diff --git a/debian/changelog b/debian/changelog
index 49dc25f..120aefe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
   * debian/patches/switch-nonfree-sha1-to-openssl.patch
     (Closes: #658326):
     + switch from upstream nonfree SHA1 implementation to openssl
-  * debian/patches/fix-binutils-gold-linking.patch (Closes: #553956):
-    + fix linking with binutils-gold.
   * debian/patches/fix-readline-ncurses-depends.patch
     (Closes: #646730):
     + fix ncurses requirement for readline-compiled bconsole, thanks
@@ -92,6 +90,11 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
     + Add manual pages for /usr/sbin/b{wild,regex}.
 
   [ Luca Capello ]
+  * debian/control:
+    + add automake and libltdl-dev to Build-Depends: for binutils-gold
+      upstream patch.
+  * debian/patches/fix-binutils-gold-linking.patch:
+    + import from upstream BTS (Closes: #553956).
   * debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch:
     + import from Debian Git commit:fc7990a.
   * debian/patches/upstream___Add-missing-bwild-bregex-man8-pages.patch:
@@ -101,6 +104,7 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
   * debian/rules:
     + add --with-dump-email=root and --with-job-email=root to CONF_ALL,
       thus removing the '@localhost' domain part (Closes: #519567).
+    + call aclocal to include ltdl.m4 for binutils-gold upstream patch.
 
   [ Martin Pitt ]
   * debian/control (Closes: #639466):
diff --git a/debian/control b/debian/control
index e3c74db..17f8636 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian Bacula packaging Group <pkg-bacula-devel at lists.alioth.debian.org>
 Uploaders: Jan Hauke Rahm <jhr at debian.org>
-Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf,
+Build-Depends: autotools-dev, autoconf, automake, libltdl-dev, debhelper (>= 8.1.3), po-debconf,
  zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev
  (>= 9.1), postgresql-server-dev-all, libwrap0-dev, python-dev, libgtk2.0-dev,
  libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc,
diff --git a/debian/patches/fix-binutils-gold-linking.patch b/debian/patches/fix-binutils-gold-linking.patch
index 62cebb4..09be875 100644
--- a/debian/patches/fix-binutils-gold-linking.patch
+++ b/debian/patches/fix-binutils-gold-linking.patch
@@ -1,18 +1,57 @@
-Description: Fix linking with binutils-gold
+Description: Fix bug #1870 GNU binutils-gold build failure.
+ Use some extra libtool magic to determine what lib to use
+ to get dlopen and friends for loading plugins from libbac.
 Bug-Debian: 553956
 Bug: http://bugs.bacula.org/view.php?id=1870
-Author: Alexander Golovko <alexandro at ankalagon.ru>
+Author: Marco van Wieringen <mvw at planets.elm.net>
 Reviewed-by: Luca Capello <luca at pca.it>
-Last-Update: 2012-05-17
+Last-Update: 2012-05-31
 
---- a/src/lib/Makefile.in	2012-05-09 21:41:20.000000000 +0400
-+++ b/src/lib/Makefile.in	2012-05-13 12:58:33.004628289 +0400
+---
+ bacula/autoconf/Make.common.in |    1 +
+ bacula/autoconf/aclocal.m4     |    1 +
+ bacula/autoconf/configure.in   |    1 +
+ bacula/src/lib/Makefile.in     |    2 +-
+ 4 files changed, 4 insertions(+), 1 deletions(-)
+
+--- a/autoconf/Make.common.in
++++ b/autoconf/Make.common.in
+@@ -91,6 +91,7 @@
+ PYTHON_LIBS = @PYTHON_LIBS@
+ PYTHON_INC = @PYTHON_INCDIR@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
++DLLIBS = @LIBADD_DLOPEN@
+ BDB_CPPFLAGS = @BDB_CPPFLAGS@
+ BDB_LIBS = @BDB_LIBS@
+ 
+--- a/autoconf/aclocal.m4
++++ b/autoconf/aclocal.m4
+@@ -16,6 +16,7 @@
+ m4_include([libtool/ltsugar.m4])
+ m4_include([libtool/ltversion.m4])
+ m4_include([libtool/lt~obsolete.m4])
++m4_include([libtool/ltdl.m4])
+ m4_include([gettext-macros/codeset.m4])
+ m4_include([gettext-macros/gettext.m4])
+ m4_include([gettext-macros/glibc2.m4])
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -173,6 +173,7 @@
+    ]
+ )
+ LT_INIT([shared disable-static])
++LT_LIB_DLLOAD
+ LT_LANG([C++])
+ 
+ if test x$use_libtool != xno; then
+--- a/src/lib/Makefile.in
++++ b/src/lib/Makefile.in
 @@ -119,7 +119,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) -ldl -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) $(DLLIBS)
  
  libbaccfg.a: $(LIBBACCFG_OBJS) 
  	@echo "Making $@ ..."
diff --git a/debian/rules b/debian/rules
index 09f0bf0..344cba0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,6 +141,7 @@ override_dh_installdocs:
 	dh_installdocs -Nbacula
 
 override_dh_auto_build: maintfiles
+	(cd autoconf && aclocal -I bacula-macros -I gettext-macros -I libtool)
 	autoconf -I autoconf/ -o configure autoconf/configure.in
 	dh_prep
 	dh_installdirs

-- 
Bacula, a network backup, recovery and verification program