[glibc] 05/05: Merge branch 'sid' 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 0e5806717f7cacdf04fb7e10783f5cf89e2a05ca
Merge: fbb5cb3 0fb733b
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Dec 31 18:55:50 2017 +0100
Merge branch 'sid' into glibc-2.26
debian/changelog | 21 +++++
debian/control | 6 +-
debian/control.in/main | 6 +-
debian/copyright | 2 +-
debian/patches/alpha/submitted-fminmax.diff | 136 +++++++++++++++++++++++++++
debian/patches/alpha/submitted-rlimit.diff | 137 ++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules.d/tarball.mk | 2 +-
debian/testsuite-xfail-debian.mk | 3 +
9 files changed, 307 insertions(+), 8 deletions(-)
diff --cc debian/changelog
index f806469,0508f2f..3158f20
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,183 -1,24 +1,204 @@@
+glibc (2.26-0experimental3) UNRELEASED; urgency=medium
+
+ [ Aurelien Jarno ]
+ * debian/patches/any/local-ldso-disable-hwcap.diff: Include <fcntl.h>
+ before <not-errno.h>.
+ * debian/rules, debian/rules.d/build.mk: stop logging build/check messages
+ to files, both sbuild and debuild are able to do that.
+ * debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override
+ per architecture.
+ * debian/sysdeps/hppa.mk: set TIMEOUTFACTOR to 100 on HPPA.
+ * debian/testsuite-xfail-debian.mk: remove tst-create-detached from XFAIL
+ on HPPA.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 17 Dec 2017 20:13:55 +0100
+
+glibc (2.26-0experimental2) experimental; 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.
+ - Drop debian/patches/ia64/git-ia64-crash-thread-exit.diff (merged
+ upstream).
+ * 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.
+ * debian/testsuite-xfail-debian.mk: x32: remove a bunch of conform issues,
+ add tst-platform-1, as this test has x86-64 specific expectations.
+ * debian/sysdeps/sparc64.mk: don't force -mcpu=ultrasparc as that
+ miscompiles at least pthread_barrier_wait.c. Mark tst-realloc as XFAIL, as
+ there are way to trigger the issue on older libc and/or other
+ architectures.
+ * debian/patches/locale/fix-LC_COLLATE-rules.diff: drop, not useful anymore
+ and has side effects.
+ * debian/patches/localedata/local-hu_HU-sort.diff: removed, the hu_HU
+ collation is now the same than upstream.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 17 Dec 2017 18:44:55 +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-6) unstable; urgency=medium
+
+ [ Aurelien Jarno ]
+ * debian/control.in/main: add mips r6 architectures to Build-Depends:
+ g++-6-multilib. Closes: #884774.
+ * debian/patches/git-updates.diff: update from upstream stable branch:
+ - Fixes incorrect RPATH/RUNPATH handling for SUID binaries
+ (CVE-2017-16997). Closes: #884615.
+ * debian/control.in/main, debian/copyright, rules.d/tarball.mk: prefer
+ https for upstream links.
+ * debian/control.in/main: bump Standards-Version to 4.1.3.
+ * debian/patches/alpha/submitted-rlimit.diff: new patch to fix getrlimit
+ and setrlimit with RLIM_INFINITY on alpha.
+ * debian/patches/alpha/submitted-fminmax.diff: new patch to fix fmin and
+ fmax on alpha.
+ * debian/testsuite-xfail-debian.mk: mark test-fexcept, test-ldouble and
+ test-ldouble-finite as XFAIL as the failures are due to new tests, and
+ thus not a regression.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 31 Dec 2017 18:50:30 +0100
+
glibc (2.25-5) unstable; urgency=medium
[ Samuel Thibault ]
diff --cc debian/control
index 10ef2ee,e3f7a47..ad0fc21
--- a/debian/control
+++ b/debian/control
@@@ -9,17 -9,18 +9,17 @@@ Build-Depends: gettext, dpkg (>= 1.18.7
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 mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el 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],
++ g++-7, g++-7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el 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>
- Standards-Version: 4.0.1
+ Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-glibc/glibc.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git -b glibc-2.26
- Homepage: http://www.gnu.org/software/libc/libc.html
+ Homepage: https://www.gnu.org/software/libc/libc.html
Package: libc-bin
Architecture: any
diff --cc debian/control.in/main
index 36efeee,31af6ce..7ccf2a7
--- a/debian/control.in/main
+++ b/debian/control.in/main
@@@ -9,17 -9,18 +9,17 @@@ Build-Depends: gettext, dpkg (>= 1.18.7
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 mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el 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],
++ g++-7, g++-7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32],
python3:native <!nocheck>,
libc-bin (>= @GLIBC_VERSION@) <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>
- Standards-Version: 4.0.1
+ Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-glibc/glibc.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git -b glibc-2.26
- Homepage: http://www.gnu.org/software/libc/libc.html
+ Homepage: https://www.gnu.org/software/libc/libc.html
Package: libc-bin
Architecture: any
diff --cc debian/patches/series
index 7713448,580d5c2..b218628
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -32,7 -33,10 +32,9 @@@ localedata/submitted-it_IT-thousands_se
alpha/local-gcc4.1.diff
alpha/submitted-dl-support.diff
alpha/local-string-functions.diff
-alpha/submitted-termios_h.diff
alpha/submitted-fts64.diff
+ alpha/submitted-rlimit.diff
+ alpha/submitted-fminmax.diff
arm/local-sigaction.diff
arm/unsubmitted-ldconfig-cache-abi.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: