Package: util-linux-extra Version: 2.40-7 Severity: serious Tags: patch Control: affects -1 + util-linux User: helm...@debian.org Usertags: dep17p1
Hi Chris, in my last patch, I trusted your earlier changes too much and failed to notice that it didn't cover ctrlaltdel. I'm attaching a patch to also cover that. Helmut
diff --minimal -Nru util-linux-2.40/debian/changelog util-linux-2.40/debian/changelog --- util-linux-2.40/debian/changelog 2024-04-26 11:41:02.000000000 +0200 +++ util-linux-2.40/debian/changelog 2024-04-27 08:46:20.000000000 +0200 @@ -1,3 +1,10 @@ +util-linux (2.40-7.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Also cover ctrlaltdel in /usr-move mitigation (Closes: #-1). + + -- Helmut Grohne <hel...@subdivi.de> Sat, 27 Apr 2024 08:46:20 +0200 + util-linux (2.40-7) unstable; urgency=medium [ Chris Hofstaedtler ] diff --minimal -Nru util-linux-2.40/debian/util-linux-extra.lintian-overrides util-linux-2.40/debian/util-linux-extra.lintian-overrides --- util-linux-2.40/debian/util-linux-extra.lintian-overrides 2024-04-26 11:41:02.000000000 +0200 +++ util-linux-2.40/debian/util-linux-extra.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# DEP17 P1 mitigation -diversion-for-unknown-file sbin/* [preinst:*] diff --minimal -Nru util-linux-2.40/debian/util-linux-extra.postrm util-linux-2.40/debian/util-linux-extra.postrm --- util-linux-2.40/debian/util-linux-extra.postrm 2024-04-26 11:41:02.000000000 +0200 +++ util-linux-2.40/debian/util-linux-extra.postrm 2024-04-27 08:46:12.000000000 +0200 @@ -3,11 +3,9 @@ set -e if test "$1" = remove || test "$1" = disappear; then - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/fsck.cramfs.usr-is-merged --remove /sbin/fsck.cramfs - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/fsck.minix.usr-is-merged --remove /sbin/fsck.minix - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.bfs.usr-is-merged --remove /sbin/mkfs.bfs - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.cramfs.usr-is-merged --remove /sbin/mkfs.cramfs - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.minix.usr-is-merged --remove /sbin/mkfs.minix + for f in ctrlaltdel fsck.cramfs fsck.minix mkfs.bfs mkfs.cramfs mkfs.minix; do + dpkg-divert --no-rename --package util-linux-extra --divert "/sbin/$f.usr-is-merged" --remove "/sbin/$f" + done fi #DEBHELPER# diff --minimal -Nru util-linux-2.40/debian/util-linux-extra.preinst util-linux-2.40/debian/util-linux-extra.preinst --- util-linux-2.40/debian/util-linux-extra.preinst 2024-04-26 11:41:02.000000000 +0200 +++ util-linux-2.40/debian/util-linux-extra.preinst 2024-04-27 08:45:19.000000000 +0200 @@ -3,11 +3,9 @@ set -e if test "$1" = upgrade || test "$1" = install; then - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/fsck.cramfs.usr-is-merged --add /sbin/fsck.cramfs - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/fsck.minix.usr-is-merged --add /sbin/fsck.minix - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.bfs.usr-is-merged --add /sbin/mkfs.bfs - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.cramfs.usr-is-merged --add /sbin/mkfs.cramfs - dpkg-divert --no-rename --package util-linux-extra --divert /sbin/mkfs.minix.usr-is-merged --add /sbin/mkfs.minix + for f in ctrlaltdel fsck.cramfs fsck.minix mkfs.bfs mkfs.cramfs mkfs.minix; do + dpkg-divert --no-rename --package util-linux-extra --divert "/sbin/$f.usr-is-merged" --add "/sbin/$f" + done fi #DEBHELPER#
