r2731 - in glibc-package/trunk/debian: . debhelper.in
Author: aurel32
Date: 2007-12-06 23:38:39 +0000 (Thu, 06 Dec 2007)
New Revision: 2731
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
* debhelper.in/libc.preinst: check for non-dpkg owned versions of
libc6-i686 before upgrade. Closes: #454557.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-12-06 23:20:23 UTC (rev 2730)
+++ glibc-package/trunk/debian/changelog 2007-12-06 23:38:39 UTC (rev 2731)
@@ -11,9 +11,11 @@
* Update any/submitted-sched_h.diff: allow compilation of <sched.h> with
-pedantic. Closes: bug#453687.
* Fix a typo in debian/sysdeps/alpha.mk. Closes: bug#452890.
- * Disable amd64/local-x86_64_bits_sigcontext.diff. Closes: #454598.
+ * Disable amd64/local-x86_64_bits_sigcontext.diff. Closes: #454598.
+ * debhelper.in/libc.preinst: check for non-dpkg owned versions of
+ libc6-i686 before upgrade. Closes: #454557.
- -- Aurelien Jarno <aurel32@debian.org> Fri, 07 Dec 2007 00:06:19 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 07 Dec 2007 00:36:41 +0100
glibc (2.7-3) unstable; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2007-12-06 23:20:23 UTC (rev 2730)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2007-12-06 23:38:39 UTC (rev 2731)
@@ -193,6 +193,16 @@
exit 1
fi
done
+ if [ -e /lib/tls/i686/cmov/libc.so.6 ] || [ -e /lib/i686/cmov/libc.so.6 ] ; then
+ status=$(dpkg -s libc6-i686 2>/dev/null | grep ^Status: | sed -e 's/^Status: \(.*\) \(.*\) \(.*\)/\3/g')
+ if [ -z "$status" ] || [ "$status" = "not-installed" ] || [ "$status" = "config-files" ]; then
+ echo
+ echo "A non-dpkg owned copy of the libc6-i686 package was found."
+ echo "It is not safe to upgrade the C library in this situation;"
+ echo "please remove that copy of the C library and try again."
+ exit 1
+ fi
+ fi
if [ -n "$LD_ASSUME_KERNEL" ] ; then
if dpkg --compare-versions "$LD_ASSUME_KERNEL" le "2.6.1"; then
echo
Reply to: