Remove /lib/ld-lsb-x86-64.so.* only on upgrade.

This is a safe-side fix useful only for amd64.

Closes: #642079
Reported-by: Colin Watson <cjwatson@debian.org>
Signed-off-by: Didier Raboud <odyx@debian.org>

diff --git a/debian/lsb-core.postinst b/debian/lsb-core.postinst
index 0321747749e0b08acc7f2597fe40be6931952305..435d1e0f8770a2a27bab5b8fbcd3ee189b0d31b7 100755 (executable)
--- a/debian/lsb-core.postinst
+++ b/debian/lsb-core.postinst
@@ -29,8 +29,6 @@ setup_ldso_symlink () {
             ln -sf ld-linux.so.2 /lib/ld-lsb.so.3
             ln -sf ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.2
             ln -sf ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
-            [ -L /lib/ld-lsb-x86-64.so.2 ] && rm /lib/ld-lsb-x86-64.so.2 || true
-            [ -L /lib/ld-lsb-x86-64.so.3 ] && rm /lib/ld-lsb-x86-64.so.3 || true
             ;;
         ia64)
             ln -sf ld-linux-ia64.so.2 /lib/ld-lsb-ia64.so.1
@@ -56,6 +54,10 @@ case "$1" in
                 shadowconfig on >&2 || true
             fi
         fi
+        if dpkg --compare-versions "$2" lt "3.2+Debian30" ; then
+          [ -L /lib/ld-lsb-x86-64.so.2 ] && rm /lib/ld-lsb-x86-64.so.2 || true
+          [ -L /lib/ld-lsb-x86-64.so.3 ] && rm /lib/ld-lsb-x86-64.so.3 || true
+        fi
         setup_ldso_symlink
         ;;
     abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/debian/lsb-core.prerm b/debian/lsb-core.prerm
index e6b26b6051e993c6cba3d3a14271c024a5e3fe87..8b1f535912e75ffd59681b2eacb0ec88bb13e6e3 100644 (file)
--- a/debian/lsb-core.prerm
+++ b/debian/lsb-core.prerm
@@ -18,7 +18,7 @@ remove_ldso_symlink () {
             rm -f /lib/ld-lsb.so.[123]
             ;;
         amd64)
-            rm -f /lib/ld-lsb.so.[123] /lib64/ld-lsb-x86-64.so.[23] /lib/ld-lsb-x86-64.so.[23]
+            rm -f /lib/ld-lsb.so.[123] /lib64/ld-lsb-x86-64.so.[23]
             ;;
         *)
             echo "ld-lsb-*.so.1 symlink for $ARCH is unknown; not removed."