[glibc] 01/01: Merge branch 'sid' into glibc-2.23
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.23
in repository glibc.
commit 0c4d0d91149aa794267a5b0cb762b77167042e6c
Merge: fccd1fa 5a1ff49
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Apr 9 16:19:26 2016 +0200
Merge branch 'sid' into glibc-2.23
debian/changelog | 15 +++++++++
.../hurd-i386/submitted-anon-mmap-shared.diff | 36 ++++++++++++++++++++++
debian/patches/hurd-i386/submitted-auxv.diff | 14 +++++++++
debian/patches/kfreebsd/submitted-auxv.diff | 2 +-
debian/patches/series | 2 ++
5 files changed, 68 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index bca05ea,263b0be..1857824
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,147 -1,18 +1,162 @@@
+glibc (2.23-0experimental2) UNRELEASED; urgency=medium
+
+ [ Aurelien Jarno ]
+ * debian/patches/git-updates.diff: update from upstream stable branch.
+ * patches/kfreebsd/local-fbtl.diff: update to revision 5973 (from
+ glibc-bsd).
+ * debian/rules, debian/rules.d/build.mk: rename localedir into complocaledir
+ following upstream change.
+ * debian/patches/local-allocalim-header.diff: drop, obsolete.
+ * debian/patches/any/local-no-pagesize.diff: drop, obsolete.
+
+ [ Adam Conrad ]
+ * debian/testsuite-xfail-debian.mk: Also allow tst-malloc-thread-fail to
+ fail where we've already done so for test-xfail-tst-malloc-thread-exit.
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 24 Mar 2016 00:23:13 +0100
+
+glibc (2.23-0experimental1) experimental; urgency=medium
+
+ [ Aurelien Jarno ]
+ * debian/patches/git-updates.diff: update from upstream stable branch.
+ * debian/testsuite-xfail-debian.mk (powerpc) really mark
+ tst-malloc-thread-exit as xfail.
+ * debian/testsuite-xfail-debian.mk (ppc64) mark tst-malloc-thread-exit
+ test as xfail, it is a known issue and not a regression.
+ * patches/kfreebsd/local-fbtl.diff: update to revision 5969 (from
+ glibc-bsd).
+ * debian/patches/kfreebsd/local-tst-malloc-fbtl.diff: drop, obsoleted by
+ hurd-i386/cvs-libpthread.so.diff.
+ * debian/patches/kfreebsd/local-tst-unique.diff: disable tst-unique* on
+ GNU/kFreeBSD, as they are not supported by the FreeBSD ELF OSABI.
+ * debian/patches/alpha/submitted-fts64.diff: new patch to fix the new fts64
+ function on alpha.
+
+ [ Samuel Thibault ]
+ * hurd-i386/cvs-libpthread.diff: More updates to glibc-2.23.
+ * hurd-i386/cvs-openat.diff: Fix __openat prototype.
+ * hurd-i386/cvs-gai_sigqueue.diff: Fix gai_sigqueue prototype.
+ * hurd-i386/cvs-aio_sigqueue.diff: Fix aio_sigqueue prototype.
+ * hurd-i386/cvs-libpthread.diff: Separate 2.23 changes to...
+ * hurd-i386/cvs-libpthread-2.23.diff: ... separate patch.
+ * hurd-i386/cvs-libpthread.so.diff: Fix building malloc tests.
+ * testsuite-xfail-debian.mk: Skip test which just overflows memory.
+ * 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
+ upstream to make tst-malloc-thread-exit use fewer system resources.
+ * debian/debhelper.in/locales.config: Make default_environment_locale
+ get preseeded correctly both with and without /etc/default/locale.
+ * debian/control.in/i386: Remove list of Breaks that predate oldstable.
+ * debian/control.in/*: Drop long obsolete file overlap Breaks/Replaces.
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 24 Mar 2016 00:21:05 +0100
+
+glibc (2.23-0experimental0) experimental; urgency=medium
+
+ [ Aurelien Jarno ]
+ * New upstream release: version 2.23, with git updates up to 2016-03-12:
+ - Fix German translation of "Alarm clock". Closes: #291293.
+ - Fix strtol in Turkish locales. Closes: #458611.
+ - Add LFS support for fts functions. Closes: #534521.
+ - Fix build with GCC 6. Closes: #811574.
+ - Fix unbounded stack allocation in nan* functions (CVE-2014-9761).
+ Closes: #813187.
+ - debian/patches/localedata/locale-ku_TR.diff: rebased.
+ - debian/patches/localedata/fix-lang.diff: upstreamed.
+ - debian/patches/localedata/first_weekday.diff: rebased.
+ - debian/patches/localedata/locale-nb_NO.diff: upstreamed.
+ - debian/patches/localedata/cvs-bg_BG-t_fmt.diff: upstreamed.
+ - debian/patches/alpha/local-string-functions.diff: rebased.
+ - debian/patches/amd64/local-blacklist-for-Intel-TSX.diff: rebased.
+ - debian/patches/arm/local-ioperm.diff: dropped.
+ - debian/patches/hppa/cvs-allocatestack-stacktop.diff: upstreamed.
+ - debian/patches/hppa/local-pthread_spin_unlock.diff: upstreamed.
+ - debian/patches/hppa/submitted-mathdef.diff: upstreamed.
+ - debian/patches/hppa/cvs-update-mman.h.diff: upstreamed.
+ - debian/patches/hppa/submitted-dladdr.diff: upstreamed.
+ - debian/patches/hurd-i386/local-enable-ldconfig.diff: rebased.
+ - debian/patches/hurd-i386/tg-tls.diff: rebased.
+ - debian/patches/hurd-i386/tg-tls-threadvar.diff: rebased.
+ - debian/patches/hurd-i386/tg-hurdsig-fixes.diff: rebased.
+ - debian/patches/hurd-i386/tg-hurdsig-global-dispositions.diff: rebased.
+ - debian/patches/hurd-i386/cvs-libpthread.diff: updated.
+ - debian/patches/hurd-i386/unsubmitted-gnumach.defs.diff: rebased.
+ - debian/patches/hurd-i386/submitted-fork_port_leak.diff: upstreamed.
+ - debian/patches/hurd-i386/tg-libc_getspecific.diff: rebased.
+ - debian/patches/hurd-i386/cvs-libpthread-libc-lockP.diff: upstreamed.
+ - debian/patches/hurd-i386/tg-mmap32th_bit.diff: upstreamed.
+ - debian/patches/hurd-i386/tg-sysheaders.diff: upstreamed.
+ - debian/patches/hurd-i386/cvs-bootstrap.diff: upstreamed.
+ - debian/patches/hurd-i386/cvs-cache-mach_host_self.diff: upstreamed.
+ - debian/patches/hurd-i386/cvs-csu_crt0.diff: upstreamed.
+ - debian/patches/hurd-i386/cvs-s_scalbn.diff: upstreamed.
+ - debian/patches/hurd-i386/local-mach_print.diff: rebased.
+ - debian/patches/hurd-i386/cvs-hidden.diff: rebased.
+ - debian/patches/hurd-i386/cvs-O_DIRECTORY.diff: upstreamed.
+ - debian/patches/hurd-i386/cvs-raise-longjump.diff: upstreamed.
+ - debian/patches/i386/local-i386-ulps.diff: dropped.
+ - debian/patches/kfreebsd/local-scripts.diff: rebased.
+ - debian/patches/m68k/submitted-gcc34-seccomment.diff: rebased.
+ - debian/patches/mips/cvs-testsuite-o32-fp.diff: upstreamed.
+ - debian/patches/powerpc/local-powerpc8xx-dcbz.diff: rebased.
+ - debian/patches/sh4/local-fpscr_values.diff: rebased.
+ - debian/patches/any/local-bindresvport_blacklist.diff: rebased.
+ - debian/patches/any/local-libgcc-compat-main.diff: rebased.
+ - debian/patches/any/local-libgcc-compat-abilists.diff: rebased.
+ - debian/patches/any/local-mktemp.diff: upstreamed.
+ - debian/patches/any/cvs-stdio-lock.diff: upstreamed.
+ - debian/patches/any/local-tcsetaddr.diff: rebased.
+ - debian/patches/any/local-tst-mktime2.diff: rebased.
+ - debian/patches/any/submitted-nis-netgrp.diff: upstreamed.
+ - debian/patches/any/submitted-longdouble.diff: rebased.
+ - debian/patches/any/local-dynamic-resolvconf.diff: rebased.
+ - debian/patches/any/local-static-dlopen-search-path.diff: upstreamed.
+ - debian/patches/any/local-math-logb.diff: upstreamed.
+ - debian/patches/any/cvs-gawk-gensub.diff: upstreamed.
+ - debian/patches/any/cvs-grantpt-namespace.diff: upstreamed.
+ - debian/patches/any/cvs-grantpt-pty-owner.diff: upstreamed.
+ - debian/patches/any/cvs-bits-libc-stdio-lock.diff: upstreamed.
+ - debian/patches/any/submitted-hle-checking-mutex.diff: upstreamed.
+ - debian/{control,symbols.wildcards,copyright}: Updated strings for 2.23.
+ - debian/patches/kfreebsd/local-undef-glibc.diff: rebased.
+ - debian/patches/kfreebsd/local-tst-malloc-backtrace.diff: rebased,
+ renamed into local-tst-malloc-fbtl.diff.
+ - debian/patches/hurd-i386/submitted-net.diff: rebased.
+ - debian/patches/hurd-i386/tg-bits_atomic.h_multiple_threads.diff:
+ rebased.
+ - debian/patches/hurd-i386/submitted-handle-eprototype.diff: dropped.
+ * debian/testsuite-xfail-debian.mk (powerpc) mark tst-malloc-thread-fail
+ test as xfail, it is a known issue and not a regression.
+ * debian/testsuite-xfail-debian.mk (mipsel): mark a few math tests are
+ failing, due to a bug in the Loongson 3 FPU.
+ * patches/kfreebsd/local-fbtl.diff: update to revision 5940 (from
+ glibc-bsd).
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 13 Mar 2016 19:22:45 +0100
+
+ glibc (2.22-6) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * hurd-i386/submitted-auxv.diff: New patch, fixes cvs crash.
+ * hurd-i386/submitted-anon-mmap-shared.diff: New patch, fixes inheritence of
+ shared anonymous memory.
+
+ [ Aurelien Jarno ]
+ * Update from upstream stable branch:
+ - Fix stack overflow when getnetbyname is invoked on a very long name
+ (CVE-2016-3075).
+ - Fix HTM on powerpc/ppc64/ppc64el.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 09 Apr 2016 13:35:19 +0200
+
glibc (2.22-5) unstable; urgency=medium
[ Samuel Thibault ]
diff --cc debian/patches/hurd-i386/submitted-anon-mmap-shared.diff
index 0000000,5903cda..ec36d60
mode 000000,100644..100644
--- a/debian/patches/hurd-i386/submitted-anon-mmap-shared.diff
+++ b/debian/patches/hurd-i386/submitted-anon-mmap-shared.diff
@@@ -1,0 -1,36 +1,36 @@@
+ Optimizing anonymous maps brings bugs, and does not optimize much anyway.
+
+ https://sourceware.org/bugzilla/show_bug.cgi?id=19903
+
+ --- a/sysdeps/mach/hurd/mmap.c
+ +++ b/sysdeps/mach/hurd/mmap.c
+ @@ -44,29 +44,6 @@ __mmap (__ptr_t addr, size_t len, int pr
- if ((mapaddr & (vm_page_size - 1)) || (offset & (vm_page_size - 1)))
++ if ((mapaddr & (__vm_page_size - 1)) || (offset & (__vm_page_size - 1)))
+ return (__ptr_t) (long int) __hurd_fail (EINVAL);
+
+ - if ((flags & (MAP_TYPE|MAP_INHERIT)) == MAP_ANON
+ - && prot == (PROT_READ|PROT_WRITE)) /* cf VM_PROT_DEFAULT */
+ - {
+ - /* vm_allocate has (a little) less overhead in the kernel too. */
+ - err = __vm_allocate (__mach_task_self (), &mapaddr, len, mapaddr == 0);
+ -
+ - if (err == KERN_NO_SPACE)
+ - {
+ - if (flags & MAP_FIXED)
+ - {
+ - /* XXX this is not atomic as it is in unix! */
+ - /* The region is already allocated; deallocate it first. */
+ - err = __vm_deallocate (__mach_task_self (), mapaddr, len);
+ - if (!err)
+ - err = __vm_allocate (__mach_task_self (), &mapaddr, len, 0);
+ - }
+ - else if (mapaddr != 0)
+ - err = __vm_allocate (__mach_task_self (), &mapaddr, len, 1);
+ - }
+ -
+ - return err ? (__ptr_t) (long int) __hurd_fail (err) : (__ptr_t) mapaddr;
+ - }
+ -
+ vmprot = VM_PROT_NONE;
+ if (prot & PROT_READ)
+ vmprot |= VM_PROT_READ;
diff --cc debian/patches/series
index 7d3deb9,481fa2a..82bf7b0
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -131,18 -146,13 +131,20 @@@ hurd-i386/local-mach_print.dif
hurd-i386/cvs-hidden.diff
hurd-i386/cvs-libpthread-api.diff
hurd-i386/cvs-libpthread-sigstate.diff
-hurd-i386/cvs-O_DIRECTORY.diff
-hurd-i386/cvs-raise-longjump.diff
hurd-i386/submitted-hurd-abilist.diff
+hurd-i386/cvs-openat.diff
+hurd-i386/cvs-gai_sigqueue.diff
+hurd-i386/cvs-aio_sigqueue.diff
+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
+hurd-i386/cvs-libpthread.so.diff
+ hurd-i386/submitted-auxv.diff
+ hurd-i386/submitted-anon-mmap-shared.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: