[glibc] 03/04: Merge tag 'debian/2.22-12' 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 8a5181edb3e7f1633a75163bedf707ca0c85a2b6
Merge: 32f56ef b81d09e
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon Jun 27 01:16:29 2016 +0200
Merge tag 'debian/2.22-12' into glibc-2.23
tagging package glibc version debian/2.22-12
debian/changelog | 25 +++++++++++++++++++++-
debian/debhelper.in/libc-bin.postinst | 33 ++++++++++++++++++++++++++++++
debian/local/etc/nsswitch.conf | 1 +
debian/patches/hurd-i386/tg-eintr.diff | 31 ++++++++++++++++++++++++++++
debian/patches/hurd-i386/tg-faccessat.diff | 21 +++++++------------
debian/patches/series | 1 +
debian/rules.d/build.mk | 1 +
debian/sysdeps/kfreebsd-i386.mk | 2 +-
8 files changed, 99 insertions(+), 16 deletions(-)
diff --cc debian/changelog
index 231e450,dcaa750..5e54832
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,156 -1,25 +1,179 @@@
+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/hurd-i386/tg-faccessat.diff: rebased.
+ - 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-12) unstable; urgency=medium
+
+ [ Aurelien Jarno ]
+ * Update from upstream stable branch:
+ - fix FTBFS with recent binutils versions on mips* and sparc*. Closes:
+ #827477.
+ * debian/sysdeps/kfreebsd-i386.mk: fix libc0.1-i686 package name.
+ * debian/rules.d/build.mk: in case of build failure due testsuite
+ issues, display again the failed tests so that they appear at the end of
+ the build log.
+ * debian/local/etc/nsswitch.conf: add gshadow line to default
+ /etc/nsswitch.conf (addresses #699090).
+ * debian/debhelper.in/libc-bin.postinst: update /etc/nsswitch.conf to the
+ current default if it matches a version shipped by bases-file or
+ libc-bin. This is based on a patch from Santiago Vila, thanks. Closes:
+ #827105.
+
+ [ Samuel Thibault ]
+ * hurd-i386/tg-eintr.diff: New patch to fix "Interrupted" issues in ghc.
+
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 20 Jun 2016 00:01:21 +0200
+
glibc (2.22-11) unstable; urgency=medium
[ Samuel Thibault ]
diff --cc debian/patches/hurd-i386/tg-faccessat.diff
index 9a4a560,9a4a560..aae8dab
--- a/debian/patches/hurd-i386/tg-faccessat.diff
+++ b/debian/patches/hurd-i386/tg-faccessat.diff
@@@ -116,8 -116,8 +116,8 @@@ index 3a54df7..9379689 10064
/* Test for access to FILE by our real user and group IDs. */
@@ -28,121 +24,7 @@ __access (file, type)
-- const char *file;
-- int type;
++ int
++ __access (const char *file, int type)
{
- error_t err;
- file_t rcrdir, rcwdir, io;
@@@ -242,7 -242,7 +242,7 @@@ diff --git a/sysdeps/mach/hurd/euidacce
index 5b96a3c..a4da9da 100644
--- a/sysdeps/mach/hurd/euidaccess.c
+++ b/sysdeps/mach/hurd/euidaccess.c
--@@ -16,44 +16,15 @@
++@@ -16,42 +16,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
@@@ -253,9 -253,9 +253,7 @@@
-#include <hurd.h>
int
-- __euidaccess (file, type)
-- const char *file;
-- int type;
++ __euidaccess (const char *file, int type)
{
- error_t err;
- file_t port;
@@@ -292,7 -292,7 +290,7 @@@ diff --git a/sysdeps/mach/hurd/faccessa
index 91bec43..5ca7ff7 100644
--- a/sysdeps/mach/hurd/faccessat.c
+++ b/sysdeps/mach/hurd/faccessat.c
--@@ -23,33 +23,156 @@
++@@ -23,29 +23,152 @@
#include <sys/types.h>
#include <hurd.h>
#include <hurd/fd.h>
@@@ -301,13 -301,13 +299,8 @@@
+#include <hurd/lookup.h>
int
---faccessat (fd, file, type, flag)
--+__faccessat (fd, file, type, at_flags)
-- int fd;
-- const char *file;
-- int type;
--- int flag;
--+ int at_flags;
++-faccessat (int fd, const char *file, int type, int flag)
+++__faccessat (int fd, const char *file, int type, int at_flags)
{
error_t err;
- file_t port;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: