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=7633a469d6b8bb48b419091ff1b4fb1e45a4e24e commit 7633a469d6b8bb48b419091ff1b4fb1e45a4e24e Author: Guillem Jover <[email protected]> AuthorDate: Fri Dec 6 04:27:31 2024 +0100 debian: Remove merged-/usr warning 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. Closes: #1061718 --- debian/bug-script | 47 ----------------------------------------------- debian/dpkg.postinst | 45 --------------------------------------------- 2 files changed, 92 deletions(-) diff --git a/debian/bug-script b/debian/bug-script deleted file mode 100644 index 92b933da1..000000000 --- a/debian/bug-script +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -get_vendor() -{ - local origin="$DPKG_ROOT/etc/dpkg/origins/default" - local vendor - - if [ -n "$DEB_VENDOR" ]; then - vendor="$DEB_VENDOR" - elif [ -e "$origin" ]; then - vendor=$(sed -ne 's/^Vendor: *\([^ ]\+\) */\1/p' "$origin" | tr A-Z a-z) - fi - - echo "${vendor:-default}" -} - -check_merged_usr_via_aliased_dirs() -{ - local vendor - - vendor=$(get_vendor) - - case "$vendor" in - debian) - # In Debian some people have gotten so offended by the following _warning_ - # that they have resorted to bullying and abuse. Life's too short, sorry. - return - ;; - ubuntu) - # Ubuntu does not seem interested in it. - return - ;; - esac - - for d in /bin /sbin /lib /lib32 /libo32 /libx32 /lib64; do - linkname="$(readlink $d)" - if [ "$linkname" = "usr$d" ] || [ "$linkname" = "/usr$d" ]; then - echo "This system uses merged-usr-via-aliased-dirs, going behind dpkg's" >&3 - echo "back, breaking its core assumptions. This can cause silent file" >&3 - echo "overwrites and disappearances, and its general tools misbehavior." >&3 - echo "See <https://wiki.debian.org/Teams/Dpkg/FAQ#broken-usrmerge>." >&3 - break - fi - done -} - -check_merged_usr_via_aliased_dirs diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst index 6b5e5a17d..5b3a248a0 100644 --- a/debian/dpkg.postinst +++ b/debian/dpkg.postinst @@ -7,50 +7,6 @@ PROGNAME=dpkg . /usr/share/dpkg/sh/dpkg-error.sh -get_vendor() -{ - local origin="$DPKG_ROOT/etc/dpkg/origins/default" - local vendor - - if [ -n "$DEB_VENDOR" ]; then - vendor="$DEB_VENDOR" - elif [ -e "$origin" ]; then - vendor=$(sed -ne 's/^Vendor: *\([^ ]\+\) */\1/p' "$origin" | tr A-Z a-z) - fi - - echo "${vendor:-default}" -} - -check_merged_usr_via_aliased_dirs() -{ - local vendor - - vendor=$(get_vendor) - - case "$vendor" in - debian) - # In Debian some people have gotten so offended by the following _warning_ - # that they have resorted to bullying and abuse. Life's too short, sorry. - return - ;; - ubuntu) - # Ubuntu does not seem interested in it. - return - ;; - esac - - for d in /bin /sbin /lib /lib32 /libo32 /libx32 /lib64; do - linkname="$(readlink $DPKG_ROOT$d || true)" - if [ "$linkname" = "usr$d" ] || [ "$linkname" = "/usr$d" ]; then - warning "This system uses merged-usr-via-aliased-dirs, going behind dpkg's" - warning "back, breaking its core assumptions. This can cause silent file" - warning "overwrites and disappearances, and its general tools misbehavior." - warning "See <https://wiki.debian.org/Teams/Dpkg/FAQ#broken-usrmerge>." - break - fi - done -} - setup_aliases() { local prog=start-stop-daemon @@ -64,7 +20,6 @@ setup_aliases() case "$1" in configure) - check_merged_usr_via_aliased_dirs setup_aliases ;; abort-upgrade|abort-deconfigure|abort-remove) -- Dpkg.Org's dpkg
