diff -u eglibc-2.13/debian/changelog eglibc-2.13/debian/changelog --- eglibc-2.13/debian/changelog +++ eglibc-2.13/debian/changelog @@ -1,3 +1,12 @@ +eglibc (2.13-38+rpi2+deb7u6) wheezy-staging; urgency=low + + * add some tests to expected failures list. + * Add fix from + http://anonscm.debian.org/viewvc/pkg-glibc?view=revision&revision=5493 + to more thoughroughly cleanup ldconfig caches on upgrade. + + -- Peter Michael Green Sun, 11 Jan 2015 00:07:13 +0000 + eglibc (2.13-38+deb7u6) wheezy; urgency=medium * Update 2.13-38+deb7u5 changelog to mention that some lost glibc-doc diff -u eglibc-2.13/debian/debhelper.in/libc.preinst eglibc-2.13/debian/debhelper.in/libc.preinst --- eglibc-2.13/debian/debhelper.in/libc.preinst +++ eglibc-2.13/debian/debhelper.in/libc.preinst @@ -465,14 +465,15 @@ esac if [ -n "$preversion" ]; then - if dpkg --compare-versions "$preversion" lt 2.13-38; then + if dpkg --compare-versions "$preversion" lt 2.13-38+rpi2; 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-38+rpi2 to also # cover cache format upgrades for ARM. rm -f /etc/ld.so.cache + rm -f /var/cache/ldconfig/aux-cache fi fi diff -u eglibc-2.13/debian/testsuite-checking/expected-results-arm-linux-gnueabihf-libc eglibc-2.13/debian/testsuite-checking/expected-results-arm-linux-gnueabihf-libc --- eglibc-2.13/debian/testsuite-checking/expected-results-arm-linux-gnueabihf-libc +++ eglibc-2.13/debian/testsuite-checking/expected-results-arm-linux-gnueabihf-libc @@ -15,0 +16,6 @@ +tst-cancel4.out, Error 1 +tst-cancel5.out, Error 1 +tst-cancelx4.out, Error 1 +tst-cancelx5.out, Error 1 +tst-key1.out, Error 1 +tst-key4.out, Error 1