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

[Miriam España Acebal]

Hi team,

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

The fix is similar to the one that Steve did for krb5. I follow strictly what he did (I'll ping him for his review on this too).

To get the list of shared libraries affected, I ended with an ugly inline command, not-efficient that I run in a lxc noble VM , for both affected libraries:

for s in $(for p in $(apt-cache rdepends libkafs0-heimdal | cut -d':' -f2 | xargs); do for l in $(apt-file list ${p} | grep '.so' | grep lib | cut -d':' -f2| xargs); do readlink -f ${l} ; done; done | sort -u); do nm -D ${s} | grep strlc && apt-file search ${s} && apt-cache show $(apt-file search ${s} | cut -d':' -f1)| grep ^Version; done

and

for s in $(for p in $(apt-cache rdepends libroken19-heimdal | cut -d':' -f2 | xargs); do for l in $(apt-file list ${p} | grep '.so' | grep lib | cut -d':' -f2| xargs); do readlink -f ${l} ; done; done | sort -u); do nm -D ${s} | grep strlc && apt-file search ${s} && apt-cache show $(apt-file search ${s} | cut -d':' -f1)| grep ^Version; done

... I'll do a better script after Xmas (I looked for an already done script for this, but I didn't find one)

For libkafs0-heimdal, the symbols on the output of that inline command are the libroken ones, so nothing to do for libkafs0-heimdal in this sense (nothing to add to d/control).

Heimdal doesn't have autopkgtest. I checked it installs and uninstalls well, but I don't have a clear way/steps to test it (I'll look if there are older SRUs) but I didn't want to delay more the review of the steps taken to fix the issue (I mean, the list of packages affected).

Thanks in advance.

[Miriam España Acebal (mirespace)]

(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

[Andreas Hasenack (ahasenack)]

This was sponsored and ingested into git already, closing the MP.

diff --git a/debian/changelog b/debian/changelog
index 3ce8775..e2127b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+heimdal (7.8.git20221117.28daf24+dfsg-3ubuntu2) noble; urgency=medium
+
+  * 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 (LP: #2036253).
+    - Make symbol dependencies on libroken19-heimdal and libkafs0-heimdal
+      strict to avoid future symbol skew.
+  * d/control: Declare Breaks: against older packages using these symbols.
+     
+
+ -- Miriam España Acebal <[e-mail]>  Wed, 29 Nov 2023 12:55:12 +0100
+
 heimdal (7.8.git20221117.28daf24+dfsg-3ubuntu1) mantic; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/control b/debian/control
index a42fe7e..b02d633 100644
--- a/debian/control
+++ b/debian/control
@@ -252,6 +252,13 @@ Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libafsauthent2 (<< 1.8.10-1ubuntu4~),
+        libafsrpc2 (<< 1.8.10-1ubuntu4~),
+        libhdb9-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu2~),
+        libhx509-5-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu2~),
+        libkadm5srv8-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu2~),
+        libkdc2-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu2~),
+        libkrb5-26-heimdal (<<7.8.git20221117.28daf24+dfsg-3ubuntu2~)
 Description: Heimdal Kerberos - roken support library
  Heimdal is a free implementation of Kerberos 5 that aims to be
  compatible with MIT Kerberos.
diff --git a/debian/libkafs0-heimdal.symbols b/debian/libkafs0-heimdal.symbols
index 648ab4c..1d965ef 100644
--- a/debian/libkafs0-heimdal.symbols
+++ b/debian/libkafs0-heimdal.symbols
@@ -1,4 +1,4 @@
-libkafs.so.0 #PACKAGE# #MINVER#
+libkafs.so.0 #PACKAGE# (= ${binary:Version})
  _kafs_afslog_all_local_cells@Base 1.4.0+git20110226
  _kafs_debug@Base 1.4.0+git20110226
  _kafs_derive_des_key@Base 1.7~git20150920
@@ -12,7 +12,7 @@ libkafs.so.0 #PACKAGE# #MINVER#
  _kafs_get_cred@Base 1.4.0+git20110226
  _kafs_realm_of_cell@Base 1.4.0+git20110226
  _kafs_resolve_debug@Base 1.4.0+git20110226
- _kafs_strlcpy@Base 1.4.0+git20110226
+ (optional) _kafs_strlcpy@Base 1.4.0+git20110226
  k_afs_cell_of_file@Base 1.4.0+git20110226
  k_hasafs@Base 1.4.0+git20110226
  k_hasafs_recheck@Base 1.4.0+git20110226
diff --git a/debian/libroken19-heimdal.symbols b/debian/libroken19-heimdal.symbols
index 177457f..2deddeb 100644
--- a/debian/libroken19-heimdal.symbols
+++ b/debian/libroken19-heimdal.symbols
@@ -1,4 +1,4 @@
-libroken.so.19 #PACKAGE# #MINVER#
+libroken.so.19 #PACKAGE# (= ${binary:Version})
  HEIMDAL_ROKEN_1.0@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  arg_printusage@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  arg_printusage_i18n@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
@@ -98,8 +98,8 @@ libroken.so.19 #PACKAGE# #MINVER#
  rk_socket_sockaddr_size@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_strcollect@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_strerror_r@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
- rk_strlcat@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
- rk_strlcpy@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
+ (optional) rk_strlcat@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
+ (optional) rk_strlcpy@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_strlwr@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_strpoolcollect@HEIMDAL_ROKEN_1.0 1.4.0+git20110226
  rk_strpoolfree@HEIMDAL_ROKEN_1.0 1.4.0+git20110226