[glibc] 02/02: Merge branch 'glibc-2.23' of ssh://git.debian.org/git/pkg-glibc/glibc into glibc-2.23
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.23
in repository glibc.
commit be8dbc97433339792b0e9706c19a6ed3797da06e
Merge: e9e5bb8 7e8241e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Mar 21 22:00:39 2016 +0000
Merge branch 'glibc-2.23' of ssh://git.debian.org/git/pkg-glibc/glibc into glibc-2.23
debian/changelog | 35 +++-
debian/control | 3 +-
debian/control.in/main | 3 +-
debian/patches/any/cvs-resolver-leak.diff | 29 ---
debian/patches/any/submitted-resolver-leak.diff | 16 ++
debian/patches/git-updates.diff | 226 ++++++++++++++++++++-
debian/patches/hurd-i386/cvs-errnos.d.diff | 30 +++
debian/patches/hurd-i386/cvs-mach-syscalls.mk.diff | 21 ++
debian/patches/hurd-i386/local-ihash-use.diff | 13 ++
debian/patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff | 29 ++-
.../patches/hurd-i386/tg-sendmsg-SCM_RIGHTS.diff | 61 +++---
debian/patches/localedata/fr_CA-first_weekday.diff | 15 --
debian/patches/series | 5 +-
debian/rules | 6 +
debian/rules.d/build.mk | 45 +++-
debian/testsuite-xfail-debian.mk | 12 +-
16 files changed, 445 insertions(+), 104 deletions(-)
diff --cc debian/changelog
index 98e41e4,af7b7e6..a0045d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -20,7 -21,9 +21,10 @@@ glibc (2.23-0experimental1) UNRELEASED
* hurd-i386/cvs-pt-kill.diff: Fix pthread_kill locking.
* hurd-i386/cvs-open.diff: Fix __open in ld.so, thus fixing dlopen().
* hurd-i386/cvs-c++-types.diff: Add expected c++-types.data.
+ * hurd-i386/local-ihash-use.diff: Note that libpthread uses ihash.h.
+ * testsuite-xfail-debian.mk: Add failing new tests. Disable the problematic
+ test-lfs test.
+ * hurd-i386/local-versions.diff: New patch to fix symbol version.
[ Adam Conrad ]
* debian/patches/any/cvs-tst-malloc-thread-exit.diff: Backport fix from
diff --cc debian/patches/series
index 8dc58b0,7d8c298..da42d63
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -138,7 -137,9 +137,10 @@@ hurd-i386/cvs-aio_sigqueue.dif
hurd-i386/cvs-pt-kill.diff
hurd-i386/cvs-open.diff
hurd-i386/cvs-c++-types.diff
+ hurd-i386/local-ihash-use.diff
+ hurd-i386/cvs-errnos.d.diff
+ hurd-i386/cvs-mach-syscalls.mk.diff
+hurd-i386/local-versions.diff
i386/local-biarch.diff
i386/local-cmov.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: