This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch sid in repository glibc.
commit eebf4fca609919ce73189982aa31805293777ca4 Author: Samuel Thibault <samuel.thiba...@ens-lyon.org> Date: Wed Jul 20 09:48:44 2016 +0200 hurd-i386/libpthread_version.diff: Update with pthread_setcancelstate aliasing. --- debian/changelog | 8 ++++++ debian/patches/hurd-i386/libpthread_version.diff | 35 ++++++++++++------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index f97cd1c..3a78e38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +glibc (2.23-3) UNRELEASED; urgency=medium + + [ Samuel Thibault ] + * hurd-i386/libpthread_version.diff: Update with pthread_setcancelstate + aliasing. + + -- Aurelien Jarno <aure...@debian.org> Tue, 19 Jul 2016 20:22:37 +0200 + glibc (2.23-2) unstable; urgency=medium [ Aurelien Jarno ] diff --git a/debian/patches/hurd-i386/libpthread_version.diff b/debian/patches/hurd-i386/libpthread_version.diff index fec449e..f5ef1f5 100644 --- a/debian/patches/hurd-i386/libpthread_version.diff +++ b/debian/patches/hurd-i386/libpthread_version.diff @@ -4,10 +4,8 @@ This dates when libpthread was moved to glibc and some features were added. TODO: _DEBIAN_ in versions however pose problem. Remove the _DEBIAN_ version once packages are rebuilt against 2.21. -Index: glibc-2.21/libpthread/Versions -=================================================================== ---- glibc-2.21.orig/libpthread/Versions -+++ glibc-2.21/libpthread/Versions +--- a/libpthread/Versions ++++ b/libpthread/Versions @@ -1,5 +1,5 @@ libc { - GLIBC_2.13 { @@ -56,10 +54,8 @@ Index: glibc-2.21/libpthread/Versions pthread_hurd_cond_wait_np; pthread_hurd_cond_timedwait_np; } -Index: glibc-2.21/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c -=================================================================== ---- glibc-2.21.orig/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c -+++ glibc-2.21/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c +--- a/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c ++++ b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c @@ -23,6 +23,8 @@ #include <pt-internal.h> @@ -89,10 +85,8 @@ Index: glibc-2.21/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c int __pthread_hurd_cond_timedwait_internal (pthread_cond_t *cond, -Index: glibc-2.21/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c -=================================================================== ---- glibc-2.21.orig/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c -+++ glibc-2.21/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c +--- a/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c ++++ b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c @@ -23,6 +23,8 @@ #include <pt-internal.h> @@ -121,10 +115,8 @@ Index: glibc-2.21/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c +} +compat_symbol (libpthread, __pthread_hurd_cond_wait_np_2_13, pthread_hurd_cond_wait_np, GLIBC_2_13_DEBIAN_38); +#endif -Index: glibc-2.21/libpthread/forward.c -=================================================================== ---- glibc-2.21.orig/libpthread/forward.c -+++ glibc-2.21/libpthread/forward.c +--- a/libpthread/forward.c ++++ b/libpthread/forward.c @@ -23,20 +23,37 @@ #include <shlib-compat.h> #include <pthread-functions.h> @@ -199,7 +191,7 @@ Index: glibc-2.21/libpthread/forward.c FORWARD (pthread_getschedparam, -@@ -130,6 +159,7 @@ FORWARD (pthread_mutex_unlock, (pthread_ +@@ -130,16 +159,21 @@ FORWARD (pthread_mutex_unlock, (pthread_ FORWARD2 (pthread_self, pthread_t, (void), (), return 0) @@ -207,7 +199,14 @@ Index: glibc-2.21/libpthread/forward.c FORWARD (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), -@@ -139,6 +169,7 @@ FORWARD (pthread_setcanceltype, (int typ + 0) +-strong_alias (__pthread_setcancelstate, pthread_setcancelstate); ++versioned_symbol (libc, __pthread_setcancelstate, pthread_setcancelstate, GLIBC_2_21); ++#if SHLIB_COMPAT (libc, GLIBC_2_13, GLIBC_2_21) ++compat_symbol (libc, __pthread_setcancelstate_2_13, pthread_setcancelstate, GLIBC_2_13_DEBIAN_31); ++#endif + + FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) struct __pthread_cancelation_handler *dummy_list; FORWARD2 (__pthread_get_cleanup_stack, struct __pthread_cancelation_handler **, (void), (), return &dummy_list); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git