Source: libxcrypt Version: 1:4.4.36-2 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2 X-Debbugs-Cc: vor...@debian.org
The moratorium has been deferred to https://wiki.debian.org/UsrMerge and we can now move files to finalize the /usr-merge transition. I implemented the move and reviewed the problem classes from https://subdivi.de/~helmut/dep17.html. Most of the problems do not apply and I specifically tested that filesystem bootstrap (P8) continues to work. The debian-installer will continue to work (P10), because /usr/lib/<triplet> is on the default library search path even for unmerged systems. The one thing to keep in mind here is that renaming the library may trigger a file loss problem (P1). This is plausible to due the 2038 transition, see https://wiki.debian.org/ReleaseGoals/64bit-time. It does not list libxcrypt as not-affected and if libxcrypt really is affected, it'll be renamed to libcrypt1t64 which we'll have to mitigate using protective diversions (M8) then (because we cannot use Conflicts for essential packages). So I think this is good to go. I assume that libxcrypt will not be backported and therefore implemented the change directly. In case you consider backporting to bookworm-backports, do not upload this patch and consider using dh_movetousr instead. Also when the 2038 transition comes around, remember to upload to experimental first. Helmut
diff --minimal -Nru libxcrypt-4.4.36/debian/changelog libxcrypt-4.4.36/debian/changelog --- libxcrypt-4.4.36/debian/changelog 2023-07-29 18:32:40.000000000 +0200 +++ libxcrypt-4.4.36/debian/changelog 2023-11-14 13:34:09.000000000 +0100 @@ -1,3 +1,10 @@ +libxcrypt (1:4.4.36-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Move libcrypt.so.* to /usr. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Tue, 14 Nov 2023 13:34:09 +0100 + libxcrypt (1:4.4.36-2) unstable; urgency=medium * Stop marking libcrypt1 Important+Protected. This was needed to help diff --minimal -Nru libxcrypt-4.4.36/debian/rules libxcrypt-4.4.36/debian/rules --- libxcrypt-4.4.36/debian/rules 2023-07-25 04:33:35.000000000 +0200 +++ libxcrypt-4.4.36/debian/rules 2023-11-14 13:34:08.000000000 +0100 @@ -93,14 +93,6 @@ $(MAKE) install DESTDIR=$D # Move the shared library back to /lib/ because this is where the - # libc6 package used to install it (see #953562 for details). - mkdir -p $D/lib/$(DEB_HOST_MULTIARCH) - mv $D/usr/lib/$(DEB_HOST_MULTIARCH)/libcrypt.so.1* $D/lib/$(DEB_HOST_MULTIARCH)/ -ifeq ($(DEB_HOST_ARCH), alpha) - ln -sf /lib/$(DEB_HOST_MULTIARCH)/libcrypt.so.1.1 $D/usr/lib/$(DEB_HOST_MULTIARCH)/libcrypt.so -else - ln -sf /lib/$(DEB_HOST_MULTIARCH)/libcrypt.so.1 $D/usr/lib/$(DEB_HOST_MULTIARCH)/libcrypt.so -endif ifeq ($(BUILD_DEV_VER), 1) dh_movefiles -plibcrypt-dev --sourcedir=debian/libcrypt1/ else