Merge ~lucaskanashiro/ubuntu/+source/nsscache:fix-test-with-new-openldap into ubuntu/+source/nsscache:ubuntu/devel

[Lucas Kanashiro]

Re-apply patch to fix autopkgtest with the OpenLDAP 2.5.x., with the proposed branch autopkgtest is happy again:

autopkgtest [18:09:12]: @@@@@@@@@@@@@@@@@@@@ summary
slapd-regtest PASS

[Sergio Durigan Junior (sergiodj)]

+1, LGTM. Thanks, Lucas.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the quick review Sergio, package uploaded:

$ git push pkg upload/0.42-1ubuntu1
Enumerating objects: 19, done.
Counting objects: 100% (19/19), done.
Delta compression using up to 32 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (13/13), 1.66 KiB | 1.66 MiB/s, done.
Total 13 (delta 9), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/nsscache
 * [new tag] upload/0.42-1ubuntu1 -> upload/0.42-1ubuntu1
$ dput ubuntu ../nsscache_0.42-1ubuntu1_source.changes Checking signature on .changes
gpg: ../nsscache_0.42-1ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../nsscache_0.42-1ubuntu1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading nsscache_0.42-1ubuntu1.dsc: done.
  Uploading nsscache_0.42-1ubuntu1.debian.tar.xz: done.
  Uploading nsscache_0.42-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Bryce Harrington (bryce)]

This has migrated

* nsscache: fix-test-with-new-openldap -> ubuntu/devel
  - Current Version: 0.42-1ubuntu1
  - Proposed Version: None
  - Debian Version: 0.42-1ubuntu1
  - New Version: 0.42-1ubuntu1
  - Migrated: True

diff --git a/debian/changelog b/debian/changelog
index 2cee5db..5e3d6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nsscache (0.42-1ubuntu1) impish; urgency=medium
+
+  [ Sergio Durigan Junior ]
+  * d/t/slapd.conf.tmpl: Use MDB instead of BDB as the OpenLDAP backend,
+    because OpenLDAP 2.5.x removed support for BDB. (Closes #990172)
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 17 Aug 2021 18:00:28 -0300
+
 nsscache (0.42-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6ea2abc..3667860 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: nsscache
 Section: admin
 Priority: optional
-Maintainer: Jamie Wilkinson <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jamie Wilkinson <[e-mail]>
 Build-Depends: debhelper (>= 12~), python3, dh-python, python3-pycurl, python3-ldap, python3-mox3, python3-bsddb3, libnss-db, tzdata, python3-pytest-runner, python3-pytest, python3-boto3
 Standards-Version: 4.5.1
 Homepage: https://github.com/google/nsscache
diff --git a/tests/slapd.conf.tmpl b/tests/slapd.conf.tmpl
index 798a582..d197cf9 100644
--- a/tests/slapd.conf.tmpl
+++ b/tests/slapd.conf.tmpl
@@ -6,8 +6,8 @@ loglevel -1
 pidfile @workdir@/slapd.pid
 
 
-moduleload back_bdb.la
+moduleload back_mdb.la
 
-database bdb
+database mdb
 suffix "dc=example,dc=com"
 directory @workdir@/ldap