From 56cd5768b32fd97a7156977dcbbd40715e158e9c Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Tue, 6 Feb 2024 09:28:03 -0700 Subject: Mitigate /usr-move file loss. (Closes: #1062802) --- debian/changelog | 7 +++++++ debian/clean | 2 ++ debian/libpam0t64.postrm.in | 13 +++++++++++++ debian/libpam0t64.preinst.in | 13 +++++++++++++ debian/rules | 5 +++++ 5 files changed, 40 insertions(+) create mode 100644 debian/libpam0t64.postrm.in create mode 100644 debian/libpam0t64.preinst.in diff --git a/debian/changelog b/debian/changelog index 7adcb914..bce0df4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pam (1.5.3-3) experimental; urgency=medium + + [ Helmut Grohne ] + * Mitigate /usr-move file loss. (Closes: #1062802) + + -- Helmut Grohne Sat, 03 Feb 2024 12:18:52 +0100 + pam (1.5.3-2) experimental; urgency=medium * Rename libpam0g to libpamt64 for time_t transition diff --git a/debian/clean b/debian/clean index 62f09e76..bd751b64 100644 --- a/debian/clean +++ b/debian/clean @@ -1 +1,3 @@ debian/local/pam_getenv.8 +debian/libpam0t64.preinst +debian/libpam0t64.postrm diff --git a/debian/libpam0t64.postrm.in b/debian/libpam0t64.postrm.in new file mode 100644 index 00000000..90720b6d --- /dev/null +++ b/debian/libpam0t64.postrm.in @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ "$1" = remove ]; then + for file in libpam.so.0 libpam.so.0.85.1 libpam_misc.so.0 libpam_misc.so.0.82.1 libpamc.so.0 libpamc.so.0.82.1; do + dpkg-divert --package libpam0t64 --no-rename --remove --divert "/lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged" "/lib/#DEB_HOST_MULTIARCH#/$file" + done +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/libpam0t64.preinst.in b/debian/libpam0t64.preinst.in new file mode 100644 index 00000000..85cffd2f --- /dev/null +++ b/debian/libpam0t64.preinst.in @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ "$1" = install ]; then + for file in libpam.so.0 libpam.so.0.85.1 libpam_misc.so.0 libpam_misc.so.0.82.1 libpamc.so.0 libpamc.so.0.82.1; do + dpkg-divert --package libpam0t64 --no-rename --add --divert "/lib/#DEB_HOST_MULTIARCH#/$file.usr-is-merged" "/lib/#DEB_HOST_MULTIARCH#/$file" + done +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index 9e2562b9..c636ff47 100755 --- a/debian/rules +++ b/debian/rules @@ -76,3 +76,8 @@ endif override_dh_installchangelogs: dh_installchangelogs NEWS + +debian/%:debian/%.in + sed -e 's/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/g' $< > $@ + +execute_before_dh_installdeb:debian/libpam0t64.preinst debian/libpam0t64.postrm -- cgit v1.2.3