← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to debian/patches/hurd-i386/cvs-libpthread_lock.diff

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/hurd-i386/cvs-libpthread_lock.diff
 
1
commit d4691b4a23ae319b39ae3a84f8435d4dc991bfac
 
2
Author: Richard Braun <rbraun@sceen.net>
 
3
Date:   Tue Jan 22 00:04:23 2013 +0100
 
4
 
 
5
    Fix versions of _IO_flockfile, _IO_ftrylockfile and _IO_funlockfile
 
6
    
 
7
    * Versions: Include _IO_flockfile, _IO_ftrylockfile and _IO_funlockfile
 
8
    in version 2.2.6 of libpthread.
 
9
 
 
10
---
 
11
 Versions |    5 +++--
 
12
 1 file changed, 3 insertions(+), 2 deletions(-)
 
13
 
 
14
diff --git a/Versions b/Versions
 
15
index ca975e0..8573637 100644
 
16
--- a/libpthread/Versions
 
17
+++ b/libpthread/Versions
 
18
@@ -22,11 +22,12 @@ libc {
 
19
 }
 
20
 
 
21
 libpthread {
 
22
+  GLIBC_2.2.6 {
 
23
+    _IO_flockfile; _IO_ftrylockfile; _IO_funlockfile;
 
24
+  }
 
25
   GLIBC_2.12 {
 
26
     __pthread_errorcheck_mutexattr; __pthread_recursive_mutexattr;
 
27
 
 
28
-    _IO_flockfile; _IO_ftrylockfile; _IO_funlockfile;
 
29
-
 
30
     __pthread_get_cleanup_stack;
 
31
 
 
32
     __pthread_mutex_transfer_np;