This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch sid in repository glibc.
commit a1884d3c2ea458c655c07d87434affe95d23d8e6 Author: Samuel Thibault <[email protected]> Date: Sun Sep 11 22:15:18 2016 +0000 hurd-i386/cvs-libpthread.diff: Update from upstream. Fixes spurious dependencies of libp11, libgnutls30, libbsd0. --- debian/changelog | 4 +++- debian/patches/hurd-i386/cvs-libpthread.diff | 22 ++++++++++++++++------ debian/patches/hurd-i386/libpthread_version.diff | 11 +++++------ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14520c5..4218f32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -glibc (2.24-4) UNRELEASED; urgency=medium +glibc (2.24-3) UNRELEASED; urgency=medium [ Aurelien Jarno ] * patches/kfreebsd/local-sysdeps.diff: update to revision 6102 (from @@ -7,6 +7,8 @@ glibc (2.24-4) UNRELEASED; urgency=medium [ Samuel Thibault ] * hurd-i386/tg-poll_errors_fixes.diff: Fix spurious port destroy on io_select returning an error. + * hurd-i386/cvs-libpthread.diff: Update from upstream. Fixes spurious + dependencies of libp11, libgnutls30, libbsd0. -- Aurelien Jarno <[email protected]> Mon, 05 Sep 2016 23:34:08 +0200 diff --git a/debian/patches/hurd-i386/cvs-libpthread.diff b/debian/patches/hurd-i386/cvs-libpthread.diff index 0e0522c..0395c4d 100644 --- a/debian/patches/hurd-i386/cvs-libpthread.diff +++ b/debian/patches/hurd-i386/cvs-libpthread.diff @@ -260,7 +260,7 @@ Index: glibc-2.21/libpthread/forward.c =================================================================== --- /dev/null +++ glibc-2.21/libpthread/forward.c -@@ -0,0 +1,245 @@ +@@ -0,0 +1,248 @@ +/* Copyright (C) 2002, 2003, 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <[email protected]>, 2002. @@ -410,6 +410,7 @@ Index: glibc-2.21/libpthread/forward.c + void (*prepare) (void); + void (*parent) (void); + void (*child) (void); ++ void *dso_handle; + struct atfork *prev; + struct atfork *next; +}; @@ -482,7 +483,8 @@ Index: glibc-2.21/libpthread/forward.c +__register_atfork ( + void (*prepare) (void), + void (*parent) (void), -+ void (*child) (void)) ++ void (*child) (void), ++ void *dso_handle) +{ + struct atfork *new = malloc (sizeof (*new)); + if (!new) @@ -491,6 +493,7 @@ Index: glibc-2.21/libpthread/forward.c + new->prepare = prepare; + new->parent = parent; + new->child = child; ++ new->dso_handle = dso_handle; + new->prev = NULL; + + __mutex_lock (&atfork_lock); @@ -5106,7 +5109,7 @@ Index: glibc-2.21/libpthread/sysdeps/generic/pt-atfork.c =================================================================== --- /dev/null +++ glibc-2.21/libpthread/sysdeps/generic/pt-atfork.c -@@ -0,0 +1,29 @@ +@@ -0,0 +1,33 @@ +/* Register fork handlers. Generic version. + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -5129,12 +5132,16 @@ Index: glibc-2.21/libpthread/sysdeps/generic/pt-atfork.c +#include <pthread.h> +#include <pt-internal.h> + ++/* This is defined by newer gcc version unique for each module. */ ++extern void *__dso_handle __attribute__ ((__weak__, ++ __visibility__ ("hidden"))); ++ +int +pthread_atfork (void (*prepare) (void), + void (*parent) (void), + void (*child) (void)) +{ -+ return __register_atfork (prepare, parent, child); ++ return __register_atfork (prepare, parent, child, &__dso_handle == NULL ? NULL : __dso_handle); +} Index: glibc-2.21/libpthread/sysdeps/generic/pt-attr.c =================================================================== @@ -14437,7 +14444,7 @@ Index: glibc-2.21/libpthread/Versions =================================================================== --- /dev/null +++ glibc-2.21/libpthread/Versions -@@ -0,0 +1,142 @@ +@@ -0,0 +1,145 @@ +libc { + GLIBC_2.13 { + pthread_attr_destroy; pthread_attr_getdetachstate; @@ -14456,9 +14463,12 @@ Index: glibc-2.21/libpthread/Versions + pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock; + pthread_self; pthread_setcancelstate; pthread_setcanceltype; + __pthread_get_cleanup_stack; ++ } ++ GLIBC_2.22 { ++ __register_atfork; ++ } + GLIBC_PRIVATE { + __libc_pthread_init; -+ __register_atfork; + } +} + diff --git a/debian/patches/hurd-i386/libpthread_version.diff b/debian/patches/hurd-i386/libpthread_version.diff index 3965deb..0431ea2 100644 --- a/debian/patches/hurd-i386/libpthread_version.diff +++ b/debian/patches/hurd-i386/libpthread_version.diff @@ -13,11 +13,10 @@ once packages are rebuilt against 2.21. pthread_attr_destroy; pthread_attr_getdetachstate; pthread_attr_getinheritsched; pthread_attr_getschedparam; pthread_attr_getschedpolicy; pthread_attr_getscope; pthread_attr_init; -@@ -16,6 +16,25 @@ libc { - pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock; - pthread_self; pthread_setcancelstate; pthread_setcanceltype; - __pthread_get_cleanup_stack; -+ } +@@ -16,6 +16,24 @@ libc { + GLIBC_2.22 { + __register_atfork; + } + GLIBC_2.21 { + pthread_attr_destroy; pthread_attr_getdetachstate; + pthread_attr_getinheritsched; pthread_attr_getschedparam; @@ -38,7 +37,7 @@ once packages are rebuilt against 2.21. + } GLIBC_PRIVATE { __libc_pthread_init; - __register_atfork; + } @@ -132,7 +151,13 @@ libpthread { __pthread_spin_lock; __pthread_spin_trylock; __pthread_spin_unlock; _pthread_spin_lock; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
