[Pkg-samba-maint] [samba] 02/03: Build samba-cluster-support as built-in library, since its dependencies are broken.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch experimental
in repository samba.

commit 10f573b7b9b2888c5c8055e5854c8baec749640c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Sep 28 01:00:59 2015 +0000

    Build samba-cluster-support as built-in library, since its dependencies are broken.
---
 debian/changelog                      |  2 ++
 debian/patches/fix-cluster-build.diff | 13 +++++++++++++
 debian/patches/series                 |  1 +
 debian/rules                          |  2 +-
 source3/wscript_build                 |  2 +-
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c32662d..70e38bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 samba (2:4.3.0+dfsg-2) UNRELEASED; urgency=medium
 
   * Re-enable cluster support.
+   + Build samba-cluster-support as built-in library, since its dependencies
+     are broken.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Mon, 28 Sep 2015 00:34:51 +0000
 
diff --git a/debian/patches/fix-cluster-build.diff b/debian/patches/fix-cluster-build.diff
new file mode 100644
index 0000000..afbb021
--- /dev/null
+++ b/debian/patches/fix-cluster-build.diff
@@ -0,0 +1,13 @@
+diff --git a/source3/wscript_build b/source3/wscript_build
+index ace4b99..c6e35dd 100755
+--- a/source3/wscript_build
++++ b/source3/wscript_build
+@@ -209,7 +209,7 @@ bld.SAMBA3_LIBRARY('smbregistry',
+                    registry/reg_init_basic.c''',
+                    deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
+                    replace util_reg samba-util samba-security
+-                   errors3 dbwrap samba3-util''',
++                   errors3 dbwrap samba3-util samba3util''',
+                    allow_undefined_symbols=True,
+                    private_library=True)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 16bb934..2c9d5a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ add-so-version-to-private-libraries
 xsltproc_dont_build_smb.conf.5.patch
 heimdal-rfc3454.txt
 Fix-privacy-breach-on-google.com.patch
+fix-cluster-build.diff
diff --git a/debian/rules b/debian/rules
index 4388018..1ff9494 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ conf_args = \
 		--disable-rpath \
 		--disable-rpath-install \
 		--bundled-libraries=NONE,pytevent,iniparser,roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,com_err,compile_et,asn1_compile \
-		--builtin-libraries=replace,ccan \
+		--builtin-libraries=replace,ccan,samba-cluster-support \
 		--minimum-library-version="$(shell ./debian/autodeps.py --minimum-library-version)" \
 		--with-cluster-support
 
diff --git a/source3/wscript_build b/source3/wscript_build
index ace4b99..c6e35dd 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -209,7 +209,7 @@ bld.SAMBA3_LIBRARY('smbregistry',
                    registry/reg_init_basic.c''',
                    deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
                    replace util_reg samba-util samba-security
-                   errors3 dbwrap samba3-util''',
+                   errors3 dbwrap samba3-util samba3util''',
                    allow_undefined_symbols=True,
                    private_library=True)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git