Merge ~mirespace/ubuntu/+source/heimdal:ftbfs-kafs_strlcpy-mantic-lp2036253 into ubuntu/+source/heimdal:ubuntu/mantic-devel

Proposed by Miriam España Acebal
Status: Approved
Approved by: git-ubuntu bot
Approved revision: not available
Proposed branch: ~mirespace/ubuntu/+source/heimdal:ftbfs-kafs_strlcpy-mantic-lp2036253
Merge into: ubuntu/+source/heimdal:ubuntu/mantic-devel
Diff against target: 83 lines (+29/-3)
4 files modified
debian/changelog (+12/-0)
debian/control (+12/-0)
debian/libkafs0-heimdal.symbols (+2/-1)
debian/libroken19-heimdal.symbols (+3/-2)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Bryce Harrington (community) Approve
Steve Langasek Pending
Canonical Server Reporter Pending
Review via email: mp+457425@code.launchpad.net

Description of the change

Hi team,

same as for Noble (https://code.launchpad.net/~mirespace/ubuntu/+source/heimdal/+git/heimdal/+merge/457424).

PPA for this is ppa:mirespace/heimdal-ftbfs-lp2036253
                https://launchpad.net/~mirespace/+archive/ubuntu/heimdal-ftbfs-lp2036253

Here I changed the versions of the libraries added in the control file accordingly to mantic versions.

Thank you in advance for your time reviewing this.

To post a comment you must log in.
Revision history for this message
Miriam España Acebal (mirespace) wrote :

(02:55:36 PM) LocutusOfBorg: mirespace, if I can, I'm happy to sponsor
...
(03:06:07 PM) LocutusOfBorg: both sponsored

https://bugs.launchpad.net/ubuntu/+source/heimdal/+bug/2036253/comments/3

Revision history for this message
Bryce Harrington (bryce) wrote :

LGTM, +1

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

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

review: Approve
Revision history for this message
Miriam España Acebal (mirespace) wrote :

Hi Bryce,

After detecting some packages that need to be added to the Break too (not only libraries, binary commands too), and that the strict version in symbol files was introducing an unmet dependencies issue for some openafs packages, I'm resubmitting this heimdal mantic package.

I rebuild the openafs package at

ppa:mirespace/openafs-rebuild-lp2046441
https://launchpad.net/~mirespace/+archive/ubuntu/openafs-rebuild-lp2046441/+packages

against the this MP heimdal version here (same that before):

ppa:mirespace/heimdal-ftbfs-lp2036253
https://launchpad.net/~mirespace/+archive/ubuntu/heimdal-ftbfs-lp2036253

and I was able to install aklog from openafs-krb5 [2].

I know that this "mini" transition couldn't be accepted for SRU, because it implies the rebuild of openafs in a supportet but non-development series, but it's only one package to rebuild.

I am writing this for discussion, and I would understand if this did not qualify for SRU.

[1] (https://bugs.launchpad.net/ubuntu/+source/heimdal/+bug/2036253/comments/7)
[2] https://bugs.launchpad.net/ubuntu/+source/openafs/+bug/2046441/comments/1

Revision history for this message
Miriam España Acebal (mirespace) wrote :

Gianfranco Costamagna spotted and applied for this the following solution, from Debian:

https://bugs.launchpad.net/ubuntu/+source/heimdal/+bug/2036253/comments/11

He uploaded a new version for mantic that is now in -proposed.

This MP, although approved (thanks!), is no longer needed: please, move it to Rejected or another appropriated status.

Unmerged commits

d3f6515... by Miriam España Acebal

changelog 7.8.git20221117.28daf24+dfsg-3ubuntu3

ecaee91... by Miriam España Acebal

d/control: Declare Breaks: against older packages using these symbols.

75b9cc6... by Miriam España Acebal

  * d/lib{kafs0,roken19}-heimdal.symbols:
      - Make symbol dependencies on libroken19-heimdal and libkafs0-heimdal strict to avoid future symbol skew.

c79a46e... by Miriam España Acebal

* d/lib{kafs0,roken19}-heimdal.symbols: _{kafs,rk}_strl{cat,cpy} are
    made optional symbols, since they are not needed when built
    against glibc 2.38.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 3ce8775..6c3fede 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,15 @@
6+heimdal (7.8.git20221117.28daf24+dfsg-3ubuntu1.1) mantic; urgency=medium
7+
8+ * d/lib{kafs0,roken19}-heimdal.symbols:
9+ - _{kafs,rk}_strl{cat,cpy} are made optional symbols, since they
10+ are not needed when built against glibc 2.38 (LP: #2036253).
11+ - Make symbol dependencies on libroken19-heimdal and
12+ libkafs0-heimdal to build-depends on itself.
13+ * d/control: Declare Breaks: against older packages (libraries and
14+ commands applications) using these symbols.
15+
16+ -- Miriam España Acebal <miriam.espana@canonical.com> Wed, 13 Dec 2023 12:13:33 +0100
17+
18 heimdal (7.8.git20221117.28daf24+dfsg-3ubuntu1) mantic; urgency=medium
19
20 * Merge from Debian unstable. Remaining changes:
21diff --git a/debian/control b/debian/control
22index a42fe7e..87e746b 100644
23--- a/debian/control
24+++ b/debian/control
25@@ -252,6 +252,18 @@ Pre-Depends: ${misc:Pre-Depends}
26 Section: libs
27 Architecture: any
28 Depends: ${misc:Depends}, ${shlibs:Depends}
29+Breaks: openafs-client (<< 1.8.10-1ubuntu2~),
30+ openafs-dbserver (<< 1.8.10-1ubuntu2~),
31+ openafs-fileserver (<< 1.8.10-1ubuntu2~),
32+ openafs-fuse (<< 1.8.10-1ubuntu2~),
33+ openafs-krb5 (<< 1.8.10-1ubuntu2~),
34+ libafsauthent2 (<< 1.8.10-1ubuntu2~),
35+ libafsrpc2 (<< 1.8.10-1ubuntu2~),
36+ libhdb9-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu1.1~),
37+ libhx509-5-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu1.1~),
38+ libkadm5srv8-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu1.1~),
39+ libkdc2-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu1.1~),
40+ libkrb5-26-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu1.1~)
41 Description: Heimdal Kerberos - roken support library
42 Heimdal is a free implementation of Kerberos 5 that aims to be
43 compatible with MIT Kerberos.
44diff --git a/debian/libkafs0-heimdal.symbols b/debian/libkafs0-heimdal.symbols
45index 648ab4c..eab2806 100644
46--- a/debian/libkafs0-heimdal.symbols
47+++ b/debian/libkafs0-heimdal.symbols
48@@ -1,4 +1,5 @@
49 libkafs.so.0 #PACKAGE# #MINVER#
50+* Build-Depends-Package: libkafs0-heimdal
51 _kafs_afslog_all_local_cells@Base 1.4.0+git20110226
52 _kafs_debug@Base 1.4.0+git20110226
53 _kafs_derive_des_key@Base 1.7~git20150920
54@@ -12,7 +13,7 @@ libkafs.so.0 #PACKAGE# #MINVER#
55 _kafs_get_cred@Base 1.4.0+git20110226
56 _kafs_realm_of_cell@Base 1.4.0+git20110226
57 _kafs_resolve_debug@Base 1.4.0+git20110226
58- _kafs_strlcpy@Base 1.4.0+git20110226
59+ (optional)_kafs_strlcpy@Base 1.4.0+git20110226
60 k_afs_cell_of_file@Base 1.4.0+git20110226
61 k_hasafs@Base 1.4.0+git20110226
62 k_hasafs_recheck@Base 1.4.0+git20110226
63diff --git a/debian/libroken19-heimdal.symbols b/debian/libroken19-heimdal.symbols
64index 177457f..0406650 100644
65--- a/debian/libroken19-heimdal.symbols
66+++ b/debian/libroken19-heimdal.symbols
67@@ -1,4 +1,5 @@
68 libroken.so.19 #PACKAGE# #MINVER#
69+* Build-Depends-Package: libroken19-heimdal
70 HEIMDAL_ROKEN_1.0@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
71 arg_printusage@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
72 arg_printusage_i18n@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
73@@ -98,8 +99,8 @@ libroken.so.19 #PACKAGE# #MINVER#
74 rk_socket_sockaddr_size@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
75 rk_strcollect@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
76 rk_strerror_r@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
77- rk_strlcat@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
78- rk_strlcpy@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
79+ (optional)rk_strlcat@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
80+ (optional)rk_strlcpy@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
81 rk_strlwr@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
82 rk_strpoolcollect@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
83 rk_strpoolfree@HEIMDAL_ROKEN_1.0 1.4.0+git20110226

Subscribers

People subscribed via source and target branches