r6775 - in glibc-package/trunk/debian: . debhelper.in
Author: aurel32
Date: 2015-12-05 14:21:53 +0000 (Sat, 05 Dec 2015)
New Revision: 6775
Removed:
glibc-package/trunk/debian/debhelper.in/libc.prerm
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
debian/debhelper.in/libc.{preinst,prerm}: remove code handling the
upgrade from squeeze to wheezy, as we don't support squeeze to stretch
upgrades.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2015-12-04 11:34:05 UTC (rev 6774)
+++ glibc-package/trunk/debian/changelog 2015-12-05 14:21:53 UTC (rev 6775)
@@ -1,6 +1,9 @@
glibc (2.21-4) UNRELEASED; urgency=medium
- *
+ [ Aurelien Jarno ]
+ * debian/debhelper.in/libc.{preinst,prerm}: remove code handling the
+ upgrade from squeeze to wheezy, as we don't support squeeze to stretch
+ upgrades.
-- Aurelien Jarno <aurel32@debian.org> Fri, 04 Dec 2015 00:24:29 +0100
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2015-12-04 11:34:05 UTC (rev 6774)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2015-12-05 14:21:53 UTC (rev 6775)
@@ -99,31 +99,6 @@
done
}
-# On upgrade, if /lib64 is a symlink, remove it and replace it with a real
-# directory so we can ensure biarch and multiarch packages play nicely
-# together
-remove_lib64_symlink() {
- ldfile=$(readlink -e RTLD_SO)
- # Test if libc is of the same architecture as /bin/mv
- # If not, they almost surely have a multiarch system and we can use
- # the native ELF interpreter
- if ! $ldfile /bin/mv --version >/dev/null 2>&1; then
- interpreter=
- else
- interpreter=$ldfile
- fi
-
- mkdir /lib64.glibc-new
- ln -s $ldfile /lib64.glibc-new/$(basename RTLD_SO)
- # sync before and after the operation to reduce the danger of hosing
- # the system
- sync
- rm -f /lib64
- $interpreter /bin/mv /lib64.glibc-new /lib64
- sync
- rm -f /lib/$(basename RTLD_SO)
-}
-
if [ "$type" = upgrade ]
then
# Load debconf module if available
@@ -375,18 +350,6 @@
#DEBHELPER#
-case $type in
- upgrade|abort-upgrade)
- if test -L /lib64 && dpkg --compare-versions "$2" lt 2.13-17; then
- case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
- amd64 | ppc64 | sparc64)
- remove_lib64_symlink
- ;;
- esac
- fi
- ;;
-esac
-
if [ -n "$preversion" ]; then
if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then
# unconditionally wipe ld.so.cache on major version upgrades; this
Deleted: glibc-package/trunk/debian/debhelper.in/libc.prerm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.prerm 2015-12-04 11:34:05 UTC (rev 6774)
+++ glibc-package/trunk/debian/debhelper.in/libc.prerm 2015-12-05 14:21:53 UTC (rev 6775)
@@ -1,70 +0,0 @@
-#!/bin/sh
-set -e
-export LC_ALL=C
-
-type=$1
-if [ "x$2" != "xin-favour" ]; then
- preversion=$2
-fi
-
-restore_lib64_symlink() {
-# Downgrading from a version with a /lib64 directory to a version with
-# a /lib64 symlink is extremely dangerous. We need to move the
-# directory aside and restore the symlink, otherwise the dynamic
-# linker gets lost after unpacking the replacing version.
-
- ldfile=$(readlink -e RTLD_SO)
- # Test if libc is of the same architecture as coreutils
- # If not, they almost surely have a multiarch system and we can use
- # the native ELF interpreter
- if ! $ldfile /bin/true 2>/dev/null; then
- interpreter=
- else
- interpreter=$ldfile
- fi
-
- # Create the symlink in /lib again
- cp -a RTLD_SO /lib/
-
- # sync before and after the operation to reduce the danger of hosing
- # the system
- sync
- # See if they have anything in /lib64 besides the ELF interpreter.
- # If yes, move the directory aside so they can restore it later,
- # otherwise we just remove it.
- if ls -1A /lib64 | grep -vq "^$(basename RTLD_SO)$"; then
- echo "Warning: /lib64 not empty during libc downgrade, renaming it to /lib64.glibc-old"
- mv /lib64 /lib64.glibc-old
- else
- rm -rf /lib64
- fi
-
- $interpreter /bin/ln -s /lib /lib64
- sync
-}
-
-
-#DEBHELPER#
-
-if [ "$type" = upgrade ]; then
- if dpkg --compare-versions "$preversion" lt 2.13-17; then
- if ! test -L /lib64; then
- case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
- amd64 | ppc64 | sparc64)
- restore_lib64_symlink ;;
- esac
- fi
- fi
-fi
-
-if [ -n "$preversion" ]; then
- if dpkg --compare-versions "$preversion" lt 2.13-5; then
- # downgrading from a multiarch libc to a pre-multiarch libc; we have
- # to blow away /etc/ld.so.cache, otherwise the old unpacked libc
- # is still first in the cache and segfaults when combined with
- # our newly-unpacked ld.so.
- rm -f /etc/ld.so.cache
- fi
-fi
-
-exit 0
Reply to: