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

[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 158369b35d7a6a6849b9a6a32a3cfaf3b66c0bc7
Merge: 972afde 0bd38de
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Wed Apr 20 20:06:56 2016 +0200

    Merge branch 'sid' into glibc-2.23

 debian/changelog                                   | 13 +++
 debian/control                                     |  2 +-
 debian/control.in/main                             |  2 +-
 debian/patches/hurd-i386/cvs-auxv.diff             | 95 ++++++++++++++++++++++
 debian/patches/hurd-i386/submitted-auxv.diff       | 14 ----
 .../patches/hurd-i386/unsubmitted-prof-eintr.diff  | 22 +++++
 debian/patches/kfreebsd/submitted-auxv.diff        |  3 +-
 debian/patches/series                              |  4 +-
 debian/patches/series.hurd-i386                    |  1 +
 9 files changed, 136 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index cb35150,f552f26..4152409
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,153 -1,16 +1,166 @@@
 +glibc (2.23-0experimental3) UNRELEASED; urgency=medium
 +
 +  * 
 +
 + -- Aurelien Jarno <aurel32@debian.org>  Thu, 14 Apr 2016 15:08:27 +0200
 +
 +glibc (2.23-0experimental2) experimental; 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, 14 Apr 2016 14:20:30 +0200
 +
 +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-7) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * hurd-i386/submitted-auxv.diff: Update from upstream commit into
+     cvs-auxv.diff.
+   * hurd-i386/unsubmitted-prof-eintr.diff: Fix recording profiling from
+     ext2fs.
+   * hurd-i386/submitted-anon-mmap-shared.diff: Disable, actually breaks
+     booting hurd-i386.
+   * control: Add myself as uploader.
+ 
+  -- Samuel Thibault <sthibault@debian.org>  Tue, 19 Apr 2016 11:48:08 +0200
+ 
  glibc (2.22-6) unstable; urgency=medium
  
    [ Samuel Thibault ]
diff --cc debian/control
index 6f3c9c2,9a45047..1fecf8f
--- a/debian/control
+++ b/debian/control
@@@ -11,10 -11,10 +11,10 @@@ Build-Depends: gettext, dpkg-dev (>= 1.
   kfreebsd-kernel-headers [kfreebsd-any],
   binutils (>= 2.21),
   g++-5, g++-5-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32],
 - libc-bin (>= 2.22) <cross>
 + libc-bin (>= 2.23) <cross>
  Build-Depends-Indep: perl, po-debconf (>= 1.0)
  Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
- Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>
+ Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>, Samuel Thibault <sthibault@debian.org>
  Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-glibc/glibc.git
  Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git
diff --cc debian/patches/series
index 82bf7b0,c998db7..e36a3f7
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -131,20 -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
+ hurd-i386/cvs-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: