From aeb7d171a03977b7990dbcc046fa95635bc0be49 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 18:38:36 +0200 Subject: Merging debian version 2.40-8. Signed-off-by: Daniel Baumann --- debian/changelog | 7 +++++++ debian/util-linux-extra.lintian-overrides | 2 -- debian/util-linux-extra.postrm | 8 +++----- debian/util-linux-extra.preinst | 8 +++----- 4 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 debian/util-linux-extra.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 75b770b..516951a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +util-linux (2.40-8) unstable; urgency=medium + + [ Helmut Grohne ] + * Also cover ctrlaltdel in /usr-move mitigation (Closes: #1069923) + + -- Chris Hofstaedtler Sat, 27 Apr 2024 14:23:31 +0200 + util-linux (2.40-7~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/util-linux-extra.lintian-overrides b/debian/util-linux-extra.lintian-overrides deleted file mode 100644 index d970402..0000000 --- a/debian/util-linux-extra.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# DEP17 P1 mitigation -diversion-for-unknown-file sbin/* [preinst:*] diff --git a/debian/util-linux-extra.postrm b/debian/util-linux-extra.postrm index 3e01a3a..ba30c67 100644 --- a/debian/util-linux-extra.postrm +++ b/debian/util-linux-extra.postrm @@ -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 --git a/debian/util-linux-extra.preinst b/debian/util-linux-extra.preinst index 0d9e13a..0d5abc5 100755 --- a/debian/util-linux-extra.preinst +++ b/debian/util-linux-extra.preinst @@ -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# -- cgit v1.2.3