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

[glibc] 01/01: Merge tag 'debian/2.25-4' into glibc-2.26



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.26
in repository glibc.

commit 327f6e67a2d0588c5cde82ad8d6e69d6288bbc8f
Merge: 3f27ba0 cd87bd5
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Tue Dec 12 22:04:12 2017 +0100

    Merge tag 'debian/2.25-4' into glibc-2.26
    
    tagging package glibc version debian/2.25-4

 debian/changelog                                   | 35 +++++++++++++++++++
 debian/control                                     | 12 +++----
 debian/control.in/libc                             |  2 +-
 debian/control.in/main                             |  4 +--
 debian/glibc-source.filelist                       | 27 +++++++++++++++
 debian/libc0.3.symbols.hurd-i386                   |  4 +++
 debian/patches/any/git-any-ld.so-newline.diff      | 17 +++++++++
 debian/patches/any/local-ldso-disable-hwcap.diff   | 40 ++++++++++++++++------
 debian/patches/hurd-i386/local-msg-nosignal.diff   | 22 ------------
 .../hurd-i386/local-no-bootstrap-fs-access.diff    |  4 +--
 debian/patches/kfreebsd/local-sysdeps.diff         | 29 +++++++++++++---
 debian/patches/series                              |  1 +
 debian/patches/series.hurd-i386                    |  1 -
 debian/rules                                       | 19 +++-------
 debian/rules.d/build.mk                            |  2 ++
 debian/rules.d/debhelper.mk                        |  2 +-
 debian/testsuite-xfail-debian.mk                   |  2 ++
 17 files changed, 158 insertions(+), 65 deletions(-)

diff --cc debian/changelog
index 765b1c7,78cc05a..8c2fb4c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,156 -1,38 +1,191 @@@
 +glibc (2.26-0experimental2) UNRELEASED; urgency=medium
 +
 +  [ Aurelien Jarno ]
 +  * debian/testsuite-xfail-debian.mk: move double-lround XFAILs from mips64el
 +    to mipsel.
 +  * debian/patches/git-updates.diff: update from upstream stable branch:
 +    - Fix malloc returning pointer from tcache_get when it should returns
 +      NULL (CVE-2017-17426).  Closes: #883729.
 +  * debian/control.in/libc: add a Breaks: libperl5.26 (<< 5.26.1-3) to
 +    @libc@-dev to handle the xlocale.h removal.  Closes: #883392.
 +  * debian/control.in/main: point the Vcs-Git field to the glibc-2.26 branch
 +    to shut up tracker.debian.org about missing commits.
 +
 + -- Aurelien Jarno <aurel32@debian.org>  Wed, 22 Nov 2017 17:50:44 +0100
 +
 +glibc (2.26-0experimental1) experimental; urgency=medium
 +
 +  [ Samuel Thibault ]
 +  * debian/testsuite-xfail-debian.mk: Update hurd-i386 xfail with new test.
 +
 +  [ Aurelien Jarno ]
 +  * Bump build-dependency on binutils to >= 2.25, as required by glibc 2.26.
 +  * debian/testsuite-xfail-debian.mk: re-add double-lround XFAILs for
 +    mips64el.
 +  * debian/patches/git-updates.diff: update from upstream stable branch.
 +
 + -- Aurelien Jarno <aurel32@debian.org>  Wed, 22 Nov 2017 17:46:32 +0100
 +
 +glibc (2.26-0experimental0) experimental; urgency=medium
 +
 +  [ Adam Conrad ]
 +  * New upstream release (LP: #1703368), with git updates to 2017-10-10:
 +    - debian/{symbols.wildcards,control}: Update and regen for 2.26.
 +    - debian/patches/alpha/submitted-termios_h.diff: upstreamed.
 +    - debian/patches/arm/submitted-strip-bit-0.diff: upstreamed.
 +    - debian/patches/hurd-i386/git-__inet6_scopeid_pton.diff: upstreamed.
 +    - debian/patches/any/submitted-string2-strcmp.diff: obsolete.
 +    - debian/patches/any/local-tst-writev.diff: fixed upstream.
 +    - debian/patches/any/local-dynamic-resolvconf.diff: fixed upstream.
 +    - debian/patches/any/submitted-unicode-9.0.0.diff: obsolete.
 +    - debian/patches/any/cvs-malloc-hardening.diff: upstreamed.
 +    - debian/patches/any/local-bits-sigstack.diff: fixed upstream.
 +    - debian/patches/powerpc/submitted-tst-tlsopt-powerpc.diff: upstreamed.
 +    - debian/patches/i386/local-cmov.diff: dropped, no longer useful.
 +    - debian/patches/all/local-ldd.diff: rebased.
 +    - debian/patches/any/local-ldso-disable-hwcap.diff: rebased.
 +    - debian/patches/any/local-tcsetaddr.diff: rebased.
 +    - debian/patches/any/submitted-resolv-unaligned.diff: rebased.
 +    - debian/patches/arm/local-arm-futex.diff: rebased.
 +    - debian/patches/hurd-i386/local-ED.diff: rebased.
 +    - debian/patches/hurd-i386/tg-EGREGIOUS-fr.diff: rebased.
 +    - debian/patches/hurd-i386/tg-EIEIO-fr.diff: rebased.
 +    - debian/patches/kfreebsd/submitted-auxv.diff: rebased.
 +    - debian/patches/kfreebsd/submitted-waitid.diff: rebased.
 +    - debian/patches/localedata/locales-fr.diff: rebased.
 +    - debian/patches/sparc/submitted-sparc64-socketcall.diff: rebased.
 +    - debian/patches/localedata/local-hu_HU-sort.diff: Make testsuite
 +      agree with the sorting we see in Debian, may need another look.
 +    - debian/patches/any/local-cudacc-float128.diff: Local patch to prevent
 +      defining __HAVE_FLOAT128 on NVIDIA's CUDA compilers (LP: #1717257)
 +    - debian/patches/arm/git-arm64-memcmp.diff: Backport optimized memcmp
 +      for AArch64, improving performance from 25% to 500% (LP: #1720832)
 +    - debian/control.in/libc: Drop ancient Breaks satisfied in oldoldstable.
 +    - debian/{debhelper.in/libc.preinst,sysdeps/amd64.mk,sysdeps/i386.mk}:
 +      Bump MIN_KERNEL_SUPPORTED to 3.2 on x86, following upstream's change.
 +    - debian/sysdeps/{powerpc.mk,ppc64.mk,s390x.mk}: Disable lock-elision on
 +      powerpc and s390, following IBM's recommendation.
 +    - debian/testsuite-xfail-debian.mk: Re-enable xfailed resolv tests.
 +    - debian/testsuite-xfail-debian.mk: Allow tst-create-detached to fail on
 +      all platforms; the design of this test is such that the outcome relies
 +      on cache sizes and noisiness of the build system, which is unreliable.
 +    - debian/rules.d/build.mk: Configure with --enable-obsolete-nsl until we
 +      sort out a reasonable nsswitch migration strategy from compat to files.
 +
 +  [ Samuel Thibault ]
 +  * Adjust hurd-i386 patches to restore build and functionality with 2.26:
 +    - patches/hurd-i386/tg-gsync-libc.diff: rebased.
 +    - patches/hurd-i386/tg-hurdsig-global-dispositions.diff: rebased.
 +    - patches/hurd-i386/tg-pipe2.diff: rebased.
 +    - patches/hurd-i386/tg-socket_flags.diff: rebased.
 +    - patches/hurd-i386/tg2.25-tls.diff: rebased.
 +    - patches/hurd-i386/tg2.26-sched_param.diff: New patch.
 +    - patches/hurd-i386/git-sigsetops.h.diff: New patch.
 +    - patches/hurd-i386/git-sigsetops-2.h.diff: New patch.
 +    - patches/hurd-i386/git-sigsetops-3.h.diff: New patch.
 +    - patches/hurd-i386/tg2.26-sigsetops.h.diff: New patch.
 +    - patches/hurd-i386/git-bits_socket.h.diff: New patch.
 +    - patches/hurd-i386/git-preadwritev2.diff: New patch.
 +    - patches/hurd-i386/git-preadwritev2-2.diff: New patch.
 +    - patches/hurd-i386/git-preadwritev2-3.diff: New patch.
 +    - patches/hurd-i386/git-rtld-access.diff: New patch.
 +    - patches/hurd-i386/git-rtld-sbrk.diff: New patch.
 +    - patches/hurd-i386/git-rtld-sbrk-2.diff: New patch.
 +    - patches/hurd-i386/git-divdi.diff: New patch.
 +    - patches/hurd-i386/git-feraiseexcept.diff: New patch.
 +    - patches/hurd-i386/cvs-libpthread.diff: Update.
 +    - patches/hurd-i386/git-libpthread-2.26.diff: New patch.
 +    - patches/hurd-i386/git-i386-implies-x86.diff: New patch.
 +    - patches/hurd-i386/git-x86-tunables.diff: New patch.
 +    - patches/hurd-i386/git-rtld-strtoul_internal.diff: New patch.
 +    - patches/hurd-i386/git-clone.diff: New patch.
 +    - patches/hurd-i386/git-gethostname.diff: New patch.
 +    - patches/hurd-i386/cvs-libpthread-sigstate.diff: Remove unused merged
 +    patch.
 +    - patches/hurd-i386/cvs-send-recv-posix.diff: Remove unused merged patch.
 +    - patches/hurd-i386/cvs-truncate64.diff: Remove unused merged patch.
 +    - patches/hurd-i386/git-tst-udp-timeout.diff: New patch.
 +    - patches/hurd-i386/git-tst-udp-nonblocking.diff: New patch.
 +    - patches/hurd-i386/unsubmitted-exp-hidden-jump.diff: New patch.
 +    - patches/hurd-i386/git-hidden-def.diff: New patch.
 +    - patches/hurd-i386/git-hidden-def.diff-2: New patch.
 +    - patches/hurd-i386/git-dl-sysdep-check.diff: New patch.
 +    - patches/hurd-i386/git-socket-limit.diff: New patch.
 +    - patches/hurd-i386/tg-thread-linkspace.diff: New patch.
 +    - patches/hurd-i386/git-clock_gettime_gettimeofday.diff: New patch.
 +    - patches/hurd-i386/tg-gsync-libc.diff: Update.
 +    - patches/hurd-i386/tg-libpthread-gsync-mutex.diff: Update.
 +    - patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff: Update.
 +    - patches/hurd-i386/git-sigsuspend_not_cancel.diff: New patch.
 +    - patches/hurd-i386/tg-sysvshm.diff: Update.
 +    - patches/hurd-i386/tg-ifaddrs_v6.diff: Update.
 +    - patches/hurd-i386/git-dirfd-linknamespace.diff: New patch.
 +    - patches/hurd-i386/git-revoke-linknamespace.diff: New patch.
 +    - patches/hurd-i386/git-seekdir-linknamespace.diff: New patch.
 +    - patches/hurd-i386/git-ifaddrs-linknamespace.diff: New patch.
 +    - patches/hurd-i386/git-NO_HIDDEN.diff: New patch.
 +    - patches/hurd-i386/unsubmitted-NO_HIDDEN.diff: Remove patch.
 +    - patches/hurd-i386/unsubmitted-exp-hidden-jump.diff: Remove patch.
 +    - testsuite-xfail-debian.mk: Update.
 +    - testsuite-xfail-debian.mk: Remove now-removed XPG3 entries.
 +
 +  [ Aurelien Jarno ]
 +  * debian/patches/git-updates.diff: update from upstream stable branch:
 +    - Fix buffer overflow in glob with GLOB_TILDE (CVE-2017-15670).  Closes:
 +      #879501.
 +    - Fix memory leak in glob with GLOB_TILDE (CVE-2017-15671).  Closes:
 +      #879500.
 +  * debian/rules, debian/control.in/main: build with GCC 7.
 +  * debian/testsuite-xfail-debian.mk: remove a few XFAIL on s390x that were
 +    due to GCC 6 issues.
 +  * debian/testsuite-xfail-debian.mk: drop support for s390.
 +  * debian/testsuite-xfail-debian.mk: Use granular fma XFAIL on mips*.
 +  * debian/testsuite-xfail-debian.mk: mark misc/tst-set_ppr as XFAIL on
 +    powerpc as it requires a recent CPU or a recent kernel for CPU feature
 +    detection.
 +  * debian/patches/any/local-libgcc-compat-{abilists,main,ports}.diff: drop
 +    workaround for binaries built with some broken versions of GCC 3.2 more
 +    than 10 years ago.
 +  * debian/testsuite-xfail-debian.mk: remove many XFAIL from mips, mipsel and
 +    mips64el.
 +
 + -- Aurelien Jarno <aurel32@debian.org>  Sun, 19 Nov 2017 12:49:13 +0100
 +
+ glibc (2.25-4) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * debian/patches/kfreebsd/local-sysdeps.diff: update to revision 6194 (from
+     glibc-bsd):
+     - Provide TCP_KEEPIDLE in netinet/tcp.h.  Closes: #881185.
+     - Fix FTBFS on kfreebsd-amd64.
+   * debian/control.in/libc: add conflicts with libc0.1-i686 on kfreebsd-i386
+     and libc6-i686 on i386, to make sure the transitional packages are not
+     kept when upgrading from stretch.
+   * debian/patches/any/local-ldso-disable-hwcap.diff: use __access_noerrno
+     instead of __access.  Closes: #877493.
+   * debian/rules, debian/rules.d/debhelper.mk: reverse the logic to build
+     libc6-dbg. Only fill it with files from the main libc and optimized
+     flavours. Other debugging symbols are available in the dbgsym packages.
+     Closes: #520680.
+   * debian/rules.d/build.mk: add /usr/local multi-arch paths to ld.so.conf
+     files.  Closes: #685519, #771934.
+   * debian/patches/any/git-any-ld.so-newline.diff: add missing newline after
+     "cannot allocate TLS data structures for initial thread".  Closes:
+     #776659.
+   * debian/glibc-source.filelist: update with the latest mips* symbol files.
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix SysV IPC on IA64.  Closes: #884194.
+ 
+   [ Samuel Thibault ]
+   * patches/hurd-i386/local-no-bootstrap-fs-access.diff: Refresh.
+   * patches/hurd-i386/git-rtld-access.diff: New patch.
+   * patches/hurd-i386/local-msg-nosignal.diff: Remove, now useless.
+   * testsuite-xfail-debian.mk: Update gnu-gnu according to git-updates.diff.
+   * control: Bump hurd-dev build-dep.
+   * libc0.3.symbols.hurd-i386: Update symbols accordingly.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 12 Dec 2017 20:21:48 +0100
+ 
  glibc (2.25-3) unstable; urgency=medium
  
    [ Aurelien Jarno ]
diff --cc debian/control
index 468b152,490e6e4..10ef2ee
--- a/debian/control
+++ b/debian/control
@@@ -6,13 -6,14 +6,13 @@@ Build-Depends: gettext, dpkg (>= 1.18.7
   linux-libc-dev (>= 3.9) [linux-any],
   libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
   mig (>= 1.5-3) [hurd-i386], gnumach-dev (>= 2:1.8+git20170102-1~) [hurd-i386],
-  hurd-dev (>= 1:0.9.git20171119~) [hurd-i386] | hurd-headers-dev [hurd-i386],
-  hurd-dev (>= 1:0.9.git20171119~) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
+  hurd-dev (>= 1:0.9.git20171119-2~) [hurd-i386] | hurd-headers-dev [hurd-i386],
+  hurd-dev (>= 1:0.9.git20171119-2~) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
   kfreebsd-kernel-headers [kfreebsd-any],
 - binutils (>= 2.21),
 - g++-6, g++-6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32],
 - g++-6 (>= 6.1.1-1~) [hurd-i386 i386 kfreebsd-i386],
 + binutils (>= 2.25),
 + g++-7, g++-7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32],
   python3:native <!nocheck>,
 - libc-bin (>= 2.25) <cross>
 + libc-bin (>= 2.26) <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>, Samuel Thibault <sthibault@debian.org>
@@@ -164,8 -165,8 +164,8 @@@ Multi-Arch: sam
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
  Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
+ Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~)
 -Breaks: nscd (<< 2.25), locales (<< 2.25), locales-all (<< 2.25), 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.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
            libc0.1-i686 [kfreebsd-i386],
@@@ -252,8 -253,8 +252,8 @@@ Multi-Arch: sam
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
  Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
+ Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~)
 -Breaks: nscd (<< 2.25), locales (<< 2.25), locales-all (<< 2.25), 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.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
            libc0.1-i686 [kfreebsd-i386],
@@@ -340,8 -341,8 +340,8 @@@ Multi-Arch: sam
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
  Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
+ Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~)
 -Breaks: nscd (<< 2.25), locales (<< 2.25), locales-all (<< 2.25), 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.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
            libc0.1-i686 [kfreebsd-i386],
@@@ -428,8 -429,8 +428,8 @@@ Multi-Arch: sam
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
  Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
+ Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~)
 -Breaks: nscd (<< 2.25), locales (<< 2.25), locales-all (<< 2.25), 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.26), locales (<< 2.26), locales-all (<< 2.26), 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/control.in/libc
index 1288547,67278f0..d5a2cd0
--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@@ -6,8 -6,8 +6,8 @@@ Multi-Arch: sam
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
  Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
+ Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~)
 -Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), 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 (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), 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/control.in/main
index fcd1efe,7194a2c..36efeee
--- a/debian/control.in/main
+++ b/debian/control.in/main
@@@ -6,11 -6,12 +6,11 @@@ Build-Depends: gettext, dpkg (>= 1.18.7
   linux-libc-dev (>= 3.9) [linux-any],
   libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
   mig (>= 1.5-3) [hurd-i386], gnumach-dev (>= 2:1.8+git20170102-1~) [hurd-i386],
-  hurd-dev (>= 1:0.9.git20171119~) [hurd-i386] | hurd-headers-dev [hurd-i386],
-  hurd-dev (>= 1:0.9.git20171119~) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
+  hurd-dev (>= 1:0.9.git20171119-2~) [hurd-i386] | hurd-headers-dev [hurd-i386],
+  hurd-dev (>= 1:0.9.git20171119-2~) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
   kfreebsd-kernel-headers [kfreebsd-any],
 - binutils (>= 2.21),
 - g++-6, g++-6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32],
 - g++-6 (>= 6.1.1-1~) [hurd-i386 i386 kfreebsd-i386],
 + binutils (>= 2.25),
 + g++-7, g++-7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32],
   python3:native <!nocheck>,
   libc-bin (>= @GLIBC_VERSION@) <cross>
  Build-Depends-Indep: perl, po-debconf (>= 1.0)
diff --cc debian/patches/any/local-ldso-disable-hwcap.diff
index 00ad3a0,a3f3624..03cdc3d
--- a/debian/patches/any/local-ldso-disable-hwcap.diff
+++ b/debian/patches/any/local-ldso-disable-hwcap.diff
@@@ -8,13 -8,13 +8,22 @@@
  # DP: Date: 2003-10-28, (Updated 2005-01-02 gotom, 2007-05-20 aurel32)
  
  ---
-- elf/dl-cache.c  |    6 ++++++
-- elf/dl-hwcaps.c |   21 +++++++++++++++++++--
-- 2 files changed, 25 insertions(+), 2 deletions(-)
++ elf/dl-cache.c  |    8 ++++++++
++ elf/dl-hwcaps.c |   26 +++++++++++++++++++++++---
++ 2 files changed, 31 insertions(+), 3 deletions(-)
  
  --- a/elf/dl-hwcaps.c
  +++ b/elf/dl-hwcaps.c
--@@ -42,6 +42,7 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
++@@ -22,6 +22,8 @@
++ #include <libintl.h>
++ #include <unistd.h>
++ #include <ldsodefs.h>
+++#include <sysdep.h>
+++#include <not-errno.h>
++
++ #include <dl-procinfo.h>
++ #include <dl-hwcaps.h>
++@@ -44,6 +46,7 @@
     size_t cnt = platform != NULL;
     size_t n, m;
     size_t total;
@@@ -22,7 -22,7 +31,7 @@@
     struct r_strlenpair *result;
     struct r_strlenpair *rp;
     char *cp;
- @@ -417,8 +417,22 @@
 -@@ -111,8 +113,22 @@
++@@ -113,8 +116,22 @@
     /* For TLS enabled builds always add 'tls'.  */
     ++cnt;
   
@@@ -46,7 -46,7 +55,7 @@@
     m = 0;
   #ifdef NEED_DL_SYSINFO_DSO
     if (dsocaps != NULL)
- @@ -496,8 +510,11 @@
 -@@ -192,8 +208,11 @@
++@@ -199,8 +216,11 @@
     *sz = 1 << cnt;
     result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
     if (result == NULL)
@@@ -62,7 -62,7 +71,16 @@@
       {
  --- a/elf/dl-cache.c
  +++ b/elf/dl-cache.c
--@@ -244,6 +244,7 @@
++@@ -25,6 +25,8 @@
++ #include <stdint.h>
++ #include <_itoa.h>
++ #include <dl-hwcaps.h>
+++#include <sysdep.h>
+++#include <not-errno.h>
++ 
++ #ifndef _DL_PLATFORMS_COUNT
++ # define _DL_PLATFORMS_COUNT 0
++@@ -248,6 +250,7 @@
     if (cache_new != (void *) -1)
       {
         uint64_t platform;
@@@ -70,17 -70,17 +88,17 @@@
   
         /* This is where the strings start.  */
         cache_data = (const char *) cache_new;
- @@ -255,6 +256,9 @@
 -@@ -258,6 +260,9 @@
 -       if (platform != (uint64_t) -1)
 - 	platform = 1ULL << platform;
++@@ -261,6 +264,9 @@
 + 
 +       uint64_t hwcap_mask = GET_HWCAP_MASK();
   
- +      if (__access ("/etc/ld.so.nohwcap", F_OK) == 0)
+ +      if (__access_noerrno ("/etc/ld.so.nohwcap", F_OK) == 0)
  +	disable_hwcap = 1;
  +
   #define _DL_HWCAP_TLS_MASK (1LL << 63)
 -       uint64_t hwcap_exclude = ~((GLRO(dl_hwcap) & GLRO(dl_hwcap_mask))
 +       uint64_t hwcap_exclude = ~((GLRO(dl_hwcap) & hwcap_mask)
   				 | _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK);
- @@ -265,6 +269,8 @@
 -@@ -268,6 +273,8 @@
++@@ -271,6 +277,8 @@
   	continue;							      \
         if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion))	      \
   	continue;							      \
diff --cc debian/patches/series
index c7e9e76,8c63151..0715778
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -228,9 -205,13 +228,10 @@@ any/local-tst-eintr1-eagain.dif
  any/unsubmitted-ldso-machine-mismatch.diff
  any/unsubmitted-dlopen-static-crash.diff
  any/local-ldconfig-ignore-ld.so.diff
 -any/local-dynamic-resolvconf.diff
  any/local-libpic.diff
  any/local-bootstrap-headers.diff
 -any/submitted-unicode-9.0.0.diff
 -any/cvs-malloc-hardening.diff
 -any/local-bits-sigstack.diff
  any/submitted-resolv-unaligned.diff
  any/submitted-intl-tstgettext.diff
 +any/local-cudacc-float128.diff
  any/submitted-ldconfig-c-collation.diff
+ any/git-any-ld.so-newline.diff
diff --cc debian/testsuite-xfail-debian.mk
index 1a8525d,fa8638b..9942d0e
--- a/debian/testsuite-xfail-debian.mk
+++ b/debian/testsuite-xfail-debian.mk
@@@ -324,37 -732,13 +324,39 @@@ test-xfail-tst-vfork3 = ye
  test-xfail-tst-wcstod-round = yes
  test-xfail-tst-env-setuid = yes
  test-xfail-tst-env-setuid-tunables = yes
+ test-xfail-tst-glob-tilde = yes
+ test-xfail-tst-glob-tilde-mem = yes
  
 -# regression in 2.25
 -test-xfail-test-ildouble = yes
 -test-xfail-test-ldouble = yes
 -test-xfail-test-ldouble-finite = yes
 +# new in 2.26
 +test-xfail-tst-malloc-usable-static-tunables = yes
 +test-xfail-tst-malloc-usable-static = yes
 +test-xfail-tst-malloc-tcache-leak = yes
 +test-xfail-tst-dynarray-fail-mem = yes
 +test-xfail-test-errno = yes
 +
 +test-xfail-UNIX98/arpa/inet.h/conform = yes
 +test-xfail-UNIX98/netdb.h/conform = yes
 +test-xfail-UNIX98/netinet/in.h/conform = yes
 +test-xfail-POSIX2008/arpa/inet.h/conform = yes
 +test-xfail-POSIX2008/netdb.h/conform = yes
 +test-xfail-POSIX2008/netinet/in.h/conform = yes
 +test-xfail-XPG42/arpa/inet.h/conform = yes
 +test-xfail-XPG42/fcntl.h/conform = yes
 +test-xfail-XPG42/netdb.h/conform = yes
 +test-xfail-XPG42/netinet/in.h/conform = yes
 +test-xfail-XPG42/sys/ipc.h/conform = yes
 +test-xfail-XPG42/sys/msg.h/conform = yes
 +test-xfail-XPG42/sys/resource.h/conform = yes
 +test-xfail-XPG42/sys/shm.h/conform = yes
 +test-xfail-XPG42/sys/stat.h/conform = yes
 +test-xfail-XPG42/sys/statvfs.h/conform = yes
 +test-xfail-XPG42/sys/un.h/conform = yes
 +test-xfail-XPG42/termios.h/conform = yes
 +
 +# will be fixed in hurd >= 20170926
 +test-xfail-tst-bug18665-tcp = yes
 +test-xfail-tst-resolv-basic = yes
 +test-xfail-tst-resolv-search = yes
  endif
  
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: