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,13 @@ +eglibc (2.13-38+rpi2+deb7u11) wheezy-staging; urgency=medium + + [changes brought forward from 2.13-38+rpi2+deb7u8 by Peter Michael Green at Sun, 15 Mar 2015 13:59:33 +0000] + * 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. + + -- Raspbian forward porter Sat, 04 Jun 2016 14:21:28 +0000 + eglibc (2.13-38+deb7u11) wheezy-security; urgency=medium * Non-maintainer upload by the Debian LTS Team. diff -u eglibc-2.13/debian/patches/hurd-i386/libpthread_hurd_cond_wait.diff eglibc-2.13/debian/patches/hurd-i386/libpthread_hurd_cond_wait.diff --- eglibc-2.13/debian/patches/hurd-i386/libpthread_hurd_cond_wait.diff +++ eglibc-2.13/debian/patches/hurd-i386/libpthread_hurd_cond_wait.diff @@ -1,10 +1,10 @@ Add pthread_hurd_cond_wait_np, needed by translators with pthreads. -diff --git a/libpthread/Makefile b/libpthread/Makefile -index c1d8d33..2c7645d 100644 ---- a/libpthread/Makefile -+++ b/libpthread/Makefile -@@ -114,6 +114,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ +Index: extract.defuzz/libpthread/Makefile +=================================================================== +--- extract.defuzz.orig/libpthread/Makefile ++++ extract.defuzz/libpthread/Makefile +@@ -110,6 +110,7 @@ libpthread-routines := pt-attr pt-attr-d pt-cond-signal \ pt-cond-wait \ pt-cond-timedwait \ @@ -12,9 +12,11 @@ \ pt-stack-alloc \ pt-thread-alloc \ ---- a/Versions.def -+++ b/Versions.def -@@ -98,6 +98,7 @@ libpthread { +Index: extract.defuzz/Versions.def +=================================================================== +--- extract.defuzz.orig/Versions.def ++++ extract.defuzz/Versions.def +@@ -96,6 +96,7 @@ libpthread { GLIBC_2.6 GLIBC_2.11 GLIBC_2.12 @@ -22,9 +24,10 @@ GLIBC_PRIVATE } libresolv { -index 77eb870..ca975e0 100644 ---- a/libpthread/Versions -+++ b/libpthread/Versions +Index: extract.defuzz/libpthread/Versions +=================================================================== +--- extract.defuzz.orig/libpthread/Versions ++++ extract.defuzz/libpthread/Versions @@ -129,4 +129,7 @@ libpthread { __pthread_spin_lock; __pthread_spin_trylock; __pthread_spin_unlock; _pthread_spin_lock; @@ -33,11 +36,11 @@ + pthread_hurd_cond_wait_np; + } } -diff --git a/libpthread/pthread/pt-internal.h b/libpthread/pthread/pt-internal.h -index 067fb73..291baf5 100644 ---- a/libpthread/pthread/pt-internal.h -+++ b/libpthread/pthread/pt-internal.h -@@ -292,8 +292,9 @@ extern error_t __pthread_sigstate (struct __pthread *__restrict thread, int how, +Index: extract.defuzz/libpthread/pthread/pt-internal.h +=================================================================== +--- extract.defuzz.orig/libpthread/pthread/pt-internal.h ++++ extract.defuzz/libpthread/pthread/pt-internal.h +@@ -289,8 +289,9 @@ extern error_t __pthread_sigstate (struc int clear_pending); @@ -49,10 +52,10 @@ /* Default barrier attributes. */ extern const struct __pthread_barrierattr __pthread_default_barrierattr; -diff --git a/libpthread/sysdeps/generic/pt-attr.c b/libpthread/sysdeps/generic/pt-attr.c -index e501dc7..4f95918 100644 ---- a/libpthread/sysdeps/generic/pt-attr.c -+++ b/libpthread/sysdeps/generic/pt-attr.c +Index: extract.defuzz/libpthread/sysdeps/generic/pt-attr.c +=================================================================== +--- extract.defuzz.orig/libpthread/sysdeps/generic/pt-attr.c ++++ extract.defuzz/libpthread/sysdeps/generic/pt-attr.c @@ -24,7 +24,8 @@ #include @@ -63,11 +66,10 @@ { schedparam: { sched_priority: 0 }, stacksize: PTHREAD_STACK_DEFAULT, -diff --git a/libpthread/sysdeps/mach/hurd/bits/pthread-np.h b/libpthread/sysdeps/mach/hurd/bits/pthread-np.h -new file mode 100644 -index 0000000..9817a06 +Index: extract.defuzz/libpthread/sysdeps/mach/hurd/bits/pthread-np.h +=================================================================== --- /dev/null -+++ b/libpthread/sysdeps/mach/hurd/bits/pthread-np.h ++++ extract.defuzz/libpthread/sysdeps/mach/hurd/bits/pthread-np.h @@ -0,0 +1,32 @@ +/* Non-portable functions. Hurd on Mach version. + Copyright (C) 2008 Free Software Foundation, Inc. @@ -101,11 +103,10 @@ + pthread_mutex_t *__restrict __mutex); + +#endif /* bits/pthread-np.h */ -diff --git a/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c -new file mode 100644 -index 0000000..d2b5847 +Index: extract.defuzz/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c +=================================================================== --- /dev/null -+++ b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c ++++ extract.defuzz/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c @@ -0,0 +1,93 @@ +/* pthread_hurd_cond_wait. Hurd-specific wait on a condition. + Copyright (C) 2012 Free Software Foundation, Inc. @@ -200,13 +201,13 @@ + + return cancel; +} -diff --git a/libpthread/sysdeps/mach/hurd/pt-sysdep.c b/libpthread/sysdeps/mach/hurd/pt-sysdep.c -index f40fee5..882af69 100644 ---- a/sysdeps/mach/hurd/pt-sysdep.c -+++ b/libpthread/sysdeps/mach/hurd/pt-sysdep.c -@@ -30,6 +30,16 @@ +Index: extract.defuzz/libpthread/sysdeps/mach/hurd/pt-sysdep.c +=================================================================== +--- extract.defuzz.orig/libpthread/sysdeps/mach/hurd/pt-sysdep.c ++++ extract.defuzz/libpthread/sysdeps/mach/hurd/pt-sysdep.c +@@ -28,6 +28,16 @@ - __thread struct __pthread *___pthread_self; + #include +/* Allow programs that know about this library to override the default stack + size. @@ -221,7 +222,7 @@ /* Forward. */ static void *init_routine (void); -@@ -46,6 +56,10 @@ init_routine (void) +@@ -44,6 +54,10 @@ init_routine (void) struct __pthread *thread; int err; 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 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