r6070 - in glibc-package/branches/eglibc-2.19/debian: . control.in debhelper.in local/manpages patches patches/all patches/any patches/hppa patches/localedata patches/sparc source testsuite-checking
Author: aurel32
Date: 2014-05-14 18:49:39 +0000 (Wed, 14 May 2014)
New Revision: 6070
Added:
glibc-package/branches/eglibc-2.19/debian/local/manpages/sotruss.1
glibc-package/branches/eglibc-2.19/debian/patches/all/submitted-po-fr-fixes.diff
glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-resolv-first-query-failure.diff
glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-socketcall-syscall.diff
glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-wprintf.diff
glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-nl_langinfo-static.diff
glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-ptsname_r-uninitialized-memory.diff
glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-atomic.diff
glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-elf-make-cflags.diff
glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fanotify_mark-5i.diff
glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fcntl-osync.diff
glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fpu.diff
glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-pthread_spin_unlock.diff
glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-setjmp-namespace.diff
glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-shmlba.diff
glibc-package/branches/eglibc-2.19/debian/patches/localedata/submitted-it_IT-thousands_sep.diff
glibc-package/branches/eglibc-2.19/debian/patches/sparc/cvs-efd_semaphore.diff
glibc-package/branches/eglibc-2.19/debian/patches/sparc/cvs-strcmp.diff
glibc-package/branches/eglibc-2.19/debian/patches/sparc/submitted-prlimit.diff
Removed:
glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-resolv-first-query-failure.diff
glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-longjmp-chk.diff
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/control
glibc-package/branches/eglibc-2.19/debian/control.in/i386
glibc-package/branches/eglibc-2.19/debian/control.in/libc
glibc-package/branches/eglibc-2.19/debian/control.in/main
glibc-package/branches/eglibc-2.19/debian/control.in/mips64
glibc-package/branches/eglibc-2.19/debian/control.in/mipsn32
glibc-package/branches/eglibc-2.19/debian/control.in/powerpc
glibc-package/branches/eglibc-2.19/debian/control.in/s390
glibc-package/branches/eglibc-2.19/debian/control.in/sparc
glibc-package/branches/eglibc-2.19/debian/control.in/sparc64
glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc-dev-bin.manpages
glibc-package/branches/eglibc-2.19/debian/debhelper.in/nscd.init
glibc-package/branches/eglibc-2.19/debian/local/manpages/rpcgen.1
glibc-package/branches/eglibc-2.19/debian/local/manpages/sprof.1
glibc-package/branches/eglibc-2.19/debian/patches/series
glibc-package/branches/eglibc-2.19/debian/source/lintian-overrides
glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64
glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
Log:
Merge from trunk
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-14 18:49:39 UTC (rev 6070)
@@ -88,14 +88,59 @@
-- Adam Conrad <adconrad@0c3.net> Sun, 09 Feb 2014 09:46:13 -0700
-eglibc (2.18-6) UNRELEASED; urgency=medium
+eglibc (2.18-6) unstable; urgency=medium
[ Samuel Thibault ]
* patches/hurd-i386/cvs-libpthread_guardsize.diff: Fix guardsize semantic
for gcc's -fsplit-stack.
- -- Adam Conrad <adconrad@0c3.net> Sun, 27 Apr 2014 23:15:13 -0600
+ [ Aurelien Jarno ]
+ * patches/any/cvs-make-4.0.diff: patch from upstream to allow GNU Make
+ 4.0 and greater. Closes: #747013.
+ * patches/sparc/cvs-strcmp.diff: patch from upstream to fix a corner case
+ in the sparc specific strcmp() implementation. Closes: #746310.
+ * debhelper.in/nscd.init: invalidate nscd cache on startup. Closes:
+ #689427.
+ * patches/any/cvs-wprintf.diff: patch from upstream to correctly handle
+ %p in wprintf(). Closes: #729514.
+ * patches/any/submitted-resolv-first-query-failure.diff: replace by upstream
+ version patches/any/cvs-resolv-first-query-failure.diff.
+ * control.in/*: add conflicts between multiarch libc packages using the same
+ dynamic library loader. Closes: #745552.
+ * patches/localedata/submitted-it_IT-thousands_sep.diff: new patch to define
+ the thousands separator for the it_IT locale. Closes: #712157.
+ * patches/any/submitted-ptsname_r-uninitialized-memory.diff: new patch to
+ fix uninitialized memory in ptsname_r(). Closes: #741482.
+ * patches/all/submitted-po-fr-fixes.diff: new patch to fix the French
+ translation of inappropriate (inappropré -> inapproprié). Closes:
+ #733237.
+ * patches/any/cvs-socketcall-syscall.diff: new patch from upstream to fix
+ socketcall multiplex syscall features detection. Closes: #730744.
+ * patches/any/submitted-nl_langinfo-static.diff: new patch to fix
+ nl_langinfo() used in static binaries. Closes: #747103.
+ * patches/any/sparc/cvs-efd_semaphore.diff: new patch from upstream to
+ declare EFD_SEMAPHORE in <bits/eventfd.h> on SPARC. Closes: #730092,
+ #737697.
+ * patches/svn-updates.diff: update from 2.18 branch, to fix a race in free()
+ of fastbin chunk.
+ * local/manpages/sprof.1, local/manpages/rpcgen.1: apply typographical
+ fixes from Bjarni Ingi Gislason <bjarniig@rhi.hi.is>. Closes: #726849,
+ #740973.
+ * patches/hppa/*.diff: apply changes from John David Anglin
+ <dave.anglin@bell.net>. Closes: #725508, #741243.
+ * testsuite-checking/expected-results-mips*el: re-add tst-tls2.out and
+ tst-tls3.out (remove in the latest cleanup) as they still occasionally
+ fail.
+ * local/manpages/sotruss.1: new manpage.
+ * patches/sparc/submitted-prlimit.diff: new patch to fix missing
+ prlimit/prlimit64 prototypes on SPARC. Closes: #703559.
+ * source/lintian-overrides: add override for false positive
+ license-problem-non-free-RFC tag. Remove old override for
+ outdated-autotools-helper-file tag.
+ * control.in/main: Bump Standards-Version to 3.9.5 (no changes).
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 14 May 2014 19:15:10 +0200
+
eglibc (2.18-5) unstable; urgency=medium
[ Samuel Thibault ]
Modified: glibc-package/branches/eglibc-2.19/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control 2014-05-14 18:49:39 UTC (rev 6070)
@@ -5,14 +5,14 @@
autoconf, gawk, debhelper (>= 7.4.3), rdfind, symlinks, netbase,
linux-libc-dev (>= 3.2.1) [linux-any], linux-libc-dev (>= 3.4) [amd64 i386 x32],
libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
- mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320-1) [hurd-i386], gnumach-dev (>= 2:1.4-2~) [hurd-i386],
+ mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4-2~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
g++-4.8, g++-4.8-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390x sparc sparc64 x32]
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>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
Homepage: http://www.eglibc.org
@@ -143,7 +143,9 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1),
+ libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
+ libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -233,7 +235,9 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1),
+ libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
+ libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -323,7 +327,9 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1),
+ libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
+ libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -413,7 +419,9 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1),
+ libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
+ libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
@@ -500,6 +508,7 @@
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Replaces: libc6-dev-i386
+Conflicts: libc6:alpha, libc6:sh4, libc6:sparc, libc6-sparc:sparc64
Breaks: fakeroot (<< 1.12.3), gnu-efi (<< 3.0e-3), fakechroot (<< 2.9-1.1), fglrx-glx-ia32 (<< 1:9-6-1), ia32-libs (<< 20090804), ia32-libs-gtk (<< 20090804), lib32asound2 (<< 1.0.20-3), lib32asound2-dev (<< 1.0.20-3), lib32bz2-1.0 (<< 1.0.5-3), lib32bz2-dev (<< 1.0.5-3), lib32ffi-dev (<< 3.0.9~rc9-1), lib32ffi5 (<< 3.0.9~rc9-1), lib32g2c0 (<< 1:3.4.6-10), lib32gcc1 (<< 1:4.4.0-7), lib32gfortran3 (<< 4.4.0-7), lib32gmp3 (<< 2:4.3.1+dfsg-3), lib32gmp3-dev (<< 2:4.3.1+dfsg-3), lib32gmpxx4 (<< 2:4.3.1+dfsg-3), lib32gomp1 (<< 4.4.0-7), lib32icu-dev (<< 4.0.1-3), lib32icu40 (<< 4.0.1-3), lib32mudflap0 (<< 4.4.0-7), lib32ncurses5 (<< 5.7+20090523-1), lib32ncurses5-dev (<< 5.7+20090530-1), lib32ncursesw5 (<< 5.7+20090530-1), lib32ncursesw5-dev (<< 5.7+20090530-1), lib32nss-mdns (<< 0.10-3.1), lib32objc2 (<< 4.4.0-7), lib32readline5 (<< 5.2-5), lib32readline5-dev (<< 5.2-5), lib32stdc++6 (<< 4.4.0-7), lib32stdc++6-4.4-dbg (<< 4.4.0-7), lib32z1 (<< 1:1.2.3.3.dfsg-14), lib32z1-dev (<< 1:1.2.3
.3.dfsg-14), libc6-dev-i386 (<< 2.9-15), nvidia-glx-ia32 (<< 185.18.14-2), nvidia-libvdpau1-ia32 (<< 185.18.14-2)
Description: Embedded GNU C Library: 32-bit shared libraries for AMD64
This package includes shared versions of the standard C
@@ -525,7 +534,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: gcc-3.0 (<< 1:3.0.4ds3-11), libgcc1 (<< 1:3.0.4ds3-11), fakeroot (<< 0.4.5-2.7)
+Conflicts: libc6:alpha, libc6:i386, libc6:sh4
Description: Embedded GNU C Library: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
@@ -550,7 +559,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: gcc-3.0 (<< 1:3.0.4ds3-11), libgcc1 (<< 1:3.0.4ds3-11), fakeroot (<< 0.4.5-2.7)
+Conflicts: libc6:i386, libc6:sh4
Description: Embedded GNU C Library: 64bit Shared libraries for UltraSPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -574,6 +583,7 @@
Architecture: s390x
Section: libs
Priority: optional
+Conflicts: libc6:hppa, libc6:m68k, libc6:mips, libc6:mipsel, libc6:powerpc
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: 32bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
@@ -624,6 +634,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc6:hppa, libc6:m68k, libc6:mips, libc6:mipsel, libc6:s390
Description: Embedded GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -672,6 +683,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc6-mipsn32:mips [mipsel], libc6-mipsn32:mipsel [mips]
Description: Embedded GNU C Library: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the n32 version
@@ -696,6 +708,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc6-mips64:mips [mipsel], libc6-mips64:mipsel [mips]
Description: Embedded GNU C Library: 64bit Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/i386
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control.in/i386 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/i386 2014-05-14 18:49:39 UTC (rev 6070)
@@ -4,6 +4,7 @@
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Replaces: libc6-dev-i386
+Conflicts: libc6:alpha, libc6:sh4, libc6:sparc, libc6-sparc:sparc64
Breaks: fakeroot (<< 1.12.3), gnu-efi (<< 3.0e-3), fakechroot (<< 2.9-1.1), fglrx-glx-ia32 (<< 1:9-6-1), ia32-libs (<< 20090804), ia32-libs-gtk (<< 20090804), lib32asound2 (<< 1.0.20-3), lib32asound2-dev (<< 1.0.20-3), lib32bz2-1.0 (<< 1.0.5-3), lib32bz2-dev (<< 1.0.5-3), lib32ffi-dev (<< 3.0.9~rc9-1), lib32ffi5 (<< 3.0.9~rc9-1), lib32g2c0 (<< 1:3.4.6-10), lib32gcc1 (<< 1:4.4.0-7), lib32gfortran3 (<< 4.4.0-7), lib32gmp3 (<< 2:4.3.1+dfsg-3), lib32gmp3-dev (<< 2:4.3.1+dfsg-3), lib32gmpxx4 (<< 2:4.3.1+dfsg-3), lib32gomp1 (<< 4.4.0-7), lib32icu-dev (<< 4.0.1-3), lib32icu40 (<< 4.0.1-3), lib32mudflap0 (<< 4.4.0-7), lib32ncurses5 (<< 5.7+20090523-1), lib32ncurses5-dev (<< 5.7+20090530-1), lib32ncursesw5 (<< 5.7+20090530-1), lib32ncursesw5-dev (<< 5.7+20090530-1), lib32nss-mdns (<< 0.10-3.1), lib32objc2 (<< 4.4.0-7), lib32readline5 (<< 5.2-5), lib32readline5-dev (<< 5.2-5), lib32stdc++6 (<< 4.4.0-7), lib32stdc++6-4.4-dbg (<< 4.4.0-7), lib32z1 (<< 1:1.2.3.3.dfsg-14), lib32z1-dev (<< 1:1.2.3
.3.dfsg-14), libc6-dev-i386 (<< 2.9-15), nvidia-glx-ia32 (<< 185.18.14-2), nvidia-libvdpau1-ia32 (<< 185.18.14-2)
Description: Embedded GNU C Library: 32-bit shared libraries for AMD64
This package includes shared versions of the standard C
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/libc
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control.in/libc 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/libc 2014-05-14 18:49:39 UTC (rev 6070)
@@ -7,7 +7,9 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1),
+ libc6:alpha [i386 sh4 sparc], libc6:i386 [alpha sh4 sparc], libc6:sparc [alpha i386 sh4], libc6:sh4 [alpha i386 sparc],
+ libc6:hppa [m68k mips mipsel powerpc s390], libc6:m68k [alpha mips mipsel powerpc s390], libc6:mips [alpha m68k mipsel powerpc s390], libc6:mipsel [alpha m68k mips powerpc s390], libc6:powerpc [alpha m68k mips mipsel s390], libc6:s390 [alpha m68k mips mipsel powerpc],
Breaks: nscd (<< 2.19), locales (<< 2.19), locales-all (<< 2.19), 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)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control.in/main 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/main 2014-05-14 18:49:39 UTC (rev 6070)
@@ -5,14 +5,14 @@
autoconf, gawk, debhelper (>= 7.4.3), rdfind, symlinks, netbase,
linux-libc-dev (>= 3.2.1) [linux-any], linux-libc-dev (>= 3.4) [amd64 i386 x32],
libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
- mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320-1) [hurd-i386], gnumach-dev (>= 2:1.4-2~) [hurd-i386],
+ mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4-2~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
g++-4.8, g++-4.8-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390x sparc sparc64 x32]
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>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
Homepage: http://www.eglibc.org
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/mips64
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control.in/mips64 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/mips64 2014-05-14 18:49:39 UTC (rev 6070)
@@ -3,6 +3,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc6-mips64:mips [mipsel], libc6-mips64:mipsel [mips]
Description: Embedded GNU C Library: 64bit Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/mipsn32
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control.in/mipsn32 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/mipsn32 2014-05-14 18:49:39 UTC (rev 6070)
@@ -3,6 +3,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc6-mipsn32:mips [mipsel], libc6-mipsn32:mipsel [mips]
Description: Embedded GNU C Library: n32 Shared libraries for MIPS64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the n32 version
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/powerpc
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control.in/powerpc 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/powerpc 2014-05-14 18:49:39 UTC (rev 6070)
@@ -3,6 +3,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libc6:hppa, libc6:m68k, libc6:mips, libc6:mipsel, libc6:s390
Description: Embedded GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/s390
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control.in/s390 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/s390 2014-05-14 18:49:39 UTC (rev 6070)
@@ -2,6 +2,7 @@
Architecture: s390x
Section: libs
Priority: optional
+Conflicts: libc6:hppa, libc6:m68k, libc6:mips, libc6:mipsel, libc6:powerpc
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Description: Embedded GNU C Library: 32bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/sparc
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control.in/sparc 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/sparc 2014-05-14 18:49:39 UTC (rev 6070)
@@ -3,7 +3,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: gcc-3.0 (<< 1:3.0.4ds3-11), libgcc1 (<< 1:3.0.4ds3-11), fakeroot (<< 0.4.5-2.7)
+Conflicts: libc6:alpha, libc6:i386, libc6:sh4
Description: Embedded GNU C Library: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 32bit version
Modified: glibc-package/branches/eglibc-2.19/debian/control.in/sparc64
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/control.in/sparc64 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/control.in/sparc64 2014-05-14 18:49:39 UTC (rev 6070)
@@ -3,7 +3,7 @@
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Conflicts: gcc-3.0 (<< 1:3.0.4ds3-11), libgcc1 (<< 1:3.0.4ds3-11), fakeroot (<< 0.4.5-2.7)
+Conflicts: libc6:i386, libc6:sh4
Description: Embedded GNU C Library: 64bit Shared libraries for UltraSPARC
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
Modified: glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc-dev-bin.manpages
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc-dev-bin.manpages 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc-dev-bin.manpages 2014-05-14 18:49:39 UTC (rev 6070)
@@ -1,4 +1,5 @@
debian/local/manpages/gencat.1
debian/local/manpages/mtrace.1
debian/local/manpages/rpcgen.1
+debian/local/manpages/sotruss.1
debian/local/manpages/sprof.1
Modified: glibc-package/branches/eglibc-2.19/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/debhelper.in/nscd.init 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/debhelper.in/nscd.init 2014-05-14 18:49:39 UTC (rev 6070)
@@ -70,12 +70,19 @@
return 0
}
+invalidate_cache()
+{
+ for table in passwd group hosts ; do
+ $DAEMON --invalidate $table
+ done
+}
+
case "$1" in
start)
log_daemon_msg "Starting $DESC" "$NAME"
start_nscd
case "$?" in
- 0) log_end_msg 0 ; exit 0 ;;
+ 0) invalidate_cache ; log_end_msg 0 ; exit 0 ;;
1) log_warning_msg " (already running)." ; exit 0 ;;
*) log_end_msg 1 ; exit 1 ;;
esac
@@ -91,9 +98,7 @@
;;
restart|force-reload)
log_daemon_msg "Restarting $DESC" "$NAME"
- for table in passwd group hosts ; do
- $DAEMON --invalidate $table
- done
+ invalidate_cache
stop_nscd
case "$?" in
0|1)
Modified: glibc-package/branches/eglibc-2.19/debian/local/manpages/rpcgen.1
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/local/manpages/rpcgen.1 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/local/manpages/rpcgen.1 2014-05-14 18:49:39 UTC (rev 6070)
@@ -1,10 +1,28 @@
.\" @(#)rpcgen.new.1 1.1 90/11/09 TIRPC 1.0; from 40.10 of 10/10/89
.\" Copyright (c) 1988,1990 Sun Microsystems, Inc. - All Rights Reserved.
-.nr X
+.\" Correction to the original for groff in October 2013
+.\" Local register 'X' interferes with the same register in the
+.\" 'an-old.tmac' macro file in groff
+.\" The original did not have any value for register X, added zero
+.ie \n(.g \{\
+.\" 'X' can be defined on the command line
+.if r X .nr XTH \nX
+.nr X 0
+.\}
+.el .nr X
+.\" End correction for groff
.if \nX=0 .ds x} rpcgen 1 "" "\&"
.if \nX=1 .ds x} rpcgen 1 ""
.if \nX=2 .ds x} rpcgen 1 "" "\&"
.if \nX=3 .ds x} rpcgen "" "" "\&"
+.\" Correction to the original for groff in October 2013
+.\" The local register 'X' can interfere with the same register in the
+.\" 'an-old.tmac' macro file in groff
+.if \n(.g \{\
+.ie r XTH .nr X \n[XTH] \" X was defined on the command line
+.el .rr X
+.\}
+.\" End correction for groff
.TH \*(x}
.SH NAME
\f4rpcgen\f1 \- an RPC protocol compiler
@@ -47,7 +65,7 @@
RPC Language (Remote Procedure Call Language).
.P
\f4rpcgen\f1
-is normally used as in the first synopsis where
+is normally used as in the first synopsis where
it takes an input file and generates up to four output files.
If the
\f2infile\f1
@@ -71,21 +89,21 @@
With the
\f4\-Sc\f1
option,
-it will also generate sample code which would illustrate how to use the
-remote procedures on the client side. This code would be created in
+it will also generate sample code which would illustrate how to use the
+remote procedures on the client side. This code would be created in
\f4proto_client.c\f1.
With the
\f4\-Ss\f1
option,
it will also generate a sample server code which would illustrate how to write
-the remote procedures. This code would be created in
+the remote procedures. This code would be created in
\f4proto_server.c\f1.
.P
The server created can be started both by the port monitors
(for example, \f4inetd\f1 or \f4listen\f1)
or by itself.
When it is started by a port monitor,
-it creates servers only for the transport for which
+it creates servers only for the transport for which
the file descriptor \f40\fP was passed.
The name of the transport must be specified
by setting up the environmental variable
@@ -127,18 +145,18 @@
the size of these routines
.PD
.RE
-A server can use the dispatch table to check authorization
-and then to execute the service routine;
+A server can use the dispatch table to check authorization
+and then to execute the service routine;
a client library may use it to deal with the details of storage
management and XDR data conversion.
.P
-The other three synopses shown above are used when
+The other three synopses shown above are used when
one does not want to generate all the output files,
but only a particular one.
Some examples of their usage is described in the
EXAMPLE
section below.
-When
+When
\f4rpcgen\f1
is executed with the
\f4\-s\f1
@@ -211,11 +229,11 @@
Generate all the files including sample code for client and server side.
.TP
\f4\-b\f1
-This generates code for the SunOS4.1 style of rpc. It is
+This generates code for the SunOS4.1 style of rpc. It is
for backward compatibility. This is the default.
.TP
\f4\-5\f1
-This generates code for the SysVr4 style of rpc. It is used by the
+This generates code for the SysVr4 style of rpc. It is used by the
Transport Independent RPC that is in Svr4 systems.
By default rpcgen generates code for SunOS4.1 stype of rpc.
.TP
@@ -223,7 +241,7 @@
Compile into XDR routines.
.TP
\f4\-C\f1
-Generate code in ANSI C. This option also generates code that could be
+Generate code in ANSI C. This option also generates code that could be
compiled with the C++ compiler. This is the default.
.TP
\f4\-k\f1
@@ -247,7 +265,7 @@
\f4C\f1
data-definitions (a header file).
\f4\-T\f1
-option can be used in conjunction to produce a
+option can be used in conjunction to produce a
header file which supports RPC dispatch tables.
.TP
\f4\-I\f1
@@ -255,14 +273,14 @@
to generate a static service that handles transports selected with \f4\-s\f1.
Using \f4\-I\f1 allows starting a service by either method.
.TP
-\f4-K\f2 secs\f1
+\f4\-K\f2 secs\f1
By default, services created using \f4rpcgen\fP wait \f4120\fP seconds
after servicing a request before exiting.
-That interval can be changed using the \f4-K\fP flag.
+That interval can be changed using the \f4\-K\fP flag.
To create a server that exits immediately upon servicing a request,
-\f4-K\ 0\fP can be used.
+\f4\-K\ 0\fP can be used.
To create a server that never exits, the appropriate argument is
-\f4-K\ -1\fP.
+\f4\-K\ \-1\fP.
.IP
When monitoring for a server,
some portmonitors, like
@@ -271,7 +289,7 @@
spawn a new process in response to a service request.
If it is known that a server will be used with such a monitor, the
server should exit immediately on completion.
-For such servers, \f4rpcgen\fP should be used with \f4-K\ -1\fP.
+For such servers, \f4rpcgen\fP should be used with \f4\-K\ \-1\fP.
.TP
\f4\-l\f1
Compile into client-side stubs.
@@ -279,8 +297,8 @@
\f4\-m\f1
Compile into server-side stubs,
but do not generate a \(lqmain\(rq routine.
-This option is useful for doing callback-routines
-and for users who need to write their own
+This option is useful for doing callback-routines
+and for users who need to write their own
\(lqmain\(rq routine to do initialization.
.TP
\f4\-M\f1
@@ -300,11 +318,11 @@
so as to compile a server that serves multiple transports.
.TP
\f4\-N\f1
-Use the newstyle of rpcgen. This allows procedures to have multiple arguments.
-It also uses the style of parameter passing that closely resembles C. So, when
+Use the newstyle of rpcgen. This allows procedures to have multiple arguments.
+It also uses the style of parameter passing that closely resembles C. So, when
passing an argument to a remote procedure you do not have to pass a pointer to
-the argument but the argument itself. This behaviour is different from the oldstyle
-of rpcgen generated code. The newstyle is not the default case because of
+the argument but the argument itself. This behaviour is different from the oldstyle
+of rpcgen generated code. The newstyle is not the default case because of
backward compatibility.
.TP
\f4\-o \f2outfile\f1
@@ -325,7 +343,7 @@
modes only).
.TP
\f4\-s \f2nettype\f1
-Compile into server-side stubs for all the
+Compile into server-side stubs for all the
transports belonging to the class
\f2nettype\f1.
The supported classes are
@@ -352,7 +370,7 @@
Generate a sample Makefile which can be used for compiling the application.
.TP
\f4\-Ss\f1
-Generate skeleton code for the remote procedures on the server side. You would need
+Generate skeleton code for the remote procedures on the server side. You would need
to fill in the actual code for the remote procedures.
.TP
\f4\-t\f1
@@ -361,7 +379,7 @@
\f4\-T\f1
Generate the code to support RPC dispatch tables.
.P
-The options
+The options
\f4\-c\f1,
\f4\-h\f1,
\f4\-l\f1,
@@ -381,12 +399,12 @@
The RPC Language does not support nesting of structures.
As a work-around,
structures can be declared at the top-level,
-and their name used inside other structures in
+and their name used inside other structures in
order to achieve the same effect.
.P
Name clashes can occur when using program definitions,
since the apparent scoping does not really apply.
-Most of these can be avoided by giving
+Most of these can be avoided by giving
unique names for programs,
versions,
procedures and types.
@@ -420,7 +438,7 @@
.P
To send the test version of the
\f4-DTEST\f1,
-server side stubs for
+server side stubs for
all the transport belonging to the class
\f4datagram_n\f1
to standard output, use:
Added: glibc-package/branches/eglibc-2.19/debian/local/manpages/sotruss.1
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/local/manpages/sotruss.1 (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/local/manpages/sotruss.1 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,52 @@
+.TH SOTRUSS "1" "May 2014" "sotruss" "User Commands"
+.SH NAME
+sotruss \- trace shared library calls through PLT
+.SH SYNOPSIS
+.B sotruss
+[\fI\,OPTION\/\fR...] [\fI\,--\/\fR] \fI\,EXECUTABLE \/\fR[\fI\,EXECUTABLE-OPTION\/\fR...]
+.SH DESCRIPTION
+.B sotruss
+is a small wrapper around
+.B ld.so
+that runs the specified
+.I executable
+until it exits. It intercepts and produce a trace of the dynamic library calls which
+are called by the executed process via the Procedure Linkage Table (PLT). It
+outputs the caller, the calle and the parameters as each call is executed.
+.SH OPTIONS
+.TP
+\fB\-F\fR, \fB\-\-from\fR FROMLIST
+Trace calls from objects on FROMLIST.
+.TP
+\fB\-T\fR, \fB\-\-to\fR TOLIST
+Trace calls to objects on TOLIST.
+.TP
+\fB\-e\fR, \fB\-\-exit\fR
+Also show exits from the function calls.
+.TP
+\fB\-f\fR, \fB\-\-follow\fR
+Trace child processes as they are created by currently traced processes as a result of the
+.BR fork(2)
+system call.
+.TP
+\fB\-o\fR, \fB\-\-output\fR FILENAME
+Write output to FILENAME (or FILENAME. in case
+\fB\-f\fR is also used) instead of standard error.
+.TP
+\-?, \fB\-\-help\fR
+Give this help list
+.TP
+\fB\-\-usage\fR
+Give a short usage message
+.TP
+\fB\-\-version\fR
+Print program version
+.SH AUTHOR
+Written by Ulrich Drepper.
+.SH COPYRIGHT
+Copyright \(co 2013 Free Software Foundation, Inc.
+.br
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH "SEE ALSO"
+.BR ld.so(8).
Modified: glibc-package/branches/eglibc-2.19/debian/local/manpages/sprof.1
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/local/manpages/sprof.1 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/local/manpages/sprof.1 2014-05-14 18:49:39 UTC (rev 6070)
@@ -40,7 +40,12 @@
.\" string Tr holds user defined translation string.
.\" Bell System Logo is used as a dummy character.
.\"
-.tr \(*W-|\(bv\*(Tr
+.\" Avoid warning from groff about undefined string
+.if \n(.g \{\
+. if !dTr .ds Tr
+.\}
+.ie t .tr \(*W-|\(bv\*(Tr
+.el .tr \(*W-\*(Tr
.ie n \{\
.ds -- \(*W-
.ds PI pi
@@ -82,13 +87,19 @@
'br\}
.\" If the F register is turned on, we'll generate
.\" index entries out stderr for the following things:
-.\" TH Title
+.\" TH Title
.\" SH Header
-.\" Sh Subsection
+.\" Sh Subsection
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
.\" in some meaningful fashion.
+.\" Avoid warning from groff about undefined register and macro
+. de IX
+..
+.if \n(.g \{\
+. if !rF . nr F 0
+.\}
.if \nF \{
.de IX
.tm Index:\\$1\t\\n%\t"\\$2"
@@ -195,17 +206,17 @@
.SH "SYNOPSIS"
\fBsprof\fR \fB\-p\fR|\fB\-c\fR [\fB\-q\fR]
.SH "DESCRIPTION"
-\fB--call-pairs\fR, \fB\-c\fR
+\fB\-\-call-pairs\fR, \fB\-c\fR
.PP
.Vb 1
\& print list of count paths and their number of use
.Ve
-\fB--flat-profile\fR, \fB\-p\fR
+\fB\-\-flat-profile\fR, \fB\-p\fR
.PP
.Vb 1
\& generate flat profile with counts and ticks
.Ve
-\fB--graph\fR, \fB\-q\fR
+\fB\-\-graph\fR, \fB\-q\fR
.PP
.Vb 1
\& generate call graph
Added: glibc-package/branches/eglibc-2.19/debian/patches/all/submitted-po-fr-fixes.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/all/submitted-po-fr-fixes.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/all/submitted-po-fr-fixes.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,17 @@
+2014-05-05 Aurelien Jarno <aurelien@aurel32.net>
+
+ * po/fr.po: Fix French translation of inappropriate.
+
+diff --git a/po/fr.po b/po/fr.po
+index f73622a..3625de1 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -6015,7 +6015,7 @@ msgstr "Trop de fichiers ouverts dans le système"
+ #. TRANS modes on an ordinary file.
+ #: sysdeps/gnu/errlist.c:285
+ msgid "Inappropriate ioctl for device"
+-msgstr "Ioctl() inappropré pour un périphérique"
++msgstr "Ioctl() inapproprié pour un périphérique"
+
+ #. TRANS An attempt to execute a file that is currently open for writing, or
+ #. TRANS write to a file that is currently being executed. Often using a
Added: glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-resolv-first-query-failure.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-resolv-first-query-failure.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-resolv-first-query-failure.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,54 @@
+2014-04-30 Siddhesh Poyarekar <siddhesh@redhat.com>
+ Atsushi Onoe <atsushi@onoe.org>
+
+ [BZ #14308]
+ [BZ #12994]
+ [BZ #13651]
+ * resolv/res_query.c (__libc_res_nsearch): Return if at least
+ one response is valid.
+ * resolv/res_send.c (send_dg): Check for validity of other
+ response if the current response is a referral.
+
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -382,7 +382,9 @@ __libc_res_nsearch(res_state statp,
+ ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
+ answer, anslen, answerp,
+ answerp2, nanswerp2, resplen2);
+- if (ret > 0 || trailing_dot)
++ if (ret > 0 || trailing_dot
++ /* If the second response is valid then we use that. */
++ || (ret == 0 && answerp2 != NULL && resplen2 > 0))
+ return (ret);
+ saved_herrno = h_errno;
+ tried_as_is++;
+@@ -422,7 +424,8 @@ __libc_res_nsearch(res_state statp,
+ answer, anslen, answerp,
+ answerp2, nanswerp2,
+ resplen2);
+- if (ret > 0)
++ if (ret > 0 || (ret == 0 && answerp2 != NULL
++ && resplen2 > 0))
+ return (ret);
+
+ if (answerp && *answerp != answer) {
+diff --git a/resolv/res_send.c b/resolv/res_send.c
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -1351,6 +1351,7 @@ send_dg(res_state statp,
+ (*thisresplenp > *thisanssizp)
+ ? *thisanssizp : *thisresplenp);
+
++ next_ns:
+ if (recvresp1 || (buf2 != NULL && recvresp2)) {
+ *resplen2 = 0;
+ return resplen;
+@@ -1368,7 +1369,6 @@ send_dg(res_state statp,
+ goto wait;
+ }
+
+- next_ns:
+ __res_iclose(statp, false);
+ /* don't retry if called from dig */
+ if (!statp->pfcode)
Added: glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-socketcall-syscall.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-socketcall-syscall.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-socketcall-syscall.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,676 @@
+2014-02-20 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #16611]
+ * sysdeps/unix/sysv/linux/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x030000 && __ASSUME_SOCKETCALL]
+ (__ASSUME_SENDMMSG_SOCKETCALL): Define.
+ [__LINUX_KERNEL_VERSION >= 0x030000 && (__i386__ || __x86_64__ ||
+ __powerpc__ || __sh__ || __sparc__)] (__ASSUME_SENDMMSG_SYSCALL):
+ Likewise.
+ [__i386__ || __powerpc__ || __sh__ || __sparc__]
+ (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
+ [__ASSUME_SENDMMSG_SOCKETCALL || __ASSUME_SENDMMSG_SYSCALL]
+ (__ASSUME_SENDMMSG): Define instead of using previous
+ [__LINUX_KERNEL_VERSION >= 0x020627] condition.
+ * ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+ (__ASSUME_SENDMMSG_SYSCALL): Define.
+ * ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x030200] (__ASSUME_SENDMMSG_SYSCALL):
+ Likewise.
+ * ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
+ Likewise.
+ * ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
+ Likewise.
+ * sysdeps/unix/sysv/linux/internal_sendmmsg.S [__ASSUME_SOCKETCALL
+ && !__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL &&
+ !__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine.
+ [__ASSUME_SENDMMSG]: Change conditionals to
+ [__ASSUME_SENDMMSG_SOCKETCALL].
+ * ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x030300] (__ASSUME_SENDMMSG_SYSCALL):
+ Define.
+ * ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL):
+ Likewise.
+ * sysdeps/unix/sysv/linux/sendmmsg.c [__ASSUME_SOCKETCALL &&
+ !__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL &&
+ !__ASSUME_SENDMMSG_SYSCALL] (__NR_sendmmsg): Undefine.
+ [!__ASSUME_SENDMMSG]: Change conditional to
+ [!__ASSUME_SENDMMSG_SOCKETCALL].
+ * ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x030000] (__ASSUME_SENDMMSG_SYSCALL):
+ Define.
+
+ [BZ #16610]
+ * sysdeps/unix/sysv/linux/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020621 && __ASSUME_SOCKETCALL]
+ (__ASSUME_RECVMMSG_SOCKETCALL): Define.
+ [(__LINUX_KERNEL_VERSION >= 0x020621 && (__i386__ || __x86_64__ ||
+ __sparc__)) || (__LINUX_KERNEL_VERSION >= 0x020625 && (__powerpc__
+ || __sh__))] (__ASSUME_RECVMMSG_SYSCALL): Likewise.
+ [__i386__ || __sparc__]
+ (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
+ [__ASSUME_RECVMMSG_SOCKETCALL || __ASSUME_RECVMMSG_SYSCALL]
+ (__ASSUME_RECVMMSG): Define instead of using previous
+ [__LINUX_KERNEL_VERSION >= 0x020621] condition.
+ * ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+ (__ASSUME_RECVMMSG_SYSCALL): Define.
+ * ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+ Likewise.
+ * ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+ Likewise.
+ * ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+ Likewise.
+ * sysdeps/unix/sysv/linux/internal_recvmmsg.S [__ASSUME_SOCKETCALL
+ && !__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL &&
+ !__ASSUME_RECVMMSG_SYSCALL] (__NR_recvmmsg): Undefine.
+ [__ASSUME_RECVMMSG]: Change condition to
+ [__ASSUME_RECVMMSG_SOCKETCALL].
+ * ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+ Define.
+ (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
+ * ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_RECVMMSG_SYSCALL):
+ Likewise.
+ * sysdeps/unix/sysv/linux/recvmmsg.c [__ASSUME_SOCKETCALL &&
+ !__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL &&
+ !__ASSUME_RECVMMSG_SYSCALL] (__NR_recvmmsg): Undefine.
+ [!__ASSUME_RECVMMSG]: Change condition to
+ [!__ASSUME_RECVMMSG_SOCKETCALL].
+ * ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
+ (__ASSUME_RECVMMSG_SYSCALL): Define.
+
+ [BZ #16609]
+ * sysdeps/unix/sysv/linux/kernel-features.h [__i386__ ||
+ __powerpc__ || __s390__ || __sh__ || __sparc__]
+ (__ASSUME_SOCKETCALL): Define.
+ [__LINUX_KERNEL_VERSION && __ASSUME_SOCKETCALL]
+ (__ASSUME_ACCEPT4_SOCKETCALL): Likewise.
+ [(__LINUX_KERNEL_VERSION >= 0x02061c && (__x86_64__ || __sparc__))
+ || (__LINUX_KERNEL_VERSION >= 0x020625 && (__powerpc__ ||
+ __sh__))] (__ASSUME_ACCEPT4_SYSCALL): Likewise.
+ [__sparc__] (__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL): Likewise.
+ [__ASSUME_ACCEPT4_SOCKETCALL || __ASSUME_ACCEPT4_SYSCALL]
+ (__ASSUME_ACCEPT4): Define instead of using previous
+ [__LINUX_KERNEL_VERSION >= 0x02061c && (__i386__ || __x86_64__ ||
+ __powerpc__ || __sparc__ || __s390__)] condition.
+ * ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+ (__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL.
+ * sysdeps/unix/sysv/linux/accept4.c [__ASSUME_SOCKETCALL &&
+ !__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL &&
+ !__ASSUME_ACCEPT4_SYSCALL] (__NR_accept4): Undefine.
+ [!__ASSUME_ACCEPT4]: Change condition to
+ [!__ASSUME_ACCEPT4_SOCKETCALL].
+ * ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+ (__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL. Correct
+ condition to [__LINUX_KERNEL_VERSION >= 0x030200].
+ * ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020624] (__ASSUME_ACCEPT4): Change to
+ __ASSUME_ACCEPT4_SYSCALL.
+ * sysdeps/unix/sysv/linux/i386/accept4.S [__ASSUME_ACCEPT4]:
+ Change conditions to [__ASSUME_ACCEPT4_SOCKETCALL].
+ * ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x030300] (__ASSUME_ACCEPT4): Change to
+ __ASSUME_ACCEPT4_SYSCALL.
+ * sysdeps/unix/sysv/linux/internal_accept4.S [__ASSUME_SOCKETCALL
+ && !__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL &&
+ !__ASSUME_ACCEPT4_SYSCALL] (__NR_accept4): Undefine.
+ [__ASSUME_ACCEPT4]: Change condition to
+ [__ASSUME_ACCEPT4_SOCKETCALL].
+ * ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
+ (__ASSUME_SOCKETCALL): Define.
+ [__LINUX_KERNEL_VERSION >= 0x02061c] (__ASSUME_ACCEPT4): Remove.
+ * ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+ (__ASSUME_SOCKETCALL): Define.
+ (__ASSUME_ACCEPT4): Remove.
+ [__LINUX_KERNEL_VERSION >= 0x020621] (__ASSUME_ACCEPT4_SYSCALL):
+ Define.
+ * ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x02061f] (__ASSUME_ACCEPT4_SYSCALL):
+ Likewise.
+ * ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
+ (__ASSUME_ACCEPT4): Change to __ASSUME_ACCEPT4_SYSCALL.
+
+2014-02-20 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #16611]
+ * sysdeps/unix/sysv/linux/hppa/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x030100] (__ASSUME_SENDMMSG_SYSCALL):
+ Define.
+
+ [BZ #16610]
+ * sysdeps/unix/sysv/linux/hppa/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020622] (__ASSUME_RECVMMSG_SYSCALL):
+ [BZ #16610]
+ * sysdeps/unix/sysv/linux/hppa/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020622] (__ASSUME_RECVMMSG_SYSCALL):
+ Define.
+
+ [BZ #16609]
+ * sysdeps/unix/sysv/linux/hppa/kernel-features.h
+ [__LINUX_KERNEL_VERSION >= 0x020622] (__ASSUME_ACCEPT4_SYSCALL):
+
+--- a/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
+@@ -30,4 +30,15 @@
+ /* PA-RISC 2.6.9 kernels had the first LWS CAS support */
+ #define __ASSUME_LWS_CAS 1
+
++/* Support for the accept4 and recvmmsg syscalls was added in 2.6.34. */
++#if __LINUX_KERNEL_VERSION >= 0x020622
++# define __ASSUME_ACCEPT4_SYSCALL 1
++# define __ASSUME_RECVMMSG_SYSCALL 1
++#endif
++
++/* Support for the sendmmsg syscall was added in 3.1. */
++#if __LINUX_KERNEL_VERSION >= 0x030100
++# define __ASSUME_SENDMMSG_SYSCALL 1
++#endif
++
+ #include_next <kernel-features.h>
+--- a/ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/aarch64/kernel-features.h
+@@ -24,12 +24,14 @@
+ /* AArch64 support starts with 3.7.0, guaranteeing many kernel
+ features. */
+
+-#define __ASSUME_ACCEPT4 1
++#define __ASSUME_ACCEPT4_SYSCALL 1
+ #define __ASSUME_DUP3 1
+ #define __ASSUME_EVENTFD2 1
+ #define __ASSUME_IN_NONBLOCK 1
+ #define __ASSUME_O_CLOEXEC 1
+ #define __ASSUME_PIPE2 1
++#define __ASSUME_RECVMMSG_SYSCALL 1
++#define __ASSUME_SENDMMSG_SYSCALL 1
+ #define __ASSUME_SIGNALFD4 1
+ #define __ASSUME_SOCK_CLOEXEC 1
+ #define __ASSUME_UTIMES 1
+--- a/sysdeps/unix/sysv/linux/accept4.c
++++ b/sysdeps/unix/sysv/linux/accept4.c
+@@ -24,6 +24,14 @@
+ #include <sys/syscall.h>
+ #include <kernel-features.h>
+
++/* Do not use the accept4 syscall on socketcall architectures unless
++ it was added at the same time as the socketcall support or can be
++ assumed to be present. */
++#if defined __ASSUME_SOCKETCALL \
++ && !defined __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL \
++ && !defined __ASSUME_ACCEPT4_SYSCALL
++# undef __NR_accept4
++#endif
+
+ #ifdef __NR_accept4
+ int
+@@ -42,7 +50,7 @@
+ return result;
+ }
+ #elif defined __NR_socketcall
+-# ifndef __ASSUME_ACCEPT4
++# ifndef __ASSUME_ACCEPT4_SOCKETCALL
+ extern int __internal_accept4 (int fd, __SOCKADDR_ARG addr,
+ socklen_t *addr_len, int flags)
+ attribute_hidden;
+@@ -83,7 +91,8 @@
+ return -1;
+ }
+ # else
+-/* When __ASSUME_ACCEPT4 accept4 is defined in internal_accept4.S. */
++/* When __ASSUME_ACCEPT4_SOCKETCALL accept4 is defined in
++ internal_accept4.S. */
+ # endif
+ #else
+ int
+--- a/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/alpha/kernel-features.h
+@@ -42,9 +42,15 @@
+ # define __ASSUME_SIGNALFD4 1
+ #endif
+
+-/* Support for accept4 was added for alpha after 2.6.33-rc1. */
++/* Support for recvmmsg was added for alpha in 2.6.33. */
+ #if __LINUX_KERNEL_VERSION >= 0x020621
+-# define __ASSUME_ACCEPT4 1
++# define __ASSUME_RECVMMSG_SYSCALL 1
++#endif
++
++/* Support for accept4 and sendmmsg was added for alpha in 3.2. */
++#if __LINUX_KERNEL_VERSION >= 0x030200
++# define __ASSUME_ACCEPT4_SYSCALL 1
++# define __ASSUME_SENDMMSG_SYSCALL 1
+ #endif
+
+ #include_next <kernel-features.h>
+--- a/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+@@ -31,9 +31,19 @@
+ # define __ASSUME_SIGNALFD4 1
+ #endif
+
++/* Support for the recvmmsg syscall was added in 2.6.33. */
++#if __LINUX_KERNEL_VERSION >= 0x020621
++# define __ASSUME_RECVMMSG_SYSCALL 1
++#endif
++
+ /* Support for the accept4 syscall was added in 2.6.36. */
+ #if __LINUX_KERNEL_VERSION >= 0x020624
+-# define __ASSUME_ACCEPT4 1
++# define __ASSUME_ACCEPT4_SYSCALL 1
++#endif
++
++/* Support for the sendmmsg syscall was added in 3.0. */
++#if __LINUX_KERNEL_VERSION >= 0x030000
++# define __ASSUME_SENDMMSG_SYSCALL 1
+ #endif
+
+ #include_next <kernel-features.h>
+--- a/sysdeps/unix/sysv/linux/i386/accept4.S
++++ b/sysdeps/unix/sysv/linux/i386/accept4.S
+@@ -23,7 +23,7 @@
+ #define EINVAL 22
+ #define ENOSYS 38
+
+-#ifdef __ASSUME_ACCEPT4
++#ifdef __ASSUME_ACCEPT4_SOCKETCALL
+ # define errlabel SYSCALL_ERROR_LABEL
+ #else
+ # define errlabel .Lerr
+@@ -114,7 +114,7 @@
+ ret
+ #endif
+
+-#ifndef __ASSUME_ACCEPT4
++#ifndef __ASSUME_ACCEPT4_SOCKETCALL
+ /* The kernel returns -EINVAL for unknown socket operations.
+ We need to convert that error to an ENOSYS error. */
+ .Lerr: cmpl $-EINVAL, %eax
+--- a/ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/ia64/kernel-features.h
+@@ -47,9 +47,19 @@
+ # define __ASSUME_DUP3 1
+ #endif
+
++/* Support for the recvmmsg syscall was added in 2.6.33. */
++#if __LINUX_KERNEL_VERSION >= 0x020621
++# define __ASSUME_RECVMMSG_SYSCALL 1
++#endif
++
++/* Support for the sendmmsg syscall was added in 3.0. */
++#if __LINUX_KERNEL_VERSION >= 0x030000
++# define __ASSUME_SENDMMSG_SYSCALL 1
++#endif
++
+ /* Support for the accept4 syscall was added in 3.3. */
+ #if __LINUX_KERNEL_VERSION >= 0x030300
+-# define __ASSUME_ACCEPT4 1
++# define __ASSUME_ACCEPT4_SYSCALL 1
+ #endif
+
+ #include_next <kernel-features.h>
+--- a/sysdeps/unix/sysv/linux/internal_accept4.S
++++ b/sysdeps/unix/sysv/linux/internal_accept4.S
+@@ -1,8 +1,18 @@
+ #include <kernel-features.h>
+ #include <sys/syscall.h>
++
++/* Do not use the accept4 syscall on socketcall architectures unless
++ it was added at the same time as the socketcall support or can be
++ assumed to be present. */
++#if defined __ASSUME_SOCKETCALL \
++ && !defined __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL \
++ && !defined __ASSUME_ACCEPT4_SYSCALL
++# undef __NR_accept4
++#endif
++
+ #if !defined __NR_accept4 && defined __NR_socketcall
+ # define socket accept4
+-# ifdef __ASSUME_ACCEPT4
++# ifdef __ASSUME_ACCEPT4_SOCKETCALL
+ # define __socket accept4
+ # else
+ # define __socket __internal_accept4
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
+@@ -40,6 +40,18 @@
+ /* The sendfile syscall was introduced in 2.2.0. */
+ #define __ASSUME_SENDFILE 1
+
++/* Some architectures use the socketcall multiplexer for some or all
++ socket-related operations, via a socket.S file in glibc, instead of
++ separate syscalls. __ASSUME_SOCKETCALL is defined for such
++ architectures. */
++#if defined __i386__ \
++ || defined __powerpc__ \
++ || defined __s390__ \
++ || defined __sh__ \
++ || defined __sparc__
++# define __ASSUME_SOCKETCALL 1
++#endif
++
+ /* Linux 2.3.39 introduced IPC64. Except for powerpc. Linux 2.4.0 on
+ PPC introduced a correct IPC64. But PowerPC64 does not support a
+ separate 64-bit syscall, already 64-bit. */
+@@ -164,10 +176,34 @@
+ # define __ASSUME_DUP3 1
+ #endif
+
+-/* Support for the accept4 syscall was added in 2.6.28. */
+-#if __LINUX_KERNEL_VERSION >= 0x02061c \
+- && (defined __i386__ || defined __x86_64__ || defined __powerpc__ \
+- || defined __sparc__ || defined __s390__)
++/* Support for accept4 functionality was added in 2.6.28, but for some
++ architectures using a separate syscall rather than socketcall that
++ syscall was only added later, and some architectures first had
++ socketcall support then a separate syscall. Define
++ __ASSUME_ACCEPT4_SOCKETCALL if glibc uses socketcall on this
++ architecture and accept4 is available through socketcall,
++ __ASSUME_ACCEPT4_SYSCALL if it is available through a separate
++ syscall, __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL if it became
++ available through a separate syscall at the same time as through
++ socketcall, and __ASSUME_ACCEPT4 if the accept4 function is known
++ to work. */
++#if __LINUX_KERNEL_VERSION >= 0x02061c && defined __ASSUME_SOCKETCALL
++# define __ASSUME_ACCEPT4_SOCKETCALL 1
++#endif
++
++/* The accept4 syscall was added for x86_64 and SPARC in 2.6.28, and
++ for PowerPC and SH in 2.6.37. */
++#if (__LINUX_KERNEL_VERSION >= 0x02061c \
++ && (defined __x86_64__ || defined __sparc__)) \
++ || (__LINUX_KERNEL_VERSION >= 0x020625 \
++ && (defined __powerpc__ || defined __sh__))
++# define __ASSUME_ACCEPT4_SYSCALL 1
++#endif
++#ifdef __sparc__
++# define __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL 1
++#endif
++
++#if defined __ASSUME_ACCEPT4_SOCKETCALL || defined __ASSUME_ACCEPT4_SYSCALL
+ # define __ASSUME_ACCEPT4 1
+ #endif
+
+@@ -197,8 +233,25 @@
+ # define __ASSUME_F_GETOWN_EX 1
+ #endif
+
+-/* Support for the recvmmsg syscall was added in 2.6.33. */
+-#if __LINUX_KERNEL_VERSION >= 0x020621
++/* Support for recvmmsg functionality was added in 2.6.33. The macros
++ defined correspond to those for accept4. */
++#if __LINUX_KERNEL_VERSION >= 0x020621 && defined __ASSUME_SOCKETCALL
++# define __ASSUME_RECVMMSG_SOCKETCALL 1
++#endif
++
++/* The recvmmsg syscall was added for i386, x86_64 and SPARC in
++ 2.6.33, and for PowerPC and SH in 2.6.37. */
++#if (__LINUX_KERNEL_VERSION >= 0x020621 \
++ && (defined __i386__ || defined __x86_64__ || defined __sparc__)) \
++ || (__LINUX_KERNEL_VERSION >= 0x020625 \
++ && (defined __powerpc__ || defined __sh__))
++# define __ASSUME_RECVMMSG_SYSCALL 1
++#endif
++#if defined __i386__ || defined __sparc__
++# define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1
++#endif
++
++#if defined __ASSUME_RECVMMSG_SOCKETCALL || defined __ASSUME_RECVMMSG_SYSCALL
+ # define __ASSUME_RECVMMSG 1
+ #endif
+
+@@ -212,8 +265,25 @@
+ # define __ASSUME_PRLIMIT64 1
+ #endif
+
+-/* sendmmsg is available in 2.6.39. */
+-#if __LINUX_KERNEL_VERSION >= 0x020627
++/* Support for sendmmsg functionality was added in 3.0. The macros
++ defined correspond to those for accept4 and recvmmsg. */
++#if __LINUX_KERNEL_VERSION >= 0x030000 && defined __ASSUME_SOCKETCALL
++# define __ASSUME_SENDMMSG_SOCKETCALL 1
++#endif
++
++/* The sendmmsg syscall was added for i386, x86_64, PowerPC, SH and
++ SPARC in 3.0. */
++#if __LINUX_KERNEL_VERSION >= 0x030000 \
++ && (defined __i386__ || defined __x86_64__ || defined __powerpc__ \
++ || defined __sh__ || defined __sparc__)
++# define __ASSUME_SENDMMSG_SYSCALL 1
++#endif
++#if defined __i386__ || defined __powerpc__ || defined __sh__ \
++ || defined __sparc__
++# define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1
++#endif
++
++#if defined __ASSUME_SENDMMSG_SOCKETCALL || defined __ASSUME_SENDMMSG_SYSCALL
+ # define __ASSUME_SENDMMSG 1
+ #endif
+
+--- a/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
+@@ -17,6 +17,9 @@
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
++/* m68k uses socketcall. */
++#define __ASSUME_SOCKETCALL 1
++
+ /* Many syscalls were added in 2.6.10 for m68k. */
+ #define __ASSUME_UTIMES 1
+
+@@ -35,11 +38,6 @@
+ # define __ASSUME_DUP3 1
+ #endif
+
+-/* Support for the accept4 syscall was added in 2.6.28. */
+-#if __LINUX_KERNEL_VERSION >= 0x02061c
+-# define __ASSUME_ACCEPT4 1
+-#endif
+-
+ #include_next <kernel-features.h>
+
+ /* These syscalls were added only in 3.0 for m68k. */
+--- a/ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+@@ -16,6 +16,9 @@
+ <http://www.gnu.org/licenses/>. */
+
+
++/* MicroBlaze uses socketcall. */
++#define __ASSUME_SOCKETCALL 1
++
+ /* MicroBlaze glibc support starts with 2.6.30, guaranteeing many kernel features. */
+ #define __ASSUME_UTIMES 1
+ #define __ASSUME_O_CLOEXEC 1
+@@ -24,7 +27,18 @@
+ #define __ASSUME_PIPE2 1
+ #define __ASSUME_EVENTFD2 1
+ #define __ASSUME_SIGNALFD4 1
+-#define __ASSUME_ACCEPT4 1
+ #define __ASSUME_DUP3 1
+
++/* Support for the accept4 and recvmmsg syscalls was added in 2.6.33. */
++#if __LINUX_KERNEL_VERSION >= 0x020621
++# define __ASSUME_ACCEPT4_SYSCALL 1
++# define __ASSUME_RECVMMSG_SYSCALL 1
++#endif
++#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1
++
++/* Support for the sendmmsg syscall was added in 3.3. */
++#if __LINUX_KERNEL_VERSION >= 0x030300
++# define __ASSUME_SENDMMSG_SYSCALL 1
++#endif
++
+ #include_next <kernel-features.h>
+--- a/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+@@ -31,6 +31,21 @@
+ # define __ASSUME_SIGNALFD4 1
+ #endif
+
++/* Support for the accept4 syscall was added in 2.6.31. */
++#if __LINUX_KERNEL_VERSION >= 0x02061f
++# define __ASSUME_ACCEPT4_SYSCALL 1
++#endif
++
++/* Support for the recvmmsg syscall was added in 2.6.33. */
++#if __LINUX_KERNEL_VERSION >= 0x020621
++# define __ASSUME_RECVMMSG_SYSCALL 1
++#endif
++
++/* Support for the sendmmsg syscall was added in 3.1. */
++#if __LINUX_KERNEL_VERSION >= 0x030100
++# define __ASSUME_SENDMMSG_SYSCALL 1
++#endif
++
+ #include_next <kernel-features.h>
+
+ /* The n32 syscall ABI did not have a getdents64 syscall until
+--- a/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
+@@ -25,8 +25,14 @@
+ #define __ASSUME_PIPE2 1
+ #define __ASSUME_EVENTFD2 1
+ #define __ASSUME_SIGNALFD4 1
+-#define __ASSUME_ACCEPT4 1
++#define __ASSUME_ACCEPT4_SYSCALL 1
+ #define __ASSUME_DUP3 1
++#define __ASSUME_RECVMMSG_SYSCALL 1
++
++/* Support for the sendmmsg syscall was added in 3.0. */
++#if __LINUX_KERNEL_VERSION >= 0x030000
++# define __ASSUME_SENDMMSG_SYSCALL 1
++#endif
+
+ #include_next <kernel-features.h>
+
+--- a/sysdeps/unix/sysv/linux/internal_recvmmsg.S
++++ b/sysdeps/unix/sysv/linux/internal_recvmmsg.S
+@@ -1,8 +1,18 @@
+ #include <kernel-features.h>
+ #include <sys/syscall.h>
++
++/* Do not use the recvmmsg syscall on socketcall architectures unless
++ it was added at the same time as the socketcall support or can be
++ assumed to be present. */
++#if defined __ASSUME_SOCKETCALL \
++ && !defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL \
++ && !defined __ASSUME_RECVMMSG_SYSCALL
++# undef __NR_recvmmsg
++#endif
++
+ #if !defined __NR_recvmmsg && defined __NR_socketcall
+ # define socket recvmmsg
+-# ifdef __ASSUME_RECVMMSG
++# ifdef __ASSUME_RECVMMSG_SOCKETCALL
+ # define __socket recvmmsg
+ # else
+ # define __socket __internal_recvmmsg
+--- a/sysdeps/unix/sysv/linux/recvmmsg.c
++++ b/sysdeps/unix/sysv/linux/recvmmsg.c
+@@ -23,6 +23,14 @@
+ #include <sys/syscall.h>
+ #include <kernel-features.h>
+
++/* Do not use the recvmmsg syscall on socketcall architectures unless
++ it was added at the same time as the socketcall support or can be
++ assumed to be present. */
++#if defined __ASSUME_SOCKETCALL \
++ && !defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL \
++ && !defined __ASSUME_RECVMMSG_SYSCALL
++# undef __NR_recvmmsg
++#endif
+
+ #ifdef __NR_recvmmsg
+ int
+@@ -41,7 +49,7 @@
+ return result;
+ }
+ #elif defined __NR_socketcall
+-# ifndef __ASSUME_RECVMMSG
++# ifndef __ASSUME_RECVMMSG_SOCKETCALL
+ extern int __internal_recvmmsg (int fd, struct mmsghdr *vmessages,
+ unsigned int vlen, int flags,
+ const struct timespec *tmo)
+@@ -85,7 +93,8 @@
+ return -1;
+ }
+ # else
+-/* When __ASSUME_RECVMMSG recvmmsg is defined in internal_recvmmsg.S. */
++/* When __ASSUME_RECVMMSG_SOCKETCALL recvmmsg is defined in
++ internal_recvmmsg.S. */
+ # endif
+ #else
+ # include <socket/recvmmsg.c>
+--- a/sysdeps/unix/sysv/linux/internal_sendmmsg.S
++++ b/sysdeps/unix/sysv/linux/internal_sendmmsg.S
+@@ -1,15 +1,25 @@
+ #include <kernel-features.h>
+ #include <sys/syscall.h>
++
++/* Do not use the sendmmsg syscall on socketcall architectures unless
++ it was added at the same time as the socketcall support or can be
++ assumed to be present. */
++#if defined __ASSUME_SOCKETCALL \
++ && !defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL \
++ && !defined __ASSUME_SENDMMSG_SYSCALL
++# undef __NR_sendmmsg
++#endif
++
+ #if !defined __NR_sendmmsg && defined __NR_socketcall
+ # define socket sendmmsg
+-# ifndef __ASSUME_SENDMMSG
++# ifndef __ASSUME_SENDMMSG_SOCKETCALL
+ # define __socket __internal_sendmmsg
+ # define NO_WEAK_ALIAS
+ # endif
+ # define NARGS 4
+ # define NEED_CANCELLATION
+ # include <socket.S>
+-# ifdef __ASSUME_SENDMMSG
++# ifdef __ASSUME_SENDMMSG_SOCKETCALL
+ libc_hidden_def (__sendmmsg)
+ # endif
+ #endif
+--- a/sysdeps/unix/sysv/linux/sendmmsg.c
++++ b/sysdeps/unix/sysv/linux/sendmmsg.c
+@@ -23,6 +23,14 @@
+ #include <sys/syscall.h>
+ #include <kernel-features.h>
+
++/* Do not use the sendmmsg syscall on socketcall architectures unless
++ it was added at the same time as the socketcall support or can be
++ assumed to be present. */
++#if defined __ASSUME_SOCKETCALL \
++ && !defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL \
++ && !defined __ASSUME_SENDMMSG_SYSCALL
++# undef __NR_sendmmsg
++#endif
+
+ #ifdef __NR_sendmmsg
+ int
+@@ -42,7 +50,7 @@
+ libc_hidden_def (__sendmmsg)
+ weak_alias (__sendmmsg, sendmmsg)
+ #elif defined __NR_socketcall
+-# ifndef __ASSUME_SENDMMSG
++# ifndef __ASSUME_SENDMMSG_SOCKETCALL
+ extern int __internal_sendmmsg (int fd, struct mmsghdr *vmessages,
+ unsigned int vlen, int flags)
+ attribute_hidden;
+@@ -86,7 +94,8 @@
+ libc_hidden_def (__sendmmsg)
+ weak_alias (__sendmmsg, sendmmsg)
+ # else
+-/* When __ASSUME_SENDMMSG sendmmsg is defined in internal_sendmmsg.S. */
++/* When __ASSUME_SENDMMSG_SOCKETCALL sendmmsg is defined in
++ internal_sendmmsg.S. */
+ # endif
+ #else
+ # include <socket/sendmmsg.c>
Added: glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-wprintf.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-wprintf.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/any/cvs-wprintf.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,57 @@
+2014-05-01 Andreas Schwab <schwab@linux-m68k.org>
+
+ [BZ #16890]
+ * stdio-common/vfprintf.c (process_arg) [%p]: Mark string as wide
+ when compiling wprintf.
+ * stdio-common/tstdiomisc.c (t3): New function.
+ (main): Call it.
+
+diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c
+--- a/stdio-common/tstdiomisc.c
++++ b/stdio-common/tstdiomisc.c
+@@ -46,6 +46,24 @@ t2 (void)
+ return result;
+ }
+
++static int
++t3 (void)
++{
++ char buf[80];
++ wchar_t wbuf[80];
++ int result = 0;
++ int retval;
++
++ retval = sprintf (buf, "%p", (char *) NULL);
++ result |= retval != 5 || strcmp (buf, "(nil)") != 0;
++
++ retval = swprintf (wbuf, sizeof (wbuf) / sizeof (wbuf[0]),
++ L"%p", (char *) NULL);
++ result |= retval != 5 || wcscmp (wbuf, L"(nil)") != 0;
++
++ return result;
++}
++
+ volatile double qnanval;
+ volatile long double lqnanval;
+ /* A sNaN is only guaranteed to be representable in variables with static (or
+@@ -243,6 +261,7 @@ main (int argc, char *argv[])
+
+ result |= t1 ();
+ result |= t2 ();
++ result |= t3 ();
+ result |= F ();
+
+ result |= fflush (stdout) == EOF;
+diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
+--- a/stdio-common/vfprintf.c
++++ b/stdio-common/vfprintf.c
+@@ -936,7 +936,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
+ /* Make sure the full string "(nil)" is printed. */ \
+ if (prec < 5) \
+ prec = 5; \
+- is_long = 0; /* This is no wide-char string. */ \
++ /* This is a wide string iff compiling wprintf. */ \
++ is_long = sizeof (CHAR_T) > 1; \
+ goto LABEL (print_string); \
+ } \
+ } \
Added: glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-nl_langinfo-static.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-nl_langinfo-static.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-nl_langinfo-static.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,89 @@
+ 2014-05-06 Aurelien Jarno <aurelien@aurel32.net>
+
+ * locale/nl_langinfo_l.c: Make direct reference to every
+ _nl_current_CATEGORY symbol.
+ * localedata/Makefile (test-srcs): Add tst-langinfo-static.
+ (tests-static): Add tst-langinfo-static.
+ (tests-special): Add tst-langinfo-static.out.
+ ($(objpfx)tst-langinfo.out): Redirect output.
+ ($(objpfx)tst-langinfo-static.out): New.
+ * localedata/tst-langinfo.sh: Send output to stdout.
+ * localedata/tst-langinfo-static.c: New file.
+
+diff --git a/locale/nl_langinfo_l.c b/locale/nl_langinfo_l.c
+--- a/locale/nl_langinfo_l.c
++++ b/locale/nl_langinfo_l.c
+@@ -43,7 +43,21 @@ __nl_langinfo_l (item, l)
+ if (index == _NL_ITEM_INDEX (_NL_LOCALE_NAME (category)))
+ return (char *) l->__names[category];
+
++#if defined NL_CURRENT_INDIRECT
++ /* Make direct reference to every _nl_current_CATEGORY symbol,
++ since we know only at runtime which categories are used. */
++ switch (category)
++ {
++# define DEFINE_CATEGORY(category, category_name, items, a) \
++ case category: data = *_nl_current_##category; break;
++# include "categories.def"
++# undef DEFINE_CATEGORY
++ default: /* Should be impossible. */
++ return (char *) "";
++ }
++#else
+ data = l->__locales[category];
++#endif
+
+ if (index >= data->nstrings)
+ /* Bogus index for this category: bogus item. */
+diff --git a/localedata/Makefile b/localedata/Makefile
+--- a/localedata/Makefile
++++ b/localedata/Makefile
+@@ -45,7 +45,7 @@
+
+ test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
+ tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
+- tst-ctype tst-wctype tst-langinfo tst-numeric
++ tst-ctype tst-wctype tst-langinfo tst-langinfo-static tst-numeric
+ test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
+ hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
+ si_LK.UTF-8
+@@ -164,7 +164,8 @@
+ tests: $(objpfx)sort-test.out $(objpfx)tst-fmon.out $(objpfx)tst-locale.out \
+ $(objpfx)tst-rpmatch.out $(objpfx)tst-trans.out \
+ $(objpfx)tst-mbswcs.out $(objpfx)tst-ctype.out \
+- $(objpfx)tst-langinfo.out $(objpfx)tst-numeric.out
++ $(objpfx)tst-langinfo.out $(objpfx)tst-langinfo-static.out\
++ $(objpfx)tst-numeric.out
+ ifeq (y,$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO))
+ tests: $(objpfx)tst-wctype.out
+ endif
+@@ -211,7 +212,11 @@
+ $(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
+ $(objpfx)sort-test.out \
+ $(addprefix $(objpfx),$(CTYPE_FILES))
+- $(SHELL) $< $(common-objpfx) '$(test-program-cmd)'
++ $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@
++$(objpfx)tst-langinfo-static.out: tst-langinfo.sh $(objpfx)tst-langinfo-static \
++ $(objpfx)sort-test.out \
++ $(addprefix $(objpfx),$(CTYPE_FILES))
++ $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' >$@
+ $(objpfx)tst-digits.out: $(objpfx)tst-locale.out
+ $(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES))
+ endif
+diff --git a/localedata/tst-langinfo-static.c b/localedata/tst-langinfo-static.c
+--- /dev/null
++++ b/localedata/tst-langinfo-static.c
+@@ -0,0 +1 @@
++#include "tst-langinfo.c"
+diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh
+--- a/localedata/tst-langinfo.sh
++++ b/localedata/tst-langinfo.sh
+@@ -340,7 +340,6 @@ ja_JP.EUC-JP NOEXPR ^([nN
+ ja_JP.EUC-JP CODESET EUC-JP
+ EOF
+ LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
+-LC_ALL=tt_TT ${tst_langinfo} \
+- > ${common_objpfx}localedata/tst-langinfo.out
++LC_ALL=tt_TT ${tst_langinfo}
+
+ exit $?
Added: glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-ptsname_r-uninitialized-memory.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-ptsname_r-uninitialized-memory.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-ptsname_r-uninitialized-memory.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,20 @@
+2014-05-05 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/ptsname.c (__ptsname_internal): return
+ errno if the TIOCGPTN ioctl fails with an error different than
+ EINVAL.
+
+diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c
+--- a/sysdeps/unix/sysv/linux/ptsname.c
++++ b/sysdeps/unix/sysv/linux/ptsname.c
+@@ -105,7 +105,9 @@ __ptsname_internal (int fd, char *buf, size_t buflen, struct stat64 *stp)
+
+ memcpy (__stpcpy (buf, devpts), p, &numbuf[sizeof (numbuf)] - p);
+ }
+- else if (errno == EINVAL)
++ else if (errno != EINVAL)
++ return errno;
++ else
+ #endif
+ {
+ char *p;
Deleted: glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-resolv-first-query-failure.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-resolv-first-query-failure.diff 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/patches/any/submitted-resolv-first-query-failure.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -1,38 +0,0 @@
-2012-02-02 Aurelien Jarno <aurel32@debian.org>
-
- * resolv/res_query.c(__libc_res_nsearch): succeed if the first
- query fails, but the second query succeeds.
-
----
- resolv/res_query.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -378,7 +378,7 @@
- ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
- answer, anslen, answerp,
- answerp2, nanswerp2, resplen2);
-- if (ret > 0 || trailing_dot)
-+ if (ret > 0 || (ret == 0 && *resplen2 > 0) || trailing_dot)
- return (ret);
- saved_herrno = h_errno;
- tried_as_is++;
-@@ -418,7 +418,7 @@
- answer, anslen, answerp,
- answerp2, nanswerp2,
- resplen2);
-- if (ret > 0)
-+ if ((ret > 0) || (ret == 0 && *resplen2 > 0))
- return (ret);
-
- if (answerp && *answerp != answer) {
-@@ -487,7 +487,7 @@
- ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
- answer, anslen, answerp,
- answerp2, nanswerp2, resplen2);
-- if (ret > 0)
-+ if ((ret > 0) || (ret == 0 && *resplen2 > 0))
- return (ret);
- }
-
Added: glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-atomic.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-atomic.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-atomic.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,80 @@
+--- eglibc-2.18/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h.save 2014-02-17 20:59:55.783974838 -0500
++++ eglibc-2.18/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h 2014-02-18 18:40:53.186081865 -0500
+@@ -61,42 +61,46 @@
+
+ #if __ASSUME_LWS_CAS
+ /* The only basic operation needed is compare and exchange. */
+-# define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
+- ({ \
+- volatile int lws_errno; \
+- volatile int lws_ret; \
+- asm volatile( \
+- "0: \n\t" \
+- "copy %2, %%r26 \n\t" \
+- "copy %3, %%r25 \n\t" \
+- "copy %4, %%r24 \n\t" \
+- "ble " _LWS "(%%sr2, %%r0) \n\t" \
+- "ldi " _LWS_CAS ", %%r20 \n\t" \
+- "ldi " _ASM_EAGAIN ", %%r24 \n\t" \
+- "cmpb,=,n %%r24, %%r21, 0b \n\t" \
+- "nop \n\t" \
+- "ldi " _ASM_EDEADLOCK ", %%r25 \n\t" \
+- "cmpb,=,n %%r25, %%r21, 0b \n\t" \
+- "nop \n\t" \
+- "stw %%r28, %0 \n\t" \
+- "stw %%r21, %1 \n\t" \
+- : "=m" (lws_ret), "=m" (lws_errno) \
+- : "r" (mem), "r" (oldval), "r" (newval) \
+- : _LWS_CLOBBER \
+- ); \
+- \
+- if(lws_errno == -EFAULT || lws_errno == -ENOSYS) \
+- ABORT_INSTRUCTION; \
+- \
+- lws_ret; \
+- })
++static int __attribute__((noinline))
++__atomic_compare_and_exchange_val_acq (int mem, int newval, int oldval)
++{
++ volatile int lws_errno;
++ volatile int lws_ret;
++ asm volatile(
++ "0: \n\t"
++ "copy %2, %%r26 \n\t"
++ "copy %3, %%r25 \n\t"
++ "copy %4, %%r24 \n\t"
++ "ble " _LWS "(%%sr2, %%r0) \n\t"
++ "ldi " _LWS_CAS ", %%r20 \n\t"
++ "ldi " _ASM_EAGAIN ", %%r24 \n\t"
++ "cmpb,=,n %%r24, %%r21, 0b \n\t"
++ "nop \n\t"
++ "ldi " _ASM_EDEADLOCK ", %%r25 \n\t"
++ "cmpb,=,n %%r25, %%r21, 0b \n\t"
++ "nop \n\t"
++ "stw %%r28, %0 \n\t"
++ "stw %%r21, %1 \n\t"
++ : "=m" (lws_ret), "=m" (lws_errno)
++ : "r" (mem), "r" (oldval), "r" (newval)
++ : _LWS_CLOBBER
++ );
++
++ if (lws_errno == -EFAULT || lws_errno == -ENOSYS)
++ ABORT_INSTRUCTION;
++
++ return lws_ret;
++}
++# define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
++ ((__typeof__(oldval)) \
++ __atomic_compare_and_exchange_val_acq ((int)mem, (int)newval, (int)oldval))
+
+ # define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \
+ ({ \
+- int ret; \
++ __typeof__(oldval) ret; \
+ ret = atomic_compare_and_exchange_val_acq(mem, newval, oldval); \
+ /* Return 1 if it was already acquired. */ \
+- (ret != (int)oldval); \
++ (ret != oldval); \
+ })
+ #else
+ # error __ASSUME_LWS_CAS is required to build glibc.
Added: glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-elf-make-cflags.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-elf-make-cflags.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-elf-make-cflags.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,13 @@
+Index: eglibc-2.18/elf/Makefile
+===================================================================
+--- eglibc-2.18.orig/elf/Makefile 2014-02-25 20:47:20.859469989 -0500
++++ eglibc-2.18/elf/Makefile 2014-02-25 20:47:20.769469646 -0500
+@@ -424,7 +424,7 @@
+ -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
+ CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
+ CFLAGS-cache.c = $(SYSCONF-FLAGS)
+-CFLAGS-rtld.c = $(SYSCONF-FLAGS)
++CFLAGS-rtld.c += $(SYSCONF-FLAGS)
+
+ CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
+ -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld)
Added: glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fanotify_mark-5i.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fanotify_mark-5i.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fanotify_mark-5i.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,9 @@
+Index: eglibc-2.18/ports/sysdeps/unix/sysv/linux/hppa/syscalls.list
+===================================================================
+--- eglibc-2.18.orig/ports/sysdeps/unix/sysv/linux/hppa/syscalls.list 2014-02-24 20:50:56.481899712 -0500
++++ eglibc-2.18/ports/sysdeps/unix/sysv/linux/hppa/syscalls.list 2014-02-24 20:50:56.391899294 -0500
+@@ -36,3 +36,4 @@
+ setrlimit - setrlimit i:ip __setrlimit setrlimit
+ getrlimit - getrlimit i:ip __getrlimit getrlimit
+ prlimit64 EXTRA prlimit64 i:iipp __prlimit64 prlimit64@@GLIBC_2.17
++fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.17
Added: glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fcntl-osync.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fcntl-osync.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fcntl-osync.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,13 @@
+Index: eglibc-2.17/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
+===================================================================
+--- eglibc-2.17.orig/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h 2012-11-06 12:31:45.000000000 -0500
++++ eglibc-2.17/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h 2013-11-02 17:50:08.839898488 -0400
+@@ -27,7 +27,7 @@
+ #define O_NONBLOCK 00200004 /* HPUX has separate NDELAY & NONBLOCK */
+ #define __O_DSYNC 01000000
+ #define __O_RSYNC 02000000 /* HPUX only */
+-#define __O_SYNC 01000000
++#define __O_SYNC 00100000
+ #define O_SYNC (__O_SYNC|__O_DSYNC)
+
+ #define O_BLKSEEK 00000100 /* HPUX only */
Added: glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fpu.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fpu.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-fpu.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,46 @@
+Index: eglibc-2.18/ports/sysdeps/hppa/fpu/feholdexcpt.c
+===================================================================
+--- eglibc-2.18.orig/ports/sysdeps/hppa/fpu/feholdexcpt.c 2013-06-15 13:37:04.000000000 -0400
++++ eglibc-2.18/ports/sysdeps/hppa/fpu/feholdexcpt.c 2014-04-09 21:01:32.492451011 -0400
+@@ -29,8 +29,8 @@
+ /* Store the environment. */
+ bufptr = clear.buf;
+ __asm__ (
+- "fstd,ma %%fr0,8(%1)\n"
+- : "=m" (clear), "+r" (bufptr) : : "%r0");
++ "fstd %%fr0,0(%1)\n"
++ : "=m" (clear) : "r" (bufptr) : "%r0");
+ memcpy (envp, &clear.env, sizeof (fenv_t));
+
+ /* Clear exception queues */
+@@ -44,7 +44,7 @@
+ Thus we start bufptr at the end and work backwards */
+ bufptr = (unsigned long long *)((unsigned int)(clear.buf) + sizeof(unsigned int)*4);
+ __asm__ (
+- "fldd,mb -8(%0),%%fr0\n"
++ "fldd 0(%0),%%fr0\n"
+ : : "r" (bufptr), "m" (clear) : "%r0");
+
+ return 0;
+Index: eglibc-2.18/ports/sysdeps/hppa/fpu/fesetenv.c
+===================================================================
+--- eglibc-2.18.orig/ports/sysdeps/hppa/fpu/fesetenv.c 2013-06-15 13:37:04.000000000 -0400
++++ eglibc-2.18/ports/sysdeps/hppa/fpu/fesetenv.c 2014-04-09 20:59:45.221386729 -0400
+@@ -33,7 +33,7 @@
+ we want to use from the environment specified by the parameter. */
+ bufptr = temp.buf;
+ __asm__ (
+- "fstd,ma %%fr0,8(%1)\n"
++ "fstd %%fr0,0(%1)\n"
+ : "=m" (temp) : "r" (bufptr) : "%r0");
+
+ temp.env.__status_word &= ~(FE_ALL_EXCEPT
+@@ -54,7 +54,7 @@
+ we take advantage of that to load in reverse order so fr0
+ is loaded last and T-Bit is enabled. */
+ __asm__ (
+- "fldd,mb -8(%1),%%fr0\n"
++ "fldd 0(%1),%%fr0\n"
+ : : "m" (temp), "r" (bufptr) : "%r0" );
+
+ /* Success. */
Deleted: glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-longjmp-chk.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-longjmp-chk.diff 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-longjmp-chk.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -1,14 +0,0 @@
----
- ports/sysdeps/unix/sysv/linux/hppa/____longjmp_chk.S | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- /dev/null
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/____longjmp_chk.S
-@@ -0,0 +1,7 @@
-+/* Jump to the position specified by ENV, causing the
-+ setjmp call there to return VAL, or 1 if VAL is 0.
-+ void __longjmp (__jmp_buf env, int val). */
-+
-+#warning longjmp_chk unimplemented
-+#define __longjmp ____longjmp_chk
-+#include<__longjmp.S>
Added: glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-pthread_spin_unlock.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-pthread_spin_unlock.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-pthread_spin_unlock.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,36 @@
+Index: eglibc-2.18/ports/sysdeps/hppa/nptl/pthread_spin_init.c
+===================================================================
+--- eglibc-2.18.orig/ports/sysdeps/hppa/nptl/pthread_spin_init.c 2013-06-15 13:37:04.000000000 -0400
++++ eglibc-2.18/ports/sysdeps/hppa/nptl/pthread_spin_init.c 2014-05-03 17:52:31.677662598 -0400
+@@ -20,9 +20,9 @@
+ int
+ pthread_spin_init (pthread_spinlock_t *lock, int pshared)
+ {
+- int tmp = 0;
+- /* This should be a memory barrier to newer compilers */
+- __asm__ __volatile__ ("stw,ma %1,0(%0)"
+- : : "r" (lock), "r" (tmp) : "memory");
++ /* The LWS-CAS operation on hppa is a synthetic atomic operation
++ that doesn't provide the type of coherency that we need. Therefore
++ we force that coherency by using LWS-CAS again. */
++ atomic_exchange_rel (lock, 0);
+ return 0;
+ }
+Index: eglibc-2.18/ports/sysdeps/hppa/nptl/pthread_spin_unlock.c
+===================================================================
+--- eglibc-2.18.orig/ports/sysdeps/hppa/nptl/pthread_spin_unlock.c 2013-06-15 13:37:04.000000000 -0400
++++ eglibc-2.18/ports/sysdeps/hppa/nptl/pthread_spin_unlock.c 2014-05-03 17:54:51.829030840 -0400
+@@ -20,9 +20,9 @@
+ int
+ pthread_spin_unlock (pthread_spinlock_t *lock)
+ {
+- int tmp = 0;
+- /* This should be a memory barrier to newer compilers */
+- __asm__ __volatile__ ("stw,ma %1,0(%0)"
+- : : "r" (lock), "r" (tmp) : "memory");
++ /* The LWS-CAS operation on hppa is a synthetic atomic operation
++ that doesn't provide the type of coherency that we need. Therefore
++ we force that coherency by using LWS-CAS again. */
++ atomic_exchange_rel (lock, 0);
+ return 0;
+ }
Added: glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-setjmp-namespace.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-setjmp-namespace.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-setjmp-namespace.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,13 @@
+Index: eglibc-2.17/ports/sysdeps/hppa/bits/setjmp.h
+===================================================================
+--- eglibc-2.17.orig/ports/sysdeps/hppa/bits/setjmp.h 2013-07-07 16:03:20.000000000 -0400
++++ eglibc-2.17/ports/sysdeps/hppa/bits/setjmp.h 2013-07-07 16:37:39.000000000 -0400
+@@ -38,7 +38,7 @@
+ * 10 x 64-bit fprs in this order:
+ - fr12-fr21 (callee saves)
+ Note: We have 8 bytes of free space for future uses. */
+-typedef union
++typedef union __jmp_buf_internal
+ {
+ struct __jmp_buf_internal_tag
+ {
Added: glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-shmlba.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-shmlba.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hppa/local-shmlba.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,13 @@
+Index: eglibc-2.18/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
+===================================================================
+--- eglibc-2.18.orig/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h 2013-01-09 19:28:48.000000000 -0500
++++ eglibc-2.18/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h 2014-04-09 21:08:06.516202583 -0400
+@@ -36,7 +36,7 @@
+ #define SHM_UNLOCK 12 /* unlock segment (root only) */
+
+ /* Segment low boundary address multiple. */
+-#define SHMLBA 0x00400000 /* address needs to be 4 Mb aligned */
++#define SHMLBA (__getpagesize ())
+
+ /* Type to count number of attaches. */
+ typedef unsigned long int shmatt_t;
Added: glibc-package/branches/eglibc-2.19/debian/patches/localedata/submitted-it_IT-thousands_sep.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/localedata/submitted-it_IT-thousands_sep.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/localedata/submitted-it_IT-thousands_sep.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,18 @@
+2014-05-05 Aurelien Jarno <aurelien@aurel32.net>
+
+ * locales/it_IT: Use same grouping in LC_NUMERIC as in LC_MONETARY.
+
+diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT
+--- a/localedata/locales/it_IT
++++ b/localedata/locales/it_IT
+@@ -82,8 +82,8 @@ END LC_MONETARY
+
+ LC_NUMERIC
+ decimal_point "<U002C>"
+-thousands_sep ""
+-grouping 0;0
++thousands_sep "<U002E>"
++grouping 3;3
+ END LC_NUMERIC
+
+ LC_TIME
Modified: glibc-package/branches/eglibc-2.19/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/series 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/patches/series 2014-05-14 18:49:39 UTC (rev 6070)
@@ -37,6 +37,7 @@
localedata/submitted-en_AU-date_fmt.diff
localedata/submitted-es_MX-decimal_point.diff
localedata/submitted-locale-bo.diff
+localedata/submitted-it_IT-thousands_sep.diff
alpha/local-gcc4.1.diff
alpha/submitted-dl-support.diff
@@ -59,9 +60,15 @@
hppa/submitted-fadvise64_64.diff
hppa/submitted-nptl-carlos.diff
hppa/local-stack-grows-up.diff
-hppa/local-longjmp-chk.diff
hppa/local-lowlevellock.diff
hppa/local-EAGAIN.diff
+hppa/local-elf-make-cflags.diff
+hppa/local-setjmp-namespace.diff
+hppa/local-fcntl-osync.diff
+hppa/local-atomic.diff
+hppa/local-fpu.diff
+hppa/local-shmlba.diff
+hppa/local-pthread_spin_unlock.diff
hurd-i386/cvs-tcbhead_t.diff
hurd-i386/local-enable-ldconfig.diff
@@ -172,6 +179,9 @@
sparc/local-fork.diff
sparc/local-sparcv9-target.diff
sparc/submitted-timing.diff
+sparc/cvs-strcmp.diff
+sparc/cvs-efd_semaphore.diff
+sparc/submitted-prlimit.diff
all/local-alias-UTF-8.diff
all/local-alias-et_EE.diff
@@ -179,6 +189,7 @@
all/local-ru_RU.diff
all/local-ldd.diff
all/local-nis-shadow.diff
+all/submitted-po-fr-fixes.diff
any/local-rtlddir-cross.diff
any/local-asserth-decls.diff
@@ -216,7 +227,6 @@
any/submitted-ldsodefs_rtld_debug.diff
any/local-ldconfig-multiarch.diff
any/local-tst-writev.diff
-any/submitted-resolv-first-query-failure.diff
any/local-disable-libnss-db.diff
any/local-revert-bz13979.diff
any/local-tst-eintr1-eagain.diff
@@ -228,3 +238,8 @@
any/submitted-sysdeps-auxv.diff
any/local-ldconfig-ignore-ld.so.diff
any/local-no-malloc-backtrace.diff
+any/cvs-wprintf.diff
+any/cvs-resolv-first-query-failure.diff
+any/submitted-ptsname_r-uninitialized-memory.diff
+any/cvs-socketcall-syscall.diff
+any/submitted-nl_langinfo-static.diff
Added: glibc-package/branches/eglibc-2.19/debian/patches/sparc/cvs-efd_semaphore.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/sparc/cvs-efd_semaphore.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/sparc/cvs-efd_semaphore.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,18 @@
+2014-05-06 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #16916]
+ * sysdeps/unix/sysv/linux/sparc/bits/eventfd.h (EFD_SEMAPHORE):
+ Define.
+
+diff --git a/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h b/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h
+--- a/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h
++++ b/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h
+@@ -22,6 +22,8 @@
+ /* Flags for eventfd. */
+ enum
+ {
++ EFD_SEMAPHORE = 0x000001,
++#define EFD_SEMAPHORE EFD_SEMAPHORE
+ EFD_CLOEXEC = 0x400000,
+ #define EFD_CLOEXEC EFD_CLOEXEC
+ EFD_NONBLOCK = 0x004000
Added: glibc-package/branches/eglibc-2.19/debian/patches/sparc/cvs-strcmp.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/sparc/cvs-strcmp.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/sparc/cvs-strcmp.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,89 @@
+2014-05-01 David S. Miller <davem@davemloft.net>
+
+ [BZ #16885]
+ * sysdeps/sparc/sparc64/strcmp.S: Fix end comparison handling when
+ multiple zero bytes exist at the end of a string.
+ Reported by Aurelien Jarno <aurelien@aurel32.net>
+
+ * string/test-strcmp.c (check): Add explicit test for situations where
+ there are multiple zero bytes after the first.
+
+diff --git a/string/test-strcmp.c b/string/test-strcmp.c
+--- a/string/test-strcmp.c
++++ b/string/test-strcmp.c
+@@ -329,6 +329,34 @@ check (void)
+ FOR_EACH_IMPL (impl, 0)
+ check_result (impl, s1 + i1, s2 + i2, exp_result);
+ }
++
++ /* Test cases where there are multiple zero bytes after the first. */
++
++ for (size_t i = 0; i < 16 + 1; i++)
++ {
++ s1[i] = 0x00;
++ s2[i] = 0x00;
++ }
++
++ for (size_t i = 0; i < 16; i++)
++ {
++ int exp_result;
++
++ for (int val = 0x01; val < 0x100; val++)
++ {
++ for (size_t j = 0; j < i; j++)
++ {
++ s1[j] = val;
++ s2[j] = val;
++ }
++
++ s2[i] = val;
++
++ exp_result = SIMPLE_STRCMP (s1, s2);
++ FOR_EACH_IMPL (impl, 0)
++ check_result (impl, s1, s2, exp_result);
++ }
++ }
+ }
+
+
+diff --git a/sysdeps/sparc/sparc64/strcmp.S b/sysdeps/sparc/sparc64/strcmp.S
+--- a/sysdeps/sparc/sparc64/strcmp.S
++++ b/sysdeps/sparc/sparc64/strcmp.S
+@@ -121,6 +121,37 @@ ENTRY(strcmp)
+ movleu %xcc, -1, %o0
+ srlx rTMP1, 7, rTMP1
+
++ /* In order not to be influenced by bytes after the zero byte, we
++ * have to retain only the highest bit in the mask for the comparison
++ * with rSTRXOR to work properly.
++ */
++ mov 0, rTMP2
++ andcc rTMP1, 0x0100, %g0
++
++ movne %xcc, 8, rTMP2
++ sllx rTMP1, 63 - 16, %o1
++
++ movrlz %o1, 16, rTMP2
++ sllx rTMP1, 63 - 24, %o1
++
++ movrlz %o1, 24, rTMP2
++ sllx rTMP1, 63 - 32, %o1
++
++ movrlz %o1, 32, rTMP2
++ sllx rTMP1, 63 - 40, %o1
++
++ movrlz %o1, 40, rTMP2
++ sllx rTMP1, 63 - 48, %o1
++
++ movrlz %o1, 48, rTMP2
++ sllx rTMP1, 63 - 56, %o1
++
++ movrlz %o1, 56, rTMP2
++
++ srlx rTMP1, rTMP2, rTMP1
++
++ sllx rTMP1, rTMP2, rTMP1
++
+ cmp rTMP1, rSTRXOR
+ retl
+ movgu %xcc, 0, %o0
Added: glibc-package/branches/eglibc-2.19/debian/patches/sparc/submitted-prlimit.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/sparc/submitted-prlimit.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/sparc/submitted-prlimit.diff 2014-05-14 18:49:39 UTC (rev 6070)
@@ -0,0 +1,40 @@
+2014-05-14 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #16943]
+ * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Declare prlimit
+ and prlimit64.
+
+diff --git a/sysdeps/unix/sysv/linux/sparc/bits/resource.h b/sysdeps/unix/sysv/linux/sparc/bits/resource.h
+--- a/sysdeps/unix/sysv/linux/sparc/bits/resource.h
++++ b/sysdeps/unix/sysv/linux/sparc/bits/resource.h
+@@ -252,3 +252,30 @@ enum __priority_which
+ PRIO_USER = 2 /* WHO is a user ID. */
+ #define PRIO_USER PRIO_USER
+ };
++
++__BEGIN_DECLS
++
++#ifdef __USE_GNU
++/* Modify and return resource limits of a process atomically. */
++# ifndef __USE_FILE_OFFSET64
++extern int prlimit (__pid_t __pid, enum __rlimit_resource __resource,
++ const struct rlimit *__new_limit,
++ struct rlimit *__old_limit) __THROW;
++# else
++# ifdef __REDIRECT_NTH
++extern int __REDIRECT_NTH (prlimit, (__pid_t __pid,
++ enum __rlimit_resource __resource,
++ const struct rlimit *__new_limit,
++ struct rlimit *__old_limit), prlimit64);
++# else
++# define prlimit prlimit64
++# endif
++# endif
++# ifdef __USE_LARGEFILE64
++extern int prlimit64 (__pid_t __pid, enum __rlimit_resource __resource,
++ const struct rlimit64 *__new_limit,
++ struct rlimit64 *__old_limit) __THROW;
++# endif
++#endif
++
++__END_DECLS
Modified: glibc-package/branches/eglibc-2.19/debian/source/lintian-overrides
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/source/lintian-overrides 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/source/lintian-overrides 2014-05-14 18:49:39 UTC (rev 6070)
@@ -2,6 +2,6 @@
eglibc source: debhelper-but-no-misc-depends libc6
eglibc source: debhelper-but-no-misc-depends libc6.1
eglibc source: debhelper-but-no-misc-depends libc0.3
-eglibc source: outdated-autotools-helper-file scripts/config.sub 2006-02-27
-eglibc source: outdated-autotools-helper-file scripts/config.guess 2006-02-27
-
+eglibc source: license-problem-non-free-RFC LICENSES
+eglibc source: license-problem-non-free-RFC libidn/punycode.c
+eglibc source: license-problem-non-free-RFC libidn/punycode.h
Modified: glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mips32el-linux-gnu-mipsn32 2014-05-14 18:49:39 UTC (rev 6070)
@@ -19,5 +19,7 @@
tst-cpuclock2.out, Error 1
tst-mqueue5.out, Error 1
tst-timer.out, Error 139
+tst-tls2.out, Error 1
+tst-tls3.out, Error 1
tst-waitid.out, Error 1
tst-cputimer1.out, Error 1
Modified: glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mips64el-linux-gnu-mips64 2014-05-14 18:49:39 UTC (rev 6070)
@@ -17,6 +17,8 @@
tst-cpuclock2.out, Error 1
tst-mqueue5.out, Error 1
tst-timer.out, Error 139
+tst-tls2.out, Error 1
+tst-tls3.out, Error 1
tst-waitid.out, Error 1
tst-writev.out, Error 1
tst-cputimer1.out, Error 1
Modified: glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc 2014-05-14 18:16:47 UTC (rev 6069)
+++ glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-mipsel-linux-gnu-libc 2014-05-14 18:49:39 UTC (rev 6070)
@@ -16,5 +16,7 @@
tst-cpuclock2.out, Error 1
tst-mqueue5.out, Error 1
tst-timer.out, Error 139
+tst-tls2.out, Error 1
+tst-tls3.out, Error 1
tst-waitid.out, Error 1
tst-cputimer1.out, Error 1
Reply to: