Build-depend on reverted ldb version (with increased epoch)

3 files changed, 6 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 33e882ca15..6f4e8c0cd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ samba (2:4.1.17+dfsg-1) UNRELEASED; urgency=medium
   * Add new smbtorture test rpc.schannel_anon_setpw to detect the conditions
     leading to CVE-2015-0240.
   * Add breaks on qtsmbstatus-server (<< 2.2.1-3~). Closes: #775041
+  * Build-depend on reverted ldb version (with increased epoch).
 
  -- Ivo De Decker <ivodd@debian.org>  Sun, 22 Feb 2015 19:53:54 +0100
 
diff --git a/debian/control b/debian/control
index 335d7dc193..f4d3325ddf 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends: bison,
                libgnutls28-dev,
                libheimntlm0-heimdal (>= 1.6~),
                libldap2-dev,
-               libldb-dev (>= 1:1.1.18~),
+               libldb-dev (>= 2:1.1.17~),
                libncurses5-dev,
                libntdb-dev (>= 1.0),
                libpam0g-dev,
@@ -48,8 +48,8 @@ Build-Depends: bison,
                po-debconf,
                python-all-dev (>= 2.6.6-3),
                python-dnspython,
-               python-ldb (>= 1:1.1.18~),
-               python-ldb-dev (>= 1:1.1.18~),
+               python-ldb (>= 2:1.1.17~),
+               python-ldb-dev (>= 2:1.1.17~),
                python-ntdb,
                python-talloc-dev (>= 2.0.8~),
                python-tdb (>= 1.2.11~),
diff --git a/debian/rules b/debian/rules
index 383385c764..f43ae8c20a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,12 @@ PYVERS=$(shell pyversions -vr)
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LDB_VERSION = $(shell pkg-config --modversion ldb)
+LDB_EPOCH = $(shell dpkg-query -f '$${Version}' -W libldb-dev | sed 's/:.*//')
 LDB_NEXT_VERSION = $(shell python -c "x = '$(LDB_VERSION)'.split('.'); x[-1] = str(int(x[-1])+1); print '.'.join(x)")
 # samba ships ldb modules, which are specific to the ldb version, so we need a
 # strict dependency on the upstream ldb version
 # this also mean samba needs a rebuild when the upstream ldb version changes
-LDB_DEPENDS = "libldb1 (<< 1:$(LDB_NEXT_VERSION)~), libldb1 (>> 1:$(LDB_VERSION)~)"
+LDB_DEPENDS = "libldb1 (<< $(LDB_EPOCH):$(LDB_NEXT_VERSION)~), libldb1 (>> $(LDB_EPOCH):$(LDB_VERSION)~)"
 export PYSHORT=$(shell pyversions -d)
 export PYTHON=$(shell which $(PYSHORT))
 export PYTHON_CONFIG="$(PYTHON)-config"