Author: adconrad
Date: 2013-01-23 01:27:18 +0000 (Wed, 23 Jan 2013)
New Revision: 5445
Added:
glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/cvs-libpthread_lock.diff
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/libc0.3.symbols.hurd-i386
glibc-package/branches/eglibc-2.17/debian/patches/series
Log:
Merge with trunk.
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-22 08:49:02 UTC
(rev 5444)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-23 01:27:18 UTC
(rev 5445)
@@ -516,6 +516,8 @@
[ Samuel Thibault ]
* patches/hurd-i386/unsubmitted-setitimer_fix.diff: Finish fixing setitimer.
* patches/hurd-i386/unsubmitted-select-EINTR.diff: Fix select vs signals.
+ * patches/hurd-i386/cvs-libpthread_lock.diff: Fix file lock primitives
+ version to fix stdio thread-safety.
[ Adam Conrad ]
* debian/testsuite-checking/compare.sh: Disable failing the build on test
Modified: glibc-package/branches/eglibc-2.17/debian/libc0.3.symbols.hurd-i386
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/libc0.3.symbols.hurd-i386
2013-01-22 08:49:02 UTC (rev 5444)
+++ glibc-package/branches/eglibc-2.17/debian/libc0.3.symbols.hurd-i386
2013-01-23 01:27:18 UTC (rev 5445)
@@ -944,3 +944,4 @@
libpthread.so.0.3 #PACKAGE# #MINVER#
#include "symbols.wildcards"
*@GLIBC_2.13_DEBIAN_38 2.13-38~
+ *@GLIBC_2.2.6 2.13-38~
Copied:
glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/cvs-libpthread_lock.diff
(from rev 5444,
glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_lock.diff)
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/cvs-libpthread_lock.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/cvs-libpthread_lock.diff
2013-01-23 01:27:18 UTC (rev 5445)
@@ -0,0 +1,32 @@
+commit d4691b4a23ae319b39ae3a84f8435d4dc991bfac
+Author: Richard Braun <rbr...@sceen.net>
+Date: Tue Jan 22 00:04:23 2013 +0100
+
+ Fix versions of _IO_flockfile, _IO_ftrylockfile and _IO_funlockfile
+
+ * Versions: Include _IO_flockfile, _IO_ftrylockfile and _IO_funlockfile
+ in version 2.2.6 of libpthread.
+
+---
+ Versions | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Versions b/Versions
+index ca975e0..8573637 100644
+--- a/libpthread/Versions
++++ b/libpthread/Versions
+@@ -22,11 +22,12 @@ libc {
+ }
+
+ libpthread {
++ GLIBC_2.2.6 {
++ _IO_flockfile; _IO_ftrylockfile; _IO_funlockfile;
++ }
+ GLIBC_2.12 {
+ __pthread_errorcheck_mutexattr; __pthread_recursive_mutexattr;
+
+- _IO_flockfile; _IO_ftrylockfile; _IO_funlockfile;
+-
+ __pthread_get_cleanup_stack;
+
+ __pthread_mutex_transfer_np;
Modified: glibc-package/branches/eglibc-2.17/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/series 2013-01-22
08:49:02 UTC (rev 5444)
+++ glibc-package/branches/eglibc-2.17/debian/patches/series 2013-01-23
01:27:18 UTC (rev 5445)
@@ -113,6 +113,7 @@
hurd-i386/unsubmitted-single-hurdselect-timeout.diff
hurd-i386/unsubmitted-setitimer_fix.diff
hurd-i386/unsubmitted-select-EINTR.diff
+hurd-i386/cvs-libpthread_lock.diff
i386/local-biarch.diff
i386/local-cmov.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1txp7x-0004qs...@vasks.debian.org
