Merge ~bryce/ubuntu/+source/heimdal:merge-v7.7.0adfsg-4-kinetic into ubuntu/+source/heimdal:debian/sid

[Bryce Harrington]

Straightforward merge of heimdal. The ubuntu delta is basically to add -lto.

PPA:
  - ppa:bryce/heimdal-merge-v7.7.0adfsg-4
  - https://launchpad.net/~bryce/+archive/ubuntu/heimdal-merge-v7.7.0adfsg-4

s390x builds are still pending

There are no autopkgtests for heimdal. Running autopkgtest locally did not turn up any issues other than the lack of test cases.

[Andreas Hasenack (ahasenack)]

delta preserved, git range-diff clean, debian changes look fine, +1

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, ahasenack
Uploaders: bryce, ahasenack
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

Thanks, uploaded:

Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/heimdal
Vcs-Git-Commit: 12681092e894727f90721e8082c5d8329541ec04
Vcs-Git-Ref: refs/heads/merge-v7.7.0adfsg-4-kinetic

gpg: ../heimdal_7.7.0+dfsg-4ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../heimdal_7.7.0+dfsg-4ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading heimdal_7.7.0+dfsg-4ubuntu1.dsc: done.
  Uploading heimdal_7.7.0+dfsg.orig.tar.xz: done.
  Uploading heimdal_7.7.0+dfsg-4ubuntu1.debian.tar.xz: done.
  Uploading heimdal_7.7.0+dfsg-4ubuntu1_source.buildinfo: done.
  Uploading heimdal_7.7.0+dfsg-4ubuntu1_source.changes: done.
Successfully uploaded packages.

[Bryce Harrington (bryce)]

This has migrated

 heimdal | 7.7.0+dfsg-3ubuntu1 | jammy/universe
 heimdal | 7.7.0+dfsg-4ubuntu1 | kinetic/universe

diff --git a/debian/changelog b/debian/changelog
index 49277ff..a8ab879 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+heimdal (7.7.0+dfsg-4ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1971280). Remaining changes:
+    - d/rules: Disable lto, to regain dep on roken, otherwise
+      dependencies on amd64 are different than i386 resulting in
+      different files on amd64 and i386.
+      (LP #1934936)
+    - d/libroken18-heimdal.symbols: Remove symbol
+      rk_closefrom@HEIMDAL_ROKEN_1.0 1.4.0+git20110226 Applied verbatim
+      debdiff from Heinrich Schuchardt (xypron).
+      (LP #1945787)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 20 Jul 2022 16:52:39 -0700
+
 heimdal (7.7.0+dfsg-4) unstable; urgency=medium
 
   * Delete dependancy on install-info. Closes: #1013735.
@@ -12,6 +26,17 @@ heimdal (7.7.0+dfsg-4) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Mon, 27 Jun 2022 10:36:10 +1000
 
+heimdal (7.7.0+dfsg-3ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946860). Remaining changes:
+    - Disable lto, to regain dep on roken, otherwise dependencies on amd64
+      are different to i386 resulting in different files on amd64 and
+      i386. LP #1934936
+    - Remove symbol rk_closefrom@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
+      (LP #1945787)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 08 Dec 2021 18:02:13 -0300
+
 heimdal (7.7.0+dfsg-3) unstable; urgency=high
 
   * Fix CVE-2021-3671: A null pointer de-reference was found in the way
@@ -20,6 +45,27 @@ heimdal (7.7.0+dfsg-3) unstable; urgency=high
 
  -- Brian May <[e-mail]>  Wed, 17 Nov 2021 12:12:45 +1100
 
+heimdal (7.7.0+dfsg-2ubuntu2) impish; urgency=medium
+
+  * Remove symbol rk_closefrom@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
+    (LP: #1945787) 
+
+ -- Heinrich Schuchardt <[e-mail]>  Fri, 01 Oct 2021 15:03:02 +0200
+
+heimdal (7.7.0+dfsg-2ubuntu1) impish; urgency=medium
+
+  * Disable lto, to regain dep on roken, otherwise dependencies on amd64
+    are different to i386 resulting in different files on amd64 and
+    i386. LP: #1934936
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 20 Jul 2021 10:32:53 +0100
+
+heimdal (7.7.0+dfsg-2build1) impish; urgency=medium
+
+  * No-change rebuild due to OpenLDAP soname bump.
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 21 Jun 2021 17:48:49 -0400
+
 heimdal (7.7.0+dfsg-2) unstable; urgency=medium
 
   * Build using python3. Closes: #936695, #960032.
diff --git a/debian/control b/debian/control
index 121fcab..88ff147 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: heimdal
 Section: net
 Priority: optional
-Maintainer: Brian May <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Brian May <[e-mail]>
 Uploaders: Dominik George <[e-mail]>
 Homepage: http://www.h5l.org/
 Standards-Version: 4.1.2
diff --git a/debian/libroken18-heimdal.symbols b/debian/libroken18-heimdal.symbols
index 6caac8a..2ce5854 100644
--- a/debian/libroken18-heimdal.symbols
+++ b/debian/libroken18-heimdal.symbols
@@ -42,7 +42,6 @@ libroken.so.18 #PACKAGE# #MINVER#
  rk_cloexec_dir@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_cloexec_file@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_cloexec_socket@HEIMDAL_ROKEN_1.0 1.6~git20131117
- rk_closefrom@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_copyhostent@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_dns_free_data@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_dns_lookup@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
diff --git a/debian/rules b/debian/rules
index 5709867..60d5089 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+# amd64 ends up without a dep on libroken breaking multiarch
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all optimize=-lto
 
 %:
 	dh $* --parallel