Merge ~michal-maloszewski99/ubuntu/+source/heimdal:merge-7.8.git20221117.28daf24+dfsg-1-lunar into ubuntu/+source/heimdal:debian/sid

[Michał Małoszewski]

[Michał Małoszewski (michal-maloszewski99)]

Created MP, added Reviewers and linked the bug (merge). But it is not yet ready to be scored.
(Status: Work in progress)
In a while I will add dep8 tests and write a comment regarding delta which has not been dropped.

[Michał Małoszewski (michal-maloszewski99)]

No autopkgtests for heimdal.

[Michał Małoszewski (michal-maloszewski99)]

I was trying to figure out if the delta which is still not dropped is required or not.
So, to test it, I have created 2 PPAs, one in which lto is disabled, and the second one, where the lto is enabled. I have built them and downloaded the debs for i386 and amd64.
Then I have compared amd64 deb from PPA1 with amd64 deb from PPA2. The same story with i386. The binary dependencies were identical. No difference between the files. So in that case, the delta can be possibly dropped.
I think that Andreas might know something about it.

Unmerged commits

9fc9163... by Michał Małoszewski on 2023-01-17

Changelog for 7.8.git20221117.28daf24+dfsg-1

e217fae... by Michał Małoszewski on 2023-01-17

update-maintainer

3c66d87... by Michał Małoszewski on 2023-01-17

reconstruct-changelog

58b895f... by Michał Małoszewski on 2023-01-17

merge-changelogs

d6827c7... by Andreas Hasenack on 2021-12-08

    - 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)

diff --git a/debian/changelog b/debian/changelog
index 5408dea..9a68371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+heimdal (7.8.git20221117.28daf24+dfsg-1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable. 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.
+
+ -- Michal Maloszewski <[e-mail]>  Tue, 17 Jan 2023 16:13:49 +0100
+
 heimdal (7.8.git20221117.28daf24+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
@@ -44,6 +53,28 @@ heimdal (7.8.git20221115.a6cf945+dfsg-1) unstable; urgency=medium
 
  -- Brian May <[e-mail]>  Sun, 27 Nov 2022 10:44:26 +1100
 
+heimdal (7.7.0+dfsg-6ubuntu2) lunar; urgency=medium
+
+  * No-change rebuild against libldap-2
+
+ -- Steve Langasek <[e-mail]>  Thu, 15 Dec 2022 19:48:34 +0000
+
+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: #857215.
@@ -65,6 +96,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.
@@ -79,6 +124,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
@@ -87,6 +143,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 192cb49..0349172 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 a9c6022..b20d9df 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 $*