isc-dhcp-client and isc-dhcp-client-ddns both install
/sbin/dhclient, with the latter diverting it. The diversions become
ineffective when one of them moves to /usr/sbin/dhclient.

I'm attaching a patch that moves /sbin/dhclient and applies the
required workarounds for diversions ("DEP17 M18").

Getting this right is hard. I would welcome additional testing and
reviews.

I would also advise uploading to experimental first. Please do so
soon, so we can all check the result (again).

Chris

[1] https://wiki.debian.org/UsrMerge

Helmut Grohne pointed out that the new postinst was missing the
#DEBHELPER# stanza. Please find a new patch attached.

Sorry about this.

Chris

Hi,

Attached is an improved patch, that avoids the temporary file loss
that could occur in the old version. This is mostly based on work by
Helmut Grohne.

Please consider this version of the patch.

Chris

Reviewed-by: Helmut Grohne <helmut@subdivi.de>

I could not identify issues. The begin-remove-after markup feels
slightly inconsistent as it partially cleans up the mitigation, but
cleaning up the part in -ddns using this simple markup is non-trivial
and keeping those snippets a little longer shall not cause breakage, so
while this isn't perfect, I think it's good to go as is.

I also locally built this change and performed bootstrap testing with
debootstrap, cdebootstrap and mmebstrap (which include isc-dhcp-client
in the larger variants).

I second this request. I appreciate to have this resolved by the end of
February. Preferrably, we have this change in experimental for a few
days before transitioning to unstable to allow for more QA.

Helmut

We believe that the bug you reported is fixed in the latest version of
isc-dhcp, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1060089@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Santiago Ruano Rincón <santiago@debian.org> (supplier of updated isc-dhcp package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Thu, 25 Jan 2024 12:25:30 -0300
Source: isc-dhcp
Architecture: source
Version: 4.4.3-P1-5~exp1
Distribution: experimental
Urgency: medium
Maintainer: Debian ISC DHCP Maintainers <isc-dhcp@packages.debian.org>
Changed-By: Santiago Ruano Rincón <santiago@debian.org>
Closes: 1060089
Changes:
 isc-dhcp (4.4.3-P1-5~exp1) experimental; urgency=medium
 .
   * Move dhclient to /usr/sbin and add duplicated diversions (DEP17 P3 M18).
     Also add Conflicts: older isc-dhcp-client-ddns. Thanks to Chris
     Hofstaedtler <zeha@debian.org> (Closes: #1060089)
   * Add isc-dhcp-client-ddns lintian overrides about
     diversion-for-unknown-file sbin/dhclient
Checksums-Sha1:
 8d049e11e3f2ee0968f4a5486489191e5bd769af 2317 isc-dhcp_4.4.3-P1-5~exp1.dsc
 63e3d7fd3b27f1dc46930af3c7b64cda88e57226 104012 isc-dhcp_4.4.3-P1-5~exp1.debian.tar.xz
 8c95db2533b4e278252e7998e8ef4ed59b7fb04d 10875 isc-dhcp_4.4.3-P1-5~exp1_amd64.buildinfo
Checksums-Sha256:
 d853d7d9d48b5570464b5b4c14fb3ae77ef4a01dc8bb32d7ef9b2354413dedd6 2317 isc-dhcp_4.4.3-P1-5~exp1.dsc
 35e784ad557339d3b92f947ce18bdae4c3afe132722b42074aa8599af60abbe2 104012 isc-dhcp_4.4.3-P1-5~exp1.debian.tar.xz
 b5f9d6815523e3a79c53d3b2ad0e315bfb8b801a0a0df8b78431f899278b32ac 10875 isc-dhcp_4.4.3-P1-5~exp1_amd64.buildinfo
Files:
 0d1ba020dd949fa437cc95b680bfb047 2317 net important isc-dhcp_4.4.3-P1-5~exp1.dsc
 9f87d01b5e62463f9a3f20ec19c13322 104012 net important isc-dhcp_4.4.3-P1-5~exp1.debian.tar.xz
 6743e7eb81382fe52d327f198e9e3111 10875 net important isc-dhcp_4.4.3-P1-5~exp1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----

iHUEARYIAB0WIQRZVjztY8b+Ty43oH1itBCJKh26HQUCZbJ/vQAKCRBitBCJKh26
HVieAQCM81FFF30+V8++JeeHS3UwXweSk9j33sRDJVqImqpmTAD/czbRFo/ZPvXZ
CK9fsl27YEXi32YOOmp9hCLDr5vhlgs=
=uojh
-----END PGP SIGNATURE-----

El 23/01/24 a las 10:34, Helmut Grohne escribió:

Done. Thanks a lot to both of your for your work.

user helmutg@debian.org
severity 1059981 important
tags 1059981 + trixie sid
severity 1061274 important
tags 1061274 + trixie sid
severity 1060269 important
tags 1060269 + trixie sid patch
severity 1060270 important
tags 1060270 + trixie sid patch
severity 1060000 important
usertags 1060000 + dep17m2
severity 1059534 important
tags 1059534 + trixie sid
severity 1059533 important
tags 1059533 + trixie sid
severity 1059919 important
tags 1059919 + trixie sid
severity 1060089 important
tags 1060089 + trixie sid
severity 1055959 important
tags 1055959 + trixie sid
severity 1060160 important
tags 1060160 + trixie sid
severity 1060139 important
tags 1060139 + trixie sid
thanks

The number of packages installed by debootstrap containing files in
aliased locations has been shrinking since a while. We're now down to 10
packages and I'd like to get them done by mid March to be able to move
forward with uploading base-files/bash/dash/glibc/util-linux. Please
upload the requested changes or reply to the bugs. In some cases (such
as isc-dhcp, libtirpc and pam) these have been fixed in experimental and
are expected to land in unstable soon. For others, I intend to upload
delayed NMUs in agreement with the developers reference soon. I'm aware
that the time64 transition is in progress, but there is little
intersection except for libtirpc and pam, both of which will be moved as
part of the time64 transition. Please let me know if you have questions
or objections to moving forward.

Helmut