[glibc] 02/04: Merge tag 'debian/2.22-11' 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 32f56efccdaa07c93047fc311046293f13b94e31
Merge: 2024f56 db2b658
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon Jun 27 01:15:37 2016 +0200
Merge tag 'debian/2.22-11' into glibc-2.23
tagging package glibc version debian/2.22-11
debian/changelog | 21 +
debian/control | 35 +-
debian/control.in/libc | 2 +-
debian/control.in/opt | 27 ++
debian/debhelper.in/libc.NEWS | 9 -
debian/patches/hurd-i386/tg-faccessat.diff | 472 +++++++++++++++++++++
debian/patches/hurd-i386/tg-poll_errors_fixes.diff | 51 ++-
debian/patches/series | 2 +-
debian/script.in/nohwcap.sh | 3 -
debian/sysdeps/hurd-i386.mk | 3 +
debian/sysdeps/i386.mk | 3 +
debian/sysdeps/kfreebsd-i386.mk | 2 +
12 files changed, 596 insertions(+), 34 deletions(-)
diff --cc debian/changelog
index 7cb1a27,337358f..231e450
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,156 -1,24 +1,177 @@@
+glibc (2.23-0experimental3) UNRELEASED; urgency=medium
+
+ [ Aurelien Jarno ]
+ * debian/patches/git-updates.diff: update from upstream stable branch:
+ - debian/patches/hurd-i386/tg-hurdsig-fixes-2.diff: refresh.
+ - debian/patches/hurd-i386/cvs-libpthread.so.diff: drop, upstreamed.
+
+ -- 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: partially upstreamed, rebased.
+ - 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-11) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * hurd-i386/tg-poll_errors_fixes.diff: Fix crash when calling poll or select
+ on a fd which had never been allocated. Closes: #826175.
+ * hurd-i386/tg-faccessat.diff: Finish faccessat implementation. Fixes
+ findutils.
+
+ [ Aurelien Jarno ]
+ * Update from upstream stable branch.
+ * debian/control: re-add libc0.1-i686, libc0.3-i686, libc6-i686 as a
+ dummy package to ease the upgrades. Closes: #825421, #826290.
+ * debian/sysdeps/i386.mk: add libc6-i686 dummy package.
+ * debian/sysdeps/hurd-i386.mk: add libc0.1-i686 dummy package.
+ * debian/sysdeps/kfreebsd-i386.mk: add libc0.3-i686 dummy package.
+ * debian/debhelper.in/libc.NEWS: drop the new about libc6-i686, libc0.1-i686
+ and libc0.3-i686 packages removal.
+ * debian/script.in/nohwcap.sh: drop sparc optimized packages.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 05 Jun 2016 00:04:04 +0200
+
glibc (2.22-10) unstable; urgency=medium
[ Aurelien Jarno ]
diff --cc debian/control
index 2367ea4,acc0f4d..ea44fd3
--- a/debian/control
+++ b/debian/control
@@@ -164,8 -167,8 +164,8 @@@ Multi-Arch: sam
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+ Conflicts: libc6-loongson2f [mipsel]
-Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
@@@ -252,8 -255,8 +252,8 @@@ Multi-Arch: sam
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+ Conflicts: libc6-loongson2f [mipsel]
-Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
@@@ -340,8 -343,8 +340,8 @@@ Multi-Arch: sam
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+ Conflicts: libc6-loongson2f [mipsel]
-Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
@@@ -428,8 -431,8 +428,8 @@@ Multi-Arch: sam
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+ Conflicts: libc6-loongson2f [mipsel]
-Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
diff --cc debian/patches/series
index af54999,a227a88..137261a
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -132,17 -147,12 +132,16 @@@ 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/cvs-libpthread.so.diff
+hurd-i386/local-versions.diff
hurd-i386/cvs-auxv.diff
#hurd-i386/submitted-anon-mmap-shared.diff
hurd-i386/cvs-gprof-tick.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: