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

[Bryce Harrington]

Merge of heimdal to pull in two Debian revisions that fix a few bugs. The symbol correction we included in delta previously to address ftbfs is no longer needed, because Debian implemented a better fix. I verified this as no longer needed, in my own build test.

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

There are no autopkgtests for heimdal (LP: #1677863), unfortunately.

Usual tags pushed for review:
  - tags/old/debian 0c7aa01d
  - tags/new/debian bdd6fca3
  - tags/old/ubuntu 12681092
  - tags/logical/7.7.0+dfsg-4ubuntu1 ca4e8058
  - tags/reconstruct/7.7.0+dfsg-4ubuntu1 af77027f
  - tags/split/7.7.0+dfsg-4ubuntu1 964c09f4

[Robie Basak (racb)]

I'll take this.

[Robie Basak (racb)]

lgtm

A couple of things of note:

1) I wondered if disabling lto was still needed. This would need build testing with lto on amd64 and i386 and then comparing the resulting dependencies. And I wonder if we need a more general view to dealing with the situation that lto results in that issue arising. But the changes from last time aren't significant and none look like they would affect that issue, so it's probably not worth checking until we get significant changes from upstream, or some change that looks like it might fix the issue. It does seem like a bit of a hack to disable lto though.

2) I was puzzled by previous changelog entry changes until I realised that the Debian maintainer fixed historical typos. I guess it makes sense to follow in Ubuntu.

review: Approve

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

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

review: Approve

[Bryce Harrington (bryce)]

Thanks Robie, uploaded:

Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/heimdal
Vcs-Git-Commit: 383d276770920404353a3a1775e86b9de09485b4
Vcs-Git-Ref: refs/heads/merge-v7.7.0adfsg-6-lunar

 signfile dsc ../heimdal_7.7.0+dfsg-6ubuntu1.dsc A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_buildinfo ../heimdal_7.7.0+dfsg-6ubuntu1.dsc ../heimdal_7.7.0+dfsg-6ubuntu1_source.buildinfo
 signfile buildinfo ../heimdal_7.7.0+dfsg-6ubuntu1_source.buildinfo A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_changes dsc ../heimdal_7.7.0+dfsg-6ubuntu1.dsc ../heimdal_7.7.0+dfsg-6ubuntu1_source.changes
 fixup_changes buildinfo ../heimdal_7.7.0+dfsg-6ubuntu1_source.buildinfo ../heimdal_7.7.0+dfsg-6ubuntu1_source.changes
 signfile changes ../heimdal_7.7.0+dfsg-6ubuntu1_source.changes A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

$ dput ubuntu ../heimdal_7.7.0+dfsg-6ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading heimdal_7.7.0+dfsg-6ubuntu1.dsc: done.
  Uploading heimdal_7.7.0+dfsg.orig.tar.xz: done.
  Uploading heimdal_7.7.0+dfsg-6ubuntu1.debian.tar.xz: done.
  Uploading heimdal_7.7.0+dfsg-6ubuntu1_source.buildinfo: done.
  Uploading heimdal_7.7.0+dfsg-6ubuntu1_source.changes: done.
Successfully uploaded packages.

That's true about lto, but of course we've got a few packages with similar issues and dealt with similarly. I didn't bother re-testing heimdal but have spot checked other packages in the past to found the changes were still needed, so expect they're probably still needed here as well.

Yeah I also noticed Debian's modification to the changelog history, and agree it's not worth reverting. Hopefully that doesn't mess git-ubuntu up too much.

diff --git a/debian/changelog b/debian/changelog
index d2dc845..108c1c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+heimdal (7.7.0+dfsg-6ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1993403). 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)
+  * Dropped:
+    - 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)
+      [Fixed in Debian release 7.7.0+dfsg-5]
+
+ -- Bryce Harrington <[e-mail]>  Thu, 17 Nov 2022 20:38:21 -0800
+
 heimdal (7.7.0+dfsg-6) unstable; urgency=medium
 
   * Retry deleting dangling windc.so again. Closes: #577229.
@@ -19,6 +35,20 @@ heimdal (7.7.0+dfsg-5) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Fri, 02 Sep 2022 07:59:59 +1000
 
+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 dependency on install-info. Closes: #1013735.
@@ -33,6 +63,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
@@ -41,6 +82,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 bdfe563..f4a836b 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/rules b/debian/rules
index 16c98a0..7a9a3a2 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 $*