r5541 - in glibc-package/branches/eglibc-2.17/debian: . debhelper.in
Author: adconrad
Date: 2013-05-07 07:16:22 +0000 (Tue, 07 May 2013)
New Revision: 5541
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/debhelper.in/libc.preinst
Log:
Merge 5493 from trunk
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-05-03 04:09:16 UTC (rev 5540)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-05-07 07:16:22 UTC (rev 5541)
@@ -638,6 +638,7 @@
[ Adam Conrad ]
* debian/testsuite-checking/compare.sh: Disable failing the build on test
regressions to ease the pain of ongoing stable/security maintenance.
+ * debian/debhelper.in/libc.preinst: Remove ld.so's aux-cache on upgrades.
[ Petr Salinger ]
* patches/kfreebsd/local-initgroups-order.diff: always put supplied extra
Modified: glibc-package/branches/eglibc-2.17/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/debhelper.in/libc.preinst 2013-05-03 04:09:16 UTC (rev 5540)
+++ glibc-package/branches/eglibc-2.17/debian/debhelper.in/libc.preinst 2013-05-07 07:16:22 UTC (rev 5541)
@@ -431,14 +431,15 @@
esac
if [ -n "$preversion" ]; then
- if dpkg --compare-versions "$preversion" lt 2.13-38; then
+ if dpkg --compare-versions "$preversion" lt 2.13-39; then
# upgrading from a pre-multiarch libc to a 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. Do this last to avoid slowing down the
- # rest of the upgrade. Version number bumped to 2.13-38 to also
+ # rest of the upgrade. Version number bumped to 2.13-39 to also
# cover cache format upgrades for ARM.
rm -f /etc/ld.so.cache
+ rm -f /var/cache/ldconfig/aux-cache
fi
fi
Reply to: