Merge ~sergiodj/ubuntu/+source/volatildap:fix-autopkgtest-openldap-2.5.5 into ubuntu/+source/volatildap:ubuntu/devel

[Sergio Durigan Junior]

This MP fixes the autopkgtest for volatildap when using OpenLDAP 2.5.

As usual with these issues, this required just a simple change when selection the OpenLDAP backend: instead of using the now deprecated and removed HDB backend, we have to use the MDB one. After that, the tests start passing.

I have submitted a bug and a PR upstream containing this proposed patch; you can see them at:

https://github.com/rbarrois/volatildap/issues/7
https://github.com/rbarrois/volatildap/pull/8

I'm still waiting on their reply, but meanwhile I'd like to unblock this package (which is one of the last packages blocking the OpenLDAP 2.5 migration). I've also found that this issue is the reason why another package's autopkgtest, django-ldapdb, is failing.

There's also a Debian bug that I opened in order to report the failure to the Debian maintainer:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990335

You can find a PPA with the proposed package here:

https://launchpad.net/~sergiodj/+archive/ubuntu/volatildap-openldap-2.5/+packages

And you can verify that its autopkgtest is now passing:

autopkgtest [22:45:20]: @@@@@@@@@@@@@@@@@@@@ summary
run-tests PASS

Here's the log of the autopkgtest run against the PPA:

https://autopkgtest.ubuntu.com/results/autopkgtest-impish-sergiodj-volatildap-openldap-2.5/impish/amd64/v/volatildap/20210625_224531_29f21@/log.gz

[Bryce Harrington (bryce)]

Straightforward enough, LGTM +1

Verified the HDB backend is retired as of 2.5.5:
https://www.openldap.org/software/release/announce.html

PPA build and autopkgtest log look clean, I didn't attempt the tests or builds myself.

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thank you very much, Bryce.

Pushed & uploaded:

$ git push pkg upload/1.3.0-2ubuntu4
Enumerating objects: 14, done.
Counting objects: 100% (14/14), done.
Delta compression using up to 8 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (11/11), 1.86 KiB | 954.00 KiB/s, done.
Total 11 (delta 5), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/volatildap
 * [new tag] upload/1.3.0-2ubuntu4 -> upload/1.3.0-2ubuntu4

$ dput volatildap_1.3.0-2ubuntu4_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/volatildap/volatildap_1.3.0-2ubuntu4_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/volatildap/volatildap_1.3.0-2ubuntu4.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading volatildap_1.3.0-2ubuntu4.dsc: done.
  Uploading volatildap_1.3.0-2ubuntu4.debian.tar.xz: done.
  Uploading volatildap_1.3.0-2ubuntu4_source.buildinfo: done.
  Uploading volatildap_1.3.0-2ubuntu4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 780f92e..f17b12f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+volatildap (1.3.0-2ubuntu4) impish; urgency=medium
+
+  * d/p/0001-Use-L-MDB-backend-instead-of-HDB.patch: Use MDB backend
+    instead of the now deprecated and removed HDB backend on OpenLDAP
+    2.5.x.
+
+ -- Sergio Durigan Junior <[e-mail]>  Fri, 25 Jun 2021 18:09:01 -0400
+
 volatildap (1.3.0-2ubuntu3) impish; urgency=medium
 
   * No-change rebuild due to OpenLDAP soname bump.
diff --git a/debian/patches/0001-Use-L-MDB-backend-instead-of-HDB.patch b/debian/patches/0001-Use-L-MDB-backend-instead-of-HDB.patch
new file mode 100644
index 0000000..ae6fef2
--- /dev/null
+++ b/debian/patches/0001-Use-L-MDB-backend-instead-of-HDB.patch
@@ -0,0 +1,32 @@
+From: Sergio Durigan Junior <[e-mail]>
+Date: Fri, 25 Jun 2021 16:26:44 -0400
+Subject: Use (L)MDB backend instead of HDB
+
+OpenLDAP 2.5.x has deprecated and removed support for the HDB backend,
+which makes the tests fail.  This commit changes the backend to MDB,
+which is the recommended one now.
+
+Closes #7
+
+Bug: https://github.com/rbarrois/volatildap/issues/7
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990335
+Forwarded: yes, https://github.com/rbarrois/volatildap/pull/8
+---
+ volatildap/server.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/volatildap/server.py b/volatildap/server.py
+index efa70f3..81a3336 100644
+--- a/volatildap/server.py
++++ b/volatildap/server.py
+@@ -145,8 +145,8 @@ class LdapServer(object):
+             yield quote('TLSCertificateFile %s', self._tls_certificate_path)
+             yield quote('TLSCertificateKeyFile %s', self._tls_key_path)
+ 
+-        yield quote('moduleload back_hdb')
+-        yield quote('database hdb')
++        yield quote('moduleload back_mdb')
++        yield quote('database mdb')
+         yield quote('directory %s', self._datadir)
+         yield quote('suffix %s', self.suffix)
+         yield quote('rootdn %s', self.rootdn)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4bf63d0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Use-L-MDB-backend-instead-of-HDB.patch