This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=2ee46ac3a0de739a399f06175bc8b449f1d02eaf commit 2ee46ac3a0de739a399f06175bc8b449f1d02eaf Author: Guillem Jover <[email protected]> AuthorDate: Wed Jan 1 19:04:54 2025 +0100 Dpkg::Vendor::Debian: Remove merged-/usr taint logic Now that Debian has done more or less a "proper" /usr-move, where the symlinks are actually provided by a package, and all packages install on the canonical location, where the packaging system should not incur in aliasing, the warning does no longer serve much of a purpose, as any derivative will be picking up the same changes. Aliasing from external packages can still occur, but banning that will be implemented via filesystem metadata tracking, once those changes can be deployed and are not guaranteed to fail due to file type conflicts due to the previous /usr-merge approach. Aliasing from the filesystem is still problematic, but that should now be either a UI issue or a reliability issue for other tools to deal with. --- man/deb-buildinfo.pod | 13 ------------- scripts/Dpkg/Vendor/Debian.pm | 10 ---------- 2 files changed, 23 deletions(-) diff --git a/man/deb-buildinfo.pod b/man/deb-buildinfo.pod index 14da028f4..11e2a5f80 100644 --- a/man/deb-buildinfo.pod +++ b/man/deb-buildinfo.pod @@ -195,19 +195,6 @@ On Debian and derivatives the following reason tags can be emitted: =over -=item B<merged-usr-via-aliased-dirs> - -The system has a merged I</usr> via aliased directories (previously known -as B<merged-usr-via-symlinks>). -This will confuse B<dpkg-query>, B<dpkg-statoverride>, -B<dpkg-trigger>, B<update-alternatives> and any other tool using -pathnames as keys into their databases, as it creates filesystem aliasing -problems, and messes with the understanding of the filesystem that -B<dpkg> has recorded in its database. -For build systems that hardcode pathnames to specific binaries or libraries -on the resulting artifacts, it can also produce packages that will be -incompatible with non-/usr-merged filesystems. - =item B<usr-local-has-configs> The system has configuration files under I</usr/local/etc>. diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index edf94bc19..1af60dabd 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -669,16 +669,6 @@ sub _build_tainted_by { my $self = shift; my %tainted; - foreach my $pathname (qw(/bin /sbin /lib /lib32 /libo32 /libx32 /lib64)) { - next unless -l $pathname; - - my $linkname = readlink $pathname; - if ($linkname eq "usr$pathname" or $linkname eq "/usr$pathname") { - $tainted{'merged-usr-via-aliased-dirs'} = 1; - last; - } - } - require File::Find; my %usr_local_types = ( configs => [ qw(etc) ], -- Dpkg.Org's dpkg
