Merge ~ahasenack/ubuntu/+source/kerberos-configs:focal-kerberos-configs-i386-deps into ubuntu/+source/kerberos-configs:ubuntu/devel

[Andreas Hasenack]

Add multi-arch to krb5-config, allowing it to be used as a dependency of krb5-user:i386 when installing on an amd64 host.

For reference: https://wiki.ubuntu.com/MultiarchCross

To test on an amd64 host/container:

sudo dpkg --add-architecture i386
sudo apt update
sudo apt install krb5-user:i386

Without the fix, krb5-user:i386 is uninstallable on amd64:
The following packages have unmet dependencies:
 krb5-user:i386 : Depends: krb5-config:i386 but it is not installable

With the fix, the installation proceeds:
(...)
The following additional packages will be installed:
  gcc-9-base:i386 krb5-config libc6:i386 libcom-err2:i386 libgcc1:i386 libgssapi-krb5-2 libgssapi-krb5-2:i386 libgssrpc4:i386 libidn2-0:i386 libk5crypto3 libk5crypto3:i386 libkadm5clnt-mit11:i386 libkadm5srv-mit11:i386
  libkdb5-9:i386 libkeyutils1:i386 libkrb5-3 libkrb5-3:i386 libkrb5support0 libkrb5support0:i386 libss2:i386 libssl1.1:i386 libunistring2:i386
Suggested packages:
  krb5-k5tls:i386 glibc-doc:i386 locales:i386 krb5-doc krb5-doc:i386
The following NEW packages will be installed:
  gcc-9-base:i386 krb5-config krb5-user:i386 libc6:i386 libcom-err2:i386 libgcc1:i386 libgssapi-krb5-2:i386 libgssrpc4:i386 libidn2-0:i386 libk5crypto3:i386 libkadm5clnt-mit11:i386 libkadm5srv-mit11:i386 libkdb5-9:i386
  libkeyutils1:i386 libkrb5-3:i386 libkrb5support0:i386 libss2:i386 libssl1.1:i386 libunistring2:i386
The following packages will be upgraded:
  libgssapi-krb5-2 libk5crypto3 libkrb5-3 libkrb5support0
4 upgraded, 19 newly installed, 0 to remove and 51 not upgraded.
Need to get 5910 kB of archives.
After this operation, 22.8 MB of additional disk space will be used.

I'll send this to debian and update this MP with that information once it's done.

Bileto ticket showed other i386 issues with other packages, many (if not all) already in the list sent by Steve to ubuntu-devel@. krb5/i386 still doesn't pass, but now it's because of slapd:i386 which is entangled with perl I believe.

https://bileto.ubuntu.com/#/ticket/3874

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3874/
sudo add-apt-repository ppa:ci-train-ppa-service/3874

[Christian Ehrhardt  (paelzer)]

After discussing if these changes are really needed for arch:all (it is needed as shown by tests) this is essentially the same as the krb5 change.

+1, but:
- please add a link to the i386 discussion on ubuntu devel
- please file it with Debian even though we know they might not take it (as they don't need it until i386 is removed there)

review: Approve

[Andreas Hasenack (ahasenack)]

Sent to debian via https://salsa.debian.org/debian/kerberos-configs/merge_requests/1

[Andreas Hasenack (ahasenack)]

Ok, this one still builds in focal, phew :)

Tagging and uploading 352c4c124085f18ce94d336739cd9819782247cb:

$ git push pkg upload/2.6ubuntu1
Enumerating objects: 17, done.
Counting objects: 100% (17/17), done.
Delta compression using up to 4 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (13/13), 1.69 KiB | 863.00 KiB/s, done.
Total 13 (delta 9), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/kerberos-configs
 * [new tag] upload/2.6ubuntu1 -> upload/2.6ubuntu1

$ dput ubuntu ../kerberos-configs_2.6ubuntu1_source.changes
Checking signature on .changes
gpg: ../kerberos-configs_2.6ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../kerberos-configs_2.6ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading kerberos-configs_2.6ubuntu1.dsc: done.
  Uploading kerberos-configs_2.6ubuntu1.tar.xz: done.
  Uploading kerberos-configs_2.6ubuntu1_source.buildinfo: done.
  Uploading kerberos-configs_2.6ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 2adcb33..b3c88be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+kerberos-configs (2.6ubuntu1) focal; urgency=medium
+
+  * d/control: set Multi-Arch to foreign to allow this package to be
+    used as a dependency of architecture-dependent packages. In
+    particular, this lets krb5-user:i386 be installed on an amd64 host.
+    See
+    https://lists.ubuntu.com/archives/ubuntu-devel/2019-December/040859.html
+    for details.
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 06 Jan 2020 16:36:24 -0300
+
 kerberos-configs (2.6build1) disco; urgency=medium
 
   * No-change rebuild against latest bind9
diff --git a/debian/control b/debian/control
index fd3225a..3b43ebd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: kerberos-configs
 Section: net
 Priority: optional
-Maintainer: Sam Hartman <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Sam Hartman <[e-mail]>
 Uploaders: Russ Allbery <[e-mail]>
 Build-Depends: debhelper (>= 9), perl (>= 5.8)
 Standards-Version: 3.9.6
@@ -10,6 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-k5-afs/kerberos-configs.git
 
 Package: krb5-config
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, bind9-host
 Description: Configuration files for Kerberos Version 5
  This package provides /etc/krb5.conf and any other files needed to