Merge ~ahasenack/ubuntu/+source/openldap:focal-slapd-perl-any into ubuntu/+source/openldap:ubuntu/devel

[Andreas Hasenack]

Allow slapd to use the perl *interpreter* from another architecture. The interpreter is used only in postinst & friends, and build time helper scripts.

This fix the problem where slapd:i386 cannot be installed on an amd64 host:
sudo dpkg --add-architecture i386
sudo apt update
sudo apt install slapd

It fails like this:
Unpacking libsasl2-modules:i386 (2.1.27+dfsg-1) ...
dpkg: dependency problems prevent configuration of slapd:i386:
 slapd:i386 depends on perl (>> 5.8.0) | libmime-base64-perl.

dpkg: error processing package slapd:i386 (--configure):
 dependency problems - leaving unconfigured
...
Errors were encountered while processing:
 slapd:i386
E: Sub-process /usr/bin/dpkg returned an error code (1)

Which in turn happens when trying to run the krb5:i386 dep8 tests.

I sent an email to the debian uploaders, and Ryan Tandy agreed with the analysis and will take the change once its shown to be fine for Ubuntu (i.e., in our archive).

Bileto ticket, with the right triggers, shows openldap and krb5 dep8 i386 tests passing:
https://bileto.ubuntu.com/#/ticket/3874

You can also get the test PPA from that link, but here it is:

https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3874/

sudo add-apt-repository ppa:ci-train-ppa-service/3874

[Christian Ehrhardt  (paelzer)]

Sorry, this takes a bit longer despite the small change.
I went for some more testing on this and while it generally works I got it into a state where it can't (re-)install that I want to debug first before approving.

[Christian Ehrhardt  (paelzer)]

Ok, the binary database files are incompatible when swicthgin i386/amd64 but no one ever expected that would work. Found no other issue.

You might mention that this can be dropped once https://salsa.debian.org/openldap-team/openldap/commit/794c73620dc47e2a521e97357006c48e0e63d32d is in Debian and we had a sync.

review: Approve

[Andreas Hasenack (ahasenack)]

Did a test rebuild, it still builds :)

Tagging and uploading 19eff4338d456ac1a662970f8c8c664672679887

$ git push pkg upload/2.4.48+dfsg-1ubuntu4
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 4 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.31 KiB | 83.00 KiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/openldap
 * [new tag] upload/2.4.48+dfsg-1ubuntu4 -> upload/2.4.48+dfsg-1ubuntu4

$ dput ubuntu ../openldap_2.4.48+dfsg-1ubuntu4_source.changes
Checking signature on .changes
gpg: ../openldap_2.4.48+dfsg-1ubuntu4_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../openldap_2.4.48+dfsg-1ubuntu4.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openldap_2.4.48+dfsg-1ubuntu4.dsc: done.
  Uploading openldap_2.4.48+dfsg-1ubuntu4.debian.tar.xz: done.
  Uploading openldap_2.4.48+dfsg-1ubuntu4_source.buildinfo: done.
  Uploading openldap_2.4.48+dfsg-1ubuntu4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index a68eebe..72d215f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openldap (2.4.48+dfsg-1ubuntu4) focal; urgency=medium
+
+  * d/control: slapd can depend on perl:any since it only uses perl for
+    some maintainer and helper scripts. The perl backend links against
+    the correct architecture perl libraries already. Can be dropped
+    after https://salsa.debian.org/openldap-team/openldap/commit/794c736
+    is in a Debian upload.
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 06 Jan 2020 16:46:11 -0300
+
 openldap (2.4.48+dfsg-1ubuntu3) focal; urgency=medium
 
   * No-change rebuild against libnettle7
diff --git a/debian/control b/debian/control
index f3baaa9..be848db 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Architecture: any
 Build-Profiles: <!stage1>
 Pre-Depends: debconf (>= 0.5) | debconf-2.0, ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version}),
- coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl,
+ coreutils (>= 4.5.1-1), psmisc, perl:any (>> 5.8.0) | libmime-base64-perl,
  adduser, lsb-base (>= 3.2-13), ${misc:Depends}
 Recommends: libsasl2-modules
 Suggests: ldap-utils, ufw,