[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: * hurd-i386/cvs-libpthread-2.23.diff: Update



This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch sid
in repository glibc.

commit 04b357ad9642154a5874b789162a2d73c5d57347
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed Jul 13 01:24:21 2016 +0200

    * hurd-i386/cvs-libpthread-2.23.diff: Update
    
    adds pthread_setcancelstate alias, fixes rsyslog start.
---
 debian/changelog                                  | 4 ++++
 debian/patches/hurd-i386/cvs-libpthread-2.23.diff | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2aa9def..4d3e8ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ glibc (2.23-2) UNRELEASED; urgency=medium
   [ Aurelien Jarno ]
   * Danish debconf translation update from Joe Hansen.  Closes: #830589.
 
+  [ Samuel Thibault ]
+  * hurd-i386/cvs-libpthread-2.23.diff: Update, adds pthread_setcancelstate
+    alias, fixes rsyslog start.
+
  -- Aurelien Jarno <aurel32@debian.org>  Mon, 04 Jul 2016 00:33:56 +0200
 
 glibc (2.23-1) unstable; urgency=medium
diff --git a/debian/patches/hurd-i386/cvs-libpthread-2.23.diff b/debian/patches/hurd-i386/cvs-libpthread-2.23.diff
index 6e6bae5..0233387 100644
--- a/debian/patches/hurd-i386/cvs-libpthread-2.23.diff
+++ b/debian/patches/hurd-i386/cvs-libpthread-2.23.diff
@@ -1,14 +1,16 @@
 --- a/libpthread/forward.c
 +++ b/libpthread/forward.c
-@@ -132,7 +132,7 @@ FORWARD (pthread_mutex_unlock, (pthread_
+@@ -132,8 +132,9 @@ FORWARD (pthread_mutex_unlock, (pthread_
  FORWARD2 (pthread_self, pthread_t, (void), (), return 0)
  
  
 -FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
 +FORWARD (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
  	 0)
++strong_alias (__pthread_setcancelstate, pthread_setcancelstate);
  
  FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
+ 
 --- a/libpthread/pthread/pt-initialize.c
 +++ b/libpthread/pthread/pt-initialize.c
 @@ -61,7 +61,7 @@ static const struct pthread_functions pt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: